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

Automatically updated using 

perl -pi -0777 -e 's/^(\s*)dev->disable(\s*)=\s*(\w+)_disable;\s*nic->poll\s*=\s*(\w+);\s*nic->transmit\s*=\s*(\w+);\s*nic->irq\s*=\s*(\w+);/static struct nic_operations ${3}_operations;\nstatic struct nic_operations ${3}_operations = {\n\t.connect\t= dummy_connect,\n\t.poll\t\t= $4,\n\t.transmit\t= $5,\n\t.irq\t\t= $6,\n\t.disable\t= ${3}_disable,\n};${1}nic->nic_op\t= &${3}_operations;/msg' *.c
pull/1/head
Michael Brown 2005-04-13 00:02:40 +00:00
parent d9c64c9422
commit 91e46ed588
31 changed files with 272 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/net/3c509.c
View File

@ -627,11 +627,15 @@ static int t509_probe(struct dev *dev, unsigned short *probe_addrs __unused)
nic->irqno = 0; nic->irqno = 0;
nic->ioaddr = eth_nic_base; nic->ioaddr = eth_nic_base;
static struct nic_operations t509_operations;
dev->disable = t509_disable; static struct nic_operations t509_operations = {
nic->poll = t509_poll; .connect = dummy_connect,
nic->transmit = t509_transmit; .poll = t509_poll,
nic->irq = t509_irq; .transmit = t509_transmit,
.irq = t509_irq,
.disable = t509_disable,
};
nic->nic_op = &t509_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR); dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);

14
src/drivers/net/3c515.c
View File

@ -686,11 +686,15 @@ static int t515_probe(struct dev *dev,
nic->irqno = 0; nic->irqno = 0;
nic->ioaddr = BASE; nic->ioaddr = BASE;
static struct nic_operations t515_operations;
dev->disable = t515_disable; static struct nic_operations t515_operations = {
nic->poll = t515_poll; .connect = dummy_connect,
nic->transmit = t515_transmit; .poll = t515_poll,
nic->irq = t515_irq; .transmit = t515_transmit,
.irq = t515_irq,
.disable = t515_disable,
};
nic->nic_op = &t515_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
dev->devid.vendor_id = htons(ISAPNP_VENDOR('T', 'C', 'M')); dev->devid.vendor_id = htons(ISAPNP_VENDOR('T', 'C', 'M'));

12
src/drivers/net/3c595.c
View File

@ -508,10 +508,14 @@ static int t595_probe ( struct dev *dev ) {
printf("Ethernet address: %!\n", nic->node_addr); printf("Ethernet address: %!\n", nic->node_addr);
t595_reset(nic); t595_reset(nic);
dev->disable = t595_disable; static struct nic_operations t595_operations;
nic->poll = t595_poll; static struct nic_operations t595_operations = {
nic->transmit = t595_transmit; .connect = dummy_connect,
nic->irq = t595_irq; .poll = t595_poll,
.transmit = t595_transmit,
.irq = t595_irq,
.disable = t595_disable,
}; nic->nic_op = &t595_operations;
return 1; return 1;
} }

12
src/drivers/net/3c90x.c
View File

@ -951,10 +951,14 @@ static int a3c90x_probe ( struct dev *dev ) {
cmdAcknowledgeInterrupt, 0x661); cmdAcknowledgeInterrupt, 0x661);
/** Set our exported functions **/ /** Set our exported functions **/
dev->disable = a3c90x_disable; static struct nic_operations a3c90x_operations;
nic->poll = a3c90x_poll; static struct nic_operations a3c90x_operations = {
nic->transmit = a3c90x_transmit; .connect = dummy_connect,
nic->irq = a3c90x_irq; .poll = a3c90x_poll,
.transmit = a3c90x_transmit,
.irq = a3c90x_irq,
.disable = a3c90x_disable,
}; nic->nic_op = &a3c90x_operations;
return 1; return 1;
} }

14
src/drivers/net/cs89x0.c
View File

@ -691,11 +691,15 @@ static int cs89x0_probe(struct dev *dev, unsigned short *probe_addrs __unused)
nic->irqno = 0; nic->irqno = 0;
nic->ioaddr = ioaddr; nic->ioaddr = ioaddr;
static struct nic_operations cs89x0_operations;
dev->disable = cs89x0_disable; static struct nic_operations cs89x0_operations = {
nic->poll = cs89x0_poll; .connect = dummy_connect,
nic->transmit = cs89x0_transmit; .poll = cs89x0_poll,
nic->irq = cs89x0_irq; .transmit = cs89x0_transmit,
.irq = cs89x0_irq,
.disable = cs89x0_disable,
};
nic->nic_op = &cs89x0_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
dev->devid.vendor_id = htons(ISAPNP_VENDOR('C','S','C')); dev->devid.vendor_id = htons(ISAPNP_VENDOR('C','S','C'));

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

@ -694,11 +694,15 @@ static int davicom_probe ( struct dev *dev ) {
/* initialize device */ /* initialize device */
davicom_reset(nic); davicom_reset(nic);
static struct nic_operations davicom_operations;
dev->disable = davicom_disable; static struct nic_operations davicom_operations = {
nic->poll = davicom_poll; .connect = dummy_connect,
nic->transmit = davicom_transmit; .poll = davicom_poll,
nic->irq = davicom_irq; .transmit = davicom_transmit,
.irq = davicom_irq,
.disable = davicom_disable,
};
nic->nic_op = &davicom_operations;
return 1; return 1;
} }

12
src/drivers/net/depca.c
View File

@ -773,10 +773,14 @@ static int depca_probe(struct dev *dev, unsigned short *probe_addrs)
depca_reset(nic); depca_reset(nic);
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = depca_disable; static struct nic_operations depca_operations;
nic->poll = depca_poll; static struct nic_operations depca_operations = {
nic->transmit = depca_transmit; .connect = dummy_connect,
nic->irq = depca_irq; .poll = depca_poll,
.transmit = depca_transmit,
.irq = depca_irq,
.disable = depca_disable,
}; nic->nic_op = &depca_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR); dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);

12
src/drivers/net/dmfe.c
View File

@ -515,10 +515,14 @@ static int dmfe_probe ( struct dev *dev ) {
nic->ioaddr = pci->ioaddr; nic->ioaddr = pci->ioaddr;
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = dmfe_disable; static struct nic_operations dmfe_operations;
nic->poll = dmfe_poll; static struct nic_operations dmfe_operations = {
nic->transmit = dmfe_transmit; .connect = dummy_connect,
nic->irq = dmfe_irq; .poll = dmfe_poll,
.transmit = dmfe_transmit,
.irq = dmfe_irq,
.disable = dmfe_disable,
}; nic->nic_op = &dmfe_operations;
return 1; return 1;
} }

12
src/drivers/net/e1000.c
View File

@ -3663,10 +3663,14 @@ static int e1000_probe ( struct dev *dev ) {
init_descriptor(); init_descriptor();
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = e1000_disable; static struct nic_operations e1000_operations;
nic->poll = e1000_poll; static struct nic_operations e1000_operations = {
nic->transmit = e1000_transmit; .connect = dummy_connect,
nic->irq = e1000_irq; .poll = e1000_poll,
.transmit = e1000_transmit,
.irq = e1000_irq,
.disable = e1000_disable,
}; nic->nic_op = &e1000_operations;
return 1; return 1;
} }

12
src/drivers/net/eepro.c
View File

@ -606,10 +606,14 @@ static int eepro_probe(struct dev *dev, unsigned short *probe_addrs)
eepro_reset(nic); eepro_reset(nic);
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = eepro_disable; static struct nic_operations eepro_operations;
nic->poll = eepro_poll; static struct nic_operations eepro_operations = {
nic->transmit = eepro_transmit; .connect = dummy_connect,
nic->irq = eepro_irq; .poll = eepro_poll,
.transmit = eepro_transmit,
.irq = eepro_irq,
.disable = eepro_disable,
}; nic->nic_op = &eepro_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR); dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
dev->devid.device_id = htons(0x828a); dev->devid.device_id = htons(0x828a);

14
src/drivers/net/eepro100.c
View File

@ -767,11 +767,15 @@ static int eepro100_probe ( struct dev *dev ) {
eepro100_disable(dev); eepro100_disable(dev);
return 0; return 0;
} }
static struct nic_operations eepro100_operations;
dev->disable = eepro100_disable; static struct nic_operations eepro100_operations = {
nic->poll = eepro100_poll; .connect = dummy_connect,
nic->transmit = eepro100_transmit; .poll = eepro100_poll,
nic->irq = eepro100_irq; .transmit = eepro100_transmit,
.irq = eepro100_irq,
.disable = eepro100_disable,
};
nic->nic_op = &eepro100_operations;
return 1; return 1;
} }

14
src/drivers/net/epic100.c
View File

@ -202,11 +202,15 @@ epic100_probe ( struct dev *dev ) {
} }
epic100_open(); epic100_open();
static struct nic_operations epic100_operations;
dev->disable = epic100_disable; static struct nic_operations epic100_operations = {
nic->poll = epic100_poll; .connect = dummy_connect,
nic->transmit = epic100_transmit; .poll = epic100_poll,
nic->irq = epic100_irq; .transmit = epic100_transmit,
.irq = epic100_irq,
.disable = epic100_disable,
};
nic->nic_op = &epic100_operations;
return 1; return 1;
} }

12
src/drivers/net/forcedeth.c
View File

@ -1015,10 +1015,14 @@ static int forcedeth_probe ( struct dev *dev ) {
forcedeth_reset(nic); forcedeth_reset(nic);
// if (board_found && valid_link) // if (board_found && valid_link)
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = forcedeth_disable; static struct nic_operations forcedeth_operations;
nic->poll = forcedeth_poll; static struct nic_operations forcedeth_operations = {
nic->transmit = forcedeth_transmit; .connect = dummy_connect,
nic->irq = forcedeth_irq; .poll = forcedeth_poll,
.transmit = forcedeth_transmit,
.irq = forcedeth_irq,
.disable = forcedeth_disable,
}; nic->nic_op = &forcedeth_operations;
return 1; return 1;
// } // }
/* else */ /* else */

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

@ -763,10 +763,14 @@ static int mtd_probe ( struct dev *dev ) {
mtd_reset( nic ); mtd_reset( nic );
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = mtd_disable; static struct nic_operations mtd_operations;
nic->poll = mtd_poll; static struct nic_operations mtd_operations = {
nic->transmit = mtd_transmit; .connect = dummy_connect,
nic->irq = dummy_irq; .poll = mtd_poll,
.transmit = mtd_transmit,
.irq = dummy_irq,
.disable = mtd_disable,
}; nic->nic_op = &mtd_operations;
return 1; return 1;
} }

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

@ -316,11 +316,15 @@ natsemi_probe ( struct dev *dev ) {
/* initialize device */ /* initialize device */
natsemi_init(nic); natsemi_init(nic);
static struct nic_operations natsemi_operations;
dev->disable = natsemi_disable; static struct nic_operations natsemi_operations = {
nic->poll = natsemi_poll; .connect = dummy_connect,
nic->transmit = natsemi_transmit; .poll = natsemi_poll,
nic->irq = natsemi_irq; .transmit = natsemi_transmit,
.irq = natsemi_irq,
.disable = natsemi_disable,
};
nic->nic_op = &natsemi_operations;
return 1; return 1;
} }

12
src/drivers/net/ns83820.c
View File

@ -1000,10 +1000,14 @@ static int ns83820_probe ( struct dev *dev ) {
ns83820_reset(nic); ns83820_reset(nic);
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = ns83820_disable; static struct nic_operations ns83820_operations;
nic->poll = ns83820_poll; static struct nic_operations ns83820_operations = {
nic->transmit = ns83820_transmit; .connect = dummy_connect,
nic->irq = ns83820_irq; .poll = ns83820_poll,
.transmit = ns83820_transmit,
.irq = ns83820_irq,
.disable = ns83820_disable,
}; nic->nic_op = &ns83820_operations;
return 1; return 1;
} }

14
src/drivers/net/ns8390.c
View File

@ -930,11 +930,15 @@ static int eth_probe (struct dev *dev, unsigned short *probe_addrs __unused)
if (eth_vendor != VENDOR_3COM) if (eth_vendor != VENDOR_3COM)
eth_rmem = eth_bmem; eth_rmem = eth_bmem;
ns8390_reset(nic); ns8390_reset(nic);
static struct nic_operations ns8390_operations;
dev->disable = ns8390_disable; static struct nic_operations ns8390_operations = {
nic->poll = ns8390_poll; .connect = dummy_connect,
nic->transmit = ns8390_transmit; .poll = ns8390_poll,
nic->irq = ns8390_irq; .transmit = ns8390_transmit,
.irq = ns8390_irq,
.disable = ns8390_disable,
};
nic->nic_op = &ns8390_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
#ifdef INCLUDE_WD #ifdef INCLUDE_WD

14
src/drivers/net/pcnet32.c
View File

@ -945,11 +945,15 @@ static int pcnet32_probe ( struct dev *dev ) {
else else
printf("\n"); printf("\n");
} }
static struct nic_operations pcnet32_operations;
dev->disable = pcnet32_disable; static struct nic_operations pcnet32_operations = {
nic->poll = pcnet32_poll; .connect = dummy_connect,
nic->transmit = pcnet32_transmit; .poll = pcnet32_poll,
nic->irq = pcnet32_irq; .transmit = pcnet32_transmit,
.irq = pcnet32_irq,
.disable = pcnet32_disable,
};
nic->nic_op = &pcnet32_operations;
return 1; return 1;
} }

12
src/drivers/net/prism2.c
View File

@ -856,10 +856,14 @@ static int prism2_pci_probe(struct dev *dev, struct pci_device *p)
printf ( "Link connected (BSSID %! - MAC address %!)\n", hw->bssid, nic->node_addr ); printf ( "Link connected (BSSID %! - MAC address %!)\n", hw->bssid, nic->node_addr );
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = prism2_disable; static struct nic_operations prism2_operations;
nic->poll = prism2_poll; static struct nic_operations prism2_operations = {
nic->transmit = prism2_transmit; .connect = dummy_connect,
nic->irq = prism2_irq; .poll = prism2_poll,
.transmit = prism2_transmit,
.irq = prism2_irq,
.disable = prism2_disable,
}; nic->nic_op = &prism2_operations;
return 1; return 1;
} }

12
src/drivers/net/r8169.c
View File

@ -831,10 +831,14 @@ static int r8169_probe ( struct dev *dev ) {
r8169_reset(nic); r8169_reset(nic);
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = r8169_disable; static struct nic_operations r8169_operations;
nic->poll = r8169_poll; static struct nic_operations r8169_operations = {
nic->transmit = r8169_transmit; .connect = dummy_connect,
nic->irq = r8169_irq; .poll = r8169_poll,
.transmit = r8169_transmit,
.irq = r8169_irq,
.disable = r8169_disable,
}; nic->nic_op = &r8169_operations;
nic->irqno = pci->irq; nic->irqno = pci->irq;
nic->ioaddr = ioaddr; nic->ioaddr = ioaddr;
return 1; return 1;

14
src/drivers/net/rtl8139.c
View File

@ -223,11 +223,15 @@ static int rtl8139_probe ( struct dev *dev ) {
printf("Cable not connected or other link failure\n"); printf("Cable not connected or other link failure\n");
return(0); return(0);
} }
static struct nic_operations rtl_operations;
dev->disable = rtl_disable; static struct nic_operations rtl_operations = {
nic->poll = rtl_poll; .connect = dummy_connect,
nic->transmit = rtl_transmit; .poll = rtl_poll,
nic->irq = rtl_irq; .transmit = rtl_transmit,
.irq = rtl_irq,
.disable = rtl_disable,
};
nic->nic_op = &rtl_operations;
return 1; return 1;
} }

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

@ -409,11 +409,15 @@ static int sis900_probe ( struct dev *dev ) {
/* initialize device */ /* initialize device */
sis900_init(nic); sis900_init(nic);
static struct nic_operations sis900_operations;
dev->disable = sis900_disable; static struct nic_operations sis900_operations = {
nic->poll = sis900_poll; .connect = dummy_connect,
nic->transmit = sis900_transmit; .poll = sis900_poll,
nic->irq = sis900_irq; .transmit = sis900_transmit,
.irq = sis900_irq,
.disable = sis900_disable,
};
nic->nic_op = &sis900_operations;
return 1; return 1;
} }

12
src/drivers/net/sk_g16.c
View File

@ -782,10 +782,14 @@ static int SK_probe(struct dev *dev, unsigned short *probe_addrs)
nic->ioaddr = ioaddr & ~3; nic->ioaddr = ioaddr & ~3;
nic->irqno = 0; nic->irqno = 0;
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = SK_disable; static struct nic_operations SK_operations;
nic->poll = SK_poll; static struct nic_operations SK_operations = {
nic->transmit = SK_transmit; .connect = dummy_connect,
nic->irq = SK_irq; .poll = SK_poll,
.transmit = SK_transmit,
.irq = SK_irq,
.disable = SK_disable,
}; nic->nic_op = &SK_operations;
/* FIXME set dev->devid */ /* FIXME set dev->devid */
return 1; return 1;
} }

24
src/drivers/net/skel.c
View File

@ -145,10 +145,14 @@ static int skel_probe ( struct dev *dev ) {
nic->ioaddr = pci->ioaddr & ~3; nic->ioaddr = pci->ioaddr & ~3;
nic->irqno = pci->irq; nic->irqno = pci->irq;
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = skel_disable; static struct nic_operations skel_operations;
nic->poll = skel_poll; static struct nic_operations skel_operations = {
nic->transmit = skel_transmit; .connect = dummy_connect,
nic->irq = skel_irq; .poll = skel_poll,
.transmit = skel_transmit,
.irq = skel_irq,
.disable = skel_disable,
}; nic->nic_op = &skel_operations;
return 1; return 1;
} }
/* else */ /* else */
@ -174,10 +178,14 @@ static int skel_isa_probe(struct dev *dev, unsigned short *probe_addrs)
if (board_found && valid_link) if (board_found && valid_link)
{ {
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = skel_disable; static struct nic_operations skel_operations;
nic->poll = skel_poll; static struct nic_operations skel_operations = {
nic->transmit = skel_transmit; .connect = dummy_connect,
nic->irq = skel_irq; .poll = skel_poll,
.transmit = skel_transmit,
.irq = skel_irq,
.disable = skel_disable,
}; nic->nic_op = &skel_operations;
/* Report the ISA pnp id of the board */ /* Report the ISA pnp id of the board */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR); dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);

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

@ -514,11 +514,15 @@ static int smc9000_probe(struct dev *dev, unsigned short *probe_addrs)
_outw( inw( smc9000_base + CONFIG ) | CFG_AUI_SELECT, _outw( inw( smc9000_base + CONFIG ) | CFG_AUI_SELECT,
smc9000_base + CONFIG ); smc9000_base + CONFIG );
} }
static struct nic_operations smc9000_operations;
dev->disable = smc9000_disable; static struct nic_operations smc9000_operations = {
nic->poll = smc9000_poll; .connect = dummy_connect,
nic->transmit = smc9000_transmit; .poll = smc9000_poll,
nic->irq = smc9000_irq; .transmit = smc9000_transmit,
.irq = smc9000_irq,
.disable = smc9000_disable,
};
nic->nic_op = &smc9000_operations;
/* Based on PnP ISA map */ /* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR); dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);

12
src/drivers/net/sundance.c
View File

@ -735,10 +735,14 @@ static int sundance_probe ( struct dev *dev ) {
sdc->mii_if.full_duplex ? "Full" : "Half"); sdc->mii_if.full_duplex ? "Full" : "Half");
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = sundance_disable; static struct nic_operations sundance_operations;
nic->poll = sundance_poll; static struct nic_operations sundance_operations = {
nic->transmit = sundance_transmit; .connect = dummy_connect,
nic->irq = sundance_irq; .poll = sundance_poll,
.transmit = sundance_transmit,
.irq = sundance_irq,
.disable = sundance_disable,
}; nic->nic_op = &sundance_operations;
nic->irqno = pci->irq; nic->irqno = pci->irq;
nic->ioaddr = BASE; nic->ioaddr = BASE;

14
src/drivers/net/tg3.c
View File

@ -3340,11 +3340,15 @@ static int tg3_probe ( struct dev *dev ) {
printf("Valid link not established\n"); printf("Valid link not established\n");
goto err_out_disable; goto err_out_disable;
} }
static struct nic_operations tg3_operations;
dev->disable = tg3_disable; static struct nic_operations tg3_operations = {
nic->poll = tg3_poll; .connect = dummy_connect,
nic->transmit = tg3_transmit; .poll = tg3_poll,
nic->irq = tg3_irq; .transmit = tg3_transmit,
.irq = tg3_irq,
.disable = tg3_disable,
};
nic->nic_op = &tg3_operations;
return 1; return 1;

14
src/drivers/net/tlan.c
View File

@ -844,11 +844,15 @@ static int tlan_probe ( struct dev *dev ) {
/* if (board_found && valid_link) /* if (board_found && valid_link)
{*/ {*/
/* point to NIC specific routines */ /* point to NIC specific routines */
static struct nic_operations tlan_operations;
dev->disable = tlan_disable; static struct nic_operations tlan_operations = {
nic->poll = tlan_poll; .connect = dummy_connect,
nic->transmit = tlan_transmit; .poll = tlan_poll,
nic->irq = tlan_irq; .transmit = tlan_transmit,
.irq = tlan_irq,
.disable = tlan_disable,
};
nic->nic_op = &tlan_operations;
return 1; return 1;
} }

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

@ -1422,11 +1422,15 @@ static int tulip_probe ( struct dev *dev ) {
/* reset the device and make ready for tx and rx of packets */ /* reset the device and make ready for tx and rx of packets */
tulip_reset(nic); tulip_reset(nic);
static struct nic_operations tulip_operations;
dev->disable = tulip_disable; static struct nic_operations tulip_operations = {
nic->poll = tulip_poll; .connect = dummy_connect,
nic->transmit = tulip_transmit; .poll = tulip_poll,
nic->irq = tulip_irq; .transmit = tulip_transmit,
.irq = tulip_irq,
.disable = tulip_disable,
};
nic->nic_op = &tulip_operations;
/* give the board a chance to reset before returning */ /* give the board a chance to reset before returning */
tulip_wait(4*TICKS_PER_SEC); tulip_wait(4*TICKS_PER_SEC);

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

@ -963,11 +963,15 @@ rhine_probe ( struct dev *dev ) {
adjust_pci_device(pci); adjust_pci_device(pci);
rhine_reset (nic); rhine_reset (nic);
static struct nic_operations rhine_operations;
dev->disable = rhine_disable; static struct nic_operations rhine_operations = {
nic->poll = rhine_poll; .connect = dummy_connect,
nic->transmit = rhine_transmit; .poll = rhine_poll,
nic->irq = rhine_irq; .transmit = rhine_transmit,
.irq = rhine_irq,
.disable = rhine_disable,
};
nic->nic_op = &rhine_operations;
nic->irqno = pci->irq; nic->irqno = pci->irq;
nic->ioaddr = tp->ioaddr; nic->ioaddr = tp->ioaddr;

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

@ -698,10 +698,14 @@ static int w89c840_probe ( struct dev *dev ) {
} }
/* point to NIC specific routines */ /* point to NIC specific routines */
dev->disable = w89c840_disable; static struct nic_operations w89c840_operations;
nic->poll = w89c840_poll; static struct nic_operations w89c840_operations = {
nic->transmit = w89c840_transmit; .connect = dummy_connect,
nic->irq = w89c840_irq; .poll = w89c840_poll,
.transmit = w89c840_transmit,
.irq = w89c840_irq,
.disable = w89c840_disable,
}; nic->nic_op = &w89c840_operations;
w89c840_reset(nic); w89c840_reset(nic);