Updated to new device API.

1 files changed, 22 insertions, 13 deletions

diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index 4278e83c..bfad2fd2 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -14,23 +14,17 @@ $Id$
  * your option) any later version.
  */
 
+#include "pci.h"
+#include "nic.h"
+
 #define WLAN_HOSTIF WLAN_PCI
 #include "prism2.c"
 
-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"),
-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 );
-
-static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
-  struct nic *nic = nic_device ( dev );
+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);
@@ -38,7 +32,22 @@ static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
   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"),
+PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
+};
+
+static struct pci_driver prism2_pci_driver =
+	PCI_DRIVER ( prism2_pci_nics, PCI_NO_CLASS );
 
-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 );