|
@@ -31,13 +31,11 @@ has 34 pins, the top row of 2 are not used.
|
31
|
31
|
* your option) any later version.
|
32
|
32
|
*/
|
33
|
33
|
|
34
|
|
-/* to get some global routines like printf */
|
35
|
34
|
#include "etherboot.h"
|
36
|
|
-/* to get the interface to the body of the program */
|
37
|
35
|
#include "nic.h"
|
38
|
36
|
#include "isa.h"
|
39
|
|
-/* we use timer2 for microsecond waits */
|
40
|
37
|
#include "timer.h"
|
|
38
|
+#include <gpxe/ethernet.h>
|
41
|
39
|
|
42
|
40
|
/* Different 82595 chips */
|
43
|
41
|
#define LAN595 0
|
|
@@ -463,7 +461,6 @@ static void eepro_transmit(
|
463
|
461
|
DISABLE - Turn off ethernet interface
|
464
|
462
|
***************************************************************************/
|
465
|
463
|
static void eepro_disable ( struct nic *nic, struct isa_device *isa __unused ) {
|
466
|
|
- nic_disable ( nic );
|
467
|
464
|
eepro_sw2bank0(nic->ioaddr); /* Switch to bank 0 */
|
468
|
465
|
/* Flush the Tx and disable Rx */
|
469
|
466
|
outb(STOP_RCV_CMD, nic->ioaddr);
|
|
@@ -596,7 +593,9 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) {
|
596
|
593
|
for (i = 0; i < ETH_ALEN; i++) {
|
597
|
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
|
599
|
mem_start = RCV_LOWER_LIMIT << 8;
|
601
|
600
|
if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29)
|
602
|
601
|
mem_end = RCV_UPPER_LIMIT << 8;
|