Changeset 640f1cb in rtems

Timestamp:

05/21/04 15:09:43 (19 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

922db65

Parents:

e2f50f9d

Message:

2004-05-21 Till Strauman <strauman@…>

• PR/625/networking
• network/dec21140.c: Prevent name clashes by making 'ld_le32()' etc. static inlines. Let dec21140 attach routine return an error rather than panic if no chip is detected (thus allowing for probing).
• network/elnk.c: Let elnk bail out if autoneg never completes instead of looping forever. Avoid divide by zero (crashed my PC).
• network/if_fxp.c: Enable more fxp chip variants but warn that they are UNTESTED.

Location:

c/src/libchip

Files:

• ChangeLog (modified) (1 diff)
• network/dec21140.c (modified) (2 diffs)
• network/elnk.c (modified) (4 diffs)
• network/if_fxp.c (modified) (3 diffs)

c/src/libchip/ChangeLog

@@ +1 @@
+2004-05-21  Till Strauman <strauman@slac.stanford.edu>
+
+        * PR/625/networking
+        * network/dec21140.c: Prevent name clashes by making 'ld_le32()' etc.
+        static inlines.  Let dec21140 attach routine return an error rather
+        than panic if no chip is detected (thus allowing for probing).
+        * network/elnk.c: Let elnk bail out if autoneg never completes
+        instead of looping forever.  Avoid divide by zero (crashed my PC).
+        * network/if_fxp.c: Enable more fxp chip variants but warn that
+        they are UNTESTED.
+
 2003-09-26      Cedric Aubert <cedric_aubert@yahoo.fr>
 

c/src/libchip/network/dec21140.c

@@ -244 +244 @@
 #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE
 
-inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
+static inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
 {
   *(addr)=value ;
 }
 
-inline unsigned32 ld_le32(volatile unsigned32 *addr)
+static inline unsigned32 ld_le32(volatile unsigned32 *addr)
 {
   return(*addr);
@@ -1062 +1062 @@
          printk( "DEC/Intel 21143 PCI network card found\n" );
       else
-         rtems_panic("DEC PCI network card not found !!\n");
+      {
+         printk("No DEC/Intel 21140/3 PCI network card found !!\n");
+         return 0;
+      }
    }
 #endif  

c/src/libchip/network/elnk.c

@@ -205 +205 @@
 #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PG_SIZE
 
-inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
+static inline void st_le32(volatile unsigned32 *addr, unsigned32 value)
 {
   *(addr)=value ;
 }
 
-inline unsigned32 ld_le32(volatile unsigned32 *addr)
+static inline unsigned32 ld_le32(volatile unsigned32 *addr)
 {
   return(*addr);
@@ -2670 +2670 @@
          xl_miibus_writereg(sc, 0x18, MII_BMCR, BMCR_STARTNEG | BMCR_AUTOEN );
 
-         while( ((sr = xl_miibus_readreg(sc, 0x18, MII_BMSR)) & BMSR_ACOMP) == 0 ); 
+
+         for (i=0; ((sr = xl_miibus_readreg(sc, 0x18, MII_BMSR)) & BMSR_ACOMP) == 0 && i < 20; i++) 
+            DELAY(10000);
       }
 
@@ -2998 +3000 @@
              sc->xl_stats.device_interrupts,
              sc->xl_stats.txcomplete_ints,
-             (totalLengths / numLengths) );
+             numLengths ? (totalLengths / numLengths) : -1 );
    }
 
@@ -3120 +3122 @@
       int pbus,pdev,pfun, vid, did, tindex;
 };
-
-
 
 /*

c/src/libchip/network/if_fxp.c

@@ -183 +183 @@
         u_int16_t       devid;
         char            *name;
+        int                     warn;
 };
+
+#define UNTESTED 1
 
 /*
@@ -192 +195 @@
  */
 static struct fxp_ident fxp_ident_table[] = {
-#ifdef NOTUSED
-        /* currently untested */
-    { 0x1229,           "Intel Pro 10/100B/100+ Ethernet" },
-    { 0x2449,           "Intel Pro/100 Ethernet" },
-#endif
-    { 0x1209,           "Intel Embedded 10/100 Ethernet" },
-#ifdef NOTUSED
-        /* currently untested */
-    { 0x1029,           "Intel Pro/100 Ethernet" },
-#endif
-    { 0x1030,           "Intel Pro/100 Ethernet" },
-#ifdef NOTUSED
-        /* currently untested */
-    { 0x1031,           "Intel Pro/100 Ethernet" },
-    { 0x1032,           "Intel Pro/100 Ethernet" },
-    { 0x1033,           "Intel Pro/100 Ethernet" },
-    { 0x1034,           "Intel Pro/100 Ethernet" },
-    { 0x1035,           "Intel Pro/100 Ethernet" },
-    { 0x1036,           "Intel Pro/100 Ethernet" },
-    { 0x1037,           "Intel Pro/100 Ethernet" },
-    { 0x1038,           "Intel Pro/100 Ethernet" },
-#endif
+    { 0x1229,           "Intel Pro 10/100B/100+ Ethernet", UNTESTED },
+    { 0x2449,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1209,           "Intel Embedded 10/100 Ethernet", 0 },
+    { 0x1029,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1030,           "Intel Pro/100 Ethernet", 0 },
+    { 0x1031,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1032,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1033,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1034,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1035,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1036,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1037,           "Intel Pro/100 Ethernet", UNTESTED },
+    { 0x1038,           "Intel Pro/100 Ethernet", UNTESTED },
     { 0,                NULL },
 };
@@ -474 +468 @@
                       "and pci signature 0x%x\n",
                       i,sc->pci_signature);
-        if (PCIB_ERR_SUCCESS == i)
+        if (PCIB_ERR_SUCCESS == i) {
+                        if ( UNTESTED == fxp_ident_table[j].warn ) {
+                                device_printf(dev,"WARNING: this chip version has NOT been reported to work under RTEMS yet.\n");
+                                device_printf(dev,"         If it works OK, report it as tested in 'c/src/libchip/network/if_fxp.c'\n");
+                        }
                         break;
+                }
           }                     
         }