|
@@ -44,6 +44,7 @@
|
44
|
44
|
#include "etherboot.h"
|
45
|
45
|
#include "nic.h"
|
46
|
46
|
#include <gpxe/pci.h>
|
|
47
|
+#include <gpxe/ethernet.h>
|
47
|
48
|
|
48
|
49
|
#undef DAVICOM_DEBUG
|
49
|
50
|
#undef DAVICOM_DEBUG_WHERE
|
|
@@ -159,7 +160,7 @@ static void davicom_reset(struct nic *nic);
|
159
|
160
|
static void davicom_transmit(struct nic *nic, const char *d, unsigned int t,
|
160
|
161
|
unsigned int s, const char *p);
|
161
|
162
|
static int davicom_poll(struct nic *nic, int retrieve);
|
162
|
|
-static void davicom_disable(struct nic *nic, struct pci_device *pci);
|
|
163
|
+static void davicom_disable(struct nic *nic);
|
163
|
164
|
#ifdef DAVICOM_DEBUG
|
164
|
165
|
static void davicom_more(void);
|
165
|
166
|
#endif /* DAVICOM_DEBUG */
|
|
@@ -616,7 +617,7 @@ static int davicom_poll(struct nic *nic, int retrieve)
|
616
|
617
|
/*********************************************************************/
|
617
|
618
|
/* eth_disable - Disable the interface */
|
618
|
619
|
/*********************************************************************/
|
619
|
|
-static void davicom_disable ( struct nic *nic, struct pci_device *pci __unused ) {
|
|
620
|
+static void davicom_disable ( struct nic *nic ) {
|
620
|
621
|
|
621
|
622
|
whereami("davicom_disable\n");
|
622
|
623
|
|
|
@@ -686,7 +687,7 @@ static int davicom_probe ( struct nic *nic, struct pci_device *pci ) {
|
686
|
687
|
for (i=0; i<ETH_ALEN; i++)
|
687
|
688
|
nic->node_addr[i] = ee_data[20+i];
|
688
|
689
|
|
689
|
|
- printf("Davicom %! at ioaddr %#hX\n", nic->node_addr, ioaddr);
|
|
690
|
+ DBG ( "Davicom %s at IOADDR %4.4lx\n", eth_ntoa ( nic->node_addr ), ioaddr );
|
690
|
691
|
|
691
|
692
|
/* initialize device */
|
692
|
693
|
davicom_reset(nic);
|