git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
eec5020
..
ba92905
100644
(file)
--- a/
Kernel/modules.c
+++ b/
Kernel/modules.c
@@
-5,6
+5,9
@@
#include <common.h>
#include <modules.h>
#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);
// === PROTOTYPES ===
int Modules_LoadBuiltins();
int Module_LoadMem(void *Buffer, Uint Length, char *ArgString);
@@
-13,6
+16,9
@@
int Module_IsLoaded(char *Name);
// === IMPORTS ===
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;
extern void StartupPrint(char *Str);
extern tModule gKernelModules[];
extern void gKernelModulesEnd;
@@
-98,9
+104,13
@@
int Modules_LoadBuiltins()
gKernelModules[i].Name,
gKernelModules[i].Version>>8, gKernelModules[i].Version & 0xFF
);
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
// Mark as loaded
- baIsLoaded[i] = 1;
+ else
+ baIsLoaded[i] = 1;
numToInit --;
}
}
numToInit --;
}
}
@@
-116,7
+126,7
@@
int Module_LoadMem(void *Buffer, Uint Length, char *ArgString)
{
char path[VFS_MEMPATH_SIZE];
{
char path[VFS_MEMPATH_SIZE];
- VFS_GetMemPath(
Buffer, Length, pa
th);
+ VFS_GetMemPath(
path, Buffer, Leng
th);
return Module_LoadFile( path, ArgString );
}
return Module_LoadFile( path, ArgString );
}
@@
-148,6
+158,14
@@
int Module_LoadFile(char *Path, char *ArgString)
}
#endif
}
#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
// Unknown module type?, return error
Binary_Unload(base);
#if USE_EDI
UCC
git Repository :: git.ucc.asn.au