if you get to manual device selectoin and don't have any devices of

the required type, we now ask if you want to load a driver disk. (#80222)

also fix the load driver from driver disk action for the manual driver selection
screen

4 files changed, 48 insertions, 30 deletions

diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c
index bb506da4a..f4f6618a0 100644
--- a/loader2/driverdisk.c
+++ b/loader2/driverdisk.c
@@ -304,7 +304,7 @@ int loadDriverFromMedia(int class, moduleList modLoaded,
                  * beginning with them */
                 stage = DEV_DEVICE;
             } else {
-                rc = chooseManualDriver(class, modLoaded, *modDepsPtr, modInfo,
+                rc = chooseManualDriver(class, modLoaded, modDepsPtr, modInfo,
                                         kd, flags);
                 /* if they go back from a manual driver, we'll ask again.
                  * if they load something, assume it's what we need */
diff --git a/loader2/driverdisk.h b/loader2/driverdisk.h
index b0f47a190..41e7c7498 100644
--- a/loader2/driverdisk.h
+++ b/loader2/driverdisk.h
@@ -16,8 +16,8 @@ int loadDriverDisks(int class, moduleList modLoaded,
 int getRemovableDevices(char *** devNames);
 
 
-int chooseManualDriver(int class, moduleList modLoaded, moduleDeps modDeps,
-                       moduleInfoSet modInfo, struct knownDevices * kd, 
-                       int flags);
+int chooseManualDriver(int class, moduleList modLoaded, 
+                       moduleDeps * modDepsPtr, moduleInfoSet modInfo, 
+                       struct knownDevices * kd, int flags);
 
 #endif
diff --git a/loader2/driverselect.c b/loader2/driverselect.c
index 9e3564af9..9e88b8da3 100644
--- a/loader2/driverselect.c
+++ b/loader2/driverselect.c
@@ -28,6 +28,7 @@
 #include "log.h"
 #include "lang.h"
 #include "hardware.h"
+#include "driverdisk.h"
 
 struct sortModuleList {
     int index;
@@ -139,14 +140,17 @@ static int getManualModuleArgs(struct moduleInfo * mod, char *** moduleArgs) {
     return LOADER_OK;
 }
 
-int chooseManualDriver(int class, moduleList modLoaded, moduleDeps modDeps,
-                       moduleInfoSet modInfo, struct knownDevices * kd, 
-                       int flags) {
+int chooseManualDriver(int class, moduleList modLoaded, 
+                       moduleDeps * modDepsPtr, moduleInfoSet modInfo, 
+                       struct knownDevices * kd, int flags) {
     int i, numSorted, num = 0, done = 0;
     enum driverMajor type;
     struct sortModuleList * sortedOrder;
     char giveArgs = ' ';
     char ** moduleArgs = NULL;
+    moduleDeps modDeps;
+
+    modDeps = *modDepsPtr;
 
     newtComponent text, f, ok, back, argcheckbox, listbox;
     newtGrid grid, buttons;
@@ -165,24 +169,35 @@ int chooseManualDriver(int class, moduleList modLoaded, moduleDeps modDeps,
         return LOADER_ERROR;
     }
 
-    sortedOrder = malloc(sizeof(*sortedOrder) * modInfo->numModules);
-    numSorted = 0;
-
-    for (i = 0; i < modInfo->numModules; i++) {
-        if (mlModuleInList(modInfo->moduleList[i].moduleName, modLoaded) ||
-            !modInfo->moduleList[i].description ||
-            ((type >= 0) && (type != modInfo->moduleList[i].major)))
+    do {
+        sortedOrder = malloc(sizeof(*sortedOrder) * modInfo->numModules);
+        numSorted = 0;
+        
+        for (i = 0; i < modInfo->numModules; i++) {
+            if (mlModuleInList(modInfo->moduleList[i].moduleName, modLoaded) ||
+                !modInfo->moduleList[i].description ||
+                ((type >= 0) && (type != modInfo->moduleList[i].major)))
+                continue;
+            sortedOrder[numSorted].index = i;
+            sortedOrder[numSorted++].modInfo = modInfo;
+        }
+        
+        if (numSorted == 0) {
+            i = newtWinChoice(_("No drivers found"), _("Load driver disk"), 
+                              _("Back"), _("No drivers were found to manually "
+                                           "insert.  Would you like to use "
+                                           "a driver disk?"));
+            if (i != 1)
+                return LOADER_BACK;
+            
+            loadDriverFromMedia(class, modLoaded, modDepsPtr, modInfo, kd,
+                                flags, 1);
             continue;
-        sortedOrder[numSorted].index = i;
-        sortedOrder[numSorted++].modInfo = modInfo;
-    }
-
-    if (numSorted == 0) {
-        /* JKFIXME: if no drivers to load, should we ask about driver disk? */
-        logMessage("no drivers to load");
-        return LOADER_BACK;
-    }
-
+        } else {
+            break;
+        }
+    } while (1);
+        
     qsort(sortedOrder, numSorted, sizeof(*sortedOrder), sortDrivers);
 
     f = newtForm(NULL, NULL, 0);
@@ -228,9 +243,7 @@ int chooseManualDriver(int class, moduleList modLoaded, moduleDeps modDeps,
         if (es.reason == NEWT_EXIT_COMPONENT && es.u.co == back) {
             done = -1;
         } else if (es.reason == NEWT_EXIT_HOTKEY && es.u.key == NEWT_KEY_F2) {
-            logMessage("need to go to load a driver disk here");
-            /* JKFIXME: ^^^ */
-            done = -1;
+            done = -2;
         } else {
             if (giveArgs != ' ') {
                 i = getManualModuleArgs(&(modInfo->moduleList[num]), 
@@ -251,7 +264,12 @@ int chooseManualDriver(int class, moduleList modLoaded, moduleDeps modDeps,
 
     if (done == -1) 
         return LOADER_BACK;
-
+    if (done == -2) {
+        loadDriverFromMedia(class, modLoaded, modDepsPtr, modInfo, kd,
+                            flags, 1);
+        return chooseManualDriver(class, modLoaded, modDepsPtr, modInfo, 
+                                  kd, flags);
+    }
 
     mlLoadModule(modInfo->moduleList[num].moduleName, modLoaded, modDeps,
                  modInfo, moduleArgs, flags);
diff --git a/loader2/loader.c b/loader2/loader.c
index bb29f6bf1..03f72d808 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -708,7 +708,7 @@ static char *doLoaderMain(char * location,
             }
 
             chooseManualDriver(installMethods[validMethods[methodNum]].deviceType,
-                                    modLoaded, *modDepsPtr, modInfo, kd, flags);
+                                    modLoaded, modDepsPtr, modInfo, kd, flags);
             /* it doesn't really matter what we return here; we just want
              * to reprobe and make sure we have the driver */
             step = STEP_DRIVER;
@@ -799,7 +799,7 @@ static int manualDeviceCheck(moduleInfoSet modInfo, moduleList modLoaded,
         if (rc != 2)
             break;
 
-        chooseManualDriver(CLASS_UNSPEC, modLoaded, *modDepsPtr, modInfo, 
+        chooseManualDriver(CLASS_UNSPEC, modLoaded, modDepsPtr, modInfo, 
                            kd, flags);
     } while (1);
     return 0;