|
@@ -108,6 +108,8 @@
|
108
|
108
|
|
109
|
109
|
#include "etherboot.h"
|
110
|
110
|
#include "nic.h"
|
|
111
|
+
|
|
112
|
+#include <gpxe/ethernet.h>
|
111
|
113
|
#include <gpxe/pci.h>
|
112
|
114
|
|
113
|
115
|
/* User settable parameters */
|
|
@@ -496,7 +498,7 @@ static void tulip_reset(struct nic *nic);
|
496
|
498
|
static void tulip_transmit(struct nic *nic, const char *d, unsigned int t,
|
497
|
499
|
unsigned int s, const char *p);
|
498
|
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
|
502
|
static void nway_start(struct nic *nic);
|
501
|
503
|
static void pnic_do_nway(struct nic *nic);
|
502
|
504
|
static void select_media(struct nic *nic, int startup);
|
|
@@ -1184,13 +1186,12 @@ static int tulip_poll(struct nic *nic, int retrieve)
|
1184
|
1186
|
/*********************************************************************/
|
1185
|
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
|
1191
|
#ifdef TULIP_DEBUG_WHERE
|
1190
|
1192
|
whereami("tulip_disable\n");
|
1191
|
1193
|
#endif
|
1192
|
1194
|
|
1193
|
|
- /* merge reset and disable */
|
1194
|
1195
|
tulip_reset(nic);
|
1195
|
1196
|
|
1196
|
1197
|
/* disable interrupts */
|
|
@@ -1403,9 +1404,7 @@ static int tulip_probe ( struct nic *nic, struct pci_device *pci ) {
|
1403
|
1404
|
for (i = 0; i < ETH_ALEN; i++)
|
1404
|
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
|
1409
|
tp->chip_id = chip_idx;
|
1411
|
1410
|
tp->revision = chip_rev;
|