Changeset 38b81b5 in rtems

Timestamp:

12/13/99 16:25:03 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9537e5e

Parents:

4bdebdfe

Message:

Patch from Emmanuel Raguet <raguet@…> to correct some problems
in the dec21140 driver. Comments follow:

I have tried to use bootp with the dec21140 driver
and I had problems. I have found them

• Ethernet address must be known in Attach step (read from the board)
• Endian problem for Ethernet address storage.

Now it is solved and I can use bootp to obtain
the network configuration of the target.

File:

• c/src/libchip/network/dec21140.c (modified) (3 diffs)

c/src/libchip/network/dec21140.c

@@ -364 +364 @@
    */
   st_le32( (tbase+memCSR0), CSR0_MODE);  
-
-  /*  csr12_val = ld_le32( (tbase+memCSR8) );*/
-
-  for (i=0; i<32; i++){
-    rombuf.s[i] = eeget16(tbase+memCSR9, i);
-  }
-  memcpy (sc->arpcom.ac_enaddr, rombuf.c+20, ETHER_ADDR_LEN);
 
 #ifdef DEC_DEBUG
@@ -494 +487 @@
   st_le32( (tbase+memCSR7), IT_SETUP); 
   st_le32( (unsigned int*)(tbase+memCSR6), CSR6_INIT | CSR6_TXRX);
-  
 }
 
@@ -887 +879 @@
         }
         else {
-          memset (sc->arpcom.ac_enaddr, 0x08,ETHER_ADDR_LEN);
+          union {char c[64]; unsigned short s[32];} rombuf;
+          int i;
+
+          for (i=0; i<32; i++){
+            rombuf.s[i] = eeget16(sc->base+memCSR9, i);
+          }
+#if defined(__i386)
+          for (i=0 ; i<(ETHER_ADDR_LEN/2); i++){
+            sc->arpcom.ac_enaddr[2*i]   = rombuf.c[20+2*i+1];
+            sc->arpcom.ac_enaddr[2*i+1] = rombuf.c[20+2*i];
+          }  
+#endif
+#if defined(__PPC)
+          memcpy (sc->arpcom.ac_enaddr, rombuf.c+20, ETHER_ADDR_LEN);
+#endif
         }
+
         if (config->mtu)
                 mtu = config->mtu;