summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-01-25 15:13:34 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-01-25 15:13:34 +0000
commit0360052d0fd202158ca96e48a171746a3cb8acf5 (patch)
tree51a6b91d56d6d138b751d9c3523731cc797245ec
parent49d815276d8ef491c7a20888331787411d548fb8 (diff)
downloaddrakx-0360052d0fd202158ca96e48a171746a3cb8acf5.tar
drakx-0360052d0fd202158ca96e48a171746a3cb8acf5.tar.gz
drakx-0360052d0fd202158ca96e48a171746a3cb8acf5.tar.bz2
drakx-0360052d0fd202158ca96e48a171746a3cb8acf5.tar.xz
drakx-0360052d0fd202158ca96e48a171746a3cb8acf5.zip
better tightness of probing stuff
-rw-r--r--mdk-stage1/probing.c12
-rw-r--r--mdk-stage1/probing.h13
2 files changed, 11 insertions, 14 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index d67719041..88b406b8a 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -49,13 +49,23 @@
#include "probing.h"
+enum bus_type { IDE, SCSI };
+
+struct media_info {
+ char * name;
+ char * model;
+ enum media_type type;
+ enum bus_type bus;
+};
+
+
static void warning_insmod_failed(void)
{
error_message("Warning, installation of driver failed.");
}
-void probe_that_type(enum driver_type type)
+static void probe_that_type(enum driver_type type)
{
if (IS_EXPERT)
ask_insmod(type);
diff --git a/mdk-stage1/probing.h b/mdk-stage1/probing.h
index cb01d4fa6..ecafa0e0a 100644
--- a/mdk-stage1/probing.h
+++ b/mdk-stage1/probing.h
@@ -24,21 +24,8 @@
enum media_type { CDROM, DISK, FLOPPY, TAPE, UNKNOWN_MEDIA };
-enum bus_type { IDE, SCSI };
-
-struct media_info {
- char * name;
- char * model;
- enum media_type type;
- enum bus_type bus;
-};
-
-enum media_query_type { QUERY_NAME, QUERY_MODEL };
-
enum driver_type { SCSI_ADAPTERS, NETWORK_DEVICES, ANY_DRIVER_TYPE };
-
-void probe_that_type(enum driver_type type);
void get_medias(enum media_type media, char *** names, char *** models);
char ** get_net_devices(void);