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);
extern int UDI_LoadDriver(void *Base);
#endif
extern void StartupPrint(char *Str);
-extern tModule gKernelModules[];
+extern void gKernelModules;
extern void gKernelModulesEnd;
// === GLOBALS ===
int giNumBuiltinModules = 0;
-tSpinlock glModuleSpinlock;
+tShortSpinlock glModuleSpinlock;
tModule *gLoadedModules = NULL;
tModuleLoader *gModule_Loaders = NULL;
tModule *gLoadingModules = NULL;
+tModule **gapBuiltinModules = NULL;
char **gasBuiltinModuleArgs;
// === CODE ===
/**
* \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.
tModule *mod;
ENTER("pModule", Module);
+ LOG("Module->Magic = 0x%x", Module->Magic);
+ if(Module->Magic != MODULE_MAGIC) {
+ Log_Warning(
+ "Module",
+ "Module %p is no a valid Acess2 module (0x%08x != 0x%08x)",
+ Module, Module->Magic, MODULE_MAGIC
+ );
+ LEAVE('i', MODULE_ERR_BADMODULE);
+ return MODULE_ERR_BADMODULE;
+ }
+ LOG("Module->Name = %p \"%s\"", Module->Name, Module->Name);
+
+ if(Module->Arch != MODULE_ARCH_ID) {
+ Log_Warning(
+ "Module",
+ "Module %p (%s) is for another architecture (%i)",
+ Module, Module->Name, Module->Arch
+ );
+ }
deps = Module->Dependencies;
// So, if it's not loaded, we better load it then
for( i = 0; i < giNumBuiltinModules; i ++ )
{
- if( strcmp(deps[j], gKernelModules[i].Name) == 0 )
+ if( strcmp(deps[j], gapBuiltinModules[i]->Name) == 0 )
break;
}
if( i == giNumBuiltinModules ) {
// Dependency is not loaded, so load it
ret = Module_int_Initialise(
- &gKernelModules[i],
+ gapBuiltinModules[i],
gasBuiltinModuleArgs ? gasBuiltinModuleArgs[i] : NULL
);
if( ret )
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);
}
+/**
+ * \brief Scans the builtin modules and creates an array of them
+ */
+void Modules_int_GetBuiltinArray(void)
+{
+ int i;
+ tModule *module;
+
+ // Count
+ module = &gKernelModules;
+ i = 0;
+ while( (tVAddr)module < (tVAddr)&gKernelModulesEnd )
+ {
+ if(module->Magic == MODULE_MAGIC) {
+ i ++;
+ module ++;
+ }
+ 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 )
+ {
+ if(module->Magic == MODULE_MAGIC) {
+ gapBuiltinModules[i] = module;
+ i ++;
+ module ++;
+ }
+ else
+ module = (void*)( (tVAddr)module + 4 );
+ }
+}
+
/**
* \brief Initialises builtin modules
*/
{
int i;
- // Count modules
- giNumBuiltinModules = (Uint)&gKernelModulesEnd - (Uint)&gKernelModules;
- giNumBuiltinModules /= sizeof(tModule);
+ if( !gapBuiltinModules )
+ Modules_int_GetBuiltinArray();
for( i = 0; i < giNumBuiltinModules; i++ )
{
Module_int_Initialise(
- &gKernelModules[i],
+ gapBuiltinModules[i],
(gasBuiltinModuleArgs ? gasBuiltinModuleArgs[i] : NULL)
);
}
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
*/
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*) );
+
+ if( gasBuiltinModuleArgs == NULL )
+ {
+ Modules_int_GetBuiltinArray();
}
- for( i = 0; i < giNumBuiltinModules; i ++ )
+ // I hate expensive scans
+ for( i = 0; i < giNumBuiltinModules; i++ )
{
- if(strcmp( gKernelModules[i].Name, Name ) == 0) {
+ if(strcmp( gapBuiltinModules[i]->Name, Name ) == 0) {
gasBuiltinModuleArgs[i] = ArgString;
return ;
}
return 0;
}
- // Check magic number
- if(info->Magic != MODULE_MAGIC)
- {
- Log_Warning("Module", "Module's magic value is invalid (0x%x != 0x%x)", info->Magic, MODULE_MAGIC);
- return 0;
- }
-
- // Check Architecture
- if(info->Arch != MODULE_ARCH_ID)
- {
- Log_Warning("Module", "Module is for a different architecture");
- return 0;
- }
-
- #if 1
+ // Initialise (and register)
if( Module_int_Initialise( info, ArgString ) )
{
Binary_Unload(base);
return 0;
}
- #else
- // Resolve Dependencies
- if( !Module_int_ResolveDeps(info) ) {
- Binary_Unload(base);
- return 0;
- }
-
- Log_Log("Module", "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 )
- {
- Binary_Unload(base);
- return 0;
- }
-
- // Add to list
- LOCK( &glModuleSpinlock );
- info->Next = gLoadedModules;
- gLoadedModules = info;
- RELEASE( &glModuleSpinlock );
- #endif
return 1;
}
}
/**
- * \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;
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au