Browse Source

DBG MAC addr printout in driver

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
a9cb4ca079
1 changed files with 5 additions and 6 deletions
  1. 5
    6
      src/drivers/net/tulip.c

+ 5
- 6
src/drivers/net/tulip.c View File

108
 
108
 
109
 #include "etherboot.h"
109
 #include "etherboot.h"
110
 #include "nic.h"
110
 #include "nic.h"
111
+
112
+#include <gpxe/ethernet.h>
111
 #include <gpxe/pci.h>
113
 #include <gpxe/pci.h>
112
 
114
 
113
 /* User settable parameters */
115
 /* User settable parameters */
496
 static void tulip_transmit(struct nic *nic, const char *d, unsigned int t,
498
 static void tulip_transmit(struct nic *nic, const char *d, unsigned int t,
497
                            unsigned int s, const char *p);
499
                            unsigned int s, const char *p);
498
 static int tulip_poll(struct nic *nic, int retrieve);
500
 static int tulip_poll(struct nic *nic, int retrieve);
499
-static void tulip_disable(struct nic *nic, struct pci_device *pci);
501
+static void tulip_disable(struct nic *nic);
500
 static void nway_start(struct nic *nic);
502
 static void nway_start(struct nic *nic);
501
 static void pnic_do_nway(struct nic *nic);
503
 static void pnic_do_nway(struct nic *nic);
502
 static void select_media(struct nic *nic, int startup);
504
 static void select_media(struct nic *nic, int startup);
1184
 /*********************************************************************/
1186
 /*********************************************************************/
1185
 /* eth_disable - Disable the interface                               */
1187
 /* eth_disable - Disable the interface                               */
1186
 /*********************************************************************/
1188
 /*********************************************************************/
1187
-static void tulip_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1189
+static void tulip_disable ( struct nic *nic ) {
1188
 
1190
 
1189
 #ifdef TULIP_DEBUG_WHERE
1191
 #ifdef TULIP_DEBUG_WHERE
1190
     whereami("tulip_disable\n");
1192
     whereami("tulip_disable\n");
1191
 #endif
1193
 #endif
1192
 
1194
 
1193
-    /* merge reset and disable */
1194
     tulip_reset(nic);
1195
     tulip_reset(nic);
1195
 
1196
 
1196
     /* disable interrupts */
1197
     /* disable interrupts */
1403
     for (i = 0; i < ETH_ALEN; i++)
1404
     for (i = 0; i < ETH_ALEN; i++)
1404
         last_phys_addr[i] = nic->node_addr[i];
1405
         last_phys_addr[i] = nic->node_addr[i];
1405
 
1406
 
1406
-/*  FIXME: This should be printed out in a higher-level routine.
1407
-    printf("%s: %! at ioaddr %hX\n", tp->nic_name, nic->node_addr, ioaddr);
1408
-*/
1407
+    DBG ( "%s: %s at ioaddr %hX\n", tp->nic_name, eth_ntoa ( nic->node_addr ), ioaddr );
1409
 
1408
 
1410
     tp->chip_id = chip_idx;
1409
     tp->chip_id = chip_idx;
1411
     tp->revision = chip_rev;
1410
     tp->revision = chip_rev;

Loading…
Cancel
Save