Cleaning up some old code

diff --git a/Kernel/bin/elf.c b/Kernel/bin/elf.c
index 90a092f..c524cf8 100644 (file)
--- a/Kernel/bin/elf.c
+++ b/Kernel/bin/elf.c
@@ -9,7 +9,6 @@
 \r
 #define DEBUG_WARN     1\r
 \r
-\r
 // === PROTOTYPES ===\r
 tBinary        *Elf_Load(int fp);\r
  int   Elf_Relocate(void *Base);\r

diff --git a/Kernel/modules.c b/Kernel/modules.c
index 9f6d3c5..92dd8d3 100644 (file)
--- 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;
 }