Bläddra i källkod

eth_ntoa fixup, _disable arg fixup

tags/v0.9.3
Marty Connor 18 år sedan
förälder
incheckning
5a39995f8b
1 ändrade filer med 4 tillägg och 3 borttagningar
  1. 4
    3
      src/drivers/net/3c595.c

+ 4
- 3
src/drivers/net/3c595.c Visa fil

@@ -28,6 +28,7 @@
28 28
 #include "etherboot.h"
29 29
 #include "nic.h"
30 30
 #include <gpxe/pci.h>
31
+#include <gpxe/ethernet.h>
31 32
 #include "3c595.h"
32 33
 #include "timer.h"
33 34
 
@@ -442,8 +443,8 @@ vxsetlink(void)
442 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 448
 	t595_reset(nic);
448 449
 
449 450
 	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
@@ -505,7 +506,7 @@ static int t595_probe ( struct nic *nic, struct pci_device *pci ) {
505 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 511
 	t595_reset(nic);
511 512
 	nic->nic_op	= &t595_operations;

Laddar…
Avbryt
Spara