david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

eth_ntoa fixup, _disable arg fixup

This commit is contained in:
Marty Connor 2006-09-19 15:17:51 +00:00
parent c4964c3e3a
commit 5a39995f8b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/net/3c595.c
View File

@ -28,6 +28,7 @@
#include "etherboot.h" #include "etherboot.h"
#include "nic.h" #include "nic.h"
#include <gpxe/pci.h> #include <gpxe/pci.h>
#include <gpxe/ethernet.h>
#include "3c595.h" #include "3c595.h"
#include "timer.h" #include "timer.h"
@ -442,8 +443,8 @@ vxsetlink(void)
GO_WINDOW(1); GO_WINDOW(1);
} }
static void t595_disable ( struct nic *nic, struct pci_device *pci __unused ) { static void t595_disable ( struct nic *nic ) {
nic_disable ( nic );
t595_reset(nic); t595_reset(nic);
outw(STOP_TRANSCEIVER, BASE + VX_COMMAND); 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)); 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); t595_reset(nic);
nic->nic_op = &t595_operations; nic->nic_op = &t595_operations;