diff options
| author | Marty Connor | 2006-09-19 17:17:51 +0200 |
|---|---|---|
| committer | Marty Connor | 2006-09-19 17:17:51 +0200 |
| commit | 5a39995f8b32ab1cba1a1386e0a70e1024d42b08 (patch) | |
| tree | 1b45809f6896be48a6216a90f9f3ed07d65b9469 /src | |
| parent | fix args to _disable routine (diff) | |
| download | ipxe-5a39995f8b32ab1cba1a1386e0a70e1024d42b08.tar.gz ipxe-5a39995f8b32ab1cba1a1386e0a70e1024d42b08.tar.xz ipxe-5a39995f8b32ab1cba1a1386e0a70e1024d42b08.zip | |
eth_ntoa fixup, _disable arg fixup
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/net/3c595.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c index 464f080f..3553fa61 100644 --- a/src/drivers/net/3c595.c +++ b/src/drivers/net/3c595.c @@ -28,6 +28,7 @@ #include "etherboot.h" #include "nic.h" #include <gpxe/pci.h> +#include <gpxe/ethernet.h> #include "3c595.h" #include "timer.h" @@ -442,8 +443,8 @@ vxsetlink(void) GO_WINDOW(1); } -static void t595_disable ( struct nic *nic, struct pci_device *pci __unused ) { - nic_disable ( nic ); +static void t595_disable ( struct nic *nic ) { + t595_reset(nic); outw(STOP_TRANSCEIVER, BASE + VX_COMMAND); @@ -505,7 +506,7 @@ static int t595_probe ( struct nic *nic, struct pci_device *pci ) { outw(ntohs(p[i]), BASE + VX_W2_ADDR_0 + (i * 2)); } - printf("Ethernet address: %!\n", nic->node_addr); + DBG ( "Ethernet address: %s\n", eth_ntoa (nic->node_addr) ); t595_reset(nic); nic->nic_op = &t595_operations; |