From a355e3ea982d7bb8a8cb5a67f810c66cbfc78330 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 22 May 2001 23:07:09 +0000 Subject: 2001-05-22 Greg Menke * Assisted in design and debug by Joel Sherrill . * clock/clockdrv.c, console/conscfg.c: Corrected. * include/bsp.h: Support for tm27 and addition of CPU_CLOCK_RATE. * startup/bspstart.c: Properly set initial status register and pending interrupts. * timer/timer.c: Works now. --- .../lib/libbsp/mips/genmongoosev/clock/clockdrv.c | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c') diff --git a/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c b/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c index e948b7ee4f..7d47945864 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/genmongoosev/clock/clockdrv.c @@ -23,14 +23,16 @@ #define CLOCK_VECTOR MONGOOSEV_IRQ_TIMER1 #endif + + /* reset Timeout (TO) bit */ + #define Clock_driver_support_at_tick() \ - MONGOOSEV_WRITE_REGISTER( \ - CLOCK_BASE, \ - MONGOOSEV_TIMER_CONTROL_REGISTER, \ - (MONGOOSEV_TIMER_CONTROL_COUNTER_ENABLE | \ - MONGOOSEV_TIMER_CONTROL_INTERRUPT_ENABLE) \ - ); + do { \ + MONGOOSEV_WRITE_REGISTER( CLOCK_BASE, MONGOOSEV_TIMER_CONTROL_REGISTER, \ + (MONGOOSEV_TIMER_CONTROL_COUNTER_ENABLE | MONGOOSEV_TIMER_CONTROL_INTERRUPT_ENABLE)); \ + } while(0) + #define Clock_driver_support_install_isr( _new, _old ) \ do { \ @@ -38,20 +40,12 @@ } while(0) -extern int ClockRate; - -#define CLICKS (((unsigned32) &ClockRate) / 1000000 ) #define Clock_driver_support_initialize_hardware() \ - do { \ - unsigned32 _clicks; \ - _clicks = CLICKS * rtems_configuration_get_microseconds_per_tick(); \ - MONGOOSEV_WRITE_REGISTER( \ - CLOCK_BASE, \ - MONGOOSEV_TIMER_INITIAL_COUNTER_REGISTER, \ - _clicks \ - ); \ + do { \ + unsigned32 _clicks = CPU_CLOCK_RATE_MHZ * rtems_configuration_get_microseconds_per_tick(); \ + MONGOOSEV_WRITE_REGISTER( CLOCK_BASE, MONGOOSEV_TIMER_INITIAL_COUNTER_REGISTER, _clicks ); \ Clock_driver_support_at_tick(); \ - } while(0) + } while(0) #define Clock_driver_support_shutdown_hardware() \ MONGOOSEV_WRITE_REGISTER( CLOCK_BASE, MONGOOSEV_TIMER_CONTROL_REGISTER, 0 ) -- cgit v1.2.3