summaryrefslogtreecommitdiffstats
path: root/src/include/gpxe/device.h
diff options
context:
space:
mode:
authorMichael Brown2007-01-10 05:22:09 +0100
committerMichael Brown2007-01-10 05:22:09 +0100
commitdad52745227fd06090e73ea535e0b0fe0f667c60 (patch)
tree6be296bedc785a5aab0d055ae148c6ffb1fe285f /src/include/gpxe/device.h
parentRemove uIP; we haven't used it for quite some time now. (diff)
downloadipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.tar.gz
ipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.tar.xz
ipxe-dad52745227fd06090e73ea535e0b0fe0f667c60.zip
Add "name" field to struct device to allow human-readable hardware device
names. Add "dev" pointer in struct net_device to tie network interfaces back to a hardware device. Force natural alignment of data types in __table() macros. This seems to prevent gcc from taking the unilateral decision to occasionally increase their alignment (which screws up the table packing).
Diffstat (limited to 'src/include/gpxe/device.h')
-rw-r--r--src/include/gpxe/device.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/gpxe/device.h b/src/include/gpxe/device.h
index 43bbf604..9f670cfd 100644
--- a/src/include/gpxe/device.h
+++ b/src/include/gpxe/device.h
@@ -13,6 +13,8 @@
/** A hardware device */
struct device {
+ /** Name */
+ char name[16];
/** Devices on the same bus */
struct list_head siblings;
/** Devices attached to this device */
@@ -28,8 +30,6 @@ struct device {
*
*/
struct root_device {
- /** Name */
- const char *name;
/** Device chain
*
* A root device has a NULL parent field.
@@ -62,7 +62,7 @@ struct root_driver {
};
/** Declare a root device */
-#define __root_device __table ( root_devices, 01 )
+#define __root_device __table ( struct root_device, root_devices, 01 )
extern int probe_devices ( void );
extern void remove_devices ( void );