Browse Source

eth_ntoa fixups

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
896f871fba
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      src/drivers/net/3c90x.c

+ 3
- 2
src/drivers/net/3c90x.c View File

40
 #include "etherboot.h"
40
 #include "etherboot.h"
41
 #include "nic.h"
41
 #include "nic.h"
42
 #include <gpxe/pci.h>
42
 #include <gpxe/pci.h>
43
+#include <gpxe/ethernet.h>
43
 #include "timer.h"
44
 #include "timer.h"
44
 
45
 
45
 static struct nic_operations a3c90x_operations;
46
 static struct nic_operations a3c90x_operations;
675
  ***/
676
  ***/
676
 static void
677
 static void
677
 a3c90x_disable ( struct nic *nic __unused ) {
678
 a3c90x_disable ( struct nic *nic __unused ) {
678
-	/* reset and disable merge */
679
 	a3c90x_reset();
679
 	a3c90x_reset();
680
 	/* Disable the receiver and transmitter. */
680
 	/* Disable the receiver and transmitter. */
681
 	outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
681
 	outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
802
     INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
802
     INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
803
     INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
803
     INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
804
     INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
804
     INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
805
-    printf("MAC Address = %!\n", INF_3C90X.HWAddr);
805
+
806
+    DBG ( "MAC Address = %s\n", eth_ntoa ( INF_3C90X.HWAddr ) );
806
 
807
 
807
     /** 3C556: Invert MII power **/
808
     /** 3C556: Invert MII power **/
808
     if (INF_3C90X.is3c556) {
809
     if (INF_3C90X.is3c556) {

Loading…
Cancel
Save