diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-10-20 08:23:27 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-10-20 08:23:27 +0000 |
commit | 76f9c44c9a1125800e34352504164c54465ad9be (patch) | |
tree | d64ead995a60af29fcbae25509d7d719ebb142c7 /c | |
parent | 2004-10-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-76f9c44c9a1125800e34352504164c54465ad9be.tar.bz2 |
2004-10-20 Ralf Corsepius <ralf_corsepius@rtems.org>
* console/console.c, include/bsp.h, startup/bspstart.c,
startup/iss555.c: Use POSIX fixed size types.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/console/console.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/include/bsp.h | 30 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ss555/startup/iss555.c | 4 |
5 files changed, 24 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index 1a8e548d21..515a08ba96 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,8 @@ +2004-10-20 Ralf Corsepius <ralf_corsepius@rtems.org> + + * console/console.c, include/bsp.h, startup/bspstart.c, + startup/iss555.c: Use POSIX fixed size types. + 2004-09-24 Ralf Corsepius <ralf_corsepius@rtems.org> * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/powerpc/ss555/console/console.c b/c/src/lib/libbsp/powerpc/ss555/console/console.c index 64d4503fee..af1407e592 100644 --- a/c/src/lib/libbsp/powerpc/ss555/console/console.c +++ b/c/src/lib/libbsp/powerpc/ss555/console/console.c @@ -153,7 +153,7 @@ static rtems_status_code do_poll_write( ) { rtems_libio_rw_args_t *rw_args = arg; - unsigned32 i; + uint32_t i; char cr ='\r'; for( i = 0; i < rw_args->count; i++ ) { diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h index 7ed5220f93..21f66d2b86 100644 --- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h @@ -51,26 +51,26 @@ extern "C" { * off-board devices. */ typedef struct cpld_ { - rtems_unsigned8 cs3a[32]; /* Chip select 3A */ - rtems_unsigned8 pad0[0x200000 - 0x000020]; + uint8_t cs3a[32]; /* Chip select 3A */ + uint8_t pad0[0x200000 - 0x000020]; - rtems_unsigned8 cs3b[32]; /* Chip select 3B */ - rtems_unsigned8 pad2[0x400000 - 0x200020]; + uint8_t cs3b[32]; /* Chip select 3B */ + uint8_t pad2[0x400000 - 0x200020]; - rtems_unsigned8 cs3c[32]; /* Chip select 3C */ - rtems_unsigned8 pad4[0x600000 - 0x400020]; + uint8_t cs3c[32]; /* Chip select 3C */ + uint8_t pad4[0x600000 - 0x400020]; - rtems_unsigned8 cs3d[32]; /* Chip select 3D */ - rtems_unsigned8 pad6[0x800000 - 0x600020]; + uint8_t cs3d[32]; /* Chip select 3D */ + uint8_t pad6[0x800000 - 0x600020]; - rtems_unsigned8 serial_ints; /* Enable/disable serial interrupts */ - rtems_unsigned8 serial_resets; /* Enable/disable serial resets */ - rtems_unsigned8 serial_ack; /* Acknowledge serial transfers */ - rtems_unsigned8 pad8[0xA00000 - 0x800003]; + uint8_t serial_ints; /* Enable/disable serial interrupts */ + uint8_t serial_resets; /* Enable/disable serial resets */ + uint8_t serial_ack; /* Acknowledge serial transfers */ + uint8_t pad8[0xA00000 - 0x800003]; - rtems_unsigned8 iflash_writess; /* Enable/disable internal-flash writes */ - rtems_unsigned8 nflash_writess; /* Enable/disable NAND-flash writes */ - rtems_unsigned8 padA[0xC00000 - 0xA00002]; + uint8_t iflash_writess; /* Enable/disable internal-flash writes */ + uint8_t nflash_writess; /* Enable/disable NAND-flash writes */ + uint8_t padA[0xC00000 - 0xA00002]; } cpld_t; extern volatile cpld_t cpld; /* defined in linkcmds */ diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c index 95df3b3e25..81920142ca 100644 --- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c @@ -58,7 +58,7 @@ char *rtems_progname; * rtems/c/src/lib/libbsp/shared/bsplibc.c. */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); void BSP_panic(char *s) { diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c index 66e851cc1b..d7e18913c5 100644 --- a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c +++ b/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c @@ -31,7 +31,7 @@ SPR_RW(BBCMCR); */ void _InitSS555 (void) { - register unsigned32 plprcr, msr; + register uint32_t plprcr, msr; /* * Initialize the System Protection Control Register (SYPCR). @@ -103,7 +103,7 @@ void _InitSS555 (void) usiu.memc[0]._br = USIU_MEMC_BR_BA(_read_IMMR() & IMMR_FLEN - ? (rtems_unsigned32)int_ram_top : 0) /* base address */ + ? (uint32_t)int_ram_top : 0) /* base address */ | USIU_MEMC_BR_PS32 /* 32-bit data bus */ | USIU_MEMC_BR_TBDIP /* toggle bdip */ | USIU_MEMC_BR_V; /* base register valid */ |