when available, always load usb interface, as soon as possible, should help usb mouse detection in stage2 which otherwise timeouts

4 files changed, 3 insertions, 21 deletions

diff --git a/mdk-stage1/frontend-common.c b/mdk-stage1/frontend-common.c
index fac4bccd0..601fa312f 100644
--- a/mdk-stage1/frontend-common.c
+++ b/mdk-stage1/frontend-common.c
@@ -23,7 +23,6 @@
 void info_message(char *msg, ...)
 {
 	va_list args;
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	va_start(args, msg);
 	vinfo_message(msg, args);
 	va_end(args);
@@ -40,7 +39,6 @@ void wait_message(char *msg, ...)
 void error_message(char *msg, ...)
 {
 	va_list args;
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	va_start(args, msg);
 	verror_message(msg, args);
 	va_end(args);
diff --git a/mdk-stage1/newt-frontend.c b/mdk-stage1/newt-frontend.c
index 0c740f42f..750d3e0ac 100644
--- a/mdk-stage1/newt-frontend.c
+++ b/mdk-stage1/newt-frontend.c
@@ -59,13 +59,11 @@ void finish_frontend(void)
 
 void verror_message(char *msg, va_list ap)
 {
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	newtWinMessagev("Error", "Ok", msg, ap);
 }
 
 void vinfo_message(char *msg, va_list ap)
 {
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	newtWinMessagev("Notice", "Ok", msg, ap);
 }
 
@@ -179,8 +177,6 @@ enum return_type ask_from_list_comments(char *msg, char ** elems, char ** elems_
 	char ** sav_elems = elems;
 	int i;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	i = 0;
 	while (elems && *elems) {
 		int j = (*elems_comments) ? strlen(*elems_comments) : 0;
@@ -212,8 +208,6 @@ enum return_type ask_from_list(char *msg, char ** elems, char ** choice)
 {
 	int answer = 0, rc;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	rc = newtWinMenu("Please choose...", msg, 52, 5, 5, 7, elems, &answer, "Ok", "Cancel", NULL);
 
 	if (rc == 2)
@@ -229,8 +223,6 @@ enum return_type ask_yes_no(char *msg)
 {
 	int rc;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	rc = newtWinTernary("Please answer...", "Yes", "No", "Back", msg);
 
 	if (rc == 1)
@@ -368,8 +360,6 @@ enum return_type ask_from_entries(char *msg, char ** questions, char *** answers
 	int rc;
 	char ** already_answers = NULL;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	while (questions && *questions) {
 		entries[i].text = *questions;
 		entries[i].flags = NEWT_FLAG_SCROLL | (!strcmp(*questions, "Password") ? NEWT_FLAG_PASSWORD : 0);
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index fe933684c..95694308f 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -583,6 +583,9 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
 	if (!IS_NOAUTO)
 		handle_pcmcia(&pcmcia_adapter);
 #endif
+        
+        // load usb interface as soon as possible, helps usb mouse detection in stage2 */
+	probe_that_type(USB_CONTROLLERS, BUS_USB);
 
 	if (IS_CHANGEDISK)
 		stg1_info_message("You are starting the installation with an alternate booting method. "
diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c
index 45d9177a2..a5a2fb576 100644
--- a/mdk-stage1/stdio-frontend.c
+++ b/mdk-stage1/stdio-frontend.c
@@ -176,13 +176,11 @@ static void blocking_msg(char *type, char *fmt, va_list ap)
 
 void verror_message(char *msg, va_list ap)
 {
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	blocking_msg("> Error! ", msg, ap);
 }
 
 void vinfo_message(char *msg, va_list ap)
 {
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	blocking_msg("> Notice: ", msg, ap);
 }
 
@@ -254,8 +252,6 @@ enum return_type ask_from_list_comments(char *msg, char ** elems, char ** elems_
 	int i = 1;
 	int j = 0;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	while (elems && *elems) {
 		elems++;
 		i++;
@@ -310,7 +306,6 @@ enum return_type ask_from_list_comments(char *msg, char ** elems, char ** elems_
 
 enum return_type ask_from_list(char *msg, char ** elems, char ** choice)
 {
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
 	return ask_from_list_comments(msg, elems, NULL, choice);
 }
 
@@ -319,8 +314,6 @@ enum return_type ask_yes_no(char *msg)
 {
 	int j;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	printf("> %s\n[0] Yes  [1] No  [2] Back\n? ", msg);
 
 	j = get_int_response();
@@ -338,8 +331,6 @@ enum return_type ask_from_entries(char *msg, char ** questions, char *** answers
 	int j, i = 0;
 	char ** already_answers = NULL;
 
-	probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so...
-
 	printf("> %s\n", msg);
 
 	while (questions && *questions) {