From: John Hodge <tpg@mutabah.net>
Date: Thu, 15 Jul 2010 15:29:50 +0000 (+0800)
Subject: Cleaning up some old code
X-Git-Tag: rel0.06~105
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=263987655706186a27d4c158ea30a00924f47f7d;p=tpg%2Facess2.git

Cleaning up some old code
---

diff --git a/Kernel/bin/elf.c b/Kernel/bin/elf.c
index 90a092f6..c524cf81 100644
--- a/Kernel/bin/elf.c
+++ b/Kernel/bin/elf.c
@@ -9,7 +9,6 @@
 
 #define DEBUG_WARN	1
 
-
 // === PROTOTYPES ===
 tBinary	*Elf_Load(int fp);
  int	Elf_Relocate(void *Base);
diff --git a/Kernel/modules.c b/Kernel/modules.c
index 9f6d3c54..92dd8d31 100644
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -349,39 +349,12 @@ int Module_LoadFile(char *Path, char *ArgString)
 		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;
 }