Merge branch 'master' of git://localhost/acess2

[tpg/acess2.git] / KernelLand / Kernel / arch / x86 / main.c

diff --git a/KernelLand/Kernel/arch/x86/main.c b/KernelLand/Kernel/arch/x86/main.c
index 8b85d06..10cac71 100644 (file)
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <mm_virt.h>
 #include <pmemmap.h>
+#include <semaphore.h>
 
 #define        VGA_ERRORS      0
 
@@ -23,6 +24,8 @@ extern void   MM_Install(int NPMemRanges, tPMemMapEnt *PMemRanges);
 extern void    MM_InstallVirtual(void);
 extern int     Time_Setup(void);
 extern int     ACPICA_Initialise(void);
+// - Modules/Display/VESA
+extern void    VBE_int_SetBootMode(Uint16 ModeID, const void *ModeInfo);
 
 // === PROTOTYPES ===
  int   kmain(Uint MbMagic, void *MbInfoPtr);
@@ -50,13 +53,26 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        // Multiboot 1
        case MULTIBOOT_MAGIC: {
                // TODO: Handle when this isn't in the mapped area
+               ASSERT( mbInfo->CommandLine < 4*1024*1024 );
                gsBootCmdLine = (char*)(mbInfo->CommandLine + KERNEL_BASE);
 
                // Adjust Multiboot structure address
                mbInfo = (void*)( (tVAddr)MbInfoPtr + KERNEL_BASE );
 
+               // Parse memory map
+               // - mbInfo->Flags is checked in this function
                nPMemMapEnts = Multiboot_LoadMemoryMap(mbInfo, KERNEL_BASE, pmemmap, MAX_PMEMMAP_ENTS,
                        KERNEL_LOAD, (tVAddr)&gKernelEnd - KERNEL_BASE);
+               
+               
+               // Get video mode
+               Debug("mbInfo->Flags = 0x%x", mbInfo->Flags);
+               if( mbInfo->Flags & (1 << 11) )
+               {
+                       // TODO: Ensure address is in mapped area
+                       ASSERT( mbInfo->vbe_mode_info < 4*1024*1024 );
+                       VBE_int_SetBootMode(mbInfo->vbe_mode, (void*)(mbInfo->vbe_mode_info + KERNEL_BASE));
+               }
 
                break; }
        
@@ -72,7 +88,7 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
                        MbMagic, MULTIBOOT_MAGIC, MULTIBOOT2_MAGIC);
                return 0;
        }
-       
+
        // Set up physical memory manager
        MM_Install(nPMemMapEnts, pmemmap);
        
@@ -118,20 +134,9 @@ void Arch_LoadBootModules(void)
                        Log_Warning("Arch", "Unable to load module");
                        continue ;
                }
-               
-               #if 0
-               // Unmap and free
-               int numPages = (mod->Size + ((tVAddr)mod->Base&0xFFF) + 0xFFF) >> 12;
-               MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].Base, numPages );
-               
-               //for( int j = 0; j < numPages; j++ )
-               //      MM_DerefPhys( mod->PBase + (j << 12) );
-               
-               if( (tVAddr) mod->ArgString > MAX_ARGSTR_POS )
-                       MM_UnmapHWPages( (tVAddr)mod->ArgString, 2 );
-               #endif
        }
        Log_Log("Arch", "Boot modules loaded");
-       if( gaArch_BootModules )
-               free( gaArch_BootModules );
+       Multiboot_FreeModules(giArch_NumBootModules, gaArch_BootModules);
+       giArch_NumBootModules = 0;
+       gaArch_BootModules = NULL;
 }