Usermode/libc - Fix strchr and strrchr behavior

[tpg/acess2.git] / Kernel / modules.c

diff --git a/Kernel/modules.c b/Kernel/modules.c
deleted file mode 100644 (file)
index b7209ff..0000000
--- a/Kernel/modules.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Acess2
- * - Module Loader
- */
-#include <common.h>
-#include <modules.h>
-
-// === PROTOTYPES ===
- int   Module_LoadMem(void *Buffer, Uint Length, char *ArgString);
- int   Module_LoadFile(char *Path, char *ArgString);
- int   Module_int_ResolveDeps(tModule *Info);
- int   Module_IsLoaded(char *Name);
-
-// === IMPORTS ===
-extern tModule gKernelModules[];
-extern void            gKernelModulesEnd;
-
-// === GLOBALS ===
- int   giNumBuiltinModules = 0;
- int   giModuleSpinlock = 0;
-tModule        *gLoadedModules = NULL;
-
-// === CODE ===
-int Modules_LoadBuiltins()
-{
-        int    i;
-       giNumBuiltinModules = (Uint)&gKernelModulesEnd - (Uint)&gKernelModules;
-       giNumBuiltinModules /= sizeof(tModule);
-       
-       for( i = 0; i < giNumBuiltinModules; i++ )
-       {
-               Log("Initialising %p '%s' v%i.%i...",
-                       &gKernelModules[i],
-                       gKernelModules[i].Name,
-                       gKernelModules[i].Version>>8, gKernelModules[i].Version & 0xFF
-                       );
-               gKernelModules[i].Init(NULL);
-       }
-       
-       return 0;
-}
-
-/**
- * \fn int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
- * \brief Load a module from a memory location
- */
-int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
-{
-       char    path[VFS_MEMPATH_SIZE];
-       
-       VFS_GetMemPath(Buffer, Length, path);
-       
-       return Module_LoadFile( path, ArgString );
-}
-
-/**
- * \fn int Module_LoadFile(char *Path, char *ArgString)
- * \brief Load a module from a file
- */
-int Module_LoadFile(char *Path, char *ArgString)
-{
-       void    *base;
-       tModule *info;
-       
-       // Load Binary
-       base = Binary_LoadKernel(Path);
-       
-       // Error check
-       if(base == NULL)        return 0;
-       
-       // Check for Acess Driver
-       if( Binary_FindSymbol(base, "DriverInfo", (Uint*)&info ) == 0 )
-       {
-               #if USE_EDI
-               // Check for EDI Driver
-               if( Binary_FindSymbol(base, "driver_init", NULL ) == 0 )
-               {
-                       Binary_Relocate(base);  // Relocate
-                       return Module_InitEDI( base );  // And intialise
-               }
-               #endif
-               
-               // Unknown module type?, return error
-               Binary_Unload(base);
-               #if USE_EDI
-               Warning("Module_LoadMem: Module has neither a Module Info struct, nor an EDI entrypoint");
-               #else
-               Warning("Module_LoadMem: Module does not have a Module Info struct");
-               #endif
-               return 0;
-       }
-       
-       // Check magic number
-       if(info->Magic != MODULE_MAGIC)
-       {
-               Warning("Module_LoadMem: Module's magic value is invalid (0x%x != 0x%x)", info->Magic, MODULE_MAGIC);
-               return 0;
-       }
-       
-       // Check Architecture
-       if(info->Arch != MODULE_ARCH_ID)
-       {
-               Warning("Module_LoadMem: Module is for a different architecture");
-               return 0;
-       }
-       
-       // Resolve Dependencies
-       if( !Module_int_ResolveDeps(info) ) {
-               Binary_Unload(base);
-               return 0;
-       }
-       
-       // Call Initialiser
-       //if( info->Init( ArgString ) != 0 )
-       if( info->Init( NULL ) == 0 )
-       {
-               Binary_Unload(base);
-               return 0;
-       }
-       
-       // Add to list
-       LOCK( &giModuleSpinlock );
-       info->Next = gLoadedModules;
-       gLoadedModules = info;
-       RELEASE( &giModuleSpinlock );
-       
-       return 1;
-}
-
-/**
- * \fn int Module_int_ResolveDeps(tModule *Info)
- * \brief Resolves the dependencies
- * \todo Implement
- * \note Currently does not resolve the dependencies, just checks them
- */
-int Module_int_ResolveDeps(tModule *Info)
-{
-       char    **names = Info->Dependencies;
-       
-       // Walk dependencies array
-       for( ; *names; names++ )
-       {
-               // Check if the module is loaded
-               if( !Module_IsLoaded(*names) ) {
-                       Warning("Module `%s' requires `%s', which is not loaded\n", Info->Name, *names);
-                       return 0;
-               }
-       }
-       return 1;
-}
-
-/**
- * \fn int Module_IsLoaded(char *Name)
- * \brief Checks if a module is loaded
- * \param Name Name of module to find
- */
-int Module_IsLoaded(char *Name)
-{
-       tModule *mod = gLoadedModules;
-       
-       // Scan loaded list
-       for( ; mod; mod = mod->Next )
-       {
-               // If found, return true
-               if(strcmp(mod->Name, Name) == 0)
-                       return 1;
-       }
-       // not found - return false
-       return 0;
-}