X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmodules.c;h=4b095bc5c52844f204e2dd05101572248c4632bf;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=68d5ba00161afc42c9e33567ce252f95dc32a880;hpb=7d2f8503550796a3cd42d01f944c2baa49a2fcfa;p=tpg%2Facess2.git

diff --git a/Kernel/modules.c b/Kernel/modules.c
index 68d5ba00..4b095bc5 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -10,7 +10,9 @@
 #define	USE_UDI	0
 
 // === PROTOTYPES ===
- int	Modules_LoadBuiltins(void);
+ int	Module_int_Initialise(tModule *Module, char *ArgString);
+void	Modules_LoadBuiltins(void);
+void	Modules_SetBuiltinParams(char *Name, char *ArgString);
  int	Module_RegisterLoader(tModuleLoader *Loader);
  int	Module_LoadMem(void *Buffer, Uint Length, char *ArgString);
  int	Module_LoadFile(char *Path, char *ArgString);
@@ -34,6 +36,7 @@ tSpinlock	glModuleSpinlock;
 tModule	*gLoadedModules = NULL;
 tModuleLoader	*gModule_Loaders = NULL;
 tModule	*gLoadingModules = NULL;
+char	**gasBuiltinModuleArgs;
 
 // === CODE ===
 /**
@@ -45,11 +48,12 @@ tModule	*gLoadingModules = NULL;
  * \retval 0	Returned on success
  * \retval >0	Error code form the module's initialisation function
  */
-int Module_int_Initialise(tModule *Module)
+int Module_int_Initialise(tModule *Module, char *ArgString)
 {
 	 int	i, j;
 	 int	ret;
 	char	**deps;
+	char	**args;
 	tModule	*mod;
 	
 	ENTER("pModule", Module);
@@ -84,7 +88,8 @@ int Module_int_Initialise(tModule *Module)
 				break;
 		}
 		if( mod ) {
-			Log_Warning("Module", "Circular dependency detected");
+			Log_Warning("Module", "Circular dependency detected (%s and %s)",
+				mod->Name, Module->Name);
 			LEAVE_RET('i', -1);
 		}
 		
@@ -95,12 +100,16 @@ int Module_int_Initialise(tModule *Module)
 				break;
 		}
 		if( i == giNumBuiltinModules ) {
-			Log_Warning("Module", "Dependency '%s' for module '%s' failed");
+			Log_Warning("Module", "Dependency '%s' for module '%s' failed",
+				deps[j], Module->Name);
 			return -1;
 		}
 		
 		// Dependency is not loaded, so load it
-		ret = Module_int_Initialise( &gKernelModules[i] );
+		ret = Module_int_Initialise(
+			&gKernelModules[i],
+			gasBuiltinModuleArgs ? gasBuiltinModuleArgs[i] : NULL
+			);
 		if( ret )
 		{
 			// The only "ok" error is NOTNEEDED
@@ -116,7 +125,18 @@ int Module_int_Initialise(tModule *Module)
 		Module->Version >> 8, Module->Version & 0xFF
 		);
 	
-	ret = Module->Init(NULL);
+	if( ArgString )
+		args = str_split( ArgString, ',' );
+	else
+		args = NULL;
+	
+	ret = Module->Init(args);
+	
+	if(args)	free(args);
+	
+	// Remove from loading list
+	gLoadingModules = gLoadingModules->Next;
+	
 	if( ret != MODULE_ERR_OK ) {
 		switch(ret)
 		{
@@ -138,9 +158,6 @@ int Module_int_Initialise(tModule *Module)
 	}
 	LOG("ret = %i", ret);
 	
-	// Remove from loading list
-	gLoadingModules = gLoadingModules->Next;
-	
 	// Add to loaded list
 	LOCK( &glModuleSpinlock );
 	Module->Next = gLoadedModules;
@@ -153,7 +170,7 @@ int Module_int_Initialise(tModule *Module)
 /**
  * \brief Initialises builtin modules
  */
-int Modules_LoadBuiltins()
+void Modules_LoadBuiltins()
 {
 	 int	i;
 	
@@ -163,10 +180,37 @@ int Modules_LoadBuiltins()
 	
 	for( i = 0; i < giNumBuiltinModules; i++ )
 	{
-		Module_int_Initialise( &gKernelModules[i] );
+		Module_int_Initialise(
+			&gKernelModules[i],
+			(gasBuiltinModuleArgs ? gasBuiltinModuleArgs[i] : NULL)
+			);
 	}
 	
-	return 0;
+	if( gasBuiltinModuleArgs != NULL )
+		free(gasBuiltinModuleArgs);
+}
+
+/**
+ * \brief Sets the parameters for a builtin module
+ */
+void Modules_SetBuiltinParams(char *Name, char *ArgString)
+{
+	 int	i;
+	if( gasBuiltinModuleArgs == NULL ) {
+		giNumBuiltinModules = (Uint)&gKernelModulesEnd - (Uint)&gKernelModules;
+		giNumBuiltinModules /= sizeof(tModule);
+		gasBuiltinModuleArgs = calloc( giNumBuiltinModules, sizeof(char*) );
+	}
+	
+	for( i = 0; i < giNumBuiltinModules; i ++ )
+	{
+		if(strcmp( gKernelModules[i].Name, Name ) == 0) {
+			gasBuiltinModuleArgs[i] = ArgString;
+			return ;
+		}
+	}
+	
+	Log_Warning("Modules", "Unknown builtin kernel module '%s'", Name);
 }
 
 /**
@@ -258,7 +302,7 @@ int Module_LoadFile(char *Path, char *ArgString)
 	}
 	
 	#if 1
-	if( Module_int_Initialise( info ) )
+	if( Module_int_Initialise( info, ArgString ) )
 	{
 		Binary_Unload(base);
 		return 0;