david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Updated to current API

This commit is contained in:
Michael Brown 2005-04-21 18:31:31 +00:00
parent 8153a0fa7e
commit a713813596
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/drivers/net/pnic.c
View File

@ -176,7 +176,8 @@ static void pnic_transmit ( struct nic *nic, const char *dest,
/************************************************************************** /**************************************************************************
DISABLE - Turn off ethernet interface DISABLE - Turn off ethernet interface
***************************************************************************/ ***************************************************************************/
static void pnic_disable ( struct nic *nic ) { static void pnic_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
pnic_command ( nic, PNIC_CMD_RESET, NULL, 0, NULL, 0, NULL ); pnic_command ( nic, PNIC_CMD_RESET, NULL, 0, NULL, 0, NULL );
} }
@ -208,21 +209,17 @@ static struct nic_operations pnic_operations = {
.poll = pnic_poll, .poll = pnic_poll,
.transmit = pnic_transmit, .transmit = pnic_transmit,
.irq = pnic_irq, .irq = pnic_irq,
.disable = pnic_disable,
}; };
/************************************************************************** /**************************************************************************
PROBE - Look for an adapter, this routine's visible to the outside PROBE - Look for an adapter, this routine's visible to the outside
***************************************************************************/ ***************************************************************************/
static int pnic_probe ( struct nic *nic, struct pci_device *pci ) {
static int pnic_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
uint16_t api_version; uint16_t api_version;
uint16_t status; uint16_t status;
/* Retrieve relevant information about PCI device */ /* Retrieve relevant information about PCI device */
nic->ioaddr = pci->ioaddr; pci_fill_nic ( nic, pci );
nic->irqno = pci->irq;
/* API version check */ /* API version check */
status = pnic_command_quiet( nic, PNIC_CMD_API_VER, NULL, 0, status = pnic_command_quiet( nic, PNIC_CMD_API_VER, NULL, 0,
@ -249,7 +246,8 @@ static struct pci_id pnic_nics[] = {
PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor" ), PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor" ),
}; };
static struct pci_driver pnic_driver = static struct pci_driver_info pnic_driver =
PCI_DRIVER ( "PNIC", pnic_nics, PCI_NO_CLASS ); PCI_DRIVER ( pnic_nics, PCI_NO_CLASS );
BOOT_DRIVER ( "PNIC", find_pci_boot_device, pnic_driver, pnic_probe ); DRIVER ( "PNIC", nic_driver, pci_driver, pnic_driver,
pnic_probe, pnic_disable );