Modules/IPStack - Abstract HW addr cache, IPv6 TX (no ND yet)

[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 822bf70..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
 
@@ -87,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);
        
@@ -133,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;
 }