diff options
| author | Michael Brown | 2011-04-07 21:59:47 +0200 |
|---|---|---|
| committer | Michael Brown | 2011-04-08 00:09:19 +0200 |
| commit | fc7e2be617df0f671977655249f5c6a04a0ba04f (patch) | |
| tree | e0b37397cdfb2e4d588ec5c34fa9f05bb41719d4 /src/include | |
| parent | [build] Refuse to attempt building with the GNU gold linker (diff) | |
| download | ipxe-fc7e2be617df0f671977655249f5c6a04a0ba04f.tar.gz ipxe-fc7e2be617df0f671977655249f5c6a04a0ba04f.tar.xz ipxe-fc7e2be617df0f671977655249f5c6a04a0ba04f.zip | |
[device] Make driver name a generic device property
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ipxe/device.h | 2 | ||||
| -rw-r--r-- | src/include/ipxe/eisa.h | 2 | ||||
| -rw-r--r-- | src/include/ipxe/isa.h | 2 | ||||
| -rw-r--r-- | src/include/ipxe/isapnp.h | 2 | ||||
| -rw-r--r-- | src/include/ipxe/mca.h | 2 | ||||
| -rw-r--r-- | src/include/ipxe/pci.h | 1 |
6 files changed, 3 insertions, 8 deletions
diff --git a/src/include/ipxe/device.h b/src/include/ipxe/device.h index 635ce59c..435af6ec 100644 --- a/src/include/ipxe/device.h +++ b/src/include/ipxe/device.h @@ -58,6 +58,8 @@ struct device_description { struct device { /** Name */ char name[16]; + /** Driver name */ + const char *driver_name; /** Device description */ struct device_description desc; /** Devices on the same bus */ diff --git a/src/include/ipxe/eisa.h b/src/include/ipxe/eisa.h index 1588f811..22a1ed94 100644 --- a/src/include/ipxe/eisa.h +++ b/src/include/ipxe/eisa.h @@ -54,8 +54,6 @@ struct eisa_device { * this field. */ void *priv; - /** Driver name */ - const char *driver_name; }; /** An EISA driver */ diff --git a/src/include/ipxe/isa.h b/src/include/ipxe/isa.h index 6d8f7616..4e69fc6f 100644 --- a/src/include/ipxe/isa.h +++ b/src/include/ipxe/isa.h @@ -22,8 +22,6 @@ struct isa_device { * this field. */ void *priv; - /** Driver name */ - const char *driver_name; }; /* diff --git a/src/include/ipxe/isapnp.h b/src/include/ipxe/isapnp.h index f2b0b34a..47a47025 100644 --- a/src/include/ipxe/isapnp.h +++ b/src/include/ipxe/isapnp.h @@ -198,8 +198,6 @@ struct isapnp_device { * this field. */ void *priv; - /** Driver name */ - const char *driver_name; }; /** An ISAPnP driver */ diff --git a/src/include/ipxe/mca.h b/src/include/ipxe/mca.h index 79543c1a..d86dab19 100644 --- a/src/include/ipxe/mca.h +++ b/src/include/ipxe/mca.h @@ -50,8 +50,6 @@ struct mca_device { * this field. */ void *priv; - /** Driver name */ - const char *driver_name; }; #define MCA_ID(mca) ( ( (mca)->pos[1] << 8 ) + (mca)->pos[0] ) diff --git a/src/include/ipxe/pci.h b/src/include/ipxe/pci.h index 90802a3f..960454d6 100644 --- a/src/include/ipxe/pci.h +++ b/src/include/ipxe/pci.h @@ -410,6 +410,7 @@ static inline void pci_set_driver ( struct pci_device *pci, struct pci_device_id *id ) { pci->driver = driver; pci->id = id; + pci->dev.driver_name = id->name; } /** |