diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-19 14:41:23 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-19 14:41:23 +0000 |
commit | 2d7d605fdfde31394a46a9bc57f39f20e2f39334 (patch) | |
tree | e3f9b09eab63d5d02f8b04f8b843b7b3b228f96f /c/src/lib/libbsp/i386/pc386/timer/timer.c | |
parent | Patches from Ralf Corsepius <corsepiu@faw.uni-ulm.de> and myself to (diff) | |
download | rtems-2d7d605fdfde31394a46a9bc57f39f20e2f39334.tar.bz2 |
Patch from Aleksey <qqi@world.std.com>:
It fixes netboot build problem, KA9Q configuration
for pc386, some compiler wardning, it also removed some stuff
ifdef'ed with '#if 0'.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/timer/timer.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c index 4fe0fb2cd9..8ae7f7c011 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timer.c +++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c @@ -55,9 +55,8 @@ volatile rtems_unsigned32 Ttimer_val; /*-------------------------------------------------------------------------+ | External Prototypes +--------------------------------------------------------------------------*/ -extern void timerisr(); +extern void timerisr(void); /* timer (int 08h) Interrupt Service Routine (defined in 'timerisr.s') */ -extern int clockIsOn(const rtems_irq_connect_data*); /*-------------------------------------------------------------------------+ | Pentium optimized timer handling. @@ -155,7 +154,7 @@ Read_timer(void) | Arguments: None. | Returns: Nothing. +--------------------------------------------------------------------------*/ -void +static void timerOff(const rtems_raw_irq_connect_data* used) { /* @@ -169,7 +168,8 @@ timerOff(const rtems_raw_irq_connect_data* used) } /* Timer_exit */ -void timerOn(const rtems_raw_irq_connect_data* used) +static void +timerOn(const rtems_raw_irq_connect_data* used) { /* load timer for US_PER_ISR microsecond period */ outport_byte(TIMER_MODE, TIMER_SEL0|TIMER_16BIT|TIMER_RATEGEN); @@ -181,12 +181,17 @@ void timerOn(const rtems_raw_irq_connect_data* used) pc386_irq_enable_at_i8259s(used->idtIndex - PC386_IRQ_VECTOR_BASE); } +static int +timerIsOn(const rtems_raw_irq_connect_data *used) +{ + return pc386_irq_enabled_at_i8259s(used->idtIndex - PC386_IRQ_VECTOR_BASE);} + static rtems_raw_irq_connect_data timer_raw_irq_data = { PC_386_PERIODIC_TIMER + PC386_IRQ_VECTOR_BASE, timerisr, timerOn, timerOff, - clockIsOn + timerIsOn }; /*-------------------------------------------------------------------------+ |