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

diff --git a/KernelLand/Kernel/modules.c b/KernelLand/Kernel/modules.c
index dd8a3ae1..b5e917c3 100644
--- a/KernelLand/Kernel/modules.c
+++ b/KernelLand/Kernel/modules.c
@@ -178,7 +178,7 @@ int Module_int_Initialise(tModule *Module, const char *ArgString)
 			Log_Warning("Module", "Unable to load, reason: Miscelanious");
 			break;
 		case MODULE_ERR_NOTNEEDED:
-			Log_Debug("Module", "Unable to load, reason: Module not needed");
+//			Log_Debug("Module", "Unable to load, reason: Module not needed");
 			break;
 		case MODULE_ERR_MALLOC:
 			Log_Warning("Module", "Unable to load, reason: Error in malloc/realloc/calloc, probably not good");
@@ -341,7 +341,7 @@ int Module_LoadMem(void *Buffer, Uint Length, const char *ArgString)
 	
 	VFS_GetMemPath(path, Buffer, Length);
 	
-	return Module_LoadFile( path, ArgString );
+	return Module_LoadFile( path, ArgString ) == EOK;
 }
 
 /**
@@ -360,15 +360,15 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 	// Error check
 	if(base == NULL) {
 		Log_Warning("Module", "Module_LoadFile - Unable to load '%s'", Path);
-		return 0;
+		return ENOENT;
 	}
 
 	// 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);
+		Log_Warning("Module", "Relocation of module %s failed", Path);
 		Binary_Unload(base);
-		return 0;
+		return EINVAL;
 	}
 	
 	// Check for Acess Driver
@@ -384,24 +384,34 @@ int Module_LoadFile(const char *Path, const char *ArgString)
 		if( !loader ) {
 			Binary_Unload(base);
 			Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
-			return 0;
+			return EINVAL;
 		}
 	}
 
-	if( !Module_int_ResolveDeps(info) ) {
-		Log_Warning("Dependencies not met for '%s'", Path);
-		Binary_Unload(base);
-		return 0;
+	if( loader )
+	{
+		if( loader->Loader(base) )
+		{
+			Binary_Unload(base);
+			return EINVAL;
+		}
 	}
-
-	// Initialise (and register)
-	if( loader ? loader->Loader(base) : Module_int_Initialise( info, ArgString ) )
+	else
 	{
-		Binary_Unload(base);
-		return 0;
+		if( !Module_int_ResolveDeps(info) ) {
+			Log_Warning("Module", "Dependencies not met for '%s'", Path);
+			Binary_Unload(base);
+			return EINVAL;
+		}
+		
+		if( Module_int_Initialise(info, ArgString) )
+		{
+			Binary_Unload(base);
+			return EINVAL;
+		}
 	}
 	
-	return 1;
+	return 0;
 }
 
 /**