diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2002-09-05 14:33:34 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2002-09-05 14:33:34 +0000 |
| commit | f0eba89d8d6862087755141ac37bbb3bf9d3a714 (patch) | |
| tree | e1c73dc7123317a83491b8a541e919e04d839d12 /mdk-stage1 | |
| parent | 6b3068afe4f39c70f0c950688bb94cfda6b3d4e1 (diff) | |
| download | drakx-backup-do-not-use-f0eba89d8d6862087755141ac37bbb3bf9d3a714.tar drakx-backup-do-not-use-f0eba89d8d6862087755141ac37bbb3bf9d3a714.tar.gz drakx-backup-do-not-use-f0eba89d8d6862087755141ac37bbb3bf9d3a714.tar.bz2 drakx-backup-do-not-use-f0eba89d8d6862087755141ac37bbb3bf9d3a714.tar.xz drakx-backup-do-not-use-f0eba89d8d6862087755141ac37bbb3bf9d3a714.zip | |
fake support the firewire in stage1 (as if it were usb ;p)
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/modules.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/modules.h | 1 | ||||
| -rw-r--r-- | mdk-stage1/probing.c | 2 | ||||
| -rwxr-xr-x | mdk-stage1/usb-resource/update-usb-ids.pl | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index 1fe1cd42a..083a81e6a 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -197,7 +197,7 @@ static void add_modules_conf(char * str) } -static int module_already_present(const char * name) +int module_already_present(const char * name) { FILE * f; int answ = 0; diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h index a5fccb609..5e14764d7 100644 --- a/mdk-stage1/modules.h +++ b/mdk-stage1/modules.h @@ -24,6 +24,7 @@ void init_modules_insmoding(void); enum insmod_return my_insmod(const char * mod_name, enum driver_type type, char * options); enum return_type ask_insmod(enum driver_type); void update_modules(void); +int module_already_present(const char * name); struct module_deps_elem { char * name; diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 077a664d3..d46c35e4d 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -244,6 +244,8 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u if (!already_mounted_usbdev) { already_mounted_usbdev = 1; my_insmod("usb-storage", SCSI_ADAPTERS, NULL); + if (module_already_present("ieee1394")) + my_insmod("sbp2", SCSI_ADAPTERS, NULL); if (mount("/proc/bus/usb", "/proc/bus/usb", "usbdevfs", 0, NULL)) { log_message("USB: couldn't mount /proc/bus/usb"); goto end_usb_probe; diff --git a/mdk-stage1/usb-resource/update-usb-ids.pl b/mdk-stage1/usb-resource/update-usb-ids.pl index 2a54a678b..187c7f5c0 100755 --- a/mdk-stage1/usb-resource/update-usb-ids.pl +++ b/mdk-stage1/usb-resource/update-usb-ids.pl @@ -24,7 +24,7 @@ print "struct pci_module_map usb_pci_ids[] = { "; while (my ($k, $v) = each %$pci) { - $v->[0] =~ /^usb-|^ehci-hcd/ or next; + $v->[0] =~ /^usb-|^ehci-hcd|^ohci1394/ or next; $k =~ /^(....)(....)/; printf qq|\t{ 0x%s, 0x%s, "", "%s" },\n|, $1, $2, $v->[0]; |