sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-02 09:52:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tweak API to allow separation of bus-scanning and device-probing logic.

Browse Source
This commit is contained in:
Michael Brown
2005-04-14 13:44:07 +00:00
parent ce8dea0dff
commit 104880ca19
6 changed files with 89 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/drivers/bus/mca.c
View File

@@ -48,23 +48,6 @@ static int fill_mca_device ( struct mca_device *mca ) {
return 1;
}
/*
* Obtain a struct mca * from a struct dev *
*
* If dev has not previously been used for an MCA device scan, blank
* out struct mca
*/
struct mca_device * mca_device ( struct dev *dev ) {
struct mca_device *mca = dev->bus;
if ( mca->magic != mca_magic ) {
memset ( mca, 0, sizeof ( *mca ) );
mca->magic = mca_magic;
}
mca->dev = dev;
return mca;
}
/*
* Find an MCA device matching the specified driver
*
@@ -72,8 +55,14 @@ struct mca_device * mca_device ( struct dev *dev ) {
int find_mca_device ( struct mca_device *mca, struct mca_driver *driver ) {
unsigned int i;
/* Initialise struct mca if it's the first time it's been used. */
if ( mca->magic != mca_magic ) {
memset ( mca, 0, sizeof ( *mca ) );
mca->magic = mca_magic;
}
/* Iterate through all possible MCA slots, starting where we
* left off/
* left off
*/
for ( ; mca->slot < MCA_MAX_SLOT_NR ; mca->slot++ ) {
/* If we've already used this device, skip it */
@@ -94,14 +83,7 @@ int find_mca_device ( struct mca_device *mca, struct mca_driver *driver ) {
if ( MCA_ID ( mca ) == id->id ) {
DBG ( "Device %s (driver %s) matches ID %hx\n",
id->name, driver->name, id->id );
if ( mca->dev ) {
mca->dev->name = driver->name;
mca->dev->devid.bus_type
= MCA_BUS_TYPE;
mca->dev->devid.vendor_id
= GENERIC_MCA_VENDOR;
mca->dev->devid.device_id = id->id;
}
mca->name = id->name;
mca->already_tried = 1;
return 1;
}
@@ -112,3 +94,22 @@ int find_mca_device ( struct mca_device *mca, struct mca_driver *driver ) {
mca->slot = 0;
return 0;
}
/*
* Find the next MCA device that can be used to boot using the
* specified driver.
*
*/
int find_mca_boot_device ( struct dev *dev, struct mca_driver *driver ) {
struct mca_device *mca = ( struct mca_device * )dev->bus;
if ( ! find_mca_device ( mca, driver ) )
return 0;
dev->name = mca->name;
dev->devid.bus_type = MCA_BUS_TYPE;
dev->devid.vendor_id = GENERIC_MCA_VENDOR;
dev->devid.device_id = MCA_ID ( mca );
return 1;
}