summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/prism2_plx.c
diff options
context:
space:
mode:
authorMarty Connor2007-12-13 17:08:40 +0100
committerMarty Connor2007-12-13 17:08:40 +0100
commit1a867bfb3949ff4131834cddd491428a056b63ce (patch)
tree53d22902865655e390486acc135688b1022ea139 /src/drivers/net/prism2_plx.c
parentRemove the obsolete pre-aBFT AoE boot table. (diff)
downloadipxe-1a867bfb3949ff4131834cddd491428a056b63ce.tar.gz
ipxe-1a867bfb3949ff4131834cddd491428a056b63ce.tar.xz
ipxe-1a867bfb3949ff4131834cddd491428a056b63ce.zip
Remove *_fill_nic() calls, and directly set nic->ioaddr and nic->irqno .
This needs to be done manually because if the irq() routine is implemented then we want something like "nic->irqno = pci->irqno;", else we do "nic->irqno = 0;" nic->ioaddr may also need to be set carefully. Also added local variables to end of many files, for emacs indentation to match kernel style (tab does 8 space indent).
Diffstat (limited to 'src/drivers/net/prism2_plx.c')
-rw-r--r--src/drivers/net/prism2_plx.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 07460356..150bbe69 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -81,12 +81,10 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
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 );
}
@@ -114,3 +112,10 @@ PCI_DRIVER ( prism2_plx_driver, prism2_plx_nics, PCI_NO_CLASS );
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:
+ */