Changeset 13509 for src/router/services/sysinit/sysinit-gateworx.c

Timestamp:

12/23/09 20:47:05 (3 years ago)

Author:

BrainSlayer

Message:

generic detection method

File:

• src/router/services/sysinit/sysinit-gateworx.c (modified) (2 diffs)

src/router/services/sysinit/sysinit-gateworx.c

@@ -51 +51 @@
 #include <linux/sockios.h>
 #include <linux/mii.h>
-
-static int detect(char *devicename)
-{
-        char devcall[128];
-        int res;
-
-        sprintf(devcall, "/sbin/lspci|/bin/grep \"%s\"|/bin/wc -l", devicename);
-        FILE *in = popen(devcall, "rb");
-
-        fscanf(in, "%d", &res);
-        pclose(in);
-        return res > 0 ? 1 : 0;
-}
+#include "devices/ethernet.c"
+
 
 #ifndef HAVE_TONZE
@@ -221 +210 @@
         fprintf(stderr, "try modules for ethernet adapters\n");
         nvram_set("intel_eth", "0");
-        if (detect("82541"))    // Intel Gigabit
-        {
-                nvram_set("intel_eth", "1");
-                insmod("e1000");
-        }
-        if (detect("8139"))     // Intel Gigabit
-        {
-                nvram_set("intel_eth", "1");
-                insmod("8139too");
-        } else if (detect("8139"))      // Realtek 8139 Adapter (various notebooks) 
-        {
-                nvram_set("intel_eth", "1");
-                insmod("8139too");
-        } else if (detect("DFE-690TXD"))        // Realtek 8139 Adapter (various
-        {
-                // notebooks) 
-                nvram_set("intel_eth", "1");
-                insmod("8139too");
-        } else if (detect("SMC2-1211TX"))       // Realtek 8139 Adapter (various
-        {                       // notebooks) 
-                nvram_set("intel_eth", "1");
-                insmod("8139too");
-        } else if (detect("Robotics"))  // Realtek 8139 Adapter (various
-        {                       // notebooks) 
-                nvram_set("intel_eth", "1");
-                insmod("8139too");
-        }
+        if (detect_ethernet_devices())
+            nvram_set("intel_eth","1");
 #ifndef HAVE_NOWIFI
         fprintf(stderr, "load HAL Driver\n");