X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmodules.c;h=44c4cb518fb77cd44f43102f61484e9b08f8218f;hb=c7c5c4dbeb7b298675856eebb36084c92e989d98;hp=b7209fff379a0ce706562dd706dd934d4445d06f;hpb=8fef00cfab98773a519ab909fa9da9dc7af692db;p=tpg%2Facess2.git

diff --git a/Kernel/modules.c b/Kernel/modules.c
index b7209fff..44c4cb51 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -6,14 +6,16 @@
 #include <modules.h>
 
 // === PROTOTYPES ===
+ int	Modules_LoadBuiltins();
  int	Module_LoadMem(void *Buffer, Uint Length, char *ArgString);
  int	Module_LoadFile(char *Path, char *ArgString);
  int	Module_int_ResolveDeps(tModule *Info);
  int	Module_IsLoaded(char *Name);
 
 // === IMPORTS ===
+extern void	StartupPrint(char *Str);
 extern tModule	gKernelModules[];
-extern void		gKernelModulesEnd;
+extern void	gKernelModulesEnd;
 
 // === GLOBALS ===
  int	giNumBuiltinModules = 0;
@@ -23,18 +25,88 @@ tModule	*gLoadedModules = NULL;
 // === CODE ===
 int Modules_LoadBuiltins()
 {
-	 int	i;
+	 int	i, j, k;
+	 int	numToInit = 0;
+	Uint8	*baIsLoaded;
+	char	**deps;
+	
 	giNumBuiltinModules = (Uint)&gKernelModulesEnd - (Uint)&gKernelModules;
 	giNumBuiltinModules /= sizeof(tModule);
 	
+	baIsLoaded = calloc( giNumBuiltinModules, sizeof(*baIsLoaded) );
+	
+	// Pass 1 - Are the dependencies compiled in?
 	for( i = 0; i < giNumBuiltinModules; i++ )
 	{
-		Log("Initialising %p '%s' v%i.%i...",
-			&gKernelModules[i],
-			gKernelModules[i].Name,
-			gKernelModules[i].Version>>8, gKernelModules[i].Version & 0xFF
-			);
-		gKernelModules[i].Init(NULL);
+		deps = gKernelModules[i].Dependencies;
+		if(deps)
+		{
+			for( j = 0; deps[j]; j++ )
+			{
+				for( k = 0; k < giNumBuiltinModules; k++ ) {
+					if(strcmp(deps[j], gKernelModules[k].Name) == 0)
+						break;
+				}
+				if(k == giNumBuiltinModules) {
+					Warning("Unable to find dependency '%s' for '%s' in kernel",
+						deps[j], gKernelModules[i].Name);
+					
+					baIsLoaded[i] = -1;	// Don't Load
+					break;
+				}
+			}
+		}
+		numToInit ++;
+	}
+	
+	// Pass 2 - Intialise
+	while(numToInit)
+	{
+		for( i = 0; i < giNumBuiltinModules; i++ )
+		{
+			if( baIsLoaded[i] )	continue;	// Ignore already loaded modules
+		
+			deps = gKernelModules[i].Dependencies;
+			
+			if( deps )
+			{
+				for( j = 0; deps[j]; j++ )
+				{
+					for( k = 0; k < giNumBuiltinModules; k++ ) {
+						if(strcmp(deps[j], gKernelModules[k].Name) == 0)
+							break;
+					}
+					// `k` is assumed to be less than `giNumBuiltinModules`
+					
+					// If a dependency failed, skip and mark as failed
+					if( baIsLoaded[k] == -1 ) {
+						baIsLoaded[i] = -1;
+						numToInit --;
+						break;
+					}
+					// If a dependency is not intialised, skip
+					if( !baIsLoaded[k] )	break;
+				}
+				// Check if we broke out
+				if( deps[j] )	continue;
+			}
+			
+			// All Dependencies OK? Initialise
+			StartupPrint(gKernelModules[i].Name);
+			Log("Initialising %p '%s' v%i.%i...",
+				&gKernelModules[i],
+				gKernelModules[i].Name,
+				gKernelModules[i].Version>>8, gKernelModules[i].Version & 0xFF
+				);
+			if( gKernelModules[i].Init(NULL) == 0 ) {
+				Log("Loading Failed, all modules that depend on this will also fail");
+				baIsLoaded[i] = -1;
+			}
+			// Mark as loaded
+			else
+				baIsLoaded[i] = 1;
+			numToInit --;
+		}
 	}
 	
 	return 0;
@@ -48,7 +120,7 @@ int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
 {
 	char	path[VFS_MEMPATH_SIZE];
 	
-	VFS_GetMemPath(Buffer, Length, path);
+	VFS_GetMemPath(path, Buffer, Length);
 	
 	return Module_LoadFile( path, ArgString );
 }
@@ -110,6 +182,12 @@ int Module_LoadFile(char *Path, char *ArgString)
 		return 0;
 	}
 	
+	Log("Initialising %p '%s' v%i.%i...",
+				info,
+				info->Name,
+				info->Version>>8, info->Version & 0xFF
+				);
+	
 	// Call Initialiser
 	//if( info->Init( ArgString ) != 0 )
 	if( info->Init( NULL ) == 0 )