Change prototype of chooseManualDriver to take a loaderData instead of several

module parameters.  Use new loadDriverFromMedia interface in hdinstall.c.

4 files changed, 20 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index f034dd646..129b9770b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-22  Chris Lumens  <clumens@redhat.com>
+
+	* loader2/driverdisk.h:  Change prototype of chooseManualDriver to
+	take a loaderData instead of several module parameters.
+	* loader2/driverselect.c (chooseManualDriver):  Likewise.
+
+	* loader2/hdinstall.c (mountHardDrive):  Use new loadDriverFromMedia
+	interface.
+
 2007-06-22  Peter Jones  <pjones@redhat.com>
 
 	* loader2/modules.c: Get rid of "modLocation" parameter to
diff --git a/loader2/driverdisk.h b/loader2/driverdisk.h
index 4eff9a02f..a9aece6e9 100644
--- a/loader2/driverdisk.h
+++ b/loader2/driverdisk.h
@@ -13,8 +13,7 @@ int loadDriverDisks(int class, struct loaderData_s *loaderData);
 
 int getRemovableDevices(char *** devNames);
 
-int chooseManualDriver(int class, moduleList modLoaded, 
-                       moduleDeps * modDepsPtr, moduleInfoSet modInfo);
+int chooseManualDriver(int class, struct loaderData_s *loaderData);
 void useKickstartDD(struct loaderData_s * loaderData, int argc, 
                     char ** argv);
 
diff --git a/loader2/driverselect.c b/loader2/driverselect.c
index fef90aed5..70b56771e 100644
--- a/loader2/driverselect.c
+++ b/loader2/driverselect.c
@@ -134,16 +134,14 @@ static int getManualModuleArgs(struct moduleInfo * mod, char *** moduleArgs) {
     return LOADER_OK;
 }
 
-int chooseManualDriver(int class, moduleList modLoaded, 
-                       moduleDeps * modDepsPtr, moduleInfoSet modInfo) {
+int chooseManualDriver(int class, struct loaderData_s *loaderData) {
     int i, numSorted, num = 0, done = 0;
     enum driverMajor type;
     struct sortModuleList * sortedOrder;
     char giveArgs = ' ';
     char ** moduleArgs = NULL;
-    moduleDeps modDeps;
-
-    modDeps = *modDepsPtr;
+    moduleDeps modDeps = *loaderData->modDepsPtr;
+    moduleInfoSet modInfo = loaderData->modInfo;
 
     newtComponent text, f, ok, back, argcheckbox, listbox;
     newtGrid grid, buttons;
@@ -168,7 +166,7 @@ int chooseManualDriver(int class, moduleList modLoaded,
         numSorted = 0;
         
         for (i = 0; i < modInfo->numModules; i++) {
-            if (mlModuleInList(modInfo->moduleList[i].moduleName, modLoaded) ||
+            if (mlModuleInList(modInfo->moduleList[i].moduleName, loaderData->modLoaded) ||
                 !modInfo->moduleList[i].description ||
                 ((type != DRIVER_ANY) && 
                  (type != modInfo->moduleList[i].major)))
@@ -185,7 +183,7 @@ int chooseManualDriver(int class, moduleList modLoaded,
             if (i != 1)
                 return LOADER_BACK;
             
-            loadDriverFromMedia(class, modLoaded, modDepsPtr, modInfo, 1, 1);
+            loadDriverFromMedia(class, loaderData, 1, 1);
             continue;
         } else {
             break;
@@ -259,11 +257,11 @@ int chooseManualDriver(int class, moduleList modLoaded,
     if (done == -1) 
         return LOADER_BACK;
     if (done == -2) {
-        loadDriverFromMedia(class, modLoaded, modDepsPtr, modInfo, 1, 1);
-        return chooseManualDriver(class, modLoaded, modDepsPtr, modInfo);
+        loadDriverFromMedia(class, loaderData, 1, 1);
+        return chooseManualDriver(class, loaderData);
     }
 
-    mlLoadModule(modInfo->moduleList[num].moduleName, modLoaded, modDeps,
+    mlLoadModule(modInfo->moduleList[num].moduleName, loaderData->modLoaded, modDeps,
                  modInfo, moduleArgs);
     free(sortedOrder);
 
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index 564ad8b54..5754a4c07 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -269,8 +269,7 @@ char * mountHardDrive(struct installMethod * method,
             if (rc == 2)
                 return NULL;
 
-            rc = loadDriverFromMedia(CLASS_HD, modLoaded, modDepsPtr, 
-                                     modInfo, 0, 0);
+            rc = loadDriverFromMedia(CLASS_HD, loaderData, 0, 0);
             if (rc == LOADER_BACK)
                 return NULL;
 
@@ -356,8 +355,7 @@ char * mountHardDrive(struct installMethod * method,
         if (es.reason == NEWT_EXIT_COMPONENT && es.u.co == back) {
             return NULL;
         } else if (es.reason == NEWT_EXIT_HOTKEY && es.u.key == NEWT_KEY_F2) {
-            rc = loadDriverFromMedia(CLASS_HD, modLoaded, modDepsPtr, 
-                                     modInfo, 0, 0);
+            rc = loadDriverFromMedia(CLASS_HD, loaderData, 0, 0);
             if (rc == LOADER_BACK)
                 return NULL;