diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-31 04:22:15 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-31 04:22:15 +0000 |
commit | 35eb76329e59e6773ff2f566334fa86fe7f55d08 (patch) | |
tree | 1ee55df8b9a5952746a0b6150eefe3f63967fd79 /c | |
parent | 2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-35eb76329e59e6773ff2f566334fa86fe7f55d08.tar.bz2 |
2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
* clock/clockdrv.c, console/console.c, startup/bspstart.c,
timer/timer.c, timer/timerisr.c: Convert to using c99 fixed size
types.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/or32/orp/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/or32/orp/clock/clockdrv.c | 20 | ||||
-rw-r--r-- | c/src/lib/libbsp/or32/orp/console/console.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/or32/orp/startup/bspstart.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/or32/orp/timer/timer.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/or32/orp/timer/timerisr.c | 2 |
6 files changed, 26 insertions, 20 deletions
diff --git a/c/src/lib/libbsp/or32/orp/ChangeLog b/c/src/lib/libbsp/or32/orp/ChangeLog index 78fbcb44fa..e1c9b99fb2 100644 --- a/c/src/lib/libbsp/or32/orp/ChangeLog +++ b/c/src/lib/libbsp/or32/orp/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> + + * clock/clockdrv.c, console/console.c, startup/bspstart.c, + timer/timer.c, timer/timerisr.c: Convert to using c99 fixed size + types. + 2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Reflect changes to bsp.am. diff --git a/c/src/lib/libbsp/or32/orp/clock/clockdrv.c b/c/src/lib/libbsp/or32/orp/clock/clockdrv.c index f9642211c9..236fa46b88 100644 --- a/c/src/lib/libbsp/or32/orp/clock/clockdrv.c +++ b/c/src/lib/libbsp/or32/orp/clock/clockdrv.c @@ -36,7 +36,7 @@ void Clock_isr( rtems_vector_number vector,unsigned int pc, * number of clock ticks since the driver was initialized. */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* * Clock_isrs is the number of clock ISRs until the next invocation of @@ -46,7 +46,7 @@ volatile rtems_unsigned32 Clock_driver_ticks; * has passed. */ -rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ +uint32_t Clock_isrs; /* ISRs until next tick */ /* * These are set by clock driver during its init @@ -66,10 +66,10 @@ static const unsigned int TTMR_RESET = 0x60030D40; * Isr Handler */ -void Clock_isr(unsigned32 vector, - unsigned32 pc, - unsigned32 ear, - unsigned32 sr) +void Clock_isr(uint32_t vector, + uint32_t pc, + uint32_t ear, + uint32_t sr) { register int pending; register int value = 0x60002710; @@ -97,8 +97,8 @@ void Clock_isr(unsigned32 vector, void Install_clock() { - unsigned32 tmp,sr,ttmr,ttcr; - extern unsigned32 Or1k_Interrupt_Vectors[16]; + uint32_t tmp,sr,ttmr,ttcr; + extern uint32_t Or1k_Interrupt_Vectors[16]; ttmr = TTMR_RESET; /* Reset value */ ttcr = 0; /* Start at 0 */ @@ -129,7 +129,7 @@ void Install_clock() old_handler = (void(*)(unsigned int,unsigned int,unsigned int,unsigned int)) Or1k_Interrupt_Vectors[8]; - Or1k_Interrupt_Vectors[8] = (unsigned32)Clock_isr; + Or1k_Interrupt_Vectors[8] = (uint32_t)Clock_isr; asm volatile ("l.mtspr r0,%0,0x11\n\t":: "r" (sr)); @@ -199,7 +199,7 @@ rtems_device_driver Clock_control( void *pargp ) { - rtems_unsigned32 isrlevel; + uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; if (args == 0) diff --git a/c/src/lib/libbsp/or32/orp/console/console.c b/c/src/lib/libbsp/or32/orp/console/console.c index d347c049c3..a6cddc419f 100644 --- a/c/src/lib/libbsp/or32/orp/console/console.c +++ b/c/src/lib/libbsp/or32/orp/console/console.c @@ -78,8 +78,8 @@ rtems_device_driver console_initialize( { rtems_status_code status; int tmp,tmp2; - unsigned32 sr; - extern unsigned32 Or1k_Interrupt_Vectors[16]; + uint32_t sr; + extern uint32_t Or1k_Interrupt_Vectors[16]; /* Make sure the UART (interrupt 2) is enabled and reports a low prority interrupt */ @@ -100,7 +100,7 @@ rtems_device_driver console_initialize( old_handler = (void(*)(unsigned int,unsigned int,unsigned int,unsigned int)) Or1k_Interrupt_Vectors[5]; - Or1k_Interrupt_Vectors[5] = (unsigned32)console_interrupt; + Or1k_Interrupt_Vectors[5] = (uint32_t)console_interrupt; asm volatile ("l.mtspr r0,%0,0x11\n\t":: "r" (sr)); diff --git a/c/src/lib/libbsp/or32/orp/startup/bspstart.c b/c/src/lib/libbsp/or32/orp/startup/bspstart.c index cc55ea86c1..16506ba11f 100644 --- a/c/src/lib/libbsp/or32/orp/startup/bspstart.c +++ b/c/src/lib/libbsp/or32/orp/startup/bspstart.c @@ -40,7 +40,7 @@ rtems_cpu_table Cpu_table; */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); /* * Function: bsp_pretasking_hook @@ -58,9 +58,9 @@ void bsp_libc_init( void *, unsigned32, int ); void bsp_pretasking_hook(void) { - rtems_unsigned32 heap_start; + uint32_t heap_start; - heap_start = (rtems_unsigned32) _mem_end; + heap_start = (uint32_t) _mem_end; if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); diff --git a/c/src/lib/libbsp/or32/orp/timer/timer.c b/c/src/lib/libbsp/or32/orp/timer/timer.c index 4ab13f4db8..9bef085916 100644 --- a/c/src/lib/libbsp/or32/orp/timer/timer.c +++ b/c/src/lib/libbsp/or32/orp/timer/timer.c @@ -21,7 +21,7 @@ #include <rtems.h> #include <bsp.h> -rtems_unsigned32 Timer_interrupts; +uint32_t Timer_interrupts; rtems_boolean Timer_driver_Find_average_overhead; void Timer_initialize( void ) @@ -56,8 +56,8 @@ void Timer_initialize( void ) int Read_timer( void ) { - rtems_unsigned32 clicks; - rtems_unsigned32 total; + uint32_t clicks; + uint32_t total; /* * Read the timer and see how many clicks it has been since we started. diff --git a/c/src/lib/libbsp/or32/orp/timer/timerisr.c b/c/src/lib/libbsp/or32/orp/timer/timerisr.c index 2e1e4fdb05..7cbd49a050 100644 --- a/c/src/lib/libbsp/or32/orp/timer/timerisr.c +++ b/c/src/lib/libbsp/or32/orp/timer/timerisr.c @@ -25,7 +25,7 @@ #include <rtems.h> -extern rtems_unsigned32 _Timer_interrupts; +extern uint32_t _Timer_interrupts; void timerisr( void ) { |