narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove nic_disable call from drivers. Call should be made at a higher level

pull/1/head
Marty Connor 2006-09-14 14:51:38 +00:00
parent 1ed6e69ea5
commit 35f90278a8
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/net/davicom.c
View File

@ -617,7 +617,7 @@ static int davicom_poll(struct nic *nic, int retrieve)
/* eth_disable - Disable the interface */ /* eth_disable - Disable the interface */
/*********************************************************************/ /*********************************************************************/
static void davicom_disable ( struct nic *nic, struct pci_device *pci __unused ) { static void davicom_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
whereami("davicom_disable\n"); whereami("davicom_disable\n");
davicom_reset(nic); davicom_reset(nic);

5
src/drivers/net/mtd80x.c
View File

@ -636,12 +636,13 @@ static void mtd_transmit(
DISABLE - Turn off ethernet interface DISABLE - Turn off ethernet interface
***************************************************************************/ ***************************************************************************/
static void mtd_disable ( struct nic *nic, struct pci_device *pci __unused ) { static void mtd_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
/* put the card in its initial state */
/* Disable Tx Rx*/ /* Disable Tx Rx*/
outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR); outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);
/* Reset the chip to erase previous misconfiguration. */ /* Reset the chip to erase previous misconfiguration. */
mtd_reset(nic); mtd_reset(nic);
DBG(("DISABLE\n")); DBG(("DISABLE\n"));
} }

3
src/drivers/net/natsemi.c
View File

@ -723,8 +723,7 @@ natsemi_poll(struct nic *nic, int retrieve)
static void static void
natsemi_disable ( struct nic *nic, struct pci_device *pci __unused ) { natsemi_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
/* merge reset and disable */
natsemi_init(nic); natsemi_init(nic);
/* Disable interrupts using the mask. */ /* Disable interrupts using the mask. */

3
src/drivers/net/sis900.c
View File

@ -1228,8 +1228,7 @@ sis900_poll(struct nic *nic, int retrieve)
static void static void
sis900_disable ( struct nic *nic, struct pci_device *pci __unused ) { sis900_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
/* merge reset and disable */
sis900_init(nic); sis900_init(nic);
/* Disable interrupts by clearing the interrupt mask. */ /* Disable interrupts by clearing the interrupt mask. */

2
src/drivers/net/smc9000.c
View File

@ -792,7 +792,7 @@ static int smc9000_poll(struct nic *nic, int retrieve)
} }
static void smc9000_disable ( struct nic *nic, struct isa_device *isa __unused ) { static void smc9000_disable ( struct nic *nic, struct isa_device *isa __unused ) {
nic_disable ( nic );
smc_reset(nic->ioaddr); smc_reset(nic->ioaddr);
/* no more interrupts for me */ /* no more interrupts for me */

2
src/drivers/net/tulip.c
View File

@ -1185,7 +1185,7 @@ static int tulip_poll(struct nic *nic, int retrieve)
/* eth_disable - Disable the interface */ /* eth_disable - Disable the interface */
/*********************************************************************/ /*********************************************************************/
static void tulip_disable ( struct nic *nic, struct pci_device *pci __unused ) { static void tulip_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
#ifdef TULIP_DEBUG_WHERE #ifdef TULIP_DEBUG_WHERE
whereami("tulip_disable\n"); whereami("tulip_disable\n");
#endif #endif

2
src/drivers/net/via-rhine.c
View File

@ -1164,7 +1164,7 @@ rhine_probe1 (struct nic *nic, struct pci_device *pci, int ioaddr, int chip_id,
static void static void
rhine_disable ( struct nic *nic, struct pci_device *pci __unused ) { rhine_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
struct rhine_private *tp = (struct rhine_private *) nic->priv_data; struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
int ioaddr = tp->ioaddr; int ioaddr = tp->ioaddr;

2
src/drivers/net/w89c840.c
View File

@ -576,7 +576,7 @@ static void w89c840_transmit(
w89c840_disable - Turn off ethernet interface w89c840_disable - Turn off ethernet interface
***************************************************************************/ ***************************************************************************/
static void w89c840_disable ( struct nic *nic, struct pci_device *pci __unused ) { static void w89c840_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
/* merge reset and disable */ /* merge reset and disable */
w89c840_reset(nic); w89c840_reset(nic);