Changeset e85eb70 in rtems

Timestamp:

12/22/07 08:28:57 (15 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

107f4d34

Parents:

1ff9922

Message:

2007-12-14 Chris Johns <chrisj@…>

• gdb-init: Make the first hb temporary.
• network/network.c: Add support for reading the MAC address from the FEC if set by the boot monitor. dBug does not do this unless the network is used which is a shame.

Location:

c/src/lib/libbsp/m68k/mcf5235

Files:

• ChangeLog (modified) (1 diff)
• gdb-init (modified) (1 diff)
• network/network.c (modified) (3 diffs)

c/src/lib/libbsp/m68k/mcf5235/ChangeLog

@@ +1 @@
+2007-12-14      Chris Johns <chrisj@rtems.org>
+
+        * gdb-init: Make the first hb temporary.
+        * network/network.c: Add support for reading the MAC address from
+        the FEC if set by the boot monitor. dBug does not do this unless
+        the network is used which is a shame.
+
 2007-12-14      Chris Johns <chrisj@rtems.org>
 

c/src/lib/libbsp/m68k/mcf5235/gdb-init

@@ -8 +8 @@
 # with the debugger.
 #
-hb *0xffe254c0
+thb *0xffe254c0
 
 #

c/src/lib/libbsp/m68k/mcf5235/network/network.c

@@ -307 +307 @@
     MCF5235_INTC0_IMRL &= ~(MCF5235_INTC0_IMRL_INT27 | MCF5235_INTC0_IMRL_MASKALL);
 }
+
+/*
+ * Get the MAC address from the hardware.
+ */
+static void
+fec_get_mac_address(volatile struct mcf5235_enet_struct *sc, unsigned char* hwaddr)
+{
+  unsigned long addr;
+
+  addr = MCF5235_FEC_PALR;
+
+  hwaddr[0] = (addr >> 24) & 0xff;
+  hwaddr[1] = (addr >> 16) & 0xff;
+  hwaddr[2] = (addr >>  8) & 0xff;
+  hwaddr[3] = (addr >>  0) & 0xff;
+  
+  addr = MCF5235_FEC_PAUR;
+  
+  hwaddr[4] = (addr >> 24) & 0xff;
+  hwaddr[5] = (addr >> 16) & 0xff;
+}
+                    
 
 /*
@@ -790 +812 @@
      * Is driver free?
      */
-    if ((unitNumber <= 0) || (unitNumber > NIFACES)) {
-        printf("Bad FEC unit number.\n");
+    if ((unitNumber < 0) || (unitNumber >= NIFACES)) {
+        printf("mcf5235: bad FEC unit number.\n");
         return 0;
     }
-    sc = &enet_driver[unitNumber - 1];
+    sc = &enet_driver[unitNumber];
     ifp = &sc->arpcom.ac_if;
     if (ifp->if_softc != NULL) {
-        printf("Driver already in use.\n");
+        printf("mcf5235: driver already in use.\n");
         return 0;
     }
@@ -804 +826 @@
      * Process options
      */
+    if (config->hardware_address)
+      memcpy(sc->arpcom.ac_enaddr, config->hardware_address, ETHER_ADDR_LEN);
+    else
+      fec_get_mac_address(sc, sc->arpcom.ac_enaddr);
+
     hwaddr = config->hardware_address;
-    printf("%s%d: Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                            unitName, unitNumber,
-                                            hwaddr[0], hwaddr[1], hwaddr[2],
-                                            hwaddr[3], hwaddr[4], hwaddr[5]);
-    memcpy(sc->arpcom.ac_enaddr, hwaddr, ETHER_ADDR_LEN);
+    printf("%s%d: mac: %02x:%02x:%02x:%02x:%02x:%02x\n",
+           unitName, unitNumber,
+           hwaddr[0], hwaddr[1], hwaddr[2],
+           hwaddr[3], hwaddr[4], hwaddr[5]);
 
     if (config->mtu)