Purge warnings from prism2 drivers

[people/xl0/gpxe.git] / src / drivers / net / prism2_pci.c

diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index be2b06c..918a66d 100644 (file)
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -14,19 +14,38 @@ $Id$
  * your option) any later version.
  */
 
+#include <gpxe/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"),  /* Generic Prism2.5 PCI device */
-};
+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;
+
+  return prism2_probe ( nic, hw );
+}
 
-static struct pci_driver prism2_pci_driver __pci_driver = {
-       .type     = NIC_DRIVER,
-       .name     = "Prism2_PCI",
-       .probe    = prism2_pci_probe,
-       .ids      = prism2_pci_nics,
-       .id_count = sizeof(prism2_pci_nics)/sizeof(prism2_pci_nics[0]),
-       .class    = 0,
+static void prism2_pci_disable ( struct nic *nic ) {
+  prism2_disable ( nic );
+}
+
+static struct pci_device_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"),
 };
 
+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 );
+