82559er support update

[Francois Guimond]

Savochkin Andrey Vladimirovich wrote:

> Francois,
>
> Could you send the difference in a unified style (diff -u)?
>
> Best regards
>                                         Andrey V.
>                                         Savochkin
>

Here it is...
Excuse me for the first version, I didn't know the common way to use
diff.
I'm newbie... :)

--- eepro100.c Thu Feb  3 13:32:50 2000
+++ 82557to9er.c Thu Feb 10 15:11:56 2000
@@ -319,6 +319,9 @@
  { "Intel PCI EtherExpress Pro100",
    { 0x12298086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE,
    0, speedo_found1 },
+ { "Intel 82559ER Fast Ethernet PCI Controller",
+   { 0x12098086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE,
+   0, speedo_found1 },
  {0,},      /* 0 terminated list. */
 };
 #else
@@ -335,6 +338,8 @@
 } static pci_tbl[] = {
  { "Intel PCI EtherExpress Pro100",
    0x8086, 0x1229, 0xffff, PCI_USES_IO|PCI_USES_MASTER, 32,
speedo_found1 },
+ { "Intel 82559ER Fast Ethernet PCI Controller",
+   0x8086, 0x1209, 0xffff, PCI_USES_IO|PCI_USES_MASTER, 32,
speedo_found1 },
  {0,},      /* 0 terminated list. */
 };
 #endif
@@ -561,12 +566,12 @@
 int eepro100_init(struct device *dev)
 {
  int cards_found = 0;
- static int pci_index = 0;
+ static int pci_index = 0, pci_index_82559er = 0;

  if (! pcibios_present())
   return cards_found;

- for (; pci_index < 8; pci_index++) {
+ for (; pci_index < 18; pci_index++) {
   unsigned char pci_bus, pci_device_fn, pci_latency;
   u32 pciaddr;
   long ioaddr;
@@ -577,8 +582,15 @@
   if (pcibios_find_device(PCI_VENDOR_ID_INTEL,
         PCI_DEVICE_ID_INTEL_82557,
         pci_index, &pci_bus,
+        &pci_device_fn)){
+      if (pcibios_find_device(PCI_VENDOR_ID_INTEL,
+        0x1209, /* Intel 82559ER Fast Ethernet PCI Controller */
+        pci_index_82559er, &pci_bus,
         &pci_device_fn))
-   break;
+       break;
+            else
+                pci_index_82559er++;
+            }
 #if LINUX_VERSION_CODE >= 0x20155  ||  PCI_SUPPORT_1
   {
    struct pci_dev *pdev = pci_find_slot(pci_bus, pci_device_fn);


>
> On Thu, Feb 10, 2000 at 05:18:01PM -0500, Francois Guimond wrote:
> > The message I posted last friday was wrong.
> >
> > When mixing 82557 to 82559 with 82559er, there is some missing
> > devices...
> > Here are the correct difference between eepro100.c and 82557to9er.c
> >
> >
> > 321a322,324
> > >  { "Intel 82559ER Fast Ethernet PCI Controller",
> > >    { 0x12098086, 0xffffffff,}, SPEEDO_IOTYPE, SPEEDO_SIZE,
> > >    0, speedo_found1 },
> > 337a341,342
> > >  { "Intel 82559ER Fast Ethernet PCI Controller",
> > >    0x8086, 0x1209, 0xffff, PCI_USES_IO|PCI_USES_MASTER, 32,
> > speedo_found1 },
> > 564c569
> > <  static int pci_index = 0;
> > ---
> > >  static int pci_index = 0, pci_index_82559er = 0;
> > 569c574
> > <  for (; pci_index < 8; pci_index++) {
> > ---
> > >  for (; pci_index < 18; pci_index++) {
> > 579a585,588
> > >         &pci_device_fn)){
> > >       if (pcibios_find_device(PCI_VENDOR_ID_INTEL,
> > >         0x1209, /* Intel 82559ER Fast Ethernet PCI Controller */
> > >         pci_index_82559er, &pci_bus,
> > 581c590,593
> > <    break;
> > ---
> > >        break;
> > >             else
> > >                 pci_index_82559er++;
> > >             }
> >
> >
> > -------------------------------------------------------------------
> > To unsubscribe send a message body containing "unsubscribe"
> > to linux-eepro100-request@beowulf.org

--
François Guimond
Matrox Networks
Email: Francois.Guimond@matrox.com
Web: http://www.matrox.com/netweb/home.htm
Phone: (514) 822-6000 x2565
Fax: (514) 822-6272


-------------------------------------------------------------------
To unsubscribe send a message body containing "unsubscribe"
to linux-eepro100-request@beowulf.org