Changeset 367cc5e in rtems

Timestamp:

03/24/99 22:29:32 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

c9b07e92

Parents:

33508cb

Message:

Patch from Eric Norum <eric@…> to use new network
interface naming convention.

Location:

c/src

Files:

• lib/libchip/network/sonic.c (modified) (2 diffs)
• libchip/network/sonic.c (modified) (2 diffs)

c/src/lib/libchip/network/sonic.c

@@ -1503 +1503 @@
   struct ifnet *ifp;
   int mtu;
-  int i;
-
-  /*
-   * Find an unused entry
-   */
-  i = 0;
-  sc = sonic_softc;
-  for (;;) {
-    if (sc == &sonic_softc[NSONIC]) {
-      printf ("No more SONIC devices.\n");
-      return 0;
-    }
-    ifp = &sc->arpcom.ac_if;
-    if (ifp->if_softc == NULL)
-      break;
-    sc++;
-    i++;
+  int unitNumber;
+  char *unitName;
+
+  /*
+   * Parse driver name
+   */
+  if ((unitNumber = rtems_bsdnet_parse_driver_name (config, &unitName)) < 0)
+    return 0;
+
+  /*
+   * Is driver free?
+   */
+  if ((unitNumber <= 0) || (unitNumber > NSONIC)) {
+    printf ("Bad SONIC unit number.\n");
+     return 0;
+  }
+  sc = &sonic_softc[unitNumber - 1];
+  ifp = &sc->arpcom.ac_if;
+  if (ifp->if_softc != NULL) {
+    printf ("Driver already in use.\n");
+    return 0;
   }
 
@@ -1563 +1567 @@
    */
   ifp->if_softc = sc;
-  ifp->if_unit = i + 1;
-  ifp->if_name = "sonic";
+  ifp->if_unit = unitNumber;
+  ifp->if_name = unitName;
   ifp->if_mtu = mtu;
   ifp->if_init = sonic_init;

c/src/libchip/network/sonic.c

@@ -1503 +1503 @@
   struct ifnet *ifp;
   int mtu;
-  int i;
-
-  /*
-   * Find an unused entry
-   */
-  i = 0;
-  sc = sonic_softc;
-  for (;;) {
-    if (sc == &sonic_softc[NSONIC]) {
-      printf ("No more SONIC devices.\n");
-      return 0;
-    }
-    ifp = &sc->arpcom.ac_if;
-    if (ifp->if_softc == NULL)
-      break;
-    sc++;
-    i++;
+  int unitNumber;
+  char *unitName;
+
+  /*
+   * Parse driver name
+   */
+  if ((unitNumber = rtems_bsdnet_parse_driver_name (config, &unitName)) < 0)
+    return 0;
+
+  /*
+   * Is driver free?
+   */
+  if ((unitNumber <= 0) || (unitNumber > NSONIC)) {
+    printf ("Bad SONIC unit number.\n");
+     return 0;
+  }
+  sc = &sonic_softc[unitNumber - 1];
+  ifp = &sc->arpcom.ac_if;
+  if (ifp->if_softc != NULL) {
+    printf ("Driver already in use.\n");
+    return 0;
   }
 
@@ -1563 +1567 @@
    */
   ifp->if_softc = sc;
-  ifp->if_unit = i + 1;
-  ifp->if_name = "sonic";
+  ifp->if_unit = unitNumber;
+  ifp->if_name = unitName;
   ifp->if_mtu = mtu;
   ifp->if_init = sonic_init;