From 8c936238b6adfbe2a843a786736f7a3da75c993e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 03:23:51 +0000 Subject: 2004-03-31 Ralf Corsepius * include/bsp.h, include/canbus.h, include/info.h, network/network.c, startup/bspstart.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 6 +++ c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h | 2 +- c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h | 56 +++++++++++----------- c/src/lib/libbsp/powerpc/eth_comm/include/info.h | 28 +++++------ .../lib/libbsp/powerpc/eth_comm/network/network.c | 14 +++--- .../lib/libbsp/powerpc/eth_comm/startup/bspstart.c | 12 ++--- 6 files changed, 62 insertions(+), 56 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 6bad74edea..0b2292d6a6 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius + + * include/bsp.h, include/canbus.h, include/info.h, + network/network.c, startup/bspstart.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/powerpc/eth_comm/include/bsp.h b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h index 20edbcbbd2..8a10a4bb38 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h @@ -113,7 +113,7 @@ extern rtems_configuration_table BSP_Configuration; void bsp_cleanup( void ); -void M860ExecuteRISC( rtems_unsigned16 command ); +void M860ExecuteRISC( uint16_t command ); void *M860AllocateBufferDescriptors( int count ); void *M860AllocateRiscTimers( int count ); extern char M860DefaultWatchdogFeeder; diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h b/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h index e27551ad39..6b07b823dd 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h @@ -20,52 +20,52 @@ #include typedef struct i82527_msg_t_ { - rtems_unsigned8 ctrl0 __attribute__ ((packed)); /* Control 0 register */ - rtems_unsigned8 ctrl1 __attribute__ ((packed)); /* Control 1 register */ - rtems_unsigned32 arb __attribute__ ((packed)); /* Arbitration reg */ - rtems_unsigned8 cfg __attribute__ ((packed)); /* Message config reg */ - rtems_unsigned8 data[8] __attribute__ ((packed)); /* Actual message */ + uint8_t ctrl0 __attribute__ ((packed)); /* Control 0 register */ + uint8_t ctrl1 __attribute__ ((packed)); /* Control 1 register */ + uint32_t arb __attribute__ ((packed)); /* Arbitration reg */ + uint8_t cfg __attribute__ ((packed)); /* Message config reg */ + uint8_t data[8] __attribute__ ((packed)); /* Actual message */ } i82527_msg_t; typedef struct i82527_t_ { - rtems_unsigned8 ctrl __attribute__ ((packed)); /* Control register */ - rtems_unsigned8 status __attribute__ ((packed)); /* Status register */ - rtems_unsigned8 cir __attribute__ ((packed)); /* CPU interface reg */ - rtems_unsigned8 _res0 __attribute__ ((packed)); - rtems_unsigned16 hsr __attribute__ ((packed)); /* High speed read */ - rtems_unsigned16 gms __attribute__ ((packed)); /* Global Mask - std */ - rtems_unsigned32 gml __attribute__ ((packed)); /* Global Mask - long */ - rtems_unsigned32 mlm __attribute__ ((packed)); /* Mask last message */ + uint8_t ctrl __attribute__ ((packed)); /* Control register */ + uint8_t status __attribute__ ((packed)); /* Status register */ + uint8_t cir __attribute__ ((packed)); /* CPU interface reg */ + uint8_t _res0 __attribute__ ((packed)); + uint16_t hsr __attribute__ ((packed)); /* High speed read */ + uint16_t gms __attribute__ ((packed)); /* Global Mask - std */ + uint32_t gml __attribute__ ((packed)); /* Global Mask - long */ + uint32_t mlm __attribute__ ((packed)); /* Mask last message */ i82527_msg_t msg1 __attribute__ ((packed)); /* Message 1 */ - rtems_unsigned8 clkout __attribute__ ((packed)); /* CLKOUT register */ + uint8_t clkout __attribute__ ((packed)); /* CLKOUT register */ i82527_msg_t msg2 __attribute__ ((packed)); /* Message 2 */ - rtems_unsigned8 bcr __attribute__ ((packed)); /* Bus config register */ + uint8_t bcr __attribute__ ((packed)); /* Bus config register */ i82527_msg_t msg3 __attribute__ ((packed)); /* Message 3 */ - rtems_unsigned8 btr0 __attribute__ ((packed)); /* Bit timing reg 0 */ + uint8_t btr0 __attribute__ ((packed)); /* Bit timing reg 0 */ i82527_msg_t msg4 __attribute__ ((packed)); /* Message 4 */ - rtems_unsigned8 btr1 __attribute__ ((packed)); /* Bit timing reg 1 */ + uint8_t btr1 __attribute__ ((packed)); /* Bit timing reg 1 */ i82527_msg_t msg5 __attribute__ ((packed)); /* Message 5 */ - rtems_unsigned8 intr __attribute__ ((packed)); /* Interrupt register */ + uint8_t intr __attribute__ ((packed)); /* Interrupt register */ i82527_msg_t msg6 __attribute__ ((packed)); /* Message 6 */ - rtems_unsigned8 _res1 __attribute__ ((packed)); + uint8_t _res1 __attribute__ ((packed)); i82527_msg_t msg7 __attribute__ ((packed)); /* Message 7 */ - rtems_unsigned8 _res2 __attribute__ ((packed)); + uint8_t _res2 __attribute__ ((packed)); i82527_msg_t msg8 __attribute__ ((packed)); /* Message 8 */ - rtems_unsigned8 _res3 __attribute__ ((packed)); + uint8_t _res3 __attribute__ ((packed)); i82527_msg_t msg9 __attribute__ ((packed)); /* Message 9 */ - rtems_unsigned8 p1conf __attribute__ ((packed)); /* Port 1 config */ + uint8_t p1conf __attribute__ ((packed)); /* Port 1 config */ i82527_msg_t msg10 __attribute__ ((packed)); /* Message 10 */ - rtems_unsigned8 p2conf __attribute__ ((packed)); /* Port 2 config */ + uint8_t p2conf __attribute__ ((packed)); /* Port 2 config */ i82527_msg_t msg11 __attribute__ ((packed)); /* Message 11 */ - rtems_unsigned8 p1in __attribute__ ((packed)); /* Port 1 in */ + uint8_t p1in __attribute__ ((packed)); /* Port 1 in */ i82527_msg_t msg12 __attribute__ ((packed)); /* Message 12 */ - rtems_unsigned8 p2in __attribute__ ((packed)); /* Port 2 in */ + uint8_t p2in __attribute__ ((packed)); /* Port 2 in */ i82527_msg_t msg13 __attribute__ ((packed)); /* Message 13 */ - rtems_unsigned8 p1out __attribute__ ((packed)); /* Port 1 out */ + uint8_t p1out __attribute__ ((packed)); /* Port 1 out */ i82527_msg_t msg14 __attribute__ ((packed)); /* Message 14 */ - rtems_unsigned8 p2out __attribute__ ((packed)); /* Port 2 out */ + uint8_t p2out __attribute__ ((packed)); /* Port 2 out */ i82527_msg_t msg15 __attribute__ ((packed)); /* Message 15 */ - rtems_unsigned8 sra __attribute__ ((packed)); /* Serial reset address */ + uint8_t sra __attribute__ ((packed)); /* Serial reset address */ } i82527_t; #define I82527_CTRL_CCE (1<<6) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/info.h b/c/src/lib/libbsp/powerpc/eth_comm/include/info.h index dfd4579df8..305a1d1429 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/info.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/info.h @@ -11,20 +11,20 @@ #define __info_h__ typedef struct BoardInfoBlock_ { - rtems_unsigned16 size; /* size of info block in bytes */ - rtems_unsigned8 eth_id[6]; /* ethernet id of ethernet interface */ - rtems_unsigned32 cpu_spd; /* cpu speed in Hz */ - rtems_unsigned32 flash_size; /* size of flash memory in bytes */ - rtems_unsigned32 ram_size; /* size of ram in bytes */ - rtems_unsigned32 version; /* version of firmare (x.y format) */ - rtems_unsigned32 if429; /* mask for arinc429 interface */ - rtems_unsigned32 ifcsdb; /* mask for csdb interface */ - rtems_unsigned16 if232; /* mask for rs232 interface */ - rtems_unsigned8 ifcan; /* mask for canbus interface */ - rtems_unsigned8 if568; /* mask for arinc568 interface */ - rtems_unsigned8 fpn[16]; /* Frasca part number in ASCII */ - rtems_unsigned16 rev; /* Board revision */ - rtems_unsigned32 ip_num; /* Board IP number */ + uint16_t size; /* size of info block in bytes */ + uint8_t eth_id[6]; /* ethernet id of ethernet interface */ + uint32_t cpu_spd; /* cpu speed in Hz */ + uint32_t flash_size; /* size of flash memory in bytes */ + uint32_t ram_size; /* size of ram in bytes */ + uint32_t version; /* version of firmare (x.y format) */ + uint32_t if429; /* mask for arinc429 interface */ + uint32_t ifcsdb; /* mask for csdb interface */ + uint16_t if232; /* mask for rs232 interface */ + uint8_t ifcan; /* mask for canbus interface */ + uint8_t if568; /* mask for arinc568 interface */ + uint8_t fpn[16]; /* Frasca part number in ASCII */ + uint16_t rev; /* Board revision */ + uint32_t ip_num; /* Board IP number */ } boardinfo_t; diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/network.c b/c/src/lib/libbsp/powerpc/eth_comm/network/network.c index 4341b5a2b4..5a280e4eae 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/network.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/network/network.c @@ -585,7 +585,7 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc) static void m860Enet_retire_tx_bd (struct m860_enet_struct *sc) { - rtems_unsigned16 status; + uint16_t status; int i; int nRetired; struct mbuf *m, *n; @@ -658,7 +658,7 @@ scc_rxDaemon (void *arg) struct m860_enet_struct *sc = (struct m860_enet_struct *)arg; struct ifnet *ifp = &sc->arpcom.ac_if; struct mbuf *m; - rtems_unsigned16 status; + uint16_t status; m8xxBufferDescriptor_t *rxBd; int rxBdIndex; @@ -738,7 +738,7 @@ scc_rxDaemon (void *arg) m = sc->rxMbuf[rxBdIndex]; m->m_len = m->m_pkthdr.len = rxBd->length - - sizeof(rtems_unsigned32) - + sizeof(uint32_t) - sizeof(struct ether_header); eh = mtod (m, struct ether_header *); m->m_data += sizeof(struct ether_header); @@ -795,7 +795,7 @@ fec_rxDaemon (void *arg) struct m860_enet_struct *sc = (struct m860_enet_struct *)arg; struct ifnet *ifp = &sc->arpcom.ac_if; struct mbuf *m; - rtems_unsigned16 status; + uint16_t status; m8xxBufferDescriptor_t *rxBd; int rxBdIndex; @@ -867,7 +867,7 @@ fec_rxDaemon (void *arg) m = sc->rxMbuf[rxBdIndex]; m->m_len = m->m_pkthdr.len = rxBd->length - - sizeof(rtems_unsigned32) - + sizeof(uint32_t) - sizeof(struct ether_header); eh = mtod (m, struct ether_header *); m->m_data += sizeof(struct ether_header); @@ -921,7 +921,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) struct m860_enet_struct *sc = ifp->if_softc; volatile m8xxBufferDescriptor_t *firstTxBd, *txBd; struct mbuf *l = NULL; - rtems_unsigned16 status; + uint16_t status; int nAdded; /* @@ -1041,7 +1041,7 @@ fec_sendpacket (struct ifnet *ifp, struct mbuf *m) struct m860_enet_struct *sc = ifp->if_softc; volatile m8xxBufferDescriptor_t *firstTxBd, *txBd; /* struct mbuf *l = NULL; */ - rtems_unsigned16 status; + uint16_t status; int nAdded; /* diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c index 94f2384bfe..4a2f484d79 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c @@ -46,7 +46,7 @@ char *rtems_progname; * Use the shared implementations of the following routines */ 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) { @@ -78,7 +78,7 @@ void bsp_pretasking_hook(void) { extern int _end; - rtems_unsigned32 heap_start; + uint32_t heap_start; /* * Let's check to see if the size of M860_binfo is what @@ -95,7 +95,7 @@ bsp_pretasking_hook(void) printf(" bootloader differ in their definition of boardinfo_t\n"); } */ - heap_start = (rtems_unsigned32) &_end; + heap_start = (uint32_t) &_end; /* Align the heap on a natural boundary (4 bytes?) */ if (heap_start & (CPU_ALIGNMENT-1)) { @@ -115,8 +115,8 @@ SPR_RW(SPRG1) void bsp_start(void) { extern int _end; - rtems_unsigned32 heap_start; - rtems_unsigned32 ws_start; + uint32_t heap_start; + uint32_t ws_start; ppc_cpu_id_t myCpu; ppc_cpu_revision_t myCpuRevision; register unsigned char* intrStack; @@ -161,7 +161,7 @@ void bsp_start(void) * not malloc'ed. It is just "pulled from the air". */ - heap_start = (rtems_unsigned32) &_end; + heap_start = (uint32_t) &_end; if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); -- cgit v1.2.3