X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fmodules.c;h=dd8a3ae1f0ab6a1926694d64f1fefc847773539b;hb=d8b31df1121ff75fe218f83574eb600c47f8d2d5;hp=98ca1a1eb43e40490214757dc73e28e4133d37c1;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/modules.c b/KernelLand/Kernel/modules.c
index 98ca1a1e..dd8a3ae1 100644
--- a/KernelLand/Kernel/modules.c
+++ b/KernelLand/Kernel/modules.c
@@ -8,6 +8,7 @@
 
 #define	USE_EDI	0
 #define	USE_UDI	0
+#define MODULE_FLAG_LOADERROR	0x1
 
 // === PROTOTYPES ===
  int	Module_int_Initialise(tModule *Module, const char *ArgString);
@@ -80,6 +81,15 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 			"Module %p (%s) is for another architecture (%i)",
 			Module, Module->Name, Module->Arch
 			);
+		LEAVE('i', MODULE_ERR_BADMODULE);
+		return MODULE_ERR_BADMODULE;
+	}
+
+	LOG("Module->Flags = %x", Module->Flags);	
+	if(Module->Flags & MODULE_FLAG_LOADERROR ) {
+		Log_Warning("Module", "%s has already attempted to load and encountered errors", Module->Name);
+		LEAVE('i', MODULE_ERR_MISC);
+		return MODULE_ERR_MISC;
 	}
 	
 	deps = Module->Dependencies;
@@ -177,6 +187,7 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 			Log_Warning("Module", "Unable to load reason - Unknown code %i", ret);
 			break;
 		}
+		Module->Flags |= MODULE_FLAG_LOADERROR;
 		LEAVE_RET('i', ret);
 		return ret;
 	}
@@ -341,6 +352,7 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 {
 	void	*base;
 	tModule	*info;
+	tModuleLoader	*loader = NULL;
 	
 	// Load Binary
 	base = Binary_LoadKernel(Path);
@@ -350,38 +362,40 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 		Log_Warning("Module", "Module_LoadFile - Unable to load '%s'", Path);
 		return 0;
 	}
+
+	// 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);
+		Binary_Unload(base);
+		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 )
+		for( loader = gModule_Loaders; loader; loader = loader->Next)
 		{
-			return Module_InitEDI( base );	// And intialise
+			if( loader->Detector(base) )
+				break;
 		}
-		#endif
 		
 		// Unknown module type?, return error
+		if( !loader ) {
+			Binary_Unload(base);
+			Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
+			return 0;
+		}
+	}
+
+	if( !Module_int_ResolveDeps(info) ) {
+		Log_Warning("Dependencies not met for '%s'", Path);
 		Binary_Unload(base);
-		#if USE_EDI
-		Log_Warning("Module", "Module '%s' has neither a Module Info struct, nor an EDI entrypoint", Path);
-		#else
-		Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
-		#endif
 		return 0;
 	}
-	
+
 	// Initialise (and register)
-	if( Module_int_Initialise( info, ArgString ) )
+	if( loader ? loader->Loader(base) : Module_int_Initialise( info, ArgString ) )
 	{
 		Binary_Unload(base);
 		return 0;