From 2acdaca218676655cfb182a355e39a133cbdc8e9 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Sat, 11 Jun 2011 01:52:16 -0300
Subject: [PATCH] atusb/fw/: moved timer initialization to board_app.c as well

- board.c (board_init), board_app.h (timer_init), board_app.c
  (timer_init): moved timer initialization from board_init to
  new function timer_init
- atusb.c (main): call timer_init
---
 atusb/fw/atusb.c     | 1 +
 atusb/fw/board.c     | 5 -----
 atusb/fw/board.h     | 1 +
 atusb/fw/board_app.c | 9 +++++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/atusb/fw/atusb.c b/atusb/fw/atusb.c
index deac478..cade73e 100644
--- a/atusb/fw/atusb.c
+++ b/atusb/fw/atusb.c
@@ -34,6 +34,7 @@ int main(void)
 
 	usb_init();
 	ep0_init();
+	timer_init();
 
 	while (1) {
 		usb_poll();
diff --git a/atusb/fw/board.c b/atusb/fw/board.c
index a252393..03fd1c8 100644
--- a/atusb/fw/board.c
+++ b/atusb/fw/board.c
@@ -135,10 +135,5 @@ void board_init(void)
 	CLKPR = 1 << CLKPCE;
 	CLKPR = 0;
 
-	/* configure timer 1 as a free-running CLK counter */
-
-	TCCR1A = 0;
-	TCCR1B = 1 << CS10;
-
 	get_sernum();
 }
diff --git a/atusb/fw/board.h b/atusb/fw/board.h
index c4bd9c0..a01060c 100644
--- a/atusb/fw/board.h
+++ b/atusb/fw/board.h
@@ -79,6 +79,7 @@ void panic(void);
 
 void timer_poll(void);
 uint64_t timer_read(void);
+void timer_init(void);
 
 int gpio(uint8_t port, uint8_t data, uint8_t dir, uint8_t mask, uint8_t *res);
 
diff --git a/atusb/fw/board_app.c b/atusb/fw/board_app.c
index 520f2fe..625f9c2 100644
--- a/atusb/fw/board_app.c
+++ b/atusb/fw/board_app.c
@@ -74,6 +74,15 @@ uint64_t timer_read(void)
 }
 
 
+void timer_init(void)
+{
+	/* configure timer 1 as a free-running CLK counter */
+
+	TCCR1A = 0;
+	TCCR1B = 1 << CS10;
+}
+
+
 int gpio(uint8_t port, uint8_t data, uint8_t dir, uint8_t mask, uint8_t *res)
 {
 	switch (port) {