diff options
| author | Michael Brown <mcb30@etherboot.org> | 2005-04-21 19:04:53 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2005-04-21 19:04:53 +0000 |
| commit | cfe3a663af0dc133b8f9a1652d0820160889d6ea (patch) | |
| tree | 35cc506a7d172f5f28696920247b17abc94e833b /src/drivers | |
| parent | a713813596ea47e8cc71e315f21fa5d5f94e4969 (diff) | |
| download | ipxe-cfe3a663af0dc133b8f9a1652d0820160889d6ea.tar.gz | |
Tweaked API to minimise changes to existing drivers even further.
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/bus/pci.c | 18 | ||||
| -rw-r--r-- | src/drivers/net/pnic.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c index 3cbe67e5e..c58a186bb 100644 --- a/src/drivers/bus/pci.c +++ b/src/drivers/bus/pci.c @@ -143,24 +143,24 @@ static int pci_fill_device ( struct bus_dev *bus_dev, * */ static int pci_check_driver ( struct bus_dev *bus_dev, - struct device_driver *device_driver ) { + struct device_driver *device_driver ) { struct pci_device *pci = ( struct pci_device * ) bus_dev; - struct pci_driver_info *pci_driver_info - = ( struct pci_driver_info * ) device_driver->bus_driver_info; + struct pci_driver *pci_driver + = ( struct pci_driver * ) device_driver->bus_driver_info; unsigned int i; /* If driver has a class, and class matches, use it */ - if ( pci_driver_info->class && - ( pci_driver_info->class == pci->class ) ) { + if ( pci_driver->class && + ( pci_driver->class == pci->class ) ) { DBG ( "driver %s matches class %hx\n", - device_driver->name, pci_driver_info->class ); + device_driver->name, pci_driver->class ); pci->name = device_driver->name; return 1; } /* If any of driver's IDs match, use it */ - for ( i = 0 ; i < pci_driver_info->id_count; i++ ) { - struct pci_id *id = &pci_driver_info->ids[i]; + for ( i = 0 ; i < pci_driver->id_count; i++ ) { + struct pci_id *id = &pci_driver->ids[i]; if ( ( pci->vendor_id == id->vendor_id ) && ( pci->device_id == id->device_id ) ) { @@ -193,7 +193,7 @@ static char * pci_describe ( struct bus_dev *bus_dev ) { * Name a PCI device * */ -static char * pci_name ( struct bus_dev *bus_dev ) { +static const char * pci_name ( struct bus_dev *bus_dev ) { struct pci_device *pci = ( struct pci_device * ) bus_dev; return pci->name; diff --git a/src/drivers/net/pnic.c b/src/drivers/net/pnic.c index 68b86b61d..eee3a7080 100644 --- a/src/drivers/net/pnic.c +++ b/src/drivers/net/pnic.c @@ -246,7 +246,7 @@ static struct pci_id pnic_nics[] = { PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor" ), }; -static struct pci_driver_info pnic_driver = +static struct pci_driver pnic_driver = PCI_DRIVER ( pnic_nics, PCI_NO_CLASS ); DRIVER ( "PNIC", nic_driver, pci_driver, pnic_driver, |