X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmodules.c;h=b2923f7ca55a53f51ea0dd3fd4ce3b120b9539c5;hb=8a8a744341df513d00d2e60adf5e88636856e65b;hp=92dd8d31317aea188370963440d7777c411c6b1b;hpb=8e874841ce04b0e7e45151d76bd8002b446c908e;p=tpg%2Facess2.git

diff --git a/Kernel/modules.c b/Kernel/modules.c
index 92dd8d31..b2923f7c 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -10,14 +10,15 @@
 #define	USE_UDI	0
 
 // === PROTOTYPES ===
- int	Module_int_Initialise(tModule *Module, char *ArgString);
+ int	Module_int_Initialise(tModule *Module, const char *ArgString);
+void	Modules_int_GetBuiltinArray(void);
 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);
+// int	Module_RegisterLoader(tModuleLoader *Loader);
+// 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);
+ int	Module_IsLoaded(const char *Name);
 
 // === EXPORTS ===
 EXPORT(Module_RegisterLoader);
@@ -26,13 +27,13 @@ EXPORT(Module_RegisterLoader);
 #if USE_UDI
 extern int	UDI_LoadDriver(void *Base);
 #endif
-extern void	StartupPrint(char *Str);
+extern void	StartupPrint(const char *Str);
 extern void	gKernelModules;
 extern void	gKernelModulesEnd;
 
 // === GLOBALS ===
  int	giNumBuiltinModules = 0;
-tSpinlock	glModuleSpinlock;
+tShortSpinlock	glModuleSpinlock;
 tModule	*gLoadedModules = NULL;
 tModuleLoader	*gModule_Loaders = NULL;
 tModule	*gLoadingModules = NULL;
@@ -43,17 +44,18 @@ char	**gasBuiltinModuleArgs;
 /**
  * \brief Initialises a module
  * \param Module	Pointer to the module header
+ * \param ArgString	Comma separated list of module arguments
  * \return Zero on success, eModuleErrors or -1 on error
  * \retval -1	Returned if a dependency fails, or a circular dependency
  *              exists.
  * \retval 0	Returned on success
  * \retval >0	Error code form the module's initialisation function
  */
-int Module_int_Initialise(tModule *Module, char *ArgString)
+int Module_int_Initialise(tModule *Module, const char *ArgString)
 {
 	 int	i, j;
 	 int	ret;
-	char	**deps;
+	const char	**deps;
 	char	**args;
 	tModule	*mod;
 	
@@ -179,10 +181,10 @@ int Module_int_Initialise(tModule *Module, char *ArgString)
 	LOG("ret = %i", ret);
 	
 	// Add to loaded list
-	LOCK( &glModuleSpinlock );
+	SHORTLOCK( &glModuleSpinlock );
 	Module->Next = gLoadedModules;
 	gLoadedModules = Module;
-	RELEASE( &glModuleSpinlock );
+	SHORTREL( &glModuleSpinlock );
 	
 	LEAVE_RET('i', 0);
 }
@@ -251,6 +253,33 @@ void Modules_LoadBuiltins()
 		free(gasBuiltinModuleArgs);
 }
 
+/**
+ * \brief Initialise a builtin module given it's name
+ * 
+ * E.g. Used by VTerm to load an alternate video driver at runtime
+ */
+int Modules_InitialiseBuiltin(const char *Name)
+{
+	 int	i;
+	
+	// Check if it's loaded
+	if( Module_IsLoaded(Name) )
+		return 0;
+	
+	if( !gapBuiltinModules )
+		Modules_int_GetBuiltinArray();
+	
+	for( i = 0; i < giNumBuiltinModules; i++ )
+	{
+		if( strcmp(gapBuiltinModules[i]->Name, Name) == 0 ) {
+			return Module_int_Initialise(gapBuiltinModules[i],
+				(gasBuiltinModuleArgs ? gasBuiltinModuleArgs[i] : NULL)
+				);
+		}
+	}
+	return -1;
+}
+
 /**
  * \brief Sets the parameters for a builtin module
  */
@@ -293,7 +322,7 @@ int Module_RegisterLoader(tModuleLoader *Loader)
  * \fn int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
  * \brief Load a module from a memory location
  */
-int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
+int Module_LoadMem(void *Buffer, Uint Length, const char *ArgString)
 {
 	char	path[VFS_MEMPATH_SIZE];
 	
@@ -303,10 +332,10 @@ int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
 }
 
 /**
- * \fn int Module_LoadFile(char *Path, char *ArgString)
+ * \fn int Module_LoadFile(const char *Path, const char *ArgString)
  * \brief Load a module from a file
  */
-int Module_LoadFile(char *Path, char *ArgString)
+int Module_LoadFile(const char *Path, const char *ArgString)
 {
 	void	*base;
 	tModule	*info;
@@ -367,7 +396,7 @@ int Module_LoadFile(char *Path, char *ArgString)
  */
 int Module_int_ResolveDeps(tModule *Info)
 {
-	char	**names = Info->Dependencies;
+	const char	**names = Info->Dependencies;
 	
 	// Walk dependencies array
 	for( ; *names; names++ )
@@ -382,11 +411,11 @@ int Module_int_ResolveDeps(tModule *Info)
 }
 
 /**
- * \fn int Module_IsLoaded(char *Name)
+ * \fn int Module_IsLoaded(const char *Name)
  * \brief Checks if a module is loaded
  * \param Name	Name of module to find
  */
-int Module_IsLoaded(char *Name)
+int Module_IsLoaded(const char *Name)
 {
 	tModule	*mod = gLoadedModules;