Skip to content

Commit

Permalink
Automatically updated using
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Michael Brown committed Apr 13, 2005
1 parent d9c64c9 commit 91e46ed
Show file tree
Hide file tree
Showing 31 changed files with 272 additions and 144 deletions.
14 changes: 9 additions & 5 deletions src/drivers/net/3c509.c
View file
Expand Up @@ -627,11 +627,15 @@ static int t509_probe(struct dev *dev, unsigned short *probe_addrs __unused)

nic->irqno = 0;
nic->ioaddr = eth_nic_base;

dev->disable = t509_disable;
nic->poll = t509_poll;
nic->transmit = t509_transmit;
nic->irq = t509_irq;
static struct nic_operations t509_operations;
static struct nic_operations t509_operations = {
.connect = dummy_connect,
.poll = t509_poll,
.transmit = t509_transmit,
.irq = t509_irq,
.disable = t509_disable,
};
nic->nic_op = &t509_operations;

/* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/3c515.c
View file
Expand Up @@ -686,11 +686,15 @@ static int t515_probe(struct dev *dev,

nic->irqno = 0;
nic->ioaddr = BASE;

dev->disable = t515_disable;
nic->poll = t515_poll;
nic->transmit = t515_transmit;
nic->irq = t515_irq;
static struct nic_operations t515_operations;
static struct nic_operations t515_operations = {
.connect = dummy_connect,
.poll = t515_poll,
.transmit = t515_transmit,
.irq = t515_irq,
.disable = t515_disable,
};
nic->nic_op = &t515_operations;

/* Based on PnP ISA map */
dev->devid.vendor_id = htons(ISAPNP_VENDOR('T', 'C', 'M'));
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/3c595.c
View file
Expand Up @@ -508,10 +508,14 @@ static int t595_probe ( struct dev *dev ) {
printf("Ethernet address: %!\n", nic->node_addr);

t595_reset(nic);
dev->disable = t595_disable;
nic->poll = t595_poll;
nic->transmit = t595_transmit;
nic->irq = t595_irq;
static struct nic_operations t595_operations;
static struct nic_operations t595_operations = {
.connect = dummy_connect,
.poll = t595_poll,
.transmit = t595_transmit,
.irq = t595_irq,
.disable = t595_disable,
}; nic->nic_op = &t595_operations;
return 1;

}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/3c90x.c
View file
Expand Up @@ -951,10 +951,14 @@ static int a3c90x_probe ( struct dev *dev ) {
cmdAcknowledgeInterrupt, 0x661);

/** Set our exported functions **/
dev->disable = a3c90x_disable;
nic->poll = a3c90x_poll;
nic->transmit = a3c90x_transmit;
nic->irq = a3c90x_irq;
static struct nic_operations a3c90x_operations;
static struct nic_operations a3c90x_operations = {
.connect = dummy_connect,
.poll = a3c90x_poll,
.transmit = a3c90x_transmit,
.irq = a3c90x_irq,
.disable = a3c90x_disable,
}; nic->nic_op = &a3c90x_operations;

return 1;
}
Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/cs89x0.c
View file
Expand Up @@ -691,11 +691,15 @@ static int cs89x0_probe(struct dev *dev, unsigned short *probe_addrs __unused)

nic->irqno = 0;
nic->ioaddr = ioaddr;

dev->disable = cs89x0_disable;
nic->poll = cs89x0_poll;
nic->transmit = cs89x0_transmit;
nic->irq = cs89x0_irq;
static struct nic_operations cs89x0_operations;
static struct nic_operations cs89x0_operations = {
.connect = dummy_connect,
.poll = cs89x0_poll,
.transmit = cs89x0_transmit,
.irq = cs89x0_irq,
.disable = cs89x0_disable,
};
nic->nic_op = &cs89x0_operations;

/* Based on PnP ISA map */
dev->devid.vendor_id = htons(ISAPNP_VENDOR('C','S','C'));
Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/davicom.c
View file
Expand Up @@ -694,11 +694,15 @@ static int davicom_probe ( struct dev *dev ) {

/* initialize device */
davicom_reset(nic);

dev->disable = davicom_disable;
nic->poll = davicom_poll;
nic->transmit = davicom_transmit;
nic->irq = davicom_irq;
static struct nic_operations davicom_operations;
static struct nic_operations davicom_operations = {
.connect = dummy_connect,
.poll = davicom_poll,
.transmit = davicom_transmit,
.irq = davicom_irq,
.disable = davicom_disable,
};
nic->nic_op = &davicom_operations;

return 1;
}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/depca.c
View file
Expand Up @@ -773,10 +773,14 @@ static int depca_probe(struct dev *dev, unsigned short *probe_addrs)

depca_reset(nic);
/* point to NIC specific routines */
dev->disable = depca_disable;
nic->poll = depca_poll;
nic->transmit = depca_transmit;
nic->irq = depca_irq;
static struct nic_operations depca_operations;
static struct nic_operations depca_operations = {
.connect = dummy_connect,
.poll = depca_poll,
.transmit = depca_transmit,
.irq = depca_irq,
.disable = depca_disable,
}; nic->nic_op = &depca_operations;

/* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/dmfe.c
View file
Expand Up @@ -515,10 +515,14 @@ static int dmfe_probe ( struct dev *dev ) {
nic->ioaddr = pci->ioaddr;

/* point to NIC specific routines */
dev->disable = dmfe_disable;
nic->poll = dmfe_poll;
nic->transmit = dmfe_transmit;
nic->irq = dmfe_irq;
static struct nic_operations dmfe_operations;
static struct nic_operations dmfe_operations = {
.connect = dummy_connect,
.poll = dmfe_poll,
.transmit = dmfe_transmit,
.irq = dmfe_irq,
.disable = dmfe_disable,
}; nic->nic_op = &dmfe_operations;

return 1;
}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/e1000.c
View file
Expand Up @@ -3663,10 +3663,14 @@ static int e1000_probe ( struct dev *dev ) {
init_descriptor();

/* point to NIC specific routines */
dev->disable = e1000_disable;
nic->poll = e1000_poll;
nic->transmit = e1000_transmit;
nic->irq = e1000_irq;
static struct nic_operations e1000_operations;
static struct nic_operations e1000_operations = {
.connect = dummy_connect,
.poll = e1000_poll,
.transmit = e1000_transmit,
.irq = e1000_irq,
.disable = e1000_disable,
}; nic->nic_op = &e1000_operations;

return 1;
}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/eepro.c
View file
Expand Up @@ -606,10 +606,14 @@ static int eepro_probe(struct dev *dev, unsigned short *probe_addrs)

eepro_reset(nic);
/* point to NIC specific routines */
dev->disable = eepro_disable;
nic->poll = eepro_poll;
nic->transmit = eepro_transmit;
nic->irq = eepro_irq;
static struct nic_operations eepro_operations;
static struct nic_operations eepro_operations = {
.connect = dummy_connect,
.poll = eepro_poll,
.transmit = eepro_transmit,
.irq = eepro_irq,
.disable = eepro_disable,
}; nic->nic_op = &eepro_operations;
/* Based on PnP ISA map */
dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
dev->devid.device_id = htons(0x828a);
Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/eepro100.c
View file
Expand Up @@ -767,11 +767,15 @@ static int eepro100_probe ( struct dev *dev ) {
eepro100_disable(dev);
return 0;
}

dev->disable = eepro100_disable;
nic->poll = eepro100_poll;
nic->transmit = eepro100_transmit;
nic->irq = eepro100_irq;
static struct nic_operations eepro100_operations;
static struct nic_operations eepro100_operations = {
.connect = dummy_connect,
.poll = eepro100_poll,
.transmit = eepro100_transmit,
.irq = eepro100_irq,
.disable = eepro100_disable,
};
nic->nic_op = &eepro100_operations;
return 1;
}

Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/epic100.c
View file
Expand Up @@ -202,11 +202,15 @@ epic100_probe ( struct dev *dev ) {
}

epic100_open();

dev->disable = epic100_disable;
nic->poll = epic100_poll;
nic->transmit = epic100_transmit;
nic->irq = epic100_irq;
static struct nic_operations epic100_operations;
static struct nic_operations epic100_operations = {
.connect = dummy_connect,
.poll = epic100_poll,
.transmit = epic100_transmit,
.irq = epic100_irq,
.disable = epic100_disable,
};
nic->nic_op = &epic100_operations;

return 1;
}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/forcedeth.c
View file
Expand Up @@ -1015,10 +1015,14 @@ static int forcedeth_probe ( struct dev *dev ) {
forcedeth_reset(nic);
// if (board_found && valid_link)
/* point to NIC specific routines */
dev->disable = forcedeth_disable;
nic->poll = forcedeth_poll;
nic->transmit = forcedeth_transmit;
nic->irq = forcedeth_irq;
static struct nic_operations forcedeth_operations;
static struct nic_operations forcedeth_operations = {
.connect = dummy_connect,
.poll = forcedeth_poll,
.transmit = forcedeth_transmit,
.irq = forcedeth_irq,
.disable = forcedeth_disable,
}; nic->nic_op = &forcedeth_operations;
return 1;
// }
/* else */
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/mtd80x.c
View file
Expand Up @@ -763,10 +763,14 @@ static int mtd_probe ( struct dev *dev ) {
mtd_reset( nic );

/* point to NIC specific routines */
dev->disable = mtd_disable;
nic->poll = mtd_poll;
nic->transmit = mtd_transmit;
nic->irq = dummy_irq;
static struct nic_operations mtd_operations;
static struct nic_operations mtd_operations = {
.connect = dummy_connect,
.poll = mtd_poll,
.transmit = mtd_transmit,
.irq = dummy_irq,
.disable = mtd_disable,
}; nic->nic_op = &mtd_operations;
return 1;
}

Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/natsemi.c
View file
Expand Up @@ -316,11 +316,15 @@ natsemi_probe ( struct dev *dev ) {

/* initialize device */
natsemi_init(nic);

dev->disable = natsemi_disable;
nic->poll = natsemi_poll;
nic->transmit = natsemi_transmit;
nic->irq = natsemi_irq;
static struct nic_operations natsemi_operations;
static struct nic_operations natsemi_operations = {
.connect = dummy_connect,
.poll = natsemi_poll,
.transmit = natsemi_transmit,
.irq = natsemi_irq,
.disable = natsemi_disable,
};
nic->nic_op = &natsemi_operations;

return 1;
}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/ns83820.c
View file
Expand Up @@ -1000,10 +1000,14 @@ static int ns83820_probe ( struct dev *dev ) {

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

Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/ns8390.c
View file
Expand Up @@ -930,11 +930,15 @@ static int eth_probe (struct dev *dev, unsigned short *probe_addrs __unused)
if (eth_vendor != VENDOR_3COM)
eth_rmem = eth_bmem;
ns8390_reset(nic);

dev->disable = ns8390_disable;
nic->poll = ns8390_poll;
nic->transmit = ns8390_transmit;
nic->irq = ns8390_irq;
static struct nic_operations ns8390_operations;
static struct nic_operations ns8390_operations = {
.connect = dummy_connect,
.poll = ns8390_poll,
.transmit = ns8390_transmit,
.irq = ns8390_irq,
.disable = ns8390_disable,
};
nic->nic_op = &ns8390_operations;

/* Based on PnP ISA map */
#ifdef INCLUDE_WD
Expand Down
14 changes: 9 additions & 5 deletions src/drivers/net/pcnet32.c
View file
Expand Up @@ -945,11 +945,15 @@ static int pcnet32_probe ( struct dev *dev ) {
else
printf("\n");
}

dev->disable = pcnet32_disable;
nic->poll = pcnet32_poll;
nic->transmit = pcnet32_transmit;
nic->irq = pcnet32_irq;
static struct nic_operations pcnet32_operations;
static struct nic_operations pcnet32_operations = {
.connect = dummy_connect,
.poll = pcnet32_poll,
.transmit = pcnet32_transmit,
.irq = pcnet32_irq,
.disable = pcnet32_disable,
};
nic->nic_op = &pcnet32_operations;

return 1;
}
Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/prism2.c
View file
Expand Up @@ -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 );

/* point to NIC specific routines */
dev->disable = prism2_disable;
nic->poll = prism2_poll;
nic->transmit = prism2_transmit;
nic->irq = prism2_irq;
static struct nic_operations prism2_operations;
static struct nic_operations prism2_operations = {
.connect = dummy_connect,
.poll = prism2_poll,
.transmit = prism2_transmit,
.irq = prism2_irq,
.disable = prism2_disable,
}; nic->nic_op = &prism2_operations;
return 1;
}

Expand Down
12 changes: 8 additions & 4 deletions src/drivers/net/r8169.c
View file
Expand Up @@ -831,10 +831,14 @@ static int r8169_probe ( struct dev *dev ) {

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

0 comments on commit 91e46ed

Please sign in to comment.