From 026f4aa247d4162cc98a3931dc877116a5f3815f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 9 Jan 2001 17:05:57 +0000 Subject: 2001-01-09 Joel Sherrill * clock/clockdrv.c: Clean up. * include/bsp.h: Uncomment and fix set_vector() prototype. --- c/src/lib/libbsp/mips/jmr3904/ChangeLog | 5 +++++ c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c | 11 +++++++---- c/src/lib/libbsp/mips/jmr3904/include/bsp.h | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/mips') diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 4ed44fb446..2a1645c40e 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,8 @@ +2001-01-09 Joel Sherrill + + * clock/clockdrv.c: Clean up. + * include/bsp.h: Uncomment and fix set_vector() prototype. + 2001-01-03 Joel Sherrill * console/console-io.c: Removed unused variable initialized. diff --git a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c index 513db82a0c..6bef17496d 100644 --- a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c @@ -1,14 +1,14 @@ /* * Instantiate the clock driver shell. * - * Since there is no clock source on the simulator, all we do is - * make sure it will build. + * The tx3904 simulator in gdb counts instructions. * * $Id$ */ #include #include +#include #define CLOCK_DRIVER_USE_FAST_IDLE @@ -16,12 +16,15 @@ #define Clock_driver_support_at_tick() -/* XXX */ +/* + * 5000 clicks per tick ISR is HIGHLY arbitrary + */ + #define CLICKS 5000 #define Clock_driver_support_install_isr( _new, _old ) \ do { \ unsigned32 _clicks = CLICKS; \ - _old = (rtems_isr_entry) set_vector( _new, CLOCK_VECTOR, 1 ); \ + _old = set_vector( _new, CLOCK_VECTOR, 1 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_CCDR, 0x3 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_CPRA, _clicks ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_TISR, 0x00 ); \ diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h index 77dc594cab..78d602b120 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h +++ b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h @@ -77,7 +77,7 @@ extern rtems_configuration_table BSP_Configuration; void bsp_cleanup( void ); -/* i960_isr_entry set_vector( rtems_isr_entry, unsigned int, unsigned int ); */ +rtems_isr_entry set_vector( rtems_isr_entry, unsigned int, unsigned int ); #ifdef __cplusplus } -- cgit v1.2.3