Changeset c94c251 in rtems

Timestamp:

05/25/00 13:42:00 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

f3b1664f

Parents:

64bddf48

Message:

Update from Stephan Wilms <Stephan.Wilms@…> that adds autodetection.

What I implemented in this new driver version is, that the driver will
first probe for a DEC21140 card and use it if found. If not found it
will probe for a DEC21143 card and use that if found. This removes the
need for defining/undefining a macro (as was required with my previous
version). I tested the driver with my 21143 card using netdemo and it
apears to work just fine.

Here are some cases that I did not test, mainly because I do not have
the required testing hardware:

• I did not enhance or test PPC support
• I did not test DEC21140 support
• I did not use other test software than netdemo

File:

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

c/src/libchip/network/dec21140.c

@@ -13 +13 @@
  * [22.05.2000,StWi/CWA] added support for the DEC/Intel 21143 chip
  *
- * This support is (for now) only available for the __i386 target, because
- * that's the only testing platform I have. It should to my best knowledge
- * work in the same way for the "__PPC" target, but someone should test
- * this first before it's put into the code. Thanks go to Andrew Klossner
- * who provided the vital information about the Intel 21143 chip.
+ * The 21143 support is (for now) only available for the __i386 target,
+ * because that's the only testing platform I have. It should (to my best
+ * knowledge) work in the same way for the "__PPC" target, but someone
+ * should test this first before it's put into the code. Thanks go to
+ * Andrew Klossner who provided the vital information about the
+ * Intel 21143 chip.
+ * (FWIW: I tested this driver using a Kingston KNE100TX with 21143PD chip)
  *
- * (FWIW: my network card is a Kingston KNE100TX with 21143PD chip)
- *
- * The 21143 support is enabled by defining the macro
- * "ENABLE_21143_VARIANT" (see the "#if defined(__i386)" section right
- * below, just add or remove comments as needed)
+ * The driver will automatically detect whether there is a 21140 or 21143
+ * network card in the system and activate support accordingly. It will
+ * look for the 21140 first. If the 21140 is not found the driver will
+ * look for the 21143.
  * ------------------------------------------------------------------------
  */
@@ -37 +38 @@
 #if defined(__i386)
   #define DEC21140_SUPPORTED
-  #define ENABLE_21143_VARIANT
 #endif
 
@@ -88 +88 @@
 #define DEC_DEBUG
 
+/* note: the 21143 isn't really a DEC, it's an Intel chip */
 #define PCI_INVALID_VENDORDEVICEID      0xffffffff
 #define PCI_VENDOR_ID_DEC 0x1011
-#if defined(ENABLE_21143_VARIANT)
-  #define PCI_DEVICE_ID_DEC_TULIP_FAST 0x0019
-#else
-  #define PCI_DEVICE_ID_DEC_TULIP_FAST 0x0009
-#endif
+#define PCI_DEVICE_ID_DEC_21140 0x0009
+#define PCI_DEVICE_ID_DEC_21143 0x0019
 
 #define IO_MASK  0x3
@@ -386 +384 @@
 
 #ifdef DEC_DEBUG
-  printk("DC21140 %x:%x:%x:%x:%x:%x IRQ %d IO %x M %x .........\n",
+  printk("DC2114x %x:%x:%x:%x:%x:%x IRQ %d IO %x M %x .........\n",
          sc->arpcom.ac_enaddr[0], sc->arpcom.ac_enaddr[1],
          sc->arpcom.ac_enaddr[2], sc->arpcom.ac_enaddr[3],
@@ -779 +777 @@
         int mtu;
         int i;
+    int deviceId = PCI_DEVICE_ID_DEC_21140; /* network card device ID */
         
         /*
@@ -793 +792 @@
         
         /*
-         * First, find a DEC board
+         * Try to find the network card on the PCI bus. Probe for a DEC 21140
+     * card first. If not found probe the bus for a DEC/Intel 21143 card.
          */
-        if ((diag = pcib_find_by_devid(PCI_VENDOR_ID_DEC,
-                                       PCI_DEVICE_ID_DEC_TULIP_FAST,
-                                       0,
-                                       &signature)) != PCIB_ERR_SUCCESS)
-          rtems_panic("DEC PCI board not found !! (%d)\n", diag);
-        else {
-          printk("DEC PCI Device found\n");
-        }
+    deviceId = PCI_DEVICE_ID_DEC_21140;
+    diag = pcib_find_by_devid( PCI_VENDOR_ID_DEC, deviceId,
+                               0, &signature);
+    if ( diag == PCIB_ERR_SUCCESS)
+      printk( "DEC 21140 PCI network card found\n" );
+    else
+    {
+      deviceId = PCI_DEVICE_ID_DEC_21143;
+      diag = pcib_find_by_devid( PCI_VENDOR_ID_DEC, deviceId,
+                                 0, &signature);
+      if ( diag == PCIB_ERR_SUCCESS)
+        printk( "DEC/Intel 21143 PCI network card found\n" );
+      else
+        rtems_panic("DEC PCI network card not found !!\n");
+    }
 #endif  
 #if defined(__PPC)
@@ -822 +829 @@
               continue;
             }
-            if (ulDeviceID == ((PCI_DEVICE_ID_DEC_TULIP_FAST<<16) + PCI_VENDOR_ID_DEC))
+            if (ulDeviceID == ((PCI_DEVICE_ID_DEC_21140<<16) + PCI_VENDOR_ID_DEC))
               break;
           }
-          if (ulDeviceID == ((PCI_DEVICE_ID_DEC_TULIP_FAST<<16) + PCI_VENDOR_ID_DEC)){
+          if (ulDeviceID == ((PCI_DEVICE_ID_DEC_21140<<16) + PCI_VENDOR_ID_DEC)){
             printk("DEC Adapter found !!\n");
             break;
@@ -853 +860 @@
 #if defined(__i386)
 
-#if defined(ENABLE_21143_VARIANT)
-  /* the 21143 chip must be enabled before it can be accessed */
-  pcib_conf_write32( signature, 0x40, 0 );
-#endif
+    /* the 21143 chip must be enabled before it can be accessed */
+    if ( deviceId == PCI_DEVICE_ID_DEC_21143 )
+      pcib_conf_write32( signature, 0x40, 0 );
 
         pcib_conf_read32(signature, 16, &value);
@@ -950 +956 @@
         ether_ifattach (ifp);
 
-        printk( "DEC21140 : driver has been attached\n" );
+        printk( "DC2114x : driver has been attached\n" );
         return 1;
 };