|
@@ -51,6 +51,7 @@
|
51
|
51
|
#include "isapnp.h"
|
52
|
52
|
#include "isa.h" /* for ISA_ROM */
|
53
|
53
|
#include "timer.h"
|
|
54
|
+#include <gpxe/ethernet.h>
|
54
|
55
|
|
55
|
56
|
static void t3c515_wait(unsigned int nticks)
|
56
|
57
|
{
|
|
@@ -564,9 +565,6 @@ DISABLE - Turn off ethernet interface
|
564
|
565
|
static void t515_disable ( struct nic *nic,
|
565
|
566
|
struct isapnp_device *isapnp ) {
|
566
|
567
|
|
567
|
|
- nic_disable ( nic );
|
568
|
|
-
|
569
|
|
- /* merge reset an disable */
|
570
|
568
|
t515_reset(nic);
|
571
|
569
|
|
572
|
570
|
/* This is a hack. Since ltsp worked on my
|
|
@@ -645,7 +643,7 @@ static int t515_probe ( struct nic *nic, struct isapnp_device *isapnp ) {
|
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
|
647
|
inl(nic->ioaddr + 0x2002), inw(nic->ioaddr + 0x2000) );
|
650
|
648
|
corkscrew_found_device(nic->ioaddr, nic->irqno, CORKSCREW_ID,
|
651
|
649
|
options, nic);
|
|
@@ -708,7 +706,8 @@ corkscrew_probe1(int ioaddr, int irq, int product_index __unused,
|
708
|
706
|
if (checksum != 0x00)
|
709
|
707
|
printf(" ***INVALID CHECKSUM 0x%hX*** ", checksum);
|
710
|
708
|
|
711
|
|
- printf("%!", nic->node_addr);
|
|
709
|
+ DBG ( "%s", eth_ntoa ( nic->node_addr ) );
|
|
710
|
+
|
712
|
711
|
if (eeprom[16] == 0x11c7) { /* Corkscrew */
|
713
|
712
|
|
714
|
713
|
}
|