Browse Source

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

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
338a6de549
1 changed files with 4 additions and 5 deletions
  1. 4
    5
      src/drivers/net/3c515.c

+ 4
- 5
src/drivers/net/3c515.c View File

51
 #include "isapnp.h"
51
 #include "isapnp.h"
52
 #include "isa.h" /* for ISA_ROM */
52
 #include "isa.h" /* for ISA_ROM */
53
 #include "timer.h"
53
 #include "timer.h"
54
+#include <gpxe/ethernet.h>
54
 
55
 
55
 static void t3c515_wait(unsigned int nticks)
56
 static void t3c515_wait(unsigned int nticks)
56
 {
57
 {
564
 static void t515_disable ( struct nic *nic,
565
 static void t515_disable ( struct nic *nic,
565
 			   struct isapnp_device *isapnp ) {
566
 			   struct isapnp_device *isapnp ) {
566
 
567
 
567
-	nic_disable ( nic );
568
-
569
-	/* merge reset an disable */
570
 	t515_reset(nic);
568
 	t515_reset(nic);
571
 
569
 
572
 	/* This is a hack.  Since ltsp worked on my
570
 	/* This is a hack.  Since ltsp worked on my
645
 		}
643
 		}
646
 
644
 
647
 	}
645
 	}
648
-	DBG ( "3c515 Resource configuration register 0x%hX, DCR 0x%hX.\n",
646
+	DBG ( "3c515 Resource configuration register 0x%lX, DCR 0x%hX.\n",
649
 	      inl(nic->ioaddr + 0x2002), inw(nic->ioaddr + 0x2000) );
647
 	      inl(nic->ioaddr + 0x2002), inw(nic->ioaddr + 0x2000) );
650
 	corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID,
648
 	corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID,
651
 			       options, nic);
649
 			       options, nic);
708
 	if (checksum != 0x00)
706
 	if (checksum != 0x00)
709
 		printf(" ***INVALID CHECKSUM 0x%hX*** ", checksum);
707
 		printf(" ***INVALID CHECKSUM 0x%hX*** ", checksum);
710
 
708
 
711
-	printf("%!", nic->node_addr);
709
+        DBG ( "%s", eth_ntoa ( nic->node_addr ) );
710
+
712
 	if (eeprom[16] == 0x11c7) {	/* Corkscrew */
711
 	if (eeprom[16] == 0x11c7) {	/* Corkscrew */
713
 
712
 
714
 	}
713
 	}

Loading…
Cancel
Save