X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fmodules.c;h=cbcf859b3dacee167704b997cf3bda34e0671543;hb=9c4eedf4893f851bd1ba60ce541c8d098a9ef7f7;hp=544e86611aae8ad2e05dc5d1a90a60ac7292835c;hpb=12dead97026f98253325bb6fa90500c89f792d61;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/modules.c b/KernelLand/Kernel/modules.c
index 544e8661..cbcf859b 100644
--- a/KernelLand/Kernel/modules.c
+++ b/KernelLand/Kernel/modules.c
@@ -12,6 +12,7 @@
 
 // === PROTOTYPES ===
  int	Module_int_Initialise(tModule *Module, const char *ArgString);
+size_t	Modules_int_PopulateBuiltins(tModule **Array);
 void	Modules_int_GetBuiltinArray(void);
 void	Modules_LoadBuiltins(void);
 void	Modules_SetBuiltinParams(const char *Name, char *ArgString);
@@ -202,59 +203,51 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 	LEAVE_RET('i', 0);
 }
 
-/**
- * \brief Scans the builtin modules and creates an array of them
- */
-void Modules_int_GetBuiltinArray(void)
+size_t Modules_int_PopulateBuiltins(tModule **Array)
 {
-	 int	i;
-	tModule	*module;
-	
-	// Count
-	module = &gKernelModules;
-	i = 0;
-	while( (tVAddr)module < (tVAddr)&gKernelModulesEnd )
+	size_t	count = 0;
+	for( tModule *module = &gKernelModules; module < (tModule*)&gKernelModulesEnd; )
 	{
 		if(module->Magic == MODULE_MAGIC) {
-			i ++;
+			if( Array ) {
+				Array[count] = module;
+			}
+			count ++;
 			module ++;
 		}
-		else
+		else {
 			module = (void*)( (tVAddr)module + 4 );
+		}
 	}
-	
-	// Create
-	giNumBuiltinModules = i;
-	gasBuiltinModuleArgs = calloc( giNumBuiltinModules, sizeof(char*) );
-	gapBuiltinModules = malloc( giNumBuiltinModules * sizeof(tModule*) );
-	
-	
-	// Fill
-	module = &gKernelModules;
-	i = 0;
-	while( (tVAddr)module < (tVAddr)&gKernelModulesEnd )
+	return count;
+}
+
+/**
+ * \brief Scans the builtin modules and creates an array of them
+ */
+void Modules_int_GetBuiltinArray(void)
+{
+	if( !gapBuiltinModules )
 	{
-		if(module->Magic == MODULE_MAGIC) {
-			gapBuiltinModules[i] = module;
-			i ++;
-			module ++;
-		}
-		else
-			module = (void*)( (tVAddr)module + 4 );
+		// Count
+		giNumBuiltinModules = Modules_int_PopulateBuiltins(NULL);
+		
+		// Create
+		gasBuiltinModuleArgs = calloc( giNumBuiltinModules, sizeof(char*) );
+		gapBuiltinModules = malloc( giNumBuiltinModules * sizeof(tModule*) );
+		
+		// Fill
+		Modules_int_PopulateBuiltins(gapBuiltinModules);
 	}
 }
 
 /**
  * \brief Initialises builtin modules
  */
-void Modules_LoadBuiltins()
+void Modules_LoadBuiltins(void)
 {
-	 int	i;
-	
-	if( !gapBuiltinModules )
-		Modules_int_GetBuiltinArray();
-	
-	for( i = 0; i < giNumBuiltinModules; i++ )
+	Modules_int_GetBuiltinArray();
+	for( int i = 0; i < giNumBuiltinModules; i++ )
 	{
 		Module_int_Initialise(
 			gapBuiltinModules[i],
@@ -341,7 +334,7 @@ int Module_LoadMem(void *Buffer, Uint Length, const char *ArgString)
 	
 	VFS_GetMemPath(path, Buffer, Length);
 	
-	return Module_LoadFile( path, ArgString );
+	return Module_LoadFile( path, ArgString ) == EOK;
 }
 
 /**
@@ -360,15 +353,15 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 	// Error check
 	if(base == NULL) {
 		Log_Warning("Module", "Module_LoadFile - Unable to load '%s'", Path);
-		return 0;
+		return ENOENT;
 	}
 
 	// TODO: I need a way of relocating the dependencies before everything else, so
 	// they can be resolved before any other link errors
 	if( !Binary_Relocate(base) ) {
-		Log_Warning("Relocation of module %s failed", Path);
+		Log_Warning("Module", "Relocation of module %s failed", Path);
 		Binary_Unload(base);
-		return 0;
+		return EINVAL;
 	}
 	
 	// Check for Acess Driver
@@ -384,24 +377,34 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 		if( !loader ) {
 			Binary_Unload(base);
 			Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
-			return 0;
+			return EINVAL;
 		}
 	}
 
-	if( !Module_int_ResolveDeps(info) ) {
-		Log_Warning("Dependencies not met for '%s'", Path);
-		Binary_Unload(base);
-		return 0;
+	if( loader )
+	{
+		if( loader->Loader(base, ArgString) )
+		{
+			Binary_Unload(base);
+			return EINVAL;
+		}
 	}
-
-	// Initialise (and register)
-	if( loader ? loader->Loader(base) : Module_int_Initialise( info, ArgString ) )
+	else
 	{
-		Binary_Unload(base);
-		return 0;
+		if( !Module_int_ResolveDeps(info) ) {
+			Log_Warning("Module", "Dependencies not met for '%s'", Path);
+			Binary_Unload(base);
+			return EINVAL;
+		}
+		
+		if( Module_int_Initialise(info, ArgString) )
+		{
+			Binary_Unload(base);
+			return EINVAL;
+		}
 	}
 	
-	return 1;
+	return 0;
 }
 
 /**