WebSVN – HelenOS-historic – Path Comparison – /

Ignore whitespace Rev 22 → Rev 23

/SPARTAN/trunk/include/arch.h
40,6 → 40,7
#define TASK (cpu_private_data[CPU_ID_ARCH].task)

extern void arch_init(void);
extern void arch_post_mm_init(void);
extern void calibrate_delay_loop(void);

extern pri_t cpu_priority_high(void);

 /SPARTAN/trunk/src/main/main.c
 ,17 → 103,18
     arch_init();
+    heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_HEAP_SIZE);
+    frame_init();
+    page_init();
+    tlb_init();
+    arch_post_mm_init();
     printf("%s, %s\n", project, copyright);
     printf("%L: hardcoded_ktext_size=%dK, hardcoded_kdata_size=%dK\n",
         config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);
-    heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_HEAP_SIZE);
-    frame_init();
-    page_init();
-    tlb_init();
     #ifdef __SMP__
     mp_init();  /* Multiprocessor */
     #endif /* __SMP__ */

/SPARTAN/trunk/src/mm/page.c
31,6 → 31,6

void page_init(void)
{
page_arch_init();
map_page_to_frame(0x0, 0x0, PAGE_NOT_PRESENT, 0);
page_arch_init();
}

/SPARTAN/trunk/arch/mips/src/mips.c
49,3 → 49,7
cp0_compare_write(cp0_compare_value);
cp0_count_write(0);
}

void arch_post_mm_init(void)
{
}

 /SPARTAN/trunk/arch/ia32/src/ia32.c
 ,11 → 50,10
     pm_init();
     if (config.cpu_active == 1) {
-        ega_init(); /* video */
         i8042_init();   /* a20 bit */
-        i8259_init();   /* PIC */
+            i8259_init();   /* PIC */
         i8254_init();   /* hard clock */
         trap_register(VECTOR_SYSCALL, syscall);
         #ifdef __SMP__
 ,6 → 63,11
     }
 }
+void arch_post_mm_init()
+{
+    ega_init(); /* video */
+}
 void calibrate_delay_loop(void)
 {
     i8254_calibrate_delay_loop();