X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmodules.c;h=92dd8d31317aea188370963440d7777c411c6b1b;hb=263987655706186a27d4c158ea30a00924f47f7d;hp=689487395cc95c7956095514eee0e43a25ad636d;hpb=e939fc0ced4d445c24696636fe660dddbe035b1c;p=tpg%2Facess2.git

diff --git a/Kernel/modules.c b/Kernel/modules.c
index 68948739..92dd8d31 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -2,7 +2,7 @@
  * Acess2
  * - Module Loader
  */
-#define DEBUG	1
+#define DEBUG	0
 #include <acess.h>
 #include <modules.h>
 
@@ -349,53 +349,12 @@ int Module_LoadFile(char *Path, char *ArgString)
 		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;
 }