Browse Source

eth_ntoa fixes

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
097c1b341d
1 changed files with 4 additions and 5 deletions
  1. 4
    5
      src/drivers/net/eepro.c

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

31
  * your option) any later version.
31
  * your option) any later version.
32
  */
32
  */
33
 
33
 
34
-/* to get some global routines like printf */
35
 #include "etherboot.h"
34
 #include "etherboot.h"
36
-/* to get the interface to the body of the program */
37
 #include "nic.h"
35
 #include "nic.h"
38
 #include "isa.h"
36
 #include "isa.h"
39
-/* we use timer2 for microsecond waits */
40
 #include "timer.h"
37
 #include "timer.h"
38
+#include <gpxe/ethernet.h>
41
 
39
 
42
 /* Different 82595 chips */
40
 /* Different 82595 chips */
43
 #define LAN595		0
41
 #define LAN595		0
463
 DISABLE - Turn off ethernet interface
461
 DISABLE - Turn off ethernet interface
464
 ***************************************************************************/
462
 ***************************************************************************/
465
 static void eepro_disable ( struct nic *nic, struct isa_device *isa __unused ) {
463
 static void eepro_disable ( struct nic *nic, struct isa_device *isa __unused ) {
466
-	nic_disable ( nic );
467
 	eepro_sw2bank0(nic->ioaddr);	/* Switch to bank 0 */
464
 	eepro_sw2bank0(nic->ioaddr);	/* Switch to bank 0 */
468
 	/* Flush the Tx and disable Rx */
465
 	/* Flush the Tx and disable Rx */
469
 	outb(STOP_RCV_CMD, nic->ioaddr);
466
 	outb(STOP_RCV_CMD, nic->ioaddr);
596
 	for (i = 0; i < ETH_ALEN; i++) {
593
 	for (i = 0; i < ETH_ALEN; i++) {
597
 		nic->node_addr[i] = station_addr.caddr[i];
594
 		nic->node_addr[i] = station_addr.caddr[i];
598
 	}
595
 	}
599
-	DBG("%s ioaddr %#hX, addr %!", isa->name, nic->ioaddr, nic->node_addr);
596
+
597
+	DBG ( "%s ioaddr %#hX, addr %s", isa->name, nic->ioaddr, eth_ntoa ( nic->node_addr ) );
598
+
600
 	mem_start = RCV_LOWER_LIMIT << 8;
599
 	mem_start = RCV_LOWER_LIMIT << 8;
601
 	if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29)
600
 	if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29)
602
 		mem_end = RCV_UPPER_LIMIT << 8;
601
 		mem_end = RCV_UPPER_LIMIT << 8;

Loading…
Cancel
Save