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
Commenting for new function
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
main.c
diff --git
a/Kernel/arch/x86/main.c
b/Kernel/arch/x86/main.c
index
710923d
..
f6879f8
100644
(file)
--- a/
Kernel/arch/x86/main.c
+++ b/
Kernel/arch/x86/main.c
@@
-3,7
+3,7
@@
* x86 Kernel Main
* arch/x86/main.c
*/
* x86 Kernel Main
* arch/x86/main.c
*/
-#include <
common
.h>
+#include <
acess
.h>
#include <mboot.h>
#include <init.h>
#include <mm_virt.h>
#include <mboot.h>
#include <init.h>
#include <mm_virt.h>
@@
-17,10
+17,11
@@
extern void Desctab_Install();
extern void MM_PreinitVirtual();
extern void MM_Install(tMBoot_Info *MBoot);
extern void MM_InstallVirtual();
extern void MM_PreinitVirtual();
extern void MM_Install(tMBoot_Info *MBoot);
extern void MM_InstallVirtual();
-extern void Proc_Start();
+extern void Threads_Init();
+extern int Time_Setup();
extern Uint Proc_Clone(Uint *Err, Uint Flags);
extern Uint Proc_Clone(Uint *Err, Uint Flags);
-extern void
Proc
_Sleep();
-extern void
Proc
_Exit();
+extern void
Threads
_Sleep();
+extern void
Threads
_Exit();
// === GLOBALS ===
// === GLOBALS ===
@@
-41,7
+42,10
@@
int kmain(Uint MbMagic, tMBoot_Info *MbInfo)
Log("Starting Multitasking...");
// Start Multitasking
Log("Starting Multitasking...");
// Start Multitasking
- Proc_Start();
+ Threads_Init();
+
+ // Start Timers
+ Time_Setup();
Log("Starting VFS...");
// Load Virtual Filesystem
Log("Starting VFS...");
// Load Virtual Filesystem
@@
-71,6
+75,6
@@
int kmain(Uint MbMagic, tMBoot_Info *MbInfo)
System_Init( (char*)(MbInfo->CommandLine + KERNEL_BASE) );
// Sleep forever (sleeping beauty)
System_Init( (char*)(MbInfo->CommandLine + KERNEL_BASE) );
// Sleep forever (sleeping beauty)
- for(;;)
Proc
_Sleep();
+ for(;;)
Threads
_Sleep();
return 0;
}
return 0;
}
UCC
git Repository :: git.ucc.asn.au