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/prism2_pci.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/prism2_pci.c')
-rw-r--r-- | src/drivers/net/prism2_pci.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c index 918a66df..63cc22e3 100644 --- a/src/drivers/net/prism2_pci.c +++ b/src/drivers/net/prism2_pci.c @@ -24,12 +24,13 @@ static int prism2_pci_probe ( struct nic *nic, struct pci_device *pci ) { 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 ); } @@ -49,3 +50,10 @@ PCI_DRIVER ( prism2_pci_driver, prism2_pci_nics, PCI_NO_CLASS ); 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: + */ |