diff options
| author | Michael Brown <mcb30@etherboot.org> | 2005-04-22 11:57:35 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2005-04-22 11:57:35 +0000 |
| commit | e596c42adeb8c5dd73e5494a7acd2cd75328ff08 (patch) | |
| tree | 506d8b84e052a2cb28b4e4feb066ce62fa9a1d6c /src/drivers/net/3c515.c | |
| parent | 329ccfdc2191a6330d45715635487637e584ae44 (diff) | |
| download | ipxe-e596c42adeb8c5dd73e5494a7acd2cd75328ff08.tar.gz | |
Updated to current API.
Diffstat (limited to 'src/drivers/net/3c515.c')
| -rw-r--r-- | src/drivers/net/3c515.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c index 4e32ea7ea..10157ad27 100644 --- a/src/drivers/net/3c515.c +++ b/src/drivers/net/3c515.c @@ -565,7 +565,8 @@ static void t515_transmit(struct nic *nic, const char *d, /* Destination */ /************************************************************************** DISABLE - Turn off ethernet interface ***************************************************************************/ -static void t515_disable ( struct nic *nic, struct isapnp_device *isapnp __unused ) { +static void t515_disable ( struct nic *nic, + struct isapnp_device *isapnp ) { nic_disable ( nic ); @@ -586,12 +587,8 @@ static void t515_disable ( struct nic *nic, struct isapnp_device *isapnp __unuse outw(SetIntrEnb | 0x0000, nic->ioaddr + EL3_CMD); -#ifdef ISA_PNP - /*Deactivate */ -/* ACTIVATE; - WRITE_DATA(0); - */ -#endif + + deactivate_isapnp_device ( isapnp ); return; } @@ -627,7 +624,7 @@ static int t515_probe ( struct nic *nic, struct isapnp_device *isapnp ) { nic->ioaddr = isapnp->ioaddr; nic->irqno = isapnp->irqno; - activate_isapnp_device ( isapnp, 1 ); + activate_isapnp_device ( isapnp ); /* Check the resource configuration for a matching ioaddr. */ if ((unsigned)(inw(nic->ioaddr + 0x2002) & 0x1f0) |