diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-05-10 02:40:56 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-05-10 02:40:56 +0000 |
commit | b1392b041e9bc04551fe8aeedae74b78c16d1367 (patch) | |
tree | 5365462bca0a2ee1f86c2473c48ecc2be49b53e2 /c/src/lib/libbsp/powerpc | |
parent | 2005-05-10 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-b1392b041e9bc04551fe8aeedae74b78c16d1367.tar.bz2 |
Eliminate {un|}signed{8|16|32}.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/console.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/init68360.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h | 12 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/include/tm27.h | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/vme/vmeconfig.c | 2 |
8 files changed, 28 insertions, 28 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/console.c b/c/src/lib/libbsp/powerpc/ep1a/console/console.c index 87f40d1c3c..7828a791fa 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/console.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/console.c @@ -263,7 +263,7 @@ void DEBUG_puts( ) { char *s; - unsigned32 Irql; + uint32_t Irql; rtems_interrupt_disable(Irql); @@ -293,11 +293,11 @@ void DEBUG_puts( */ void DEBUG_puth( - unsigned32 ulHexNum + uint32_t ulHexNum ) { unsigned long i,d; - unsigned32 Irql; + uint32_t Irql; rtems_interrupt_disable(Irql); diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/init68360.c b/c/src/lib/libbsp/powerpc/ep1a/console/init68360.c index d3606ffa4b..2643702377 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/init68360.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/init68360.c @@ -27,7 +27,7 @@ void M360ExecuteRISC( volatile m360_t *m360, uint16_t command) { - rtems_unsigned16 sr; + uint16_t sr; rtems_interrupt_disable(sr); while (m360->cr & M360_CR_FLG) diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c index 849b10af54..a09fb4da65 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c @@ -21,22 +21,22 @@ typedef struct uart_reg unsigned char pad[7]; } uartReg; -unsigned8 Read_ns16550_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint8_t Read_ns16550_register( + uint32_t ulCtrlPort, + uint8_t ucRegNum ) { struct uart_reg *p = (struct uart_reg *)ulCtrlPort; - unsigned8 ucData; + uint8_t ucData; ucData = p[ucRegNum].reg; asm volatile("sync"); return ucData; } void Write_ns16550_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ) { struct uart_reg *p = (struct uart_reg *)ulCtrlPort; diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h index c2aa368b28..4f4c9955cf 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.h @@ -36,15 +36,15 @@ extern "C" { * Board specific register access routines */ -unsigned8 Read_ns16550_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum +uint8_t Read_ns16550_register( + uint32_t ulCtrlPort, + uint8_t ucRegNum ); void Write_ns16550_register( - unsigned32 ulCtrlPort, - unsigned8 ucRegNum, - unsigned8 ucData + uint32_t ulCtrlPort, + uint8_t ucRegNum, + uint8_t ucData ); extern console_fns ns16550_fns_8245; diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h index a38d24db35..504cd7652c 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h @@ -96,8 +96,8 @@ #define PMCQ1_RAM 0x00200000 /* -#define PMCQ1_Read_EPLD( _base, _reg ) ( *((unsigned long *) ((unsigned32)_base + _reg)) ) -#define PMCQ1_Write_EPLD( _base, _reg, _data ) *((unsigned long *) ((unsigned32)_base + _reg)) = _data +#define PMCQ1_Read_EPLD( _base, _reg ) ( *((unsigned long *) ((uint32_t)_base + _reg)) ) +#define PMCQ1_Write_EPLD( _base, _reg, _data ) *((unsigned long *) ((uint32_t)_base + _reg)) = _data */ uint32_t PMCQ1_Read_EPLD( uint32_t base, uint32_t reg ); void PMCQ1_Write_EPLD( uint32_t base, uint32_t reg, uint32_t data ); diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h b/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h index c62810edda..c3bb2732eb 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h +++ b/c/src/lib/libbsp/powerpc/ep1a/include/tm27.h @@ -38,20 +38,20 @@ void Install_tm27_vector(void (*_handler)()) #define Cause_tm27_intr() \ do { \ - unsigned32 _clicks = 8; \ + uint32_t _clicks = 8; \ asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) #define Clear_tm27_intr() \ do { \ - unsigned32 _clicks = 0xffffffff; \ + uint32_t _clicks = 0xffffffff; \ asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \ } while (0) #define Lower_tm27_intr() \ do { \ - unsigned32 _msr = 0; \ + uint32_t _msr = 0; \ _ISR_Set_level( 0 ); \ asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \ _msr |= 0x8002; \ diff --git a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c index a0d30209a0..958bc9028a 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c @@ -46,8 +46,8 @@ SPR_RW(SPRG0) SPR_RW(SPRG1) void ShowBATS(){ - unsigned32 lower; - unsigned32 upper; + uint32_t lower; + uint32_t upper; __MFSPR(536, upper); __MFSPR(537, lower); @@ -99,7 +99,7 @@ printk("0x%x ==> %d\n", offset, data ); * Vital Board data Start using DATA RESIDUAL */ -unsigned32 VME_Slot1 = FALSE; +uint32_t VME_Slot1 = FALSE; /* * Total memory. @@ -200,7 +200,7 @@ void BSP_FLASH_set_page( */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); /* * Function: bsp_pretasking_hook @@ -417,7 +417,7 @@ ShowBATS(); stack = ((unsigned char*) __rtems_end) + INIT_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE; /* tag the bottom (T. Straumann 6/36/2001 <strauman@slac.stanford.edu>) */ - *((unsigned32 *)stack) = 0; + *((uint32_t *)stack) = 0; /* * Initialize the interrupt related settings diff --git a/c/src/lib/libbsp/powerpc/ep1a/vme/vmeconfig.c b/c/src/lib/libbsp/powerpc/ep1a/vme/vmeconfig.c index 4f0c633526..abd005bf30 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/vme/vmeconfig.c +++ b/c/src/lib/libbsp/powerpc/ep1a/vme/vmeconfig.c @@ -35,7 +35,7 @@ void BSP_vme_config(void) __attribute__ (( weak, alias("__BSP_default_vme_config SPR_RO(DBAT0U) -extern unsigned32 VME_Slot1; +extern uint32_t VME_Slot1; void __BSP_default_vme_config(void) |