Updated to new device API.

This commit is contained in:
Michael Brown
2005-04-22 11:29:40 +00:00
parent 3e8c2aa78b
commit 0e2dc7aa8e
3 changed files with 54 additions and 37 deletions

View File

@@ -14,9 +14,31 @@ $Id$
* your option) any later version.
*/
#include "pci.h"
#include "nic.h"
#define WLAN_HOSTIF WLAN_PCI
#include "prism2.c"
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 %#x\n", hw->membase );
nic->ioaddr = hw->membase;
return prism2_probe ( nic, hw );
}
static void prism2_pci_disable ( struct nic *nic,
struct pci_device *pci __unused ) {
prism2_disable ( nic );
}
static struct pci_id prism2_pci_nics[] = {
PCI_ROM(0x1260, 0x3873, "prism2_pci", "Harris Semiconductor Prism2.5 clone"),
PCI_ROM(0x1260, 0x3873, "hwp01170", "ActionTec HWP01170"),
@@ -24,21 +46,8 @@ PCI_ROM(0x1260, 0x3873, "dwl520", "DLink DWL-520"),
};
static struct pci_driver prism2_pci_driver =
PCI_DRIVER ( "Prism2_PCI", prism2_pci_nics, PCI_NO_CLASS );
PCI_DRIVER ( prism2_pci_nics, PCI_NO_CLASS );
static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
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 %#x\n", hw->membase );
nic->ioaddr = hw->membase;
return prism2_probe ( nic, hw );
}
BOOT_DRIVER ( "Prism2_PCI", find_pci_boot_device, prism2_pci_driver, prism2_pci_probe );
DRIVER ( "Prism2/PCI", nic_driver, pci_driver, prism2_pci_driver,
prism2_pci_probe, prism2_pci_disable );