narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eth_ntoa fixup, some warnings fixups (isa/pnp fixups still needed)

pull/1/head
Marty Connor 2006-09-19 15:23:28 +00:00
parent 5a39995f8b
commit 338a6de549
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/net/3c515.c
View File

@ -51,6 +51,7 @@
#include "isapnp.h" #include "isapnp.h"
#include "isa.h" /* for ISA_ROM */ #include "isa.h" /* for ISA_ROM */
#include "timer.h" #include "timer.h"
#include <gpxe/ethernet.h>
static void t3c515_wait(unsigned int nticks) static void t3c515_wait(unsigned int nticks)
{ {
@ -564,9 +565,6 @@ DISABLE - Turn off ethernet interface
static void t515_disable ( struct nic *nic, static void t515_disable ( struct nic *nic,
struct isapnp_device *isapnp ) { struct isapnp_device *isapnp ) {
nic_disable ( nic );
/* merge reset an disable */
t515_reset(nic); t515_reset(nic);
/* This is a hack. Since ltsp worked on my /* 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) ); inl(nic->ioaddr + 0x2002), inw(nic->ioaddr + 0x2000) );
corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID, corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID,
options, nic); options, nic);
@ -708,7 +706,8 @@ corkscrew_probe1(int ioaddr, int irq, int product_index __unused,
if (checksum != 0x00) if (checksum != 0x00)
printf(" ***INVALID CHECKSUM 0x%hX*** ", checksum); printf(" ***INVALID CHECKSUM 0x%hX*** ", checksum);
printf("%!", nic->node_addr); DBG ( "%s", eth_ntoa ( nic->node_addr ) );
if (eeprom[16] == 0x11c7) { /* Corkscrew */ if (eeprom[16] == 0x11c7) { /* Corkscrew */
} }