Browse Source

eth_ntoa fixups

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

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

44
 #include "etherboot.h"
44
 #include "etherboot.h"
45
 #include "nic.h"
45
 #include "nic.h"
46
 #include <gpxe/pci.h>
46
 #include <gpxe/pci.h>
47
+#include <gpxe/ethernet.h>
47
 
48
 
48
 #undef DAVICOM_DEBUG
49
 #undef DAVICOM_DEBUG
49
 #undef DAVICOM_DEBUG_WHERE
50
 #undef DAVICOM_DEBUG_WHERE
159
 static void davicom_transmit(struct nic *nic, const char *d, unsigned int t,
160
 static void davicom_transmit(struct nic *nic, const char *d, unsigned int t,
160
 			   unsigned int s, const char *p);
161
 			   unsigned int s, const char *p);
161
 static int davicom_poll(struct nic *nic, int retrieve);
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
 #ifdef	DAVICOM_DEBUG
164
 #ifdef	DAVICOM_DEBUG
164
 static void davicom_more(void);
165
 static void davicom_more(void);
165
 #endif /* DAVICOM_DEBUG */
166
 #endif /* DAVICOM_DEBUG */
616
 /*********************************************************************/
617
 /*********************************************************************/
617
 /* eth_disable - Disable the interface                               */
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
   whereami("davicom_disable\n");
622
   whereami("davicom_disable\n");
622
 
623
 
686
   for (i=0; i<ETH_ALEN; i++)
687
   for (i=0; i<ETH_ALEN; i++)
687
     nic->node_addr[i] = ee_data[20+i];
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
   /* initialize device */
692
   /* initialize device */
692
   davicom_reset(nic);
693
   davicom_reset(nic);

Loading…
Cancel
Save