Browse Source

eth_ntoa fixup, _disable arg fixup

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
5a39995f8b
1 changed files with 4 additions and 3 deletions
  1. 4
    3
      src/drivers/net/3c595.c

+ 4
- 3
src/drivers/net/3c595.c View File

28
 #include "etherboot.h"
28
 #include "etherboot.h"
29
 #include "nic.h"
29
 #include "nic.h"
30
 #include <gpxe/pci.h>
30
 #include <gpxe/pci.h>
31
+#include <gpxe/ethernet.h>
31
 #include "3c595.h"
32
 #include "3c595.h"
32
 #include "timer.h"
33
 #include "timer.h"
33
 
34
 
442
     GO_WINDOW(1); 
443
     GO_WINDOW(1); 
443
 }
444
 }
444
 
445
 
445
-static void t595_disable ( struct nic *nic, struct pci_device *pci __unused ) {
446
-	nic_disable ( nic );
446
+static void t595_disable ( struct nic *nic ) {
447
+
447
 	t595_reset(nic);
448
 	t595_reset(nic);
448
 
449
 
449
 	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
450
 	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
505
 		outw(ntohs(p[i]), BASE + VX_W2_ADDR_0 + (i * 2));
506
 		outw(ntohs(p[i]), BASE + VX_W2_ADDR_0 + (i * 2));
506
 	}
507
 	}
507
 
508
 
508
-	printf("Ethernet address: %!\n", nic->node_addr);
509
+	DBG ( "Ethernet address: %s\n", eth_ntoa (nic->node_addr) );
509
 
510
 
510
 	t595_reset(nic);
511
 	t595_reset(nic);
511
 	nic->nic_op	= &t595_operations;
512
 	nic->nic_op	= &t595_operations;

Loading…
Cancel
Save