xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-12-14 15:21:32 +00:00
Code Issues Projects Releases Wiki Activity

Updated to new device API.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/net/prism2.c
View File

@ -748,7 +748,6 @@ static struct nic_operations prism2_operations = {
.poll = prism2_poll,
.transmit = prism2_transmit,
.irq = prism2_irq,
.disable = prism2_disable,
};
/**************************************************************************

41
src/drivers/net/prism2_pci.c
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 );

49
src/drivers/net/prism2_plx.c
View File

@ -14,26 +14,12 @@ $Id$
* your option) any later version.
*/
#include "pci.h"
#include "nic.h"
#define WLAN_HOSTIF WLAN_PLX
#include "prism2.c"
static struct pci_id prism2_plx_nics[] = {
PCI_ROM(0x1385, 0x4100, "ma301", "Netgear MA301"),
PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect"),
PCI_ROM(0x111a, 0x1023, "ss1023", "Siemens SpeedStream SS1023"),
PCI_ROM(0x15e8, 0x0130, "correga", "Correga"),
PCI_ROM(0x1638, 0x1100, "smc2602w", "SMC EZConnect SMC2602W"), /* or Eumitcom PCI WL11000, Addtron AWA-100 */
PCI_ROM(0x16ab, 0x1100, "gl24110p", "Global Sun Tech GL24110P"),
PCI_ROM(0x16ab, 0x1101, "16ab-1101", "Unknown"),
PCI_ROM(0x16ab, 0x1102, "wdt11", "Linksys WDT11"),
PCI_ROM(0x16ec, 0x3685, "usr2415", "USR 2415"),
PCI_ROM(0xec80, 0xec00, "f5d6000", "Belkin F5D6000"),
PCI_ROM(0x126c, 0x8030, "emobility", "Nortel emobility"),
};
static struct pci_driver prism2_plx_driver =
PCI_DRIVER ( "Prism2_PLX", prism2_plx_nics, PCI_NO_CLASS );
/*
* Find PLX card. Prints out information strings from PCMCIA CIS as visual
* confirmation of presence of card.
@ -92,8 +78,7 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
return found;
}
static int prism2_plx_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
static int prism2_plx_probe ( struct nic *nic, struct pci_device *pci ) {
hfa384x_t *hw = &hw_global;
/* Find and intialise PLX Prism2 card */
@ -103,5 +88,29 @@ static int prism2_plx_probe ( struct dev *dev, struct pci_device *pci ) {
return prism2_probe ( nic, hw );
}
BOOT_DRIVER ( "Prism2_PLX", find_pci_boot_device, prism2_plx_driver, prism2_plx_probe );
static void prism2_plx_disable ( struct nic *nic,
struct pci_device *pci __unused ) {
prism2_disable ( nic );
}
static struct pci_id prism2_plx_nics[] = {
PCI_ROM(0x1385, 0x4100, "ma301", "Netgear MA301"),
PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect"),
PCI_ROM(0x111a, 0x1023, "ss1023", "Siemens SpeedStream SS1023"),
PCI_ROM(0x15e8, 0x0130, "correga", "Correga"),
PCI_ROM(0x1638, 0x1100, "smc2602w", "SMC EZConnect SMC2602W"), /* or Eumitcom PCI WL11000, Addtron AWA-100 */
PCI_ROM(0x16ab, 0x1100, "gl24110p", "Global Sun Tech GL24110P"),
PCI_ROM(0x16ab, 0x1101, "16ab-1101", "Unknown"),
PCI_ROM(0x16ab, 0x1102, "wdt11", "Linksys WDT11"),
PCI_ROM(0x16ec, 0x3685, "usr2415", "USR 2415"),
PCI_ROM(0xec80, 0xec00, "f5d6000", "Belkin F5D6000"),
PCI_ROM(0x126c, 0x8030, "emobility", "Nortel emobility"),
};
static struct pci_driver prism2_plx_driver =
PCI_DRIVER ( prism2_plx_nics, PCI_NO_CLASS );
DRIVER ( "Prism2/PLX", nic_driver, pci_driver, prism2_plx_driver,
prism2_plx_probe, prism2_plx_disable );