From 162ffb4885f31f8db0bab8981d180c6bdd990691 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:42:37 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, include/bsp.h, shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c | 10 +++++----- c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 8 ++++---- c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c | 12 ++++++------ c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c | 6 +++--- c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c | 2 +- c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c | 4 ++-- c/src/lib/libbsp/m68k/mvme136/timer/timer.c | 10 +++++----- 8 files changed, 32 insertions(+), 26 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 9ca73f35a8..a7b407ffd9 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius + + * clock/ckinit.c, include/bsp.h, shmsupp/getcfg.c, shmsupp/lock.c, + shmsupp/mpisr.c, startup/bspstart.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/mvme136/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c index 91b8c882ce..9318d5cde8 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c @@ -38,9 +38,9 @@ #define CLOCK_VECTOR 66 -rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ +uint32_t Clock_isrs; /* ISRs until next tick */ -volatile rtems_unsigned32 Clock_driver_ticks; /* ticks since initialization */ +volatile uint32_t Clock_driver_ticks; /* ticks since initialization */ rtems_isr_entry Old_ticker; @@ -86,7 +86,7 @@ void Install_clock( timer->MASTER_INTR = MICRVAL; timer->CT1_MODE_SPEC = T1MSRVAL; - *((rtems_unsigned16 *)0xfffb0016) = MS_COUNT; /* write countdown value */ + *((uint16_t*)0xfffb0016) = MS_COUNT; /* write countdown value */ /* * timer->CT1_TIME_CONST_MSB = (MS_COUNT >> 8); @@ -99,7 +99,7 @@ void Install_clock( /* * Enable interrupt via VME interrupt mask register */ - (*(rtems_unsigned8 *)0xfffb0038) &= 0xfd; + (*(uint8_t*)0xfffb0038) &= 0xfd; atexit( Clock_exit ); } @@ -140,7 +140,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/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index cae1868bb0..8ddd5ee861 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -56,9 +56,9 @@ extern "C" { #define Install_tm27_vector( handler ) set_vector( (handler), 75, 1 ) -#define Cause_tm27_intr() (*(volatile rtems_unsigned8 *)0xfffb006b) = 0x80 +#define Cause_tm27_intr() (*(volatile uint8_t*)0xfffb006b) = 0x80 -#define Clear_tm27_intr() (*(volatile rtems_unsigned8 *)0xfffb006b) = 0x00 +#define Clear_tm27_intr() (*(volatile uint8_t*)0xfffb006b) = 0x00 #define Lower_tm27_intr() @@ -68,8 +68,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 ; \ diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c index 81d43d32bb..6d5885a974 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c @@ -40,22 +40,22 @@ shm_config_table BSP_shm_cfgtbl; -rtems_unsigned32 *BSP_int_address() +uint32_t *BSP_int_address() { - rtems_unsigned32 id, offset; + uint32_t id, offset; - id = (rtems_unsigned32) *(rtems_unsigned8 *)0xfffb0061; + id = (uint32_t) *(uint8_t*)0xfffb0061; offset = ((id & 0x1f) << 5) | ((id & 0xe0) << 8); offset |= 0xffff000b; - return( (rtems_unsigned32 * ) offset ); + return( (uint32_t * ) offset ); } void Shm_Get_configuration( - rtems_unsigned32 localnode, + uint32_t localnode, shm_config_table **shmcfg ) { - BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x20000000; + BSP_shm_cfgtbl.base = (uint32_t*)0x20000000; BSP_shm_cfgtbl.length = 1 * MEGABYTE; BSP_shm_cfgtbl.format = SHM_BIG; diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c index aa593dc6ff..8f820302ea 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c @@ -44,8 +44,8 @@ void Shm_Lock( Shm_Locked_queue_Control *lq_cb ) { - rtems_unsigned32 isr_level; - rtems_unsigned32 *lockptr = (rtems_unsigned32 *)&lq_cb->lock; + uint32_t isr_level; + uint32_t *lockptr = (uint32_t*)&lq_cb->lock; rtems_interrupt_disable( isr_level ); Shm_isrstat = isr_level; @@ -65,7 +65,7 @@ void Shm_Unlock( Shm_Locked_queue_Control *lq_cb ) { - rtems_unsigned32 isr_level; + uint32_t isr_level; lq_cb->lock = SHM_UNLOCK_VALUE; isr_level = Shm_isrstat; diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c index da8d5a795a..eeb8f0c53c 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c @@ -21,7 +21,7 @@ rtems_isr Shm_isr_mvme136() { Shm_Interrupt_count += 1; rtems_multiprocessing_announce(); - (*(volatile rtems_unsigned8 *)0xfffb006b) = 0; /* clear MPCSR intr */ + (*(volatile uint8_t*)0xfffb006b) = 0; /* clear MPCSR intr */ } /* void _Shm_setvec( ) diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index fd071a5dd0..de76239298 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -38,7 +38,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 */ /* @@ -70,7 +70,7 @@ void bsp_start( void ) m68k_set_vbr( &M68Kvec ); - (*(rtems_unsigned8 *)0xfffb0067) = 0x7f; /* make VME access round-robin */ + (*(uint8_t*)0xfffb0067) = 0x7f; /* make VME access round-robin */ rtems_cache_enable_instruction(); diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c index 61326dc5a8..da5afead52 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c @@ -47,7 +47,7 @@ void Timer_initialize() Z8x36_WRITE( TIMER, CT1_MODE_SPEC, 0x80 ); /* T1 continuous, and */ /* cycle/pulse output */ - *((rtems_unsigned16 *)0xfffb0016) = 0x0000; /* write countdown value */ + *((uint16_t*)0xfffb0016) = 0x0000; /* write countdown value */ /* Z8x36_WRITE( TIMER, CT1_TIME_CONST_MSB, 0x00 ); Z8x36_WRITE( TIMER, CT1_TIME_CONST_LSB, 0x00 ); @@ -58,7 +58,7 @@ void Timer_initialize() /* trigger command */ /* (TCB) and gate */ /* command (GCB) bits */ - *((rtems_unsigned8 *)0xfffb0038) &= 0xfd; /* enable timer INTR on */ + *((uint8_t*)0xfffb0038) &= 0xfd; /* enable timer INTR on */ /* VME controller */ } @@ -69,12 +69,12 @@ void Timer_initialize() int Read_timer() { /* - rtems_unsigned8 msb, lsb; + uint8_t msb, lsb; */ - rtems_unsigned32 remaining, total; + uint32_t remaining, total; Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xce ); /* read the counter value */ -remaining = 0xffff - *((rtems_unsigned16 *) 0xfffb0010); +remaining = 0xffff - *((uint16_t*) 0xfffb0010); /* Z8x36_READ( TIMER, CT1_CUR_CNT_MSB, msb ); Z8x36_READ( TIMER, CT1_CUR_CNT_LSB, lsb ); -- cgit v1.2.3