Changed the x86 architecture to have tPAddr be 64-bits always

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

diff --git a/Kernel/modules.c b/Kernel/modules.c
index a4e639b..ba92905 100644 (file)
--- a/Kernel/modules.c
+++ b/Kernel/modules.c
@@ -5,13 +5,20 @@
 #include <common.h>
 #include <modules.h>
 
+#define        USE_EDI 0
+#define        USE_UDI 1
+
 // === PROTOTYPES ===
+ int   Modules_LoadBuiltins();
  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 ===
+#if USE_UDI
+extern int     UDI_LoadDriver(void *Base);
+#endif
 extern void    StartupPrint(char *Str);
 extern tModule gKernelModules[];
 extern void    gKernelModulesEnd;
@@ -46,7 +53,6 @@ int Modules_LoadBuiltins()
                                        if(strcmp(deps[j], gKernelModules[k].Name) == 0)
                                                break;
                                }
-                               Log("%s requires %s\n", gKernelModules[i].Name, deps[j]);
                                if(k == giNumBuiltinModules) {
                                        Warning("Unable to find dependency '%s' for '%s' in kernel",
                                                deps[j], gKernelModules[i].Name);
@@ -78,7 +84,6 @@ int Modules_LoadBuiltins()
                                        }
                                        // `k` is assumed to be less than `giNumBuiltinModules`
                                        
-                                       Log("baIsLoaded[%i(%s)] = %i\n", k, deps[j], baIsLoaded[k]);
                                        // If a dependency failed, skip and mark as failed
                                        if( baIsLoaded[k] == -1 ) {
                                                baIsLoaded[i] = -1;
@@ -99,9 +104,13 @@ int Modules_LoadBuiltins()
                                gKernelModules[i].Name,
                                gKernelModules[i].Version>>8, gKernelModules[i].Version & 0xFF
                                );
-                       gKernelModules[i].Init(NULL);
+                       if( gKernelModules[i].Init(NULL) == 0 ) {
+                               Log("Loading Failed, all modules that depend on this will also fail");
+                               baIsLoaded[i] = -1;
+                       }
                        // Mark as loaded
-                       baIsLoaded[i] = 1;
+                       else
+                               baIsLoaded[i] = 1;
                        numToInit --;
                }
        }
@@ -117,7 +126,7 @@ int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
 {
        char    path[VFS_MEMPATH_SIZE];
        
-       VFS_GetMemPath(Buffer, Length, path);
+       VFS_GetMemPath(path, Buffer, Length);
        
        return Module_LoadFile( path, ArgString );
 }
@@ -149,6 +158,14 @@ int Module_LoadFile(char *Path, char *ArgString)
                }
                #endif
                
+               #if USE_UDI
+               if( Binary_FindSymbol(base, "udi_init_info", NULL ) == 0 )
+               {
+                       Binary_Relocate(base);  // Relocate
+                       return UDI_LoadDriver( base );  // And intialise
+               }
+               #endif
+               
                // Unknown module type?, return error
                Binary_Unload(base);
                #if USE_EDI