diff options
| author | Michael Brown <mcb30@etherboot.org> | 2008-11-19 19:33:05 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2008-11-19 19:33:05 +0000 |
| commit | 0ebbbb95fa03622423154a3e56251dd58832654d (patch) | |
| tree | 3bb6fa8df8158cf546a3fe42364cfd3d0b4ef831 /src/drivers/net/prism2_pci.c | |
| parent | 7d36a1b7b031c01d6f20c5a8a1da9897e9d51e7e (diff) | |
| download | ipxe-0ebbbb95fa03622423154a3e56251dd58832654d.tar.gz | |
[x86_64] Fix assorted 64-bit compilation errors and warnings
Remove various 32-bit assumptions scattered throughout the codebase.
The code is still not necessarily 64-bit clean, but will at least
compile.
Diffstat (limited to 'src/drivers/net/prism2_pci.c')
| -rw-r--r-- | src/drivers/net/prism2_pci.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c index 63cc22e30..eda7bf50b 100644 --- a/src/drivers/net/prism2_pci.c +++ b/src/drivers/net/prism2_pci.c @@ -22,14 +22,11 @@ $Id$ 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_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 ); + printf ( "Prism2.5 has registers at %#lx\n", pci->membase ); + hw->membase = ioremap ( pci->membase, 0x100 ); - nic->ioaddr = hw->membase; + nic->ioaddr = pci->membase; nic->irqno = 0; return prism2_probe ( nic, hw ); |