diff options
| author | Michael Brown | 2005-04-25 20:54:15 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-04-25 20:54:15 +0200 |
| commit | 5bace628ae83891ab373555859712f75568654a2 (patch) | |
| tree | afd494423bcfcf67696d4d31d547e6c4d208b1a1 /src/drivers/bus/isa.c | |
| parent | Allow for multiple debug levels (diff) | |
| download | ipxe-5bace628ae83891ab373555859712f75568654a2.tar.gz ipxe-5bace628ae83891ab373555859712f75568654a2.tar.xz ipxe-5bace628ae83891ab373555859712f75568654a2.zip | |
Added "name" field to bus structure.
Diffstat (limited to 'src/drivers/bus/isa.c')
| -rw-r--r-- | src/drivers/bus/isa.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c index 95701c36b..526c60223 100644 --- a/src/drivers/bus/isa.c +++ b/src/drivers/bus/isa.c @@ -126,7 +126,7 @@ int isa_check_driver ( struct bus_dev *bus_dev, * Describe a ISA device * */ -static char * isa_describe ( struct bus_dev *bus_dev ) { +static char * isa_describe_device ( struct bus_dev *bus_dev ) { struct isa_device *isa = ( struct isa_device * ) bus_dev; static char isa_description[] = "ISA 0000"; @@ -138,7 +138,7 @@ static char * isa_describe ( struct bus_dev *bus_dev ) { * Name a ISA device * */ -static const char * isa_name ( struct bus_dev *bus_dev ) { +static const char * isa_name_device ( struct bus_dev *bus_dev ) { struct isa_device *isa = ( struct isa_device * ) bus_dev; return isa->name; @@ -149,11 +149,12 @@ static const char * isa_name ( struct bus_dev *bus_dev ) { * */ struct bus_driver isa_driver __bus_driver = { - .next_location = isa_next_location, - .fill_device = isa_fill_device, - .check_driver = isa_check_driver, - .describe = isa_describe, - .name = isa_name, + .name = "ISA", + .next_location = isa_next_location, + .fill_device = isa_fill_device, + .check_driver = isa_check_driver, + .describe_device = isa_describe_device, + .name_device = isa_name_device, }; /* |