diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-04 08:46:43 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-04 08:46:43 +0000 |
commit | 0b2c943b8c7eb0332df6ca9f0ca4334f9e6a8b78 (patch) | |
tree | d36fc8d8927668b8fda3ba13db853a20c5a2a6ad /c/src/lib | |
parent | 2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-0b2c943b8c7eb0332df6ca9f0ca4334f9e6a8b78.tar.bz2 |
2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org>
* console/console.c, include/bsp.h, network/network.c,
startup/bspstart.c: Remove obsolete fixed size types.
Diffstat (limited to 'c/src/lib')
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/console/console.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/network/network.c | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 8 |
5 files changed, 23 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 677821126e..b910bbf06e 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,5 +1,10 @@ 2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org> + * console/console.c, include/bsp.h, network/network.c, + startup/bspstart.c: Remove obsolete fixed size types. + +2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org> + * startup/bspstart.c: rtems_interrupt_catch(trampoline, vector, &old_handler). diff --git a/c/src/lib/libbsp/m68k/uC5282/console/console.c b/c/src/lib/libbsp/m68k/uC5282/console/console.c index 086861bd43..e30ae63387 100644 --- a/c/src/lib/libbsp/m68k/uC5282/console/console.c +++ b/c/src/lib/libbsp/m68k/uC5282/console/console.c @@ -114,9 +114,9 @@ static void IntUartSet(int minor, int baud, int databits, int parity, int stopbits, int hwflow) { int divisor; - unsigned32 clock_speed; - unsigned8 umr1 = 0; - unsigned8 umr2 = 0; + uint32_t clock_speed; + uint8_t umr1 = 0; + uint8_t umr2 = 0; struct IntUartInfoStruct *info = &IntUartInfo[minor]; int level; diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h index ed8d8c7363..634bfea609 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h @@ -67,7 +67,7 @@ extern rtems_configuration_table BSP_Configuration; /* functions */ -unsigned32 bsp_get_CPU_clock_speed(void); +uint32_t bsp_get_CPU_clock_speed(void); rtems_status_code bsp_allocate_interrupt(int level, int priority); unsigned const char *uC5282_gethwaddr(int a); const char *uC5282_getbenv(const char *a); diff --git a/c/src/lib/libbsp/m68k/uC5282/network/network.c b/c/src/lib/libbsp/m68k/uC5282/network/network.c index efb3809040..003980d758 100644 --- a/c/src/lib/libbsp/m68k/uC5282/network/network.c +++ b/c/src/lib/libbsp/m68k/uC5282/network/network.c @@ -70,8 +70,8 @@ #endif typedef struct mcf5282BufferDescriptor_ { - volatile rtems_unsigned16 status; - rtems_unsigned16 length; + volatile uint16_t status; + uint16_t length; volatile void *buffer; } mcf5282BufferDescriptor_t; @@ -138,6 +138,7 @@ mcf5282_bd_allocate(unsigned int count) return p; } +#if UNUSED /* * Read MII register * Busy-waits, but transfer time should be short! @@ -154,6 +155,7 @@ getMII(int phyNumber, int regNumber) MCF5282_FEC_EIR = MCF5282_FEC_EIR_MII; return MCF5282_FEC_MMFR & 0xFFFF; } +#endif /* * Write MII register @@ -179,7 +181,7 @@ mcf5282_fec_initialize_hardware(struct mcf5282_enet_struct *sc) const unsigned char *hwaddr; rtems_status_code status; rtems_isr_entry old_handler; - unsigned32 clock_speed = bsp_get_CPU_clock_speed(); + uint32_t clock_speed = bsp_get_CPU_clock_speed(); /* * Issue reset to FEC @@ -331,7 +333,7 @@ fec_rxDaemon (void *arg) volatile struct mcf5282_enet_struct *sc = (volatile struct mcf5282_enet_struct *)arg; struct ifnet *ifp = (struct ifnet* )&sc->arpcom.ac_if; struct mbuf *m; - volatile rtems_unsigned16 status; + volatile uint16_t status; volatile mcf5282BufferDescriptor_t *rxBd; int rxBdIndex; @@ -400,7 +402,7 @@ fec_rxDaemon (void *arg) * FIXME: Packet filtering hook could be done here. */ struct ether_header *eh; - int len = rxBd->length - sizeof(rtems_unsigned32);; + int len = rxBd->length - sizeof(uint32_t);; /* * Invalidate the cache and push the packet up. @@ -446,7 +448,7 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m) { struct mcf5282_enet_struct *sc = ifp->if_softc; volatile mcf5282BufferDescriptor_t *firstTxBd, *txBd; - rtems_unsigned16 status; + uint16_t status; int nAdded; /* @@ -519,10 +521,10 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m) if ((int)p & 0x3) { int l = m->m_len; char *dest = p - ((int)p & 0x3); - unsigned16 *o = (unsigned16 *)dest, *i = (unsigned16 *)p; + uint16_t *o = (uint16_t *)dest, *i = (uint16_t *)p; while (l > 0) { *o++ = *i++; - l -= sizeof(unsigned16); + l -= sizeof(uint16_t); } p = dest; sc->txRealign++; diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index aed04393f1..141e90ace7 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -66,7 +66,7 @@ char *rtems_progname; * No burst transfers on non-cacheable accesses * Default cache mode is *disabled* (cache only ACRx areas) */ -static unsigned32 cacr_mode = MCF5XXX_CACR_CENB | +static uint32_t cacr_mode = MCF5XXX_CACR_CENB | MCF5XXX_CACR_DBWE | MCF5XXX_CACR_DCM; /* @@ -156,7 +156,7 @@ void _CPU_cache_invalidate_1_data_line(const void *addr) * 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_pretasking_hook(void); /* m68k version */ /* @@ -246,10 +246,10 @@ void bsp_start( void ) MCF5282_CS2_CSCR = MCF5282_CS_CSCR_PS_16; } -unsigned32 bsp_get_CPU_clock_speed(void) +uint32_t bsp_get_CPU_clock_speed(void) { extern char _CPUClockSpeed[]; - return( (unsigned32)_CPUClockSpeed); + return( (uint32_t)_CPUClockSpeed); } /* |