Changeset b607d9c8 in rtems

Timestamp:

04/26/05 23:03:51 (18 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a6e2293

Parents:

17a5e1d8

Message:

2005-04-26 Joel Sherrill <joel@…>

• 3c509/3c509.c, wd8003/wd8003.c: Eliminate warnings.

Location:

c/src/lib/libbsp/i386/pc386

Files:

• 3c509/3c509.c (modified) (12 diffs)
• ChangeLog (modified) (1 diff)
• wd8003/wd8003.c (modified) (2 diffs)

c/src/lib/libbsp/i386/pc386/3c509/3c509.c

@@ -59 +59 @@
  * MODIFICATION/HISTORY:
  * $Log$
+ * Revision 1.5  2004/07/25 14:21:43  joel
+ * 2004-07-25   Joel Sherrill <joel@OARcorp.com>
+ *
+ *      * 3c509/3c509.c: Add <sys/errno.h>.
+ *      * startup/linkcmds: Add .jcr section.
+ *
  * Revision 1.4  2004/04/21 16:01:33  ralf
  * Remove duplicate white lines.
@@ -243 +249 @@
  *
  **********************************************************************************/
-static __inline void outsl( unsigned short io_addr, unsigned char *out_data, int len )
+static __inline void outsl( unsigned short io_addr, uint8_t *out_data, int len )
 {
    u_long *pl = ( u_long *)out_data;
@@ -261 +267 @@
  *
  **********************************************************************************/
-static __inline void outsw( unsigned short io_addr, unsigned char *out_data, int len )
+static __inline void outsw( unsigned short io_addr, uint8_t *out_data, int len )
 {
    u_short *ps = ( u_short *)out_data;
@@ -279 +285 @@
  *
  **********************************************************************************/
-static __inline void outsb( unsigned short io_addr, unsigned char *out_data, int len )
+static __inline void outsb( unsigned short io_addr, uint8_t *out_data, int len )
 {
    while( len-- )
@@ -296 +302 @@
  *
  **********************************************************************************/
-static __inline void insw( unsigned short io_addr, unsigned char *in_data, int len )
+static __inline void insw( unsigned short io_addr, uint8_t *in_data, int len )
 {
    u_short *ps = ( u_short *)in_data;
@@ -314 +320 @@
  *
  **********************************************************************************/
-static __inline void insl( unsigned short io_addr, unsigned char *in_data, int len )
+static __inline void insl( unsigned short io_addr, uint8_t *in_data, int len )
 {
    u_long *pl = ( u_long *)in_data;
@@ -332 +338 @@
  *
  **********************************************************************************/
-static __inline void insb( unsigned short io_addr, unsigned char *in_data, int len )
+static __inline void insb( unsigned short io_addr, uint8_t *in_data, int len )
 {
    while( len-- )
@@ -376 +382 @@
  *
  **********************************************************************************/
-void __inline outb( unsigned short io_addr, unsigned char out_data )
+void __inline outb( unsigned short io_addr, uint8_t out_data )
 {
   outport_byte( io_addr, out_data );
@@ -388 +394 @@
  *
  **********************************************************************************/
-static __inline unsigned char inb( unsigned short io_addr )
-{
-  unsigned char in_data;
+static __inline uint8_t inb( unsigned short io_addr )
+{
+  uint8_t in_data;
   inport_byte( io_addr, in_data );
   return in_data;
@@ -1330 +1336 @@
        if( ep_ftst(F_ACCESS_32_BITS ) )
        {
-              outsl( BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 4 );
+              outsl( BASE + EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *), m->m_len / 4 );
               if( m->m_len & 3 )
-             outsb(BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t) + (m->m_len & (~3)), m->m_len & 3 );
+             outsb(BASE + EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *) + (m->m_len & (~3)), m->m_len & 3 );
        }
        else
        {
-              outsw( BASE + EP_W1_TX_PIO_WR_1, mtod(m, caddr_t), m->m_len / 2 );
+              outsw( BASE + EP_W1_TX_PIO_WR_1, mtod(m, uint8_t *), m->m_len / 2 );
               if( m->m_len & 1 )
-                  outb( BASE + EP_W1_TX_PIO_WR_1, *(mtod(m, caddr_t) + m->m_len - 1) );
+                  outb( BASE + EP_W1_TX_PIO_WR_1, *(mtod(m, uint8_t *) + m->m_len - 1) );
            }
         }
@@ -1424 +1430 @@
 
            /* Read what should be the header. */
-           insw(BASE + EP_W1_RX_PIO_RD_1, mtod(top, caddr_t), sizeof(struct ether_header) / 2);
+           insw(BASE + EP_W1_RX_PIO_RD_1, mtod(top, uint8_t *), sizeof(struct ether_header) / 2);
            top->m_len = sizeof(struct ether_header);
            rx_fifo -= sizeof(struct ether_header);
@@ -1455 +1461 @@
            if( ep_ftst( F_ACCESS_32_BITS ) )
            { /* default for EISA configured cards*/
-              insl( BASE + EP_W1_RX_PIO_RD_1, mtod(m, caddr_t) + m->m_len, lenthisone / 4);
+              insl( BASE + EP_W1_RX_PIO_RD_1, mtod(m, uint8_t *) + m->m_len, lenthisone / 4);
               m->m_len += (lenthisone & ~3);
               if (lenthisone & 3)
-                     insb(BASE + EP_W1_RX_PIO_RD_1, mtod(m, caddr_t) + m->m_len, lenthisone & 3);
+                     insb(BASE + EP_W1_RX_PIO_RD_1, mtod(m, uint8_t *) + m->m_len, lenthisone & 3);
               m->m_len += (lenthisone & 3);
             }
             else
             {
-              insw(BASE + EP_W1_RX_PIO_RD_1, mtod(m, caddr_t) + m->m_len, lenthisone / 2);
+              insw(BASE + EP_W1_RX_PIO_RD_1, mtod(m, uint8_t *) + m->m_len, lenthisone / 2);
               m->m_len += lenthisone;
               if( lenthisone & 1 )
-                     *(mtod(m, caddr_t) + m->m_len - 1) = inb(BASE + EP_W1_RX_PIO_RD_1);
+                     *(mtod(m, uint8_t *) + m->m_len - 1) = inb(BASE + EP_W1_RX_PIO_RD_1);
            }
            rx_fifo -= lenthisone;

c/src/lib/libbsp/i386/pc386/ChangeLog

@@ +1 @@
+2005-04-26      Joel Sherrill <joel@OARcorp.com>
+
+        * 3c509/3c509.c, wd8003/wd8003.c: Eliminate warnings.
+
 2005-04-18      Eric Valette <eric.valette@free.fr>
 

c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c

@@ -324 +324 @@
       m->m_pkthdr.rcvif = ifp;
 
-      temp = m->m_data;
+      temp = (unsigned char *) m->m_data;
       m->m_len = m->m_pkthdr.len = len - sizeof(struct ether_header);
 
@@ -364 +364 @@
         struct mbuf *n;
         unsigned int len, tport;
-        char *shp, txReady;
+        uint8_t *shp, txReady;
 
         tport = dp->port;