summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/cdrom.c6
-rw-r--r--mdk-stage1/disk.c6
-rw-r--r--mdk-stage1/modules.c4
-rw-r--r--mdk-stage1/probing.c24
-rw-r--r--mdk-stage1/probing.h2
5 files changed, 21 insertions, 21 deletions
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index deb635ca5..922345f70 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -171,7 +171,7 @@ enum return_type cdrom_prepare(void)
if (count == 0) {
stg1_error_message("No CDROM device found.");
- i = ask_insmod(SCSI_ADAPTERS);
+ i = ask_insmod(MEDIA_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;
return cdrom_prepare();
@@ -181,7 +181,7 @@ enum return_type cdrom_prepare(void)
results = try_with_device(*medias, *medias_models);
if (results == RETURN_OK)
return RETURN_OK;
- i = ask_insmod(SCSI_ADAPTERS);
+ i = ask_insmod(MEDIA_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;
return cdrom_prepare();
@@ -206,7 +206,7 @@ enum return_type cdrom_prepare(void)
if (results == RETURN_BACK)
return cdrom_prepare();
- i = ask_insmod(SCSI_ADAPTERS);
+ i = ask_insmod(MEDIA_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;
return cdrom_prepare();
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index d87247562..421cb5a67 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -123,7 +123,7 @@ enum return_type disk_prepare(void)
if (count == 0) {
stg1_error_message("No DISK drive found.");
- i = ask_insmod(SCSI_ADAPTERS);
+ i = ask_insmod(MEDIA_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;
return disk_prepare();
@@ -133,7 +133,7 @@ enum return_type disk_prepare(void)
results = try_with_device(*medias);
if (results != RETURN_ERROR)
return results;
- i = ask_insmod(SCSI_ADAPTERS);
+ i = ask_insmod(MEDIA_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;
return disk_prepare();
@@ -149,7 +149,7 @@ enum return_type disk_prepare(void)
results = try_with_device(choice);
if (results != RETURN_ERROR)
return results;
- i = ask_insmod(SCSI_ADAPTERS);
+ i = ask_insmod(MEDIA_ADAPTERS);
if (i == RETURN_BACK)
return RETURN_BACK;
return disk_prepare();
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 5667256a9..47c52efbb 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -459,8 +459,8 @@ enum return_type ask_insmod(enum driver_type type)
if (modules && *modules) {
char * mytype;
char msg[200];
- if (type == SCSI_ADAPTERS)
- mytype = "SCSI";
+ if (type == MEDIA_ADAPTERS)
+ mytype = "MEDIA";
else if (type == NETWORK_DEVICES)
mytype = "NET";
else
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index f5d7ef545..16b52fabb 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -263,13 +263,13 @@ void discovered_device(enum driver_type type, const char * description, const ch
enum insmod_return failed = INSMOD_FAILED;
#ifndef DISABLE_MEDIAS
- if (type == SCSI_ADAPTERS) {
+ if (type == MEDIA_ADAPTERS) {
const char * alternate = NULL;
wait_message("Loading driver for media adapter:\n \n%s", description);
- failed = my_insmod(driver, SCSI_ADAPTERS, NULL, 1);
+ failed = my_insmod(driver, MEDIA_ADAPTERS, NULL, 1);
alternate = get_alternate_module(driver);
if (!IS_NOAUTO && alternate) {
- failed = failed || my_insmod(alternate, SCSI_ADAPTERS, NULL, 1);
+ failed = failed || my_insmod(alternate, MEDIA_ADAPTERS, NULL, 1);
}
remove_wait_message();
warning_insmod_failed(failed);
@@ -312,11 +312,11 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
switch (type) {
#ifndef DISABLE_PCIADAPTERS
#ifndef DISABLE_MEDIAS
- static int already_probed_scsi_adapters = 0;
- case SCSI_ADAPTERS:
- if (already_probed_scsi_adapters)
+ static int already_probed_media_adapters = 0;
+ case MEDIA_ADAPTERS:
+ if (already_probed_media_adapters)
goto end_pci_probe;
- already_probed_scsi_adapters = 1;
+ already_probed_media_adapters = 1;
pci_modules = medias_pci_modules;
pci_modules_len = medias_pci_modules_len;
break;
@@ -410,7 +410,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
switch (type) {
#ifndef DISABLE_MEDIAS
- case SCSI_ADAPTERS:
+ case MEDIA_ADAPTERS:
pcmciadb = medias_pcmcia_ids;
len = medias_pcmcia_num_ids;
break;
@@ -484,14 +484,14 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
}
#endif
- /* be sure to load usb-storage after SCSI adapters, so that they are in
+ /* be sure to load usb-storage after media adapters, so that they are in
same order than reboot, so that naming is the same */
- if (type == SCSI_ADAPTERS && already_probed_usb_controllers && !already_loaded_usb_scsi) {
+ if (type == MEDIA_ADAPTERS && already_probed_usb_controllers && !already_loaded_usb_scsi) {
already_loaded_usb_scsi = 1;
/* we can't allow additional modules floppy since we need usbkbd for keystrokes of usb keyboards */
- my_insmod("usb_storage", SCSI_ADAPTERS, NULL, 0);
+ my_insmod("usb_storage", MEDIA_ADAPTERS, NULL, 0);
if (module_already_present("ieee1394"))
- my_insmod("sbp2", SCSI_ADAPTERS, NULL, 0);
+ my_insmod("sbp2", MEDIA_ADAPTERS, NULL, 0);
wait_message("Detecting USB mass-storage devices.");
sleep(10); /* sucking background work */
remove_wait_message();
diff --git a/mdk-stage1/probing.h b/mdk-stage1/probing.h
index 7dc1d3360..bb185ef95 100644
--- a/mdk-stage1/probing.h
+++ b/mdk-stage1/probing.h
@@ -24,7 +24,7 @@
enum media_type { CDROM, DISK, FLOPPY, TAPE, UNKNOWN_MEDIA };
-enum driver_type { SCSI_ADAPTERS, NETWORK_DEVICES, USB_CONTROLLERS, ANY_DRIVER_TYPE };
+enum driver_type { MEDIA_ADAPTERS, NETWORK_DEVICES, USB_CONTROLLERS, ANY_DRIVER_TYPE };
enum media_bus { BUS_IDE, BUS_SCSI, BUS_USB, BUS_PCMCIA, BUS_ANY };
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 17:43:59 +0000