Changeset 7eade45 in mainline

Timestamp:

2005-04-19T16:19:48Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

425913b

Parents:

cb4b61d

Message:

Fix wrong order of *_init() function calls.

Files:

• arch/ia32/src/ia32.c (modified) (2 diffs)
• arch/mips/src/mips.c (modified) (1 diff)
• include/arch.h (modified) (1 diff)
• src/main/main.c (modified) (2 diffs)
• src/mm/page.c (modified) (1 diff)

arch/ia32/src/ia32.c

@@ -51 +51 @@
 
         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);
                 
@@ -65 +64 @@
 }
 
+void arch_post_mm_init()
+{
+        ega_init();     /* video */
+}
+
 void calibrate_delay_loop(void)
 {

arch/mips/src/mips.c

@@ -50 +50 @@
         cp0_count_write(0);
 }
+
+void arch_post_mm_init(void)
+{
+}

include/arch.h

@@ -41 +41 @@
 
 extern void arch_init(void);
+extern void arch_post_mm_init(void);
 extern void calibrate_delay_loop(void);
 

src/main/main.c

@@ -104 +104 @@
         arch_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();
@@ -115 +109 @@
         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);
+
         #ifdef __SMP__
         mp_init();      /* Multiprocessor */

src/mm/page.c

@@ -32 +32 @@
 void page_init(void)
 {       
+        page_arch_init();
         map_page_to_frame(0x0, 0x0, PAGE_NOT_PRESENT, 0);
-        page_arch_init();
 }