X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmodules.c;h=e4f49b288e776b2b854bb771ad09ee3c5d92e213;hb=1c2a87ec67d332b6a165c79398693eac1eb1166e;hp=b1d858c7d0d2672a39fe61e8460b815239e06759;hpb=77ed20ce9d7e25654215980d0f89e63b8dd366f0;p=tpg%2Facess2.git

diff --git a/Kernel/modules.c b/Kernel/modules.c
index b1d858c7..e4f49b28 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -2,16 +2,23 @@
  * Acess2
  * - Module Loader
  */
-#include <common.h>
+#include <acess.h>
 #include <modules.h>
 
+#define	USE_EDI	0
+#define	USE_UDI	1
+
 // === 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 ===
+#if USE_UDI
+extern int	UDI_LoadDriver(void *Base);
+#endif
 extern void	StartupPrint(char *Str);
 extern tModule	gKernelModules[];
 extern void	gKernelModulesEnd;
@@ -20,6 +27,7 @@ extern void	gKernelModulesEnd;
  int	giNumBuiltinModules = 0;
  int	giModuleSpinlock = 0;
 tModule	*gLoadedModules = NULL;
+tModuleLoader	*gModule_Loaders = NULL;
 
 // === CODE ===
 int Modules_LoadBuiltins()
@@ -64,6 +72,8 @@ int Modules_LoadBuiltins()
 		for( i = 0; i < giNumBuiltinModules; i++ )
 		{
 			if( baIsLoaded[i] )	continue;	// Ignore already loaded modules
+		
+			deps = gKernelModules[i].Dependencies;
 			
 			if( deps )
 			{
@@ -95,9 +105,13 @@ int Modules_LoadBuiltins()
 				gKernelModules[i].Name,
 				gKernelModules[i].Version>>8, gKernelModules[i].Version & 0xFF
 				);
-			gKernelModules[i].Init(NULL);
+			if( gKernelModules[i].Init(NULL) == 0 ) {
+				Log("Loading Failed, all modules that depend on this will also fail");
+				baIsLoaded[i] = -1;
+			}
 			// Mark as loaded
-			baIsLoaded[i] = 1;
+			else
+				baIsLoaded[i] = 1;
 			numToInit --;
 		}
 	}
@@ -105,6 +119,20 @@ int Modules_LoadBuiltins()
 	return 0;
 }
 
+/**
+ * \brief Registers a tModuleLoader with the kernel
+ * \param Loader	Pointer to loader structure (must be persistent)
+ */
+int Module_RegisterLoader(tModuleLoader *Loader)
+{
+	if(!Loader)	return 1;
+	
+	Loader->Next = gModule_Loaders;
+	gModule_Loaders = Loader;
+	
+	return 0;
+}
+
 /**
  * \fn int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
  * \brief Load a module from a memory location
@@ -113,7 +141,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 );
 }
@@ -131,16 +159,26 @@ int Module_LoadFile(char *Path, char *ArgString)
 	base = Binary_LoadKernel(Path);
 	
 	// Error check
-	if(base == NULL)	return 0;
+	if(base == NULL) {
+		Warning("Module_LoadFile: Unable to load '%s'", Path);
+		return 0;
+	}
 	
 	// Check for Acess Driver
 	if( Binary_FindSymbol(base, "DriverInfo", (Uint*)&info ) == 0 )
 	{
+		tModuleLoader	*tmp;
+		for( tmp = gModule_Loaders; tmp; tmp = tmp->Next)
+		{
+			if( tmp->Detector(base) == 0 )	continue;
+			
+			return tmp->Loader(base);
+		}
+		
 		#if USE_EDI
 		// Check for EDI Driver
-		if( Binary_FindSymbol(base, "driver_init", NULL ) == 0 )
+		if( Binary_FindSymbol(base, "driver_init", NULL ) != 0 )
 		{
-			Binary_Relocate(base);	// Relocate
 			return Module_InitEDI( base );	// And intialise
 		}
 		#endif
@@ -148,9 +186,9 @@ int Module_LoadFile(char *Path, char *ArgString)
 		// Unknown module type?, return error
 		Binary_Unload(base);
 		#if USE_EDI
-		Warning("Module_LoadMem: Module has neither a Module Info struct, nor an EDI entrypoint");
+		Warning("Module_LoadFile: Module has neither a Module Info struct, nor an EDI entrypoint");
 		#else
-		Warning("Module_LoadMem: Module does not have a Module Info struct");
+		Warning("Module_LoadFile: Module does not have a Module Info struct");
 		#endif
 		return 0;
 	}
@@ -158,14 +196,14 @@ int Module_LoadFile(char *Path, char *ArgString)
 	// Check magic number
 	if(info->Magic != MODULE_MAGIC)
 	{
-		Warning("Module_LoadMem: Module's magic value is invalid (0x%x != 0x%x)", info->Magic, MODULE_MAGIC);
+		Warning("Module_LoadFile: Module's magic value is invalid (0x%x != 0x%x)", info->Magic, MODULE_MAGIC);
 		return 0;
 	}
 	
 	// Check Architecture
 	if(info->Arch != MODULE_ARCH_ID)
 	{
-		Warning("Module_LoadMem: Module is for a different architecture");
+		Warning("Module_LoadFile: Module is for a different architecture");
 		return 0;
 	}