diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-04 17:57:26 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-04 17:57:26 +0000 |
| commit | b6e3a7e26d4857ef9bce7187f249dd9e07702e87 (patch) | |
| tree | 2a702cdf7e7aa839a08701a4d77c2bdf6941698e /c | |
| parent | 2008-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-b6e3a7e26d4857ef9bce7187f249dd9e07702e87.tar.bz2 | |
2008-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1344/bsps
* clock/ckinit.c: Committed code was not final. Corrections.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/clock/ckinit.c | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index f256342b94..762c1c0935 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,8 @@ +2008-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + PR 1344/bsps + * clock/ckinit.c: Committed code was not final. Corrections. + 2008-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> Michael South <msouth@msouth.org> diff --git a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c index abe69b2aaf..45b66a2734 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c +++ b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c @@ -197,7 +197,7 @@ static void calibrate_tsc(void) /* Initialize "previous tick" counters */ pc586_tsc_at_tick = rdtsc(); -#if 1 +#if 0 printk( "CPU clock at %u MHz\n", (uint32_t)(pc586_tsc_per_tick / 1000000)); #endif @@ -263,7 +263,7 @@ static rtems_irq_connect_data clockIrqData = { clockIsOn }; -void Clock_driver_support_initialize_hardware() +void Clock_driver_support_initialize_hardware(void) { bool use_tsc = false; bool use_8254 = false; @@ -282,16 +282,16 @@ void Clock_driver_support_initialize_hardware() } if ( use_8254 ) { - printk( "Use 8254\n" ); + /* printk( "Use 8254\n" ); */ Clock_driver_support_at_tick = Clock_driver_support_at_tick_empty; - bsp_clock_nanoseconds_since_last_tick = + Clock_driver_nanoseconds_since_last_tick = bsp_clock_nanoseconds_since_last_tick_tsc; } else { - printk( "Use TSC\n" ); + /* printk( "Use TSC\n" ); */ Clock_driver_support_at_tick = Clock_driver_support_at_tick_tsc; - bsp_clock_nanoseconds_since_last_tick = - bsp_clock_nanoseconds_since_last_tick_i88254; + Clock_driver_nanoseconds_since_last_tick = + bsp_clock_nanoseconds_since_last_tick_i8254; } if (!BSP_install_rtems_irq_handler (&clockIrqData)) { |