diff options
author | Marty Connor | 2006-09-27 05:00:21 +0200 |
---|---|---|
committer | Marty Connor | 2006-09-27 05:00:21 +0200 |
commit | cd8168b071f201051a638b1bb2a251179fac1398 (patch) | |
tree | 72011337e9f519cd2132b69311d49d9eba39c3f5 | |
parent | eth_ntoa and warnings cleanup (diff) | |
download | ipxe-cd8168b071f201051a638b1bb2a251179fac1398.tar.gz ipxe-cd8168b071f201051a638b1bb2a251179fac1398.tar.xz ipxe-cd8168b071f201051a638b1bb2a251179fac1398.zip |
eth_ntoa cleanup. still has warnings. needs work.
-rw-r--r-- | src/drivers/net/via-velocity.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c index 9bb471a2..78a45ca9 100644 --- a/src/drivers/net/via-velocity.c +++ b/src/drivers/net/via-velocity.c @@ -38,13 +38,10 @@ * Indent Options: indent -kr -i8 *************************************************************************/ -/* to get some global routines like printf */ #include "etherboot.h" -/* to get the interface to the body of the program */ #include "nic.h" -/* to get the PCI support functions, if this is a PCI NIC */ #include <gpxe/pci.h> - +#include <gpxe/ethernet.h> #include "via-velocity.h" @@ -476,7 +473,7 @@ extern void hex_dump(const char *data, const unsigned int len); POLL - Wait for a frame ***************************************************************************/ //EB53 static int velocity_poll(struct nic *nic, int retrieve) -static int velocity_poll(struct nic *nic __unused) +static int velocity_poll(struct nic *nic __unused) { /* Work out whether or not there's an ethernet packet ready to * read. Return 0 if not. @@ -600,7 +597,7 @@ static void velocity_transmit(struct nic *nic, const char *dest, /* Destination /************************************************************************** DISABLE - Turn off ethernet interface ***************************************************************************/ -static void velocity_disable(struct dev *dev __unused) +static void velocity_disable(struct nic *nic __unused) { /* put the card in its initial state */ /* This function serves 3 purposes. @@ -669,7 +666,7 @@ static struct nic_operations velocity_operations = { /************************************************************************** PROBE - Look for an adapter, this routine's visible to the outside ***************************************************************************/ -static int velocity_probe(struct dev *dev, struct pci_device *pci) +static int velocity_probe(struct pci_device *dev, struct pci_device *pci) { struct nic *nic = (struct nic *) dev; int ret, i; @@ -708,8 +705,7 @@ static int velocity_probe(struct dev *dev, struct pci_device *pci) for (i = 0; i < 6; i++) nic->node_addr[i] = readb(®s->PAR[i]); - /* Print out some hardware info */ - printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr, BASE); + DBG ( "%s: %s at ioaddr %#hX\n", pci->name, eth_ntoa ( nic->node_addr ), BASE ); velocity_get_options(&vptr->options, 0, pci->name); |