*/
static int el3_eisa_probe ( struct nic *nic, struct eisa_device *eisa ) {
- enable_eisa_device ( eisa );
- eisa_fill_nic ( nic, eisa );
+ nic->ioaddr = eisa->ioaddr;
+ nic->irqno = 0;
+ enable_eisa_device ( eisa );
+
/* Hand off to generic t5x9 probe routine */
return t5x9_probe ( nic, ISA_PROD_ID ( PROD_ID ), ISA_PROD_ID_MASK );
}
el3_eisa_probe, el3_eisa_disable );
ISA_ROM ( "3c509-eisa","3c509 (EISA)" );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
/* Direct copy from Beckers 3c515.c removing any ISAPNP sections */
- isapnp_fill_nic ( nic, isapnp );
-
nic->ioaddr = isapnp->ioaddr;
nic->irqno = isapnp->irqno;
activate_isapnp_device ( isapnp );
static int t529_probe ( struct nic *nic, struct mca_device *mca ) {
/* Retrieve NIC parameters from MCA device parameters */
- mca_fill_nic ( nic, mca );
nic->ioaddr = ( ( mca->pos[4] & 0xfc ) | 0x02 ) << 8;
nic->irqno = mca->pos[5] & 0x0f;
printf ( "3c529 board found on MCA at %#hx IRQ %d -",
t529_probe, t529_disable );
ISA_ROM( "3c529", "3c529 == MCA 3c509" );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
eth_nic_base = pci->ioaddr;
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr;
GO_WINDOW(0);
/*
* Local variables:
* c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
* End:
*/
-
adjust_pci_device(pci);
- pci_fill_nic ( nic, pci );
-
nic->ioaddr = pci->ioaddr;
nic->irqno = 0;
DRIVER ( "3C90X", nic_driver, pci_driver, a3c90x_driver,
a3c90x_probe, a3c90x_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
struct amd8111e_priv *lp = &amd8111e;
unsigned long mmio_start, mmio_len;
- pci_fill_nic ( nic, pdev );
+ nic->ioaddr = pdev->ioaddr;
+ nic->irqno = pdev->irq;
mmio_start = pci_bar_start(pdev, PCI_BASE_ADDRESS_0);
mmio_len = pci_bar_size(pdev, PCI_BASE_ADDRESS_0);
DRIVER ( "AMD8111E", nic_driver, pci_driver, amd8111e_driver,
amd8111e_probe, amd8111e_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
return 1;
}
-static int cs89x0_probe ( struct nic *nic, struct isa_device *isa ) {
+static int cs89x0_probe ( struct nic *nic, struct isa_device *isa __unused ) {
int i, result = -1;
unsigned rev_type = 0, isa_cnf, cs_revision;
unsigned short eeprom_buff[CHKSUM_LEN];
- isa_fill_nic ( nic, isa );
nic->ioaddr &= ~1; /* LSB = 1 indicates a more aggressive probe */
-
eth_nic_base = nic->ioaddr;
/* get the chip type */
else printf("\ncs: BUG: isa_config is %d\n", i); }
eth_irqno = i; }
+ nic->irqno = eth_irqno;
+
/* Retrieve and print the ethernet address. */
for (i=0; i<ETH_ALEN; i++) {
nic->node_addr[i] = ((unsigned char *)eeprom_buff)[i];
/*
* Local variables:
* c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
* End:
*/
-
dev_id = pci->device;
ioaddr = pci->ioaddr;
- pci_fill_nic ( nic, pci );
+ nic->ioaddr = pci->ioaddr;
+ nic->irqno = 0;
/* wakeup chip */
pci_write_config_dword(pci, 0x40, 0x00000000);
DRIVER ( "DAVICOM", nic_driver, pci_driver, davicom_driver,
davicom_probe, davicom_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
long sum, chksum;
nic->irqno = 0;
- isa_fill_nic ( nic, isa );
nic->ioaddr = isa->ioaddr;
for (i = 0, j = 0, sum = 0; j < 3; j++) {
ISA_ROM ( "depca", "Digital DE100 and DE200" );
#endif
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
dmfe_reset(nic);
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr;
/* point to NIC specific routines */
DRIVER ( "DMFE/PCI", nic_driver, pci_driver, dmfe_driver,
dmfe_probe, dmfe_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
const char *name;
nic->irqno = 0;
- isa_fill_nic ( nic, isa );
nic->ioaddr = isa->ioaddr;
station_addr.saddr[2] = read_eeprom(nic->ioaddr,2);
eepro_probe, eepro_disable );
ISA_ROM ( "eepro", "Intel Etherexpress Pro/10" );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
* leaves the 82557 initialized, and ready to recieve packets.
*/
-static int eepro100_probe ( struct nic *nic, struct pci_device *p ) {
+static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
unsigned short sum = 0;
int i;
be careful not to access beyond this array */
unsigned short eeprom[16];
- if (p->ioaddr == 0)
+ if (pci->ioaddr == 0)
return 0;
- pci_fill_nic ( nic, p );
- adjust_pci_device(p);
+
+ adjust_pci_device(pci);
+
+ nic->ioaddr = pci->ioaddr;
+ nic->irqno = pci->irq;
+
ioaddr = nic->ioaddr;
if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
DRIVER ( "EEPRO100", nic_driver, pci_driver, eepro100_driver,
eepro100_probe, eepro100_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
Epic cards in slot order. */
ioaddr = pci->ioaddr;
+
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr & ~3;
/* compute all used static epic100 registers address */
DRIVER ( "EPIC100", nic_driver, pci_driver, epic100_driver,
epic100_probe, epic100_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n",
pci->driver_name, pci->vendor, pci->device);
- pci_fill_nic ( nic, pci );
+ nic->ioaddr = pci->ioaddr;
+ nic->irqno = 0;
/* point to private storage */
np = &npx;
DRIVER ( "forcedeth", nic_driver, pci_driver, forcedeth_driver,
forcedeth_probe, forcedeth_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
if (pci->ioaddr == 0)
return 0;
- pci_fill_nic ( nic, pci );
adjust_pci_device(pci);
+ nic->ioaddr = pci->ioaddr;
+ nic->irqno = 0;
+
mtdx.nic_name = pci->driver_name;
mtdx.dev_id = pci->device;
mtdx.ioaddr = nic->ioaddr;
return 0;
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr & ~3;
/* disable interrupts */
DRIVER ( "NS83820/PCI", nic_driver, pci_driver, ns83820_driver,
ns83820_probe, ns83820_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
#endif /* INCLUDE_NS8390 */
+#endif
+
/*
* Local variables:
* c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
* End:
*/
-
-
-#endif
pci->driver_name, pci->vendor, pci->device);
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr & ~3;
/* reset the chip */
DRIVER ( "PCNET32/PCI", nic_driver, pci_driver, pcnet32_driver,
pcnet32_probe, pcnet32_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
hfa384x_t *hw = &hw_global;
uint32_t membase = 0; /* Prism2.5 Memory Base */
- pci_fill_nic ( nic, pci );
pci_read_config_dword( pci, PRISM2_PCI_MEM_BASE, &membase);
membase &= PCI_BASE_ADDRESS_MEM_MASK;
hw->membase = (uint32_t) phys_to_virt(membase);
printf ( "Prism2.5 has registers at %#lx\n", hw->membase );
+
nic->ioaddr = hw->membase;
+ nic->irqno = 0;
return prism2_probe ( nic, hw );
}
DRIVER ( "Prism2/PCI", nic_driver, pci_driver, prism2_pci_driver,
prism2_pci_probe, prism2_pci_disable );
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
static int prism2_plx_probe ( struct nic *nic, struct pci_device *pci ) {
hfa384x_t *hw = &hw_global;
- pci_fill_nic ( nic, pci );
-
/* Find and intialise PLX Prism2 card */
if ( ! prism2_find_plx ( hw, pci ) ) return 0;
nic->ioaddr = hw->iobase;
-
+ nic->irqno = 0;
return prism2_probe ( nic, hw );
}
DRIVER ( "Prism2/PLX", nic_driver, pci_driver, prism2_plx_driver,
prism2_plx_probe, prism2_plx_disable );
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
}
r8169_reset(nic);
+
/* point to NIC specific routines */
- nic->nic_op = &r8169_operations;
- pci_fill_nic ( nic, pci );
- nic->irqno = pci->irq;
+ nic->nic_op = &r8169_operations;
+
+ nic->irqno = pci->irq;
nic->ioaddr = ioaddr;
- return 1;
+ return 1;
}
//======================================================================================================
DRIVER ( "r8169/PCI", nic_driver, pci_driver, r8169_driver,
r8169_probe, r8169_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
return 0;
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr;
+
ioaddr = pci->ioaddr;
vendor = pci->vendor;
dev_id = pci->device;
DRIVER ( "SIS900", nic_driver, pci_driver, sis900_driver,
sis900_probe, sis900_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
int i;
nic->irqno = 0;
- isa_fill_nic ( nic, isa );
nic->ioaddr = isa->ioaddr;
/*
/*
* Local variables:
- * c-basic-offset: 3
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
* End:
*/
/* point to NIC specific routines */
nic->nic_op = &sundance_operations;
- pci_fill_nic ( nic, pci );
- nic->irqno = pci->irq;
+
+ nic->irqno = pci->irq;
nic->ioaddr = BASE;
return 1;
DRIVER ( "SUNDANCE/PCI", nic_driver, pci_driver, sundance_driver,
sundance_probe, sundance_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
adjust_pci_device(pdev);
- pci_fill_nic ( nic, pdev );
nic->irqno = 0;
+ nic->ioaddr = pdev->ioaddr;
/* Find power-management capability. */
pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
DRIVER ( "TG3", nic_driver, pci_driver, tg3_driver,
tg3_probe, tg3_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
return 0;
nic->irqno = 0;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr;
BASE = pci->ioaddr;
DRIVER ( "TLAN/PCI", nic_driver, pci_driver, tlan_driver,
tlan_probe, tlan_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
return 0;
ioaddr = pci->ioaddr;
- pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr & ~3;
nic->irqno = 0;
DRIVER ( "Tulip", nic_driver, pci_driver, tulip_driver,
tulip_probe, tulip_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
if (!pci->ioaddr)
return 0;
+
rhine_probe1 (nic, pci, pci->ioaddr, pci->device, -1);
adjust_pci_device ( pci );
+
rhine_reset (nic);
+
nic->nic_op = &rhine_operations;
- pci_fill_nic ( nic, pci );
+
nic->irqno = pci->irq;
nic->ioaddr = tp->ioaddr;
+
return 1;
}
rhine_probe, rhine_disable );
/* EOF via-rhine.c */
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
if (p->ioaddr == 0)
return 0;
- pci_fill_nic ( nic, p );
+ nic->ioaddr = p->ioaddr;
nic->irqno = 0;
-
#if defined(W89C840_DEBUG)
printf("winbond-840: PCI bus %hhX device function %hhX: I/O address: %hX\n", p->bus, p->devfn, ioaddr);
#endif
DRIVER ( "W89C840F", nic_driver, pci_driver, w89c840_driver,
w89c840_probe, w89c840_disable );
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * c-indent-level: 8
+ * tab-width: 8
+ * End:
+ */
http://git.etherboot.org / people / mcb30 / gpxe.git / commitdiff