Ticket #354: eepro.diff

Patch against RTEMS-ss-20030128
Author: Till Straumann <strauman@slac.stanford.edu>

2003/2/11

This patch addresses the following issues:
  - if_fxp (intel eepro network driver): re-enabled the chip
    detection against a table of supported chips. The untested
    ones are still commented out, however.

Index: c/src/libchip/network/if_fxp.c
===================================================================
RCS file: /afs/slac/g/spear/cvsrep/rtems/src-20030128/c/src/libchip/network/if_fxp.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 if_fxp.c
*** c/src/libchip/network/if_fxp.c      29 Jan 2003 22:54:46 -0000      1.1.1.1
--- c/src/libchip/network/if_fxp.c      5 Feb 2003 05:25:30 -0000
***************
*** 190,202 ****
   * particular variants, but we don't currently differentiate between
   * them.
   */
- #ifdef NOTUSED
  static struct fxp_ident fxp_ident_table[] = {
      { 0x1229,         "Intel Pro 10/100B/100+ Ethernet" },
      { 0x2449,         "Intel Pro/100 Ethernet" },
      { 0x1209,         "Intel Embedded 10/100 Ethernet" },
      { 0x1029,         "Intel Pro/100 Ethernet" },
      { 0x1030,         "Intel Pro/100 Ethernet" },
      { 0x1031,         "Intel Pro/100 Ethernet" },
      { 0x1032,         "Intel Pro/100 Ethernet" },
      { 0x1033,         "Intel Pro/100 Ethernet" },
--- 190,209 ----
   * particular variants, but we don't currently differentiate between
   * them.
   */
  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" },
***************
*** 205,213 ****
      { 0x1036,         "Intel Pro/100 Ethernet" },
      { 0x1037,         "Intel Pro/100 Ethernet" },
      { 0x1038,         "Intel Pro/100 Ethernet" },
      { 0,              NULL },
  };
- #endif
  
  #if 0
  static int            fxp_probe(device_t dev);
--- 212,220 ----
      { 0x1036,         "Intel Pro/100 Ethernet" },
      { 0x1037,         "Intel Pro/100 Ethernet" },
      { 0x1038,         "Intel Pro/100 Ethernet" },
+ #endif
      { 0,              NULL },
  };
  
  #if 0
  static int            fxp_probe(device_t dev);
***************
*** 456,466 ****
        /*
         * find device on pci bus
         */     
!       i = pcib_find_by_devid(0x8086,0x1209,unitNumber-1,
!                              &(sc->pci_signature));
!       DBGLVL_PRINTK(2,"fxp_attach: find_devid returned %d "
                      "and pci signature 0x%x\n",
                      i,sc->pci_signature);
  
        /*
         * FIXME: add search for more device types...
--- 463,482 ----
        /*
         * find device on pci bus
         */     
!     { int j;
! 
!       for (j=0; fxp_ident_table[j].devid; j++ ) {
!               i = pcib_find_by_devid( 0x8086,
!                                                               fxp_ident_table[j].devid,
!                                                               unitNumber-1,
!                                                       &(sc->pci_signature));
!               DBGLVL_PRINTK(2,"fxp_attach: find_devid returned %d "
                      "and pci signature 0x%x\n",
                      i,sc->pci_signature);
+         if (PCIB_ERR_SUCCESS == i)
+                       break;
+         }                     
+       }
  
        /*
         * FIXME: add search for more device types...