From 0f458a3b0865644ecbaee4b455d1b6b9dc430d33 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:38:23 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, console/console.c, include/bsp.h, spurious/spinit.c, startup/bspstart.c, startup/vmeintr.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/m68k/dmv152/ChangeLog | 6 ++++ c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c | 14 ++++----- c/src/lib/libbsp/m68k/dmv152/console/console.c | 12 +++---- c/src/lib/libbsp/m68k/dmv152/include/bsp.h | 42 ++++++++++++------------- c/src/lib/libbsp/m68k/dmv152/spurious/spinit.c | 2 +- c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/dmv152/startup/vmeintr.c | 8 ++--- c/src/lib/libbsp/m68k/dmv152/timer/timer.c | 12 +++---- 8 files changed, 52 insertions(+), 46 deletions(-) (limited to 'c/src/lib/libbsp/m68k/dmv152') diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog index 5ab6bce2c3..dc40ded599 100644 --- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog +++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius + + * clock/ckinit.c, console/console.c, include/bsp.h, + spurious/spinit.c, startup/bspstart.c, startup/vmeintr.c, + timer/timer.c: Convert to using c99 fixed size types. + 2004-02-19 Ralf Corsepius * Makefile.am: Reflect changes to bsp.am. diff --git a/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c b/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c index 606345700b..76f4f263b3 100644 --- a/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c @@ -22,8 +22,8 @@ #include #include -rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ -volatile rtems_unsigned32 Clock_driver_ticks; +uint32_t Clock_isrs; /* ISRs until next tick */ +volatile uint32_t Clock_driver_ticks; /* ticks since initialization */ rtems_isr_entry Old_ticker; @@ -64,7 +64,7 @@ void Install_clock( rtems_isr_entry clock_isr ) { - rtems_unsigned8 data; + uint8_t data; Clock_driver_ticks = 0; Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; @@ -86,8 +86,8 @@ void Install_clock( * ACC_IC54 - interrupt 5 will be vectored and mapped to level 6 */ - data = (*(rtems_unsigned8 *)0x0D00000B); - (*(rtems_unsigned8 *)0x0D00000B) = (data & 0x7F) | 0x60; + data = (*(uint8_t*)0x0D00000B); + (*(uint8_t*)0x0D00000B) = (data & 0x7F) | 0x60; Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xC6 ); @@ -96,7 +96,7 @@ void Install_clock( void Clock_exit( void ) { - rtems_unsigned8 data; + uint8_t data; Z8x36_READ ( TIMER, MASTER_INTR, data ); Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0x01) ); @@ -127,7 +127,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/m68k/dmv152/console/console.c b/c/src/lib/libbsp/m68k/dmv152/console/console.c index 017d3d1b16..ef54a39004 100644 --- a/c/src/lib/libbsp/m68k/dmv152/console/console.c +++ b/c/src/lib/libbsp/m68k/dmv152/console/console.c @@ -31,9 +31,9 @@ void console_outbyte_polled( char ch ) { - rtems_unsigned32 control; - rtems_unsigned32 data; - rtems_unsigned8 rr_0; + uint32_t control; + uint32_t data; + uint8_t rr_0; if ( port == 0 ) { control = CONSOLE_CONTROL_A; @@ -60,9 +60,9 @@ void console_outbyte_polled( int console_inbyte_nonblocking(int port) { - rtems_unsigned32 control; - rtems_unsigned32 data; - rtems_unsigned8 rr_0; + uint32_t control; + uint32_t data; + uint8_t rr_0; char ch; if ( port == 0 ) { diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h index 8e5b73182a..3a485d4a47 100644 --- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h +++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h @@ -69,12 +69,12 @@ extern "C" { #define Install_tm27_vector( handler ) \ { \ set_vector( (handler), 0x50, 1 ); \ - (*(volatile rtems_unsigned32 *)0x0d800024) = 0x50; /* set IVECT reg */ \ - (*(volatile rtems_unsigned8 *)0x0d00000c) = 0x40; /* set VIE reg */ \ + (*(volatile uint32_t*)0x0d800024) = 0x50; /* set IVECT reg */ \ + (*(volatile uint8_t*)0x0d00000c) = 0x40; /* set VIE reg */ \ } #define Cause_tm27_intr() \ - (*(volatile rtems_unsigned8 *)0x0d000003) = 0x0f /* set VINT */ + (*(volatile uint8_t*)0x0d000003) = 0x0f /* set VINT */ #define Clear_tm27_intr() /* no operation necessary */ @@ -86,8 +86,8 @@ extern "C" { */ #define rtems_bsp_delay( microseconds ) \ - { register rtems_unsigned32 _delay=(microseconds); \ - register rtems_unsigned32 _tmp=123; \ + { register uint32_t _delay=(microseconds); \ + register uint32_t _tmp=123; \ asm volatile( "0: \ nbcd %0 ; \ nbcd %0 ; \ @@ -121,22 +121,22 @@ extern "C" { #define ACC_BASE 0x0D000000 -#define ACC_STAT0 ((volatile rtems_unsigned8 *) (ACC_BASE + 0x00)) -#define ACC_STAT1 ((volatile rtems_unsigned8 *) (ACC_BASE + 0x01)) -#define ACC_GENCTL ((volatile rtems_unsigned8 *) (ACC_BASE + 0x02)) -#define ACC_VINT ((volatile rtems_unsigned8 *) (ACC_BASE + 0x03)) -#define ACC_VREQ ((volatile rtems_unsigned8 *) (ACC_BASE + 0x04)) -#define ACC_VARB ((volatile rtems_unsigned8 *) (ACC_BASE + 0x05)) -#define ACC_ID ((volatile rtems_unsigned8 *) (ACC_BASE + 0x06)) -#define ACC_CTL2 ((volatile rtems_unsigned8 *) (ACC_BASE + 0x07)) -#define ACC_7IS ((volatile rtems_unsigned8 *) (ACC_BASE + 0x08)) -#define ACC_LIS ((volatile rtems_unsigned8 *) (ACC_BASE + 0x09)) -#define ACC_7IE ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0A)) -#define ACC_LIE ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0B)) -#define ACC_VIE ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0C)) -#define ACC_IC10 ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0D)) -#define ACC_IC32 ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0E)) -#define ACC_IC54 ((volatile rtems_unsigned8 *) (ACC_BASE + 0x0F)) +#define ACC_STAT0 ((volatile uint8_t*) (ACC_BASE + 0x00)) +#define ACC_STAT1 ((volatile uint8_t*) (ACC_BASE + 0x01)) +#define ACC_GENCTL ((volatile uint8_t*) (ACC_BASE + 0x02)) +#define ACC_VINT ((volatile uint8_t*) (ACC_BASE + 0x03)) +#define ACC_VREQ ((volatile uint8_t*) (ACC_BASE + 0x04)) +#define ACC_VARB ((volatile uint8_t*) (ACC_BASE + 0x05)) +#define ACC_ID ((volatile uint8_t*) (ACC_BASE + 0x06)) +#define ACC_CTL2 ((volatile uint8_t*) (ACC_BASE + 0x07)) +#define ACC_7IS ((volatile uint8_t*) (ACC_BASE + 0x08)) +#define ACC_LIS ((volatile uint8_t*) (ACC_BASE + 0x09)) +#define ACC_7IE ((volatile uint8_t*) (ACC_BASE + 0x0A)) +#define ACC_LIE ((volatile uint8_t*) (ACC_BASE + 0x0B)) +#define ACC_VIE ((volatile uint8_t*) (ACC_BASE + 0x0C)) +#define ACC_IC10 ((volatile uint8_t*) (ACC_BASE + 0x0D)) +#define ACC_IC32 ((volatile uint8_t*) (ACC_BASE + 0x0E)) +#define ACC_IC54 ((volatile uint8_t*) (ACC_BASE + 0x0F)) /* constants */ diff --git a/c/src/lib/libbsp/m68k/dmv152/spurious/spinit.c b/c/src/lib/libbsp/m68k/dmv152/spurious/spinit.c index 83df5838a0..ecd9ee5f2a 100644 --- a/c/src/lib/libbsp/m68k/dmv152/spurious/spinit.c +++ b/c/src/lib/libbsp/m68k/dmv152/spurious/spinit.c @@ -36,7 +36,7 @@ rtems_device_driver Spurious_Initialize( rtems_device_minor_number minor, void *pargp, rtems_id tid, - rtems_unsigned32 *rval + uint32_t *rval ) { rtems_vector_number vector; diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index 1f8e03170e..42396f865d 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -37,7 +37,7 @@ char *rtems_progname; */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); void bsp_pretasking_hook(void); /* m68k version */ /* diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/vmeintr.c b/c/src/lib/libbsp/m68k/dmv152/startup/vmeintr.c index 97adaa2438..97d6a319bf 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/vmeintr.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/vmeintr.c @@ -26,8 +26,8 @@ void VME_interrupt_Disable ( VME_interrupt_Mask mask /* IN */ ) { - volatile rtems_unsigned8 *VME_interrupt_enable; - rtems_unsigned8 value; + volatile uint8_t *VME_interrupt_enable; + uint8_t value; VME_interrupt_enable = ACC_VIE; value = *VME_interrupt_enable; @@ -47,8 +47,8 @@ void VME_interrupt_Enable ( VME_interrupt_Mask mask /* IN */ ) { - volatile rtems_unsigned8 *VME_interrupt_enable; - rtems_unsigned8 value; + volatile uint8_t *VME_interrupt_enable; + uint8_t value; VME_interrupt_enable = ACC_VIE; value = *VME_interrupt_enable; diff --git a/c/src/lib/libbsp/m68k/dmv152/timer/timer.c b/c/src/lib/libbsp/m68k/dmv152/timer/timer.c index aa6feb1094..a16c37a0ae 100644 --- a/c/src/lib/libbsp/m68k/dmv152/timer/timer.c +++ b/c/src/lib/libbsp/m68k/dmv152/timer/timer.c @@ -28,7 +28,7 @@ rtems_isr timerisr(); void Timer_initialize() { - rtems_unsigned8 data; + uint8_t data; (void) set_vector( timerisr, TIMER_VECTOR, 0 ); /* install ISR */ @@ -54,8 +54,8 @@ void Timer_initialize() * ACC_IC54 - interrupt 5 will be vectored and mapped to level 6 */ - data = (*(rtems_unsigned8 *)0x0D00000B); - (*(rtems_unsigned8 *)0x0D00000B) = (data & 0x0F) | 0x60; + data = (*(uint8_t*)0x0D00000B); + (*(uint8_t*)0x0D00000B) = (data & 0x0F) | 0x60; } @@ -65,9 +65,9 @@ void Timer_initialize() int Read_timer() { - rtems_unsigned8 data; - rtems_unsigned8 msb, lsb; - rtems_unsigned32 remaining, total; + uint8_t data; + uint8_t msb, lsb; + uint32_t remaining, total; Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xce ); /* read the counter value */ Z8x36_READ( TIMER, CT1_CUR_CNT_MSB, msb ); -- cgit v1.2.3