sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-22 13:00:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

[pci] Make driver PCI ID a property of the PCI device

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-02-12 01:11:57 +00:00
parent abb5590b29
commit 5bde349e55
45 changed files with 77 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/ipxe/pci.h
View File

@@ -312,8 +312,8 @@ struct pci_device {
* field.
*/
void *priv;
/** Driver name */
const char *driver_name;
/** Driver device ID */
struct pci_device_id *id;
};
/** A PCI driver */
@@ -326,11 +326,9 @@ struct pci_driver {
* Probe device
*
* @v pci PCI device
* @v id Matching entry in ID table
* @ret rc Return status code
*/
int ( * probe ) ( struct pci_device *pci,
const struct pci_device_id *id );
int ( * probe ) ( struct pci_device *pci );
/**
* Remove device
*

6
src/include/nic.h
View File

@@ -85,8 +85,7 @@ void legacy_remove ( void *hwdev,
#define PCI_DRIVER(_name,_ids,_class) \
static inline int \
_name ## _pci_legacy_probe ( struct pci_device *pci, \
const struct pci_device_id *id ); \
_name ## _pci_legacy_probe ( struct pci_device *pci ); \
static inline void \
_name ## _pci_legacy_remove ( struct pci_device *pci ); \
struct pci_driver _name __pci_driver = { \
@@ -211,8 +210,7 @@ static inline void * legacy_isa_get_drvdata ( void *hwdev ) {
_unsafe_disable ( nic, hwdev ); \
} \
static inline int \
_name ## _pci_legacy_probe ( struct pci_device *pci, \
const struct pci_device_id *id __unused ) { \
_name ## _pci_legacy_probe ( struct pci_device *pci ) { \
return legacy_probe ( pci, legacy_pci_set_drvdata, \
&pci->dev, _name ## _probe, \
_name ## _disable ); \