Sfoglia il codice sorgente

eth_ntoa fixups

tags/v0.9.3
Marty Connor 18 anni fa
parent
commit
c0e91255d0
1 ha cambiato i file con 4 aggiunte e 6 eliminazioni
  1. 4
    6
      src/drivers/net/depca.c

+ 4
- 6
src/drivers/net/depca.c Vedi File

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

Loading…
Annulla
Salva