Kernel/x86_64 - Cleanup and pondering mboot framebuffer
authorJohn Hodge <[email protected]>
Wed, 28 Nov 2012 04:07:34 +0000 (12:07 +0800)
committerJohn Hodge <[email protected]>
Wed, 28 Nov 2012 04:07:34 +0000 (12:07 +0800)
KernelLand/Kernel/arch/x86_64/main.c
KernelLand/Kernel/arch/x86_64/proc.c

index a855a47..f4c4a81 100644 (file)
@@ -53,7 +53,6 @@ void kmain(Uint MbMagic, void *MbInfoPtr)
                // Adjust Multiboot structure address
                mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
                gsBootCmdLine = (char*)( (Uint)mbInfo->CommandLine + KERNEL_BASE);
-               // TODO: ref above?
                nPMemMapEnts = Multiboot_LoadMemoryMap(mbInfo, KERNEL_BASE, pmemmap, MAX_PMEMMAP_ENTS,
                        KERNEL_LOAD, (tVAddr)&gKernelEnd - KERNEL_BASE
                        );
@@ -87,6 +86,8 @@ void kmain(Uint MbMagic, void *MbInfoPtr)
        Log_Log("Arch", "Starting VFS...");
        VFS_Init();
        
+       // Multiboot_InitFramebuffer(mbInfo);
+
        gaArch_BootModules = Multiboot_LoadModules(mbInfo, KERNEL_BASE, &giArch_NumBootModules);
        
        *(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'Z';
index 48504a8..2a38d62 100644 (file)
@@ -457,9 +457,8 @@ void Proc_ClearThread(tThread *Thread)
 tTID Proc_NewKThread(void (*Fcn)(void*), void *Data)
 {
        Uint    rsp;
-       tThread *newThread, *cur;
+       tThread *newThread;
        
-       cur = Proc_GetCurThread();
        newThread = Threads_CloneTCB(0);
        if(!newThread)  return -1;
        
@@ -536,11 +535,9 @@ tTID Proc_Clone(Uint Flags)
  */
 tThread *Proc_SpawnWorker(void (*Fcn)(void*), void *Data)
 {
-       tThread *new, *cur;
+       tThread *new;
        Uint    stack_contents[3];
 
-       cur = Proc_GetCurThread();
-       
        // Create new thread
        new = Threads_CloneThreadZero();
        if(!new) {

UCC git Repository :: git.ucc.asn.au