From 1dff10fdc2b50f3cdd2931b0d30a9dacb485a00e Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 21 Oct 2004 13:15:54 +0000
Subject: 2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>

	* include/bsp.h, network/network.c, startup/bspstart.c,
	startup/init5272.c: Use POSIX fixed-size types.
---
 c/src/lib/libbsp/m68k/csb360/ChangeLog          |  5 +++++
 c/src/lib/libbsp/m68k/csb360/include/bsp.h      |  4 ++--
 c/src/lib/libbsp/m68k/csb360/network/network.c  | 14 +++++++-------
 c/src/lib/libbsp/m68k/csb360/startup/bspstart.c |  2 +-
 c/src/lib/libbsp/m68k/csb360/startup/init5272.c |  4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog
index f7ee051218..a94922995a 100644
--- a/c/src/lib/libbsp/m68k/csb360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-21	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* include/bsp.h, network/network.c, startup/bspstart.c, 
+	startup/init5272.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/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
index c41d8355b1..ef523337f6 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
@@ -147,8 +147,8 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config);
  */
 
 #define 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/csb360/network/network.c b/c/src/lib/libbsp/m68k/csb360/network/network.c
index dc41043c83..9757402826 100644
--- a/c/src/lib/libbsp/m68k/csb360/network/network.c
+++ b/c/src/lib/libbsp/m68k/csb360/network/network.c
@@ -84,8 +84,8 @@
 #endif
 
 typedef struct {
-    unsigned16 status;
-    unsigned16 length;
+    uint16_t status;
+    uint16_t length;
     void *buffer;
 } bd_t;
 #define MCF5272_BD_READY       (bit(15))
@@ -231,7 +231,7 @@ mcf5272_enet_initialize_hardware (struct mcf5272_enet_struct *sc)
 {
     int i;
     unsigned char *hwaddr;
-    unsigned32 icr;
+    uint32_t icr;
     /*
      * Issue reset to FEC
      */
@@ -362,7 +362,7 @@ mcf5272_enet_initialize_hardware (struct mcf5272_enet_struct *sc)
 static void
 mcf5272_enet_retire_tx_bd (struct mcf5272_enet_struct *sc)
 {
-    rtems_unsigned16 status;
+    uint16_t status;
     int i;
     int nRetired;
     struct mbuf *m, *n;
@@ -433,7 +433,7 @@ mcf5272_enet_rxDaemon (void *arg)
     struct mcf5272_enet_struct *sc = (struct mcf5272_enet_struct *)arg;
     struct ifnet *ifp = &sc->arpcom.ac_if;
     struct mbuf *m;
-    rtems_unsigned16 status;
+    uint16_t status;
     bd_t *rxBd;
     int rxBdIndex;
     
@@ -507,7 +507,7 @@ mcf5272_enet_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);
@@ -568,7 +568,7 @@ mcf5272_enet_sendpacket (struct ifnet *ifp, struct mbuf *m)
     struct mcf5272_enet_struct *sc = ifp->if_softc;
     volatile bd_t *firstTxBd, *txBd;
     /*  struct mbuf *l = NULL; */
-    rtems_unsigned16 status;
+    uint16_t status;
     int nAdded;
     cp;
     
diff --git a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c
index c8eec2bbbe..6e1954d057 100644
--- a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c
@@ -53,7 +53,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 */
 
 /* bsp_start --
diff --git a/c/src/lib/libbsp/m68k/csb360/startup/init5272.c b/c/src/lib/libbsp/m68k/csb360/startup/init5272.c
index 5b88fb453a..6a6f6a23de 100644
--- a/c/src/lib/libbsp/m68k/csb360/startup/init5272.c
+++ b/c/src/lib/libbsp/m68k/csb360/startup/init5272.c
@@ -129,8 +129,8 @@ init5272(void)
     /* Copy the interrupt vector table to SRAM */
     {
         extern void INTERRUPT_VECTOR();
-        rtems_unsigned32 *inttab = (rtems_unsigned32 *)&INTERRUPT_VECTOR;
-        rtems_unsigned32 *intvec = (rtems_unsigned32 *)BSP_RAMBAR;
+        uint32_t *inttab = (uint32_t *)&INTERRUPT_VECTOR;
+        uint32_t *intvec = (uint32_t *)BSP_RAMBAR;
         register int i;
         for (i = 0; i < 256; i++)
         {
-- 
cgit v1.2.3