summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-04-04 18:32:22 +0000
committerOlivier Blin <oblin@mandriva.org>2005-04-04 18:32:22 +0000
commit655a30be164be23e37d040ba7d96ff00dbec4f0e (patch)
tree36f3fd6d50ac210da1f850f5a6f334873dd8db8c
parentf55295c7319bb51ab7a22c368582624e1e424655 (diff)
downloaddrakx-655a30be164be23e37d040ba7d96ff00dbec4f0e.tar
drakx-655a30be164be23e37d040ba7d96ff00dbec4f0e.tar.gz
drakx-655a30be164be23e37d040ba7d96ff00dbec4f0e.tar.bz2
drakx-655a30be164be23e37d040ba7d96ff00dbec4f0e.tar.xz
drakx-655a30be164be23e37d040ba7d96ff00dbec4f0e.zip
allow to keep track of orphan devices (no module available)
-rw-r--r--mdk-stage1/probing.c33
1 files changed, 30 insertions, 3 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 59423a5ed..9059a6f20 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -121,14 +121,29 @@ char * get_net_intf_description(char * intf_name)
}
#endif
+static struct pci_module_map_full orphan_devices[50]; /* might be overkill, we only need the driver for now */
+static int orphan_devices_len = 0;
+
+int exists_orphan_device(char *driver) {
+ int i;
+ for (i = 0; i < orphan_devices_len ; i++) {
+ if (!strcmp(orphan_devices[i].module, driver)) {
+ log_message("probing: found orphan device for module %s", driver);
+ return 1;
+ }
+ }
+ log_message("probing: no orphan device for module %s", driver);
+ return 0;
+}
+
void discovered_device(enum driver_type type,
unsigned short vendor, unsigned short device, unsigned short subvendor, unsigned short subdevice,
const char * description, const char * driver)
{
+ enum insmod_return failed = INSMOD_FAILED;
log_message("PCI: device %04x %04x %04x %04x is \"%s\", driver is %s", vendor, device, subvendor, subdevice, description, driver);
#ifndef DISABLE_MEDIAS
if (type == SCSI_ADAPTERS) {
- enum insmod_return failed;
wait_message("Loading driver for SCSI adapter:\n \n%s", description);
failed = my_insmod(driver, SCSI_ADAPTERS, NULL, 1);
remove_wait_message();
@@ -139,7 +154,8 @@ void discovered_device(enum driver_type type,
if (type == NETWORK_DEVICES) {
wait_message("Loading driver for network device:\n \n%s", description);
prepare_intf_descr(description);
- warning_insmod_failed(my_insmod(driver, NETWORK_DEVICES, NULL, 1));
+ failed = my_insmod(driver, NETWORK_DEVICES, NULL, 1);
+ warning_insmod_failed(failed);
remove_wait_message();
if (intf_descr_for_discover) /* for modules providing more than one net intf */
net_discovered_interface(NULL);
@@ -148,8 +164,19 @@ void discovered_device(enum driver_type type,
#ifdef ENABLE_USB
if (type == USB_CONTROLLERS)
/* we can't allow additional modules floppy since we need usbkbd for keystrokes of usb keyboards */
- my_insmod(driver, USB_CONTROLLERS, NULL, 0);
+ failed = my_insmod(driver, USB_CONTROLLERS, NULL, 0);
#endif
+
+ if (failed != INSMOD_OK) {
+ struct pci_module_map_full *dev = &orphan_devices[orphan_devices_len++];
+ log_message("adding orphan device (%x, %x, %s)", vendor, device, driver);
+ dev->vendor = vendor;
+ dev->device = device;
+ dev->subvendor = subvendor;
+ dev->subdevice = subdevice;
+ dev->name = description;
+ dev->module = driver;
+ }
}
#ifdef ENABLE_USB