Kernel/x86 - Removed now-redundant extern prototype

[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 466b61e..97a7c75 100644 (file)
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -19,39 +19,28 @@
 
 // === IMPORTS ===
 extern char    gKernelEnd[];
-extern void    Heap_Install(void);
-extern void    Desctab_Install(void);
 extern void    MM_PreinitVirtual(void);
 extern void    MM_Install(int NPMemRanges, tPMemMapEnt *PMemRanges);
 extern void    MM_InstallVirtual(void);
-extern void    Threads_Init(void);
 extern int     Time_Setup(void);
-// --- Core ---
-extern void    System_Init(char *Commandline);
+extern int     ACPICA_Initialise(void);
 
 // === PROTOTYPES ===
  int   kmain(Uint MbMagic, void *MbInfoPtr);
 
 // === GLOBALS ===
 char   *gsBootCmdLine = NULL;
-struct {
-       Uint32  PBase;
-       void    *Base;
-       Uint    Size;
-       char    *ArgString;
-}      *gaArch_BootModules;
+tBootModule    *gaArch_BootModules;
  int   giArch_NumBootModules = 0;
 
 // === CODE ===
 int kmain(Uint MbMagic, void *MbInfoPtr)
 {
-       tMBoot_Module   *mods;
        tMBoot_Info     *mbInfo;
        tPMemMapEnt     pmemmap[MAX_PMEMMAP_ENTS];
         int    nPMemMapEnts;
 
-       LogF("Acess2 x86-"PLATFORM" v"EXPAND_STR(KERNEL_VERSION)"\r\n");
-       LogF(" Build %i, Git Hash %s\r\n", BUILD_NUM, gsGitHash);
+       LogF("%s\r\n", gsBuildInfo);
        
        MM_PreinitVirtual();    // Initialise virtual mappings
 
@@ -63,61 +52,13 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        case MULTIBOOT_MAGIC: {
                // TODO: Handle when this isn't in the mapped area
                gsBootCmdLine = (char*)(mbInfo->CommandLine + KERNEL_BASE);
-               
-               tMBoot_MMapEnt  *ent = (void*)mbInfo->MMapAddr;
-               tMBoot_MMapEnt  *last = (void*)(mbInfo->MMapAddr + mbInfo->MMapLength);
-               
-               // Build up memory map
-               nPMemMapEnts = 0;
-               while( ent < last && nPMemMapEnts < MAX_PMEMMAP_ENTS )
-               {
-                       tPMemMapEnt     *nent = &pmemmap[nPMemMapEnts];
-                       nent->Start = ent->Base;
-                       nent->Length = ent->Length;
-                       switch(ent->Type)
-                       {
-                       case 1:
-                               nent->Type = PMEMTYPE_FREE;
-                               break;
-                       default:
-                               nent->Type = PMEMTYPE_RESERVED;
-                               break;
-                       }
-                       nent->NUMADomain = 0;
-                       
-                       nPMemMapEnts ++;
-                       ent = (void*)( (tVAddr)ent + ent->Size + 4 );
-               }
-
-               // Ensure it's valid
-               nPMemMapEnts = PMemMap_ValidateMap(pmemmap, nPMemMapEnts, MAX_PMEMMAP_ENTS);
-               // TODO: Error handling
 
-               // Replace kernel with PMEMTYPE_USED
-               nPMemMapEnts = PMemMap_MarkRangeUsed(
-                       pmemmap, nPMemMapEnts, MAX_PMEMMAP_ENTS,
-                       KERNEL_LOAD, (tVAddr)&gKernelEnd - KERNEL_LOAD - KERNEL_BASE
-                       );
+               // Adjust Multiboot structure address
+               mbInfo = (void*)( (tVAddr)MbInfoPtr + KERNEL_BASE );
 
-               // Replace modules with PMEMTYPE_USED
-               nPMemMapEnts = PMemMap_MarkRangeUsed(pmemmap, nPMemMapEnts, MAX_PMEMMAP_ENTS,
-                       mbInfo->Modules, mbInfo->ModuleCount*sizeof(*mods)
-                       );
-               mods = (void*)mbInfo->Modules;
-               for( int i = 0; i < mbInfo->ModuleCount; i ++ )
-               {
-                       nPMemMapEnts = PMemMap_MarkRangeUsed(
-                               pmemmap, nPMemMapEnts, MAX_PMEMMAP_ENTS,
-                               mods->Start, mods->End - mods->Start
-                               );
-               }
-               
-               // Debug - Output map
-               PMemMap_DumpBlocks(pmemmap, nPMemMapEnts);
+               nPMemMapEnts = Multiboot_LoadMemoryMap(mbInfo, KERNEL_BASE, pmemmap, MAX_PMEMMAP_ENTS,
+                       KERNEL_LOAD, (tVAddr)&gKernelEnd - KERNEL_BASE);
 
-               // Adjust Multiboot structure address
-               mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
-               
                break; }
        
        // Multiboot 2
@@ -138,48 +79,22 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
        
        MM_InstallVirtual();    // Clean up virtual address space
        Heap_Install();         // Create initial heap
+       Time_Setup();   // Initialise timing
        
        // Start Multitasking
        Threads_Init();
-       
-       // Start Timers
-       Time_Setup();
-       
+
+       #if USE_ACPICA
+       // Poke ACPICA
+       ACPICA_Initialise();
+       #endif
+
        Log_Log("Arch", "Starting VFS...");
        // Load Virtual Filesystem
        VFS_Init();
        
        // Load initial modules
-       mods = (void*)( mbInfo->Modules + KERNEL_BASE );
-       giArch_NumBootModules = mbInfo->ModuleCount;
-       gaArch_BootModules = malloc( giArch_NumBootModules * sizeof(*gaArch_BootModules) );
-       for( int i = 0; i < mbInfo->ModuleCount; i ++ )
-       {
-                int    ofs;
-       
-               Log_Log("Arch", "Multiboot Module at 0x%08x, 0x%08x bytes (String at 0x%08x)",
-                       mods[i].Start, mods[i].End-mods[i].Start, mods[i].String);
-       
-               gaArch_BootModules[i].PBase = mods[i].Start;
-               gaArch_BootModules[i].Size = mods[i].End - mods[i].Start;
-       
-               // Always HW map the module data        
-               ofs = mods[i].Start&0xFFF;
-               gaArch_BootModules[i].Base = (void*)( MM_MapHWPages(mods[i].Start,
-                       (gaArch_BootModules[i].Size+ofs+0xFFF) / 0x1000
-                       ) + ofs );
-               
-               // Only map the string if needed
-               if( (tVAddr)mods[i].String > MAX_ARGSTR_POS )
-               {
-                       // Assumes the string is < 4096 bytes long)
-                       gaArch_BootModules[i].ArgString = (void*)(
-                               MM_MapHWPages(mods[i].String, 2) + (mods[i].String&0xFFF)
-                               );
-               }
-               else
-                       gaArch_BootModules[i].ArgString = (char *)mods[i].String + KERNEL_BASE;
-       }
+       gaArch_BootModules = Multiboot_LoadModules(mbInfo, KERNEL_BASE, &giArch_NumBootModules);
        
        // Pass on to Independent Loader
        Log_Log("Arch", "Starting system");
@@ -198,7 +113,9 @@ void Arch_LoadBootModules(void)
        {
                Log_Log("Arch", "Loading '%s'", gaArch_BootModules[i].ArgString);
                
-               if( !Module_LoadMem( gaArch_BootModules[i].Base, gaArch_BootModules[i].Size, gaArch_BootModules[i].ArgString ) )
+               if( !Module_LoadMem( gaArch_BootModules[i].Base,
+                       gaArch_BootModules[i].Size, gaArch_BootModules[i].ArgString
+                       ) )
                {
                        Log_Warning("Arch", "Unable to load module");
                }
@@ -214,5 +131,6 @@ void Arch_LoadBootModules(void)
                        MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].ArgString, 2 );
        }
        Log_Log("Arch", "Boot modules loaded");
-       free( gaArch_BootModules );
+       if( gaArch_BootModules )
+               free( gaArch_BootModules );
 }