diff options
| author | Marty Connor <mdc@etherboot.org> | 2006-09-19 15:23:28 +0000 |
|---|---|---|
| committer | Marty Connor <mdc@etherboot.org> | 2006-09-19 15:23:28 +0000 |
| commit | 338a6de549e085af538e3b89d5d8c5fa1d61dd18 (patch) | |
| tree | 84ad9dc7f45e5835e23cff4677896c60a857c583 /src/drivers/net/3c515.c | |
| parent | 5a39995f8b32ab1cba1a1386e0a70e1024d42b08 (diff) | |
| download | ipxe-338a6de549e085af538e3b89d5d8c5fa1d61dd18.tar.gz | |
eth_ntoa fixup, some warnings fixups (isa/pnp fixups still needed)
Diffstat (limited to 'src/drivers/net/3c515.c')
| -rw-r--r-- | src/drivers/net/3c515.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c index c87495006..e839b3589 100644 --- a/src/drivers/net/3c515.c +++ b/src/drivers/net/3c515.c @@ -51,6 +51,7 @@ #include "isapnp.h" #include "isa.h" /* for ISA_ROM */ #include "timer.h" +#include <gpxe/ethernet.h> static void t3c515_wait(unsigned int nticks) { @@ -564,9 +565,6 @@ DISABLE - Turn off ethernet interface static void t515_disable ( struct nic *nic, struct isapnp_device *isapnp ) { - nic_disable ( nic ); - - /* merge reset an disable */ t515_reset(nic); /* This is a hack. Since ltsp worked on my @@ -645,7 +643,7 @@ static int t515_probe ( struct nic *nic, struct isapnp_device *isapnp ) { } } - DBG ( "3c515 Resource configuration register 0x%hX, DCR 0x%hX.\n", + DBG ( "3c515 Resource configuration register 0x%lX, DCR 0x%hX.\n", inl(nic->ioaddr + 0x2002), inw(nic->ioaddr + 0x2000) ); corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID, options, nic); @@ -708,7 +706,8 @@ corkscrew_probe1(int ioaddr, int irq, int product_index __unused, if (checksum != 0x00) printf(" ***INVALID CHECKSUM 0x%hX*** ", checksum); - printf("%!", nic->node_addr); + DBG ( "%s", eth_ntoa ( nic->node_addr ) ); + if (eeprom[16] == 0x11c7) { /* Corkscrew */ } |