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

dev.c uses the new tables infrastructure.

Browse Source
This commit is contained in:
Michael Brown
2005-04-27 12:20:54 +00:00
parent c08671e5fc
commit f37e0a06d7
3 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/arch/i386/scripts/i386.lds
View File

@@ -145,18 +145,9 @@ SECTIONS {
*(SORT(.tbl.*)) *(SORT(.tbl.*))
device_drivers = .;
*(.drivers.device)
device_drivers_end = .;
isa_drivers = . ; isa_drivers = . ;
*(.drivers.isa) *(.drivers.isa)
isa_drivers_end = .; isa_drivers_end = .;
bus_drivers = .;
*(.drivers.bus)
bus_drivers_end = .;
type_drivers = .;
*(.drivers.type)
type_drivers_end = .;
_progbits_end = .; _progbits_end = .;
} }

19
src/core/dev.c
View File

@@ -3,19 +3,18 @@
#include "dev.h" #include "dev.h"
/* /*
* Each driver specifies a name, the bus-scanning function * Each bus driver defines several methods, which are described in
* (find_bus_boot_device) that it wants to use, a driver information * dev.h. This file provides a centralised, bus-independent mechanism
* structure (bus_driver) containing e.g. device IDs to be passed to * for locating devices and drivers.
* find_bus_boot_device, and a probe function (probe) to be called
* whenever a suitable device is found.
* *
* The generic device-probing code knows nothing about particular bus
* types; it simply passes the driver information structure
* (bus_driver) to the bus-scanning function (find_bus_boot_device),
* then passes the result of that function (if not NULL) to the probe
* function (probe).
*/ */
/* Linker symbols for the various tables */
static struct bus_driver bus_drivers[0] __table_start ( bus_driver );
static struct bus_driver bus_drivers_end[0] __table_end ( bus_driver );
static struct device_driver device_drivers[0] __table_start ( device_driver );
static struct device_driver device_drivers_end[0] __table_end (device_driver );
/* Current attempted boot device */ /* Current attempted boot device */
struct dev dev = { struct dev dev = {
.bus_driver = bus_drivers, .bus_driver = bus_drivers,

15
src/include/dev.h
View File

@@ -4,6 +4,7 @@
#include "stdint.h" #include "stdint.h"
#include "string.h" #include "string.h"
#include "dhcp.h" /* for dhcp_dev_id */ #include "dhcp.h" /* for dhcp_dev_id */
#include "tables.h"
/* /*
* Forward declarations * Forward declarations
@@ -158,7 +159,7 @@ struct bus_driver {
const char * ( *name_device ) ( struct bus_dev *bus_dev ); const char * ( *name_device ) ( struct bus_dev *bus_dev );
}; };
#define __bus_driver __attribute__ (( used, __section__ ( ".drivers.bus" ) )) #define __bus_driver __attribute__ (( used, __table_section(bus_driver,01) ))
/* /*
* A structure fully describing the bus-independent parts of a * A structure fully describing the bus-independent parts of a
@@ -187,7 +188,7 @@ struct type_driver {
unsigned int len, int eof ) ); unsigned int len, int eof ) );
}; };
#define __type_driver __attribute__ (( used, __section__ ( ".drivers.type" ) )) #define __type_driver __attribute__ (( used, __table_section(type_driver,01) ))
/* /*
* A driver for a device. * A driver for a device.
@@ -205,7 +206,7 @@ struct device_driver {
}; };
#define __device_driver \ #define __device_driver \
__attribute__ (( used, __section__ ( ".drivers.device" ) )) __attribute__ (( used, __table_section(device_driver,01) ))
#define DRIVER(_name,_type_driver,_bus_driver,_bus_info, \ #define DRIVER(_name,_type_driver,_bus_driver,_bus_info, \
_probe,_disable) \ _probe,_disable) \
@@ -283,12 +284,4 @@ static inline int load ( struct dev *dev,
return dev->type_driver->load ( dev->type_dev, process ); return dev->type_driver->load ( dev->type_dev, process );
} }
/* Linker symbols for the various tables */
extern struct bus_driver bus_drivers[];
extern struct bus_driver bus_drivers_end[];
extern struct type_driver type_drivers[];
extern struct type_driver type_drivers_end[];
extern struct device_driver device_drivers[];
extern struct device_driver device_drivers_end[];
#endif /* DEV_H */ #endif /* DEV_H */