cleaned up location handling

5 files changed, 40 insertions, 40 deletions

diff --git a/loader/devices.c b/loader/devices.c
index d98b2cc55..0206bc10b 100644
--- a/loader/devices.c
+++ b/loader/devices.c
@@ -241,7 +241,7 @@ int devLoadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded,
 
 	if (rc == 2) return LOADER_BACK;
 
-	mlLoadModule("vfat", NULL, modLoaded, (*modDepsPtr), NULL, modInfo, 
+	mlLoadModule("vfat", modLoaded, (*modDepsPtr), NULL, modInfo, 
 		     flags);
 
 	ddi->device = strdup(device);
@@ -422,7 +422,7 @@ int devDeviceMenu(enum driverMajor type, moduleInfoSet modInfo,
 	scsiWindow(mod->moduleName);
 	sleep(1);
     }
-    rc = mlLoadModule(mod->moduleName, mod->locationID, modLoaded, 
+    rc = mlLoadModule(mod->moduleName, modLoaded, 
 		      *modDepsPtr, args, modInfo, flags);
     if (mod->major == DRIVER_SCSI) newtPopWindow();
 
diff --git a/loader/loader.c b/loader/loader.c
index 71fa51992..19f09544f 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -431,7 +431,6 @@ int busProbe(moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps,
 		} else {
 		    if (modList[i]->major == DRIVER_NET) {
 			mlLoadModule(modList[i]->moduleName, 
-				     modList[i]->locationID, 
 				     modLoaded, modDeps, NULL, modInfo, flags);
 		    }
 		}
@@ -443,7 +442,7 @@ int busProbe(moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps,
 
 		    scsiWindow(modList[i]->moduleName);
 		    mlLoadModule(modList[i]->moduleName, 
-				 modList[i]->locationID, modLoaded, modDeps, 
+				 modLoaded, modDeps, 
 				 NULL, modInfo, flags);
 		    sleep(1);
 		    newtPopWindow();
@@ -759,7 +758,7 @@ static char * mountHardDrive(struct installMethod * method,
     static int ufsloaded;
     #endif
 
-    mlLoadModule("vfat", NULL, modLoaded, *modDepsPtr, 
+    mlLoadModule("vfat", modLoaded, *modDepsPtr, 
 		 NULL, modInfo, flags);
 
     while (!done) {
@@ -778,7 +777,7 @@ static char * mountHardDrive(struct installMethod * method,
 			      case BALKAN_PART_UFS:
 				if (!ufsloaded) {
 				    ufsloaded = 1;
-				    mlLoadModule("ufs", NULL, modLoaded, 
+				    mlLoadModule("ufs", modLoaded, 
 						 *modDepsPtr, NULL, modInfo, 
 						 flags);
 				}
@@ -1120,7 +1119,7 @@ static char * mountNfsImage(struct installMethod * method,
 		break;
 	    }
 
-	    mlLoadModule("nfs", NULL, modLoaded, *modDepsPtr, NULL, modInfo, 
+	    mlLoadModule("nfs", modLoaded, *modDepsPtr, NULL, modInfo, 
 			 flags);
 	    fullPath = alloca(strlen(host) + strlen(dir) + 2);
 	    sprintf(fullPath, "%s:%s", host, dir);
@@ -1576,7 +1575,7 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
 	    }
 
 	    if (!strcmp(ddi->fs, "vfat"))
-		mlLoadModule("vfat", NULL, modLoaded, *modDepsPtr, NULL, 
+		mlLoadModule("vfat", modLoaded, *modDepsPtr, NULL, 
 			     modInfo, flags);
 
 	    logMessage("looking for driver disk (%s, %s, %s)",
@@ -1631,7 +1630,7 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
 	else
 	    optv = NULL;
 
-	rc = mlLoadModule(device, mi->locationID, modLoaded, 
+	rc = mlLoadModule(device, modLoaded, 
 			  *modDepsPtr, optv, modInfo, flags);
 	if (optv) free(optv);
 
@@ -1779,7 +1778,7 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
 #ifdef INCLUDE_NETWORK
     if (ksType == KS_CMD_NFS) {
 	int count = 0;
-	mlLoadModule("nfs", NULL, modLoaded, *modDepsPtr, NULL, modInfo, flags);
+	mlLoadModule("nfs", modLoaded, *modDepsPtr, NULL, modInfo, flags);
 	fullPath = alloca(strlen(host) + strlen(dir) + 2);
 	sprintf(fullPath, "%s:%s", host, dir);
 
@@ -2042,7 +2041,7 @@ int kickstartFromNfs(struct knownDevices * kd, char * location,
 
     logMessage("ks server: %s file: %s", ksPath, file);
 
-    mlLoadModule("nfs", NULL, modLoaded, *modDepsPtr, NULL, NULL, flags);
+    mlLoadModule("nfs", modLoaded, *modDepsPtr, NULL, NULL, flags);
 
     if (doPwMount(ksPath, "/tmp/nfskd", "nfs", 1, 0, NULL, NULL)) {
 	logMessage("failed to mount %s", ksPath);
@@ -2150,9 +2149,9 @@ int kickstartFromHardDrive(char * location,
     char * fileName;
     char * fullFn;
 
-    mlLoadModule("vfat", NULL, modLoaded, *modDepsPtr, NULL, NULL, flags);
+    mlLoadModule("vfat", modLoaded, *modDepsPtr, NULL, NULL, flags);
 #ifdef __sparc__
-    mlLoadModule("ufs", NULL, modLoaded, *modDepsPtr, NULL, NULL, flags);
+    mlLoadModule("ufs", modLoaded, *modDepsPtr, NULL, NULL, flags);
 #endif
 
     fileName = strchr(source, '/');
@@ -2193,7 +2192,7 @@ int kickstartFromHardDrive(char * location,
 
 int kickstartFromFloppy(char * location, moduleList modLoaded,
 			moduleDeps * modDepsPtr, int flags) {
-    mlLoadModule("vfat", NULL, modLoaded, *modDepsPtr, NULL, NULL, flags);
+    mlLoadModule("vfat", modLoaded, *modDepsPtr, NULL, NULL, flags);
 
     if (devMakeInode(floppyDevice, "/tmp/floppy"))
 	return 1;
@@ -2348,7 +2347,7 @@ void loadUfs(struct knownDevices *kd, moduleList modLoaded,
 		    for (j = 0; j < table.maxNumPartitions; j++) {
 			if (table.parts[j].type == BALKAN_PART_UFS) {
 			    if (!ufsloaded) {
-				mlLoadModule("ufs", NULL, modLoaded, 
+				mlLoadModule("ufs", modLoaded, 
 					     *modDepsPtr, NULL, NULL, flags);
 				ufsloaded = 1;
 			    }
@@ -2420,7 +2419,7 @@ static int usbInitialize(moduleList modLoaded, moduleDeps modDeps,
     }
 
     logMessage("found USB controller %s", devices[0]->driver);
-    if (mlLoadModule(devices[0]->driver, NULL, modLoaded, modDeps, NULL, 
+    if (mlLoadModule(devices[0]->driver, modLoaded, modDeps, NULL, 
 		 modInfo, flags)) {
 	logMessage("failed to insert usb module");
 	return 1;
@@ -2430,7 +2429,7 @@ static int usbInitialize(moduleList modLoaded, moduleDeps modDeps,
 		  NULL, NULL))
 	logMessage("failed to mount device usbdevfs: %s", strerror(errno));
 
-    mlLoadModule("hid:keybdev:usb-storage", NULL, modLoaded, modDeps, NULL, 
+    mlLoadModule("hid:keybdev:usb-storage", modLoaded, modDeps, NULL, 
 		 modInfo, flags);
 
     return 0;
@@ -2446,7 +2445,7 @@ static void usbInitializeMouse(moduleList modLoaded, moduleDeps modDeps,
     logMessage("looking for USB mouse...");
     if (probeDevices(CLASS_MOUSE, BUS_USB, PROBE_ALL)) {
 	logMessage("USB mouse found, loading mousedev module");
-	if (mlLoadModule("mousedev", NULL, modLoaded, modDeps, NULL, modInfo, 
+	if (mlLoadModule("mousedev", modLoaded, modDeps, NULL, modInfo, 
 			 flags)) {
 	    logMessage ("failed to loading mousedev module");
 	    return;
@@ -2482,7 +2481,7 @@ static int agpgartInitialize(moduleList modLoaded, moduleDeps modDeps,
 	    logMessage("found %s card requiring agpgart, loading module",
 		       p->driver+5);
 	    
-	    if (mlLoadModule("agpgart", NULL, modLoaded, modDeps, NULL, 
+	    if (mlLoadModule("agpgart", modLoaded, modDeps, NULL, 
 			     modInfo, flags)) {
 		logMessage("failed to insert agpgart module");
 		return 1;
@@ -2500,7 +2499,7 @@ static int agpgartInitialize(moduleList modLoaded, moduleDeps modDeps,
 static void scsiSetup(moduleList modLoaded, moduleDeps modDeps,
 			      moduleInfoSet modInfo, int flags,
 			      struct knownDevices * kd) {
-    mlLoadModule("sd_mod:sr_mod", NULL, modLoaded, modDeps, NULL, modInfo, 
+    mlLoadModule("sd_mod:sr_mod", modLoaded, modDeps, NULL, modInfo, 
 		 flags);
 }
 
@@ -2509,7 +2508,7 @@ static void ideSetup(moduleList modLoaded, moduleDeps modDeps,
 			      struct knownDevices * kd) {
 
     /* This is fast enough that we don't need a screen to pop up */
-    mlLoadModule("ide-cd", NULL, modLoaded, modDeps, NULL, modInfo, flags);
+    mlLoadModule("ide-cd", modLoaded, modDeps, NULL, modInfo, flags);
 
     kdFindIdeList(kd, 0);
 }
@@ -2650,7 +2649,7 @@ int main(int argc, char ** argv) {
     modDeps = mlNewDeps();
     mlLoadDeps(&modDeps, "/modules/modules.dep");
 
-    mlLoadModule("cramfs", NULL, modLoaded, modDeps, NULL, modInfo, flags);
+    mlLoadModule("cramfs", modLoaded, modDeps, NULL, modInfo, flags);
 
     if (!continuing) {
 	ideSetup(modLoaded, modDeps, modInfo, flags, &kd);
@@ -2866,7 +2865,7 @@ int main(int argc, char ** argv) {
     /* We must look for cards which require the agpgart module */
     agpgartInitialize(modLoaded, modDeps, modInfo, flags);
 
-    mlLoadModule("raid0:raid1:raid5:msdos:vfat:ext3:reiserfs", NULL, 
+    mlLoadModule("raid0:raid1:raid5:msdos:vfat:ext3:reiserfs", 
 		 modLoaded, modDeps, NULL, modInfo, flags);
 
     usbInitializeMouse(modLoaded, modDeps, modInfo, flags);
diff --git a/loader/modules.c b/loader/modules.c
index b2c4c6c83..75a72d223 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -382,7 +382,7 @@ static int loadModule(const char * modName, char * path, moduleList modLoaded,
 
 /* loads a : separated list of modules. the arg only applies to the
    first module in the list */
-int mlLoadModuleSet(const char * origModNames, void * location, 
+int mlLoadModuleSet(const char * origModNames, 
 		    moduleList modLoaded, moduleDeps modDeps, char ** args, 
 		    moduleInfoSet modInfo, int flags) {
     char * modNames;
@@ -391,6 +391,7 @@ int mlLoadModuleSet(const char * origModNames, void * location,
     int i;
     char ** list, ** l;
     char ** paths, ** p;
+    struct moduleInfo * mi;
 
     start = modNames = alloca(strlen(origModNames) + 1);
     strcpy(modNames, origModNames);
@@ -427,8 +428,15 @@ int mlLoadModuleSet(const char * origModNames, void * location,
     }
 
     paths = NULL;
-    if (location)
-	paths = extractModules(location, list, paths); 
+    if (modInfo) {
+	for (i = 0; list[i]; i++) {
+	    if (paths && paths[i]) continue;
+	    mi = isysFindModuleInfo(modInfo, list[i]);
+
+	    if (mi && mi->locationID)
+		paths = extractModules(mi->locationID, list, paths); 
+	    }
+    }
 
     paths = extractModules(NULL, list, paths); 
     i = 0;
@@ -487,13 +495,6 @@ int mlLoadModuleSet(const char * origModNames, void * location,
     return i;
 }
 
-int mlLoadModule(const char * modName, void * location, moduleList modLoaded,
-	         moduleDeps modDeps, char ** args, moduleInfoSet modInfo,
-		 int flags) {
-    return mlLoadModuleSet(modName, location, modLoaded, modDeps, args,
-			   modInfo, flags);
-}
-
 char ** mlGetDeps(moduleDeps modDeps, const char * modName) {
     moduleDeps dep;
     
diff --git a/loader/modules.h b/loader/modules.h
index 3deed97f2..35adebc22 100644
--- a/loader/modules.h
+++ b/loader/modules.h
@@ -27,10 +27,10 @@ int mlReadLoadedList(moduleList * list);
 void mlFreeList(moduleList list);
 int mlLoadDeps(moduleDeps * moduleDepList, const char * path);
 moduleDeps mlNewDeps(void);
-int mlLoadModule(const char * modName, void * location, moduleList modLoaded,
-	         moduleDeps modDeps, char ** args, moduleInfoSet modInfo,
-		 int flags);
-int mlLoadModuleSet(const char * origModNames, void * location, 
+
+#define mlLoadModule mlLoadModuleSet
+
+int mlLoadModuleSet(const char * origModNames, 
 		    moduleList modLoaded, moduleDeps modDeps, char ** args, 
 		    moduleInfoSet modInfo, int flags);
 char ** mlGetDeps(moduleDeps modDeps, const char * modName);
diff --git a/loader/pcmcia.c b/loader/pcmcia.c
index 4175d7f99..9ba42c7be 100644
--- a/loader/pcmcia.c
+++ b/loader/pcmcia.c
@@ -91,7 +91,7 @@ int startPcmcia(char * floppyDevice, moduleList modLoaded, moduleDeps modDeps,
     logMessage("need to load %s", pcic);
 
     winStatus(40, 3, title, text);
-    if (mlLoadModule("pcmcia_core", NULL, modLoaded, modDeps, 
+    if (mlLoadModule("pcmcia_core", modLoaded, modDeps, 
 		     NULL, modInfo, flags)) {
 	logMessage("failed to load pcmcia_core -- ask for pcmciadd");
 	rc = 1;
@@ -125,7 +125,7 @@ int startPcmcia(char * floppyDevice, moduleList modLoaded, moduleDeps modDeps,
 		logMessage("read %s", buf);
 		if (i == 23 && !strcmp(buf, "PCMCIA Driver Diskette\n")) {
 		    winStatus(40, 3, title, text);
-		    if (mlLoadModule("pcmcia_core", NULL, modLoaded, modDeps, 
+		    if (mlLoadModule("pcmcia_core", modLoaded, modDeps, 
 				     NULL, modInfo, flags)) {
 			newtPopWindow();
 			newtWinMessage(_("Error"), _("OK"),
@@ -146,7 +146,7 @@ int startPcmcia(char * floppyDevice, moduleList modLoaded, moduleDeps modDeps,
 
     sprintf("%s:ds", pcic);
 
-    if (mlLoadModuleSet(pcic, NULL, modLoaded, modDeps, NULL, 
+    if (mlLoadModuleSet(pcic, modLoaded, modDeps, NULL, 
 		        modInfo, flags)) {
 	logMessage("failed to load pcic/ds");
 	umount("/modules");