david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

eth_ntoa fixups

This commit is contained in:
Marty Connor 2006-09-20 00:20:37 +00:00
parent fe62800bad
commit c0e91255d0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/net/depca.c
View File

@ -238,6 +238,7 @@
#include "nic.h" #include "nic.h"
#include "isa.h" #include "isa.h"
#include "console.h" #include "console.h"
#include <gpxe/ethernet.h>
/* /*
** I/O addresses. Note that the 2k buffer option is not supported in ** I/O addresses. Note that the 2k buffer option is not supported in
@ -641,9 +642,7 @@ static void depca_transmit(
/************************************************************************** /**************************************************************************
DISABLE - Turn off ethernet interface DISABLE - Turn off ethernet interface
***************************************************************************/ ***************************************************************************/
static void depca_disable ( struct nic *nic, struct isa_device *isa __unused ) { static void depca_disable ( struct nic *nic ) {
nic_disable ( nic );
/* reset and disable merge */
depca_reset(nic); depca_reset(nic);
STOP_DEPCA(nic->ioaddr); STOP_DEPCA(nic->ioaddr);
@ -767,10 +766,9 @@ static int depca_probe ( struct nic *nic, struct isa_device *isa ) {
} }
if (adapter != DEPCA) /* enable shadow RAM */ if (adapter != DEPCA) /* enable shadow RAM */
outb(nicsr |= SHE, nic->ioaddr + DEPCA_NICSR); outb(nicsr |= SHE, nic->ioaddr + DEPCA_NICSR);
printf("%s base %#hX, memory [%#hX-%#hX], addr %!", DBG ( "%s base %4.4x, memory [%4.4lx-%4.4lx] addr %s",
adapter_name[adapter], nic->ioaddr, mem_start, adapter_name[adapter], nic->ioaddr, mem_start,
mem_start + mem_len, mem_start + mem_len, eth_ntoa ( nic->node_addr ) );
nic->node_addr);
if (sum != chksum) if (sum != chksum)
printf(" (bad checksum)"); printf(" (bad checksum)");
putchar('\n'); putchar('\n');