sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-20 12:00:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Timers] Miscellaneous timer system fixes

Browse Source 
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.
This commit is contained in:
Michael Brown
2008-03-18 14:48:28 +00:00
parent 03398e3389
commit 2652abdc5f
4 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/serial.c
View File

@@ -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,
};

59
src/core/timer.c
View File

@@ -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;
}