From f3238bb3d197b79924fe41a21679e3fe1407e0d2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:41:01 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, console/console.c, include/bsp.h, network/network.c, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c | 6 +++--- c/src/lib/libbsp/m68k/gen68302/console/console.c | 4 ++-- c/src/lib/libbsp/m68k/gen68302/include/bsp.h | 4 ++-- c/src/lib/libbsp/m68k/gen68302/network/network.c | 8 ++++---- c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c | 2 +- c/src/lib/libbsp/m68k/gen68302/timer/timer.c | 6 +++--- 7 files changed, 21 insertions(+), 15 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 623f1ef7cc..6e1ae197f1 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius + + * clock/ckinit.c, console/console.c, include/bsp.h, + network/network.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/gen68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c index c903fda81c..c9b98314e6 100644 --- a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c @@ -38,7 +38,7 @@ * Clock_driver_ticks is a monotonically increasing counter of the * number of clock ticks since the driver was initialized. */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* * Clock_isrs is the number of clock ISRs until the next invocation of @@ -47,7 +47,7 @@ volatile rtems_unsigned32 Clock_driver_ticks; * length of time between the user configured microseconds per tick * has passed. */ -rtems_unsigned32 Clock_isrs; +uint32_t Clock_isrs; void Clock_exit( void ); @@ -128,7 +128,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/gen68302/console/console.c b/c/src/lib/libbsp/m68k/gen68302/console/console.c index 2c958da9dc..9169ebd48d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68302/console/console.c @@ -65,14 +65,14 @@ rtems_device_driver console_initialize( p->scc2.bd.rx[0].status = 0xA000; /* RxBD0 empty, wrap, no intr */ p->scc2.bd.rx[0].length = 0x0000; p->scc2.bd.rx[0].buffer = - (rtems_unsigned8 *) &m302.scc2.bd.rx[1]; /* RxBD1 is Rx buffer */ + (uint8_t*) &m302.scc2.bd.rx[1]; /* RxBD1 is Rx buffer */ p->reg.scc[1].dsr = 0x7000; /* set full-length last stop bit */ p->scc2.bd.tx[0].status = 0x3000; /* TxBD0 not ready, wrap, intr */ p->scc2.bd.tx[0].length = 0x0001; p->scc2.bd.tx[0].buffer = - (rtems_unsigned8 *) &m302.scc2.bd.tx[1]; /* TxBD1 is Tx buffer */ + (uint8_t*) &m302.scc2.bd.tx[1]; /* TxBD1 is Tx buffer */ p->reg.scc[1].scce = 0xFF; /* clear all SCC event flags */ p->reg.scc[1].sccm = 0x03; /* enable only Tx & Rx interrupts */ diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 3e9f9ad742..2cea25b643 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -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/gen68302/network/network.c b/c/src/lib/libbsp/m68k/gen68302/network/network.c index 76d6f5910c..703a424b87 100644 --- a/c/src/lib/libbsp/m68k/gen68302/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68302/network/network.c @@ -287,7 +287,7 @@ static void m302Enet_retire_tx_bd (struct scc_softc *sc) { - rtems_unsigned16 status; + uint16_t status; int i; int nRetired; struct mbuf *m, *n; @@ -388,7 +388,7 @@ scc_rxDaemon (void *arg) struct scc_softc *sc = (struct scc_softc *)arg; struct ifnet *ifp = &sc->arpcom.ac_if; struct mbuf *m; - rtems_unsigned16 status; + uint16_t status; volatile struct m68302_scc_bd *rxBd; int rxBdIndex; @@ -474,7 +474,7 @@ scc_rxDaemon (void *arg) m = sc->rxMbuf[rxBdIndex]; m->m_len = m->m_pkthdr.len = rxBd->data_lgth - - sizeof(rtems_unsigned32) - + sizeof(uint32_t) - sizeof(struct ether_header); eh = mtod (m, struct ether_header *); m->m_data += sizeof(struct ether_header); @@ -533,7 +533,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m) struct scc_softc *sc = ifp->if_softc; volatile struct m68302_scc_bd *firstTxBd, *txBd; struct mbuf *l = NULL; - rtems_unsigned16 status; + uint16_t status; int nAdded; /* diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c index 78c0a8eb93..63678e4b25 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c index c4be93e974..605337fa1b 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c @@ -40,7 +40,7 @@ * 2000 ticks @ (16MHz/1)/8 = 1-ms count */ -rtems_unsigned32 Timer_interrupts; +uint32_t Timer_interrupts; rtems_boolean Timer_driver_Find_average_overhead; @@ -79,8 +79,8 @@ void Timer_initialize( void ) */ int Read_timer( void ) { - rtems_unsigned16 clicks; - rtems_unsigned32 total; + uint16_t clicks; + uint32_t total; /* * Read the timer and see how many clicks it has been since counter -- cgit v1.2.3