Просмотр исходного кода

eth_ntoa and warnings cleanup

tags/v0.9.3
Marty Connor 18 лет назад
Родитель
Сommit
757618edea
1 измененных файлов: 4 добавлений и 3 удалений
  1. 4
    3
      src/drivers/net/w89c840.c

+ 4
- 3
src/drivers/net/w89c840.c Просмотреть файл

80
 #include "etherboot.h"
80
 #include "etherboot.h"
81
 #include "nic.h"
81
 #include "nic.h"
82
 #include <gpxe/pci.h>
82
 #include <gpxe/pci.h>
83
+#include <gpxe/ethernet.h>
83
 #include "timer.h"
84
 #include "timer.h"
84
 
85
 
85
 static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
86
 static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
575
 /**************************************************************************
576
 /**************************************************************************
576
 w89c840_disable - Turn off ethernet interface
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
     w89c840_reset(nic);
581
     w89c840_reset(nic);
582
 
582
 
583
     /* Don't know what to do to disable the board. Is this needed at all? */
583
     /* Don't know what to do to disable the board. Is this needed at all? */
674
     for (i=0;i<ETH_ALEN;i++) {
674
     for (i=0;i<ETH_ALEN;i++) {
675
         nic->node_addr[i] =  (eeprom[i/2] >> (8*(i&1))) & 0xff;
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
 #if defined(W89C840_DEBUG)
680
 #if defined(W89C840_DEBUG)
680
     printf("winbond-840: EEPROM checksum %hX, got eeprom", sum);
681
     printf("winbond-840: EEPROM checksum %hX, got eeprom", sum);

Загрузка…
Отмена
Сохранить