From 2652abdc5f42f623ce4abf0efc117dc4f0d20474 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 18 Mar 2008 14:48:28 +0000
Subject: [Timers] Miscellaneous timer system fixes

Add missing comments to timer code.

Lock system if no suitable timer source is found.

Fix initialisation order so that timers are initialised before code that
needs to use them.
---
 src/core/serial.c |  2 +-
 src/core/timer.c  | 59 ++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 23 deletions(-)

(limited to 'src/core')

diff --git a/src/core/serial.c b/src/core/serial.c
index f6d0ecbb9..a5b3f9135 100644
--- a/src/core/serial.c
+++ b/src/core/serial.c
@@ -263,6 +263,6 @@ struct startup_fn serial_startup_fn __startup_fn ( STARTUP_NORMAL ) = {
  * early debug messages.  It is safe to call serial_init() multiple
  * times.
  */
-struct init_fn serial_init_fn __init_fn ( INIT_EARLY ) = {
+struct init_fn serial_init_fn __init_fn ( INIT_CONSOLE ) = {
 	.initialise = serial_init,
 };
diff --git a/src/core/timer.c b/src/core/timer.c
index e736f5285..ef80c0441 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -22,7 +22,6 @@
 #include <assert.h>
 #include <gpxe/init.h>
 #include <gpxe/timer.h>
-#include <stdio.h>
 
 static struct timer ts_table[0]
 	__table_start ( struct timer, timers );
@@ -53,48 +52,64 @@ static void timer_init(void)
 	struct timer *ts;
 
 	for (ts = ts_table; ts < ts_table_end; ts++) {
-		if (ts->init && ts->init() >= 0) {
+		if ( ts->init() == 0 ) {
 			used_ts = ts;
-			break;
+			return;
 		}
 	}
 
-	assert(used_ts);
+	/* No timer found; we cannot continue */
+	assert ( 0 );
+	while ( 1 ) {};
 }
 
 struct init_fn ts_init_fn __init_fn ( INIT_NORMAL ) = {
 	.initialise = timer_init,
 };
 
-/* Functions for public use. */
-
-tick_t currticks(void)
-{
+/**
+ * Read current time
+ *
+ * @ret ticks	Current time, in ticks
+ */
+tick_t currticks ( void ) {
 	tick_t ct;
 	assert(used_ts);
 
 	ct = used_ts->currticks();
-	DBG("currticks: %ld seconds and %06ld microseconds\n", ct/USECS_IN_SEC, ct%USECS_IN_SEC);
+	DBG ( "currticks: %ld.%06ld seconds\n",
+	      ct / USECS_IN_SEC, ct % USECS_IN_SEC );
 
 	return ct;
 }
 
-void udelay(unsigned int usecs)
-{
-	used_ts->udelay(usecs);
+/**
+ * Delay
+ *
+ * @v usecs	Time to delay, in microseconds
+ */
+void udelay ( unsigned int usecs ) {
+	assert(used_ts);
+	used_ts->udelay ( usecs );
 }
 
-void mdelay(unsigned int msecs)
-{
-	while(msecs--)
-		used_ts->udelay(USECS_IN_MSEC);
+/**
+ * Delay
+ *
+ * @v msecs	Time to delay, in milliseconds
+ */
+void mdelay ( unsigned int msecs ) {
+	while ( msecs-- )
+		udelay ( USECS_IN_MSEC );
 }
 
-unsigned int sleep(unsigned int secs)
-{
-	while (secs--)
-		mdelay(MSECS_IN_SEC);
-
+/**
+ * Delay
+ *
+ * @v secs	Time to delay, in seconds
+ */
+unsigned int sleep ( unsigned int secs ) {
+	while ( secs-- )
+		mdelay ( MSECS_IN_SEC );
 	return 0;
 }
-
-- 
cgit v1.2.3-55-g7522