diff options
| author | Michael Brown <mcb30@etherboot.org> | 2005-04-25 18:54:15 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2005-04-25 18:54:15 +0000 |
| commit | 5bace628ae83891ab373555859712f75568654a2 (patch) | |
| tree | afd494423bcfcf67696d4d31d547e6c4d208b1a1 /src/drivers/bus/pci.c | |
| parent | f972f256e69c955f2dd23145331588265ac34ad7 (diff) | |
| download | ipxe-5bace628ae83891ab373555859712f75568654a2.tar.gz | |
Added "name" field to bus structure.
Diffstat (limited to 'src/drivers/bus/pci.c')
| -rw-r--r-- | src/drivers/bus/pci.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c index 6653b4d30..95a76502b 100644 --- a/src/drivers/bus/pci.c +++ b/src/drivers/bus/pci.c @@ -179,7 +179,7 @@ static int pci_check_driver ( struct bus_dev *bus_dev, * Describe a PCI device * */ -static char * pci_describe ( struct bus_dev *bus_dev ) { +static char * pci_describe_device ( struct bus_dev *bus_dev ) { struct pci_device *pci = ( struct pci_device * ) bus_dev; static char pci_description[] = "PCI 00:00.0"; @@ -193,7 +193,7 @@ static char * pci_describe ( struct bus_dev *bus_dev ) { * Name a PCI device * */ -static const char * pci_name ( struct bus_dev *bus_dev ) { +static const char * pci_name_device ( struct bus_dev *bus_dev ) { struct pci_device *pci = ( struct pci_device * ) bus_dev; return pci->name; @@ -204,11 +204,12 @@ static const char * pci_name ( struct bus_dev *bus_dev ) { * */ struct bus_driver pci_driver __bus_driver = { - .next_location = pci_next_location, - .fill_device = pci_fill_device, - .check_driver = pci_check_driver, - .describe = pci_describe, - .name = pci_name, + .name = "PCI", + .next_location = pci_next_location, + .fill_device = pci_fill_device, + .check_driver = pci_check_driver, + .describe_device = pci_describe_device, + .name_device = pci_name_device, }; /* |