diff options
author | Marty Connor | 2007-12-13 17:08:40 +0100 |
---|---|---|
committer | Marty Connor | 2007-12-13 17:08:40 +0100 |
commit | 1a867bfb3949ff4131834cddd491428a056b63ce (patch) | |
tree | 53d22902865655e390486acc135688b1022ea139 /src/drivers/net/w89c840.c | |
parent | Remove the obsolete pre-aBFT AoE boot table. (diff) | |
download | ipxe-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/w89c840.c')
-rw-r--r-- | src/drivers/net/w89c840.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c index cb40e447..2f141aa9 100644 --- a/src/drivers/net/w89c840.c +++ b/src/drivers/net/w89c840.c @@ -630,10 +630,9 @@ static int w89c840_probe ( struct nic *nic, struct pci_device *p ) { 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 @@ -954,3 +953,11 @@ static void init_ring(void) 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: + */ |