eth_ntoa fixups

[people/xl0/gpxe.git] / src / drivers / net / 3c90x.c

diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 54dcc40..0859443 100644 (file)
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -40,10 +40,10 @@
 #include "etherboot.h"
 #include "nic.h"
 #include <gpxe/pci.h>
+#include <gpxe/ethernet.h>
 #include "timer.h"
 
 static struct nic_operations a3c90x_operations;
-static struct pci_driver a3c90x_driver;
 
 #define        XCVR_MAGIC      (0x5A00)
 /** any single transmission fails after 16 collisions or other errors
@@ -676,7 +676,6 @@ a3c90x_poll(struct nic *nic, int retrieve)
  ***/
 static void
 a3c90x_disable ( struct nic *nic __unused ) {
-       /* reset and disable merge */
        a3c90x_reset();
        /* Disable the receiver and transmitter. */
        outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
@@ -719,7 +718,7 @@ static int a3c90x_probe ( struct nic *nic, struct pci_device *pci ) {
     nic->ioaddr = pci->ioaddr;
     nic->irqno = 0;
 
-    INF_3C90X.is3c556 = (pci->device_id == 0x6055);
+    INF_3C90X.is3c556 = (pci->device == 0x6055);
     INF_3C90X.IOAddr = pci->ioaddr & ~3;
     INF_3C90X.CurrentWindow = 255;
     switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03))
@@ -803,7 +802,8 @@ static int a3c90x_probe ( struct nic *nic, struct pci_device *pci ) {
     INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
     INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
     INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
-    printf("MAC Address = %!\n", INF_3C90X.HWAddr);
+
+    DBG ( "MAC Address = %s\n", eth_ntoa ( INF_3C90X.HWAddr ) );
 
     /** 3C556: Invert MII power **/
     if (INF_3C90X.is3c556) {
@@ -984,7 +984,7 @@ static struct nic_operations a3c90x_operations = {
 
 };
 
-static struct pci_id a3c90x_nics[] = {
+static struct pci_device_id a3c90x_nics[] = {
 /* Original 90x revisions: */
 PCI_ROM(0x10b7, 0x6055, "3c556",        "3C556"),              /* Huricane */
 PCI_ROM(0x10b7, 0x9000, "3c905-tpo",     "3Com900-TPO"),       /* 10 Base TPO */