|
@@ -80,6 +80,7 @@
|
80
|
80
|
#include "etherboot.h"
|
81
|
81
|
#include "nic.h"
|
82
|
82
|
#include <gpxe/pci.h>
|
|
83
|
+#include <gpxe/ethernet.h>
|
83
|
84
|
#include "timer.h"
|
84
|
85
|
|
85
|
86
|
static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
|
|
@@ -575,9 +576,8 @@ static void w89c840_transmit(
|
575
|
576
|
/**************************************************************************
|
576
|
577
|
w89c840_disable - Turn off ethernet interface
|
577
|
578
|
***************************************************************************/
|
578
|
|
-static void w89c840_disable ( struct nic *nic, struct pci_device *pci __unused ) {
|
|
579
|
+static void w89c840_disable ( struct nic *nic ) {
|
579
|
580
|
|
580
|
|
- /* merge reset and disable */
|
581
|
581
|
w89c840_reset(nic);
|
582
|
582
|
|
583
|
583
|
/* Don't know what to do to disable the board. Is this needed at all? */
|
|
@@ -674,7 +674,8 @@ static int w89c840_probe ( struct nic *nic, struct pci_device *p ) {
|
674
|
674
|
for (i=0;i<ETH_ALEN;i++) {
|
675
|
675
|
nic->node_addr[i] = (eeprom[i/2] >> (8*(i&1))) & 0xff;
|
676
|
676
|
}
|
677
|
|
- printf ("Ethernet addr: %!\n", nic->node_addr);
|
|
677
|
+
|
|
678
|
+ DBG ( "Ethernet addr: %s\n", eth_ntoa ( nic->node_addr ) );
|
678
|
679
|
|
679
|
680
|
#if defined(W89C840_DEBUG)
|
680
|
681
|
printf("winbond-840: EEPROM checksum %hX, got eeprom", sum);
|