summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/ChangeLog6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/include/bsp.h6
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/network/network.c8
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c2
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/startup/init68360.c4
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/timer/timer.c2
6 files changed, 17 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index 28fbdaec36..7318d5793d 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * include/bsp.h, network/network.c, startup/bspstart.c,
+ startup/init68360.c, timer/timer.c: Convert to using c99 fixed size
+ types.
+
2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect changes to bsp.am.
diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
index 8186f332a9..08b3830a0a 100644
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
@@ -86,8 +86,8 @@ extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int a
*/
#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 ; \
@@ -122,7 +122,7 @@ extern m68k_isr_entry M68Kvec[]; /* vector table address */
void bsp_cleanup( void );
-void M360ExecuteRISC( rtems_unsigned16 command );
+void M360ExecuteRISC( uint16_t command );
void *M360AllocateBufferDescriptors( int count );
void *M360AllocateRiscTimers( int count );
extern char M360DefaultWatchdogFeeder;
diff --git a/c/src/lib/libbsp/m68k/gen68360/network/network.c b/c/src/lib/libbsp/m68k/gen68360/network/network.c
index bb89e7867e..1e96160f25 100644
--- a/c/src/lib/libbsp/m68k/gen68360/network/network.c
+++ b/c/src/lib/libbsp/m68k/gen68360/network/network.c
@@ -343,7 +343,7 @@ m360Enet_initialize_hardware (struct scc_softc *sc)
static void
m360Enet_retire_tx_bd (struct scc_softc *sc)
{
- rtems_unsigned16 status;
+ uint16_t status;
int i;
int nRetired;
struct mbuf *m, *n;
@@ -442,7 +442,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 m360BufferDescriptor_t *rxBd;
int rxBdIndex;
@@ -525,7 +525,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);
@@ -581,7 +581,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
struct scc_softc *sc = ifp->if_softc;
volatile m360BufferDescriptor_t *firstTxBd, *txBd;
struct mbuf *l = NULL;
- rtems_unsigned16 status;
+ uint16_t status;
int nAdded;
/*
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
index c89ca9b259..125cd2e81b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
@@ -39,7 +39,7 @@ unsigned long _M68K_RamSize;
*/
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/gen68360/startup/init68360.c b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
index 49a0f26238..f40b595854 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
@@ -18,9 +18,9 @@
* Send a command to the CPM RISC processer
*/
-void M360ExecuteRISC(rtems_unsigned16 command)
+void M360ExecuteRISC(uint16_t command)
{
- rtems_unsigned16 sr;
+ uint16_t sr;
m68k_disable_interrupts (sr);
while (m360.cr & M360_CR_FLG)
diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
index a62fe15a21..7a7ded514c 100644
--- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
@@ -75,7 +75,7 @@ Timer_initialize (void)
int
Read_timer (void)
{
- return *(rtems_unsigned32 *)&m360.tcn1;
+ return *(uint32_t*)&m360.tcn1;
}
/*