Changeset 7453929 in mainline

Timestamp:

2005-11-22T16:26:18Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aa72859

Parents:

f10c72e

Message:

Rename arch_late_init() to arch_pre_smp_init().
Add arch_post_smp_init().
Enable IRQ_KBD on ia-32 (doesn't work on Bochs SMP, works on Bochs UP).

Files:

• arch/amd64/src/amd64.c (modified) (2 diffs)
• arch/ia32/src/ia32.c (modified) (2 diffs)
• arch/ia64/src/dummy.s (modified) (2 diffs)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/mips32/src/mips32.c (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• arch/sparc64/src/sparc64.c (modified) (1 diff)
• generic/include/arch.h (modified) (1 diff)
• generic/src/main/main.c (modified) (1 diff)

arch/amd64/src/amd64.c

@@ -90 +90 @@
 }
 
-void arch_late_init(void)
+void arch_pre_smp_init(void)
 {
         if (config.cpu_active == 1) {
@@ -101 +101 @@
 }
 
+void arch_post_smp_init(void)
+{
+}
+
 void calibrate_delay_loop(void)
 {

arch/ia32/src/ia32.c

@@ -77 +77 @@
 }
 
-void arch_late_init(void)
+void arch_pre_smp_init(void)
 {
         if (config.cpu_active == 1) {
@@ -88 +88 @@
 }
 
+void arch_post_smp_init(void)
+{
+        trap_virtual_enable_irqs(1<<IRQ_KBD);
+}
+
 void calibrate_delay_loop(void)
 {

arch/ia64/src/dummy.s

@@ -33 +33 @@
 .global userspace
 .global before_thread_runs_arch
-.global arch_late_init
 .global cpu_sleep
 .global dummy
@@ -44 +43 @@
 calibrate_delay_loop:
 asm_delay_loop:
-arch_late_init:
 cpu_sleep:
 fpu_init:

arch/ia64/src/ia64.c

@@ -47 +47 @@
 {
 }
+
+void arch_pre_smp_init(void)
+{
+}
+
+
+void arch_post_smp_init(void)
+{
+}

arch/mips32/src/mips32.c

@@ -91 +91 @@
 }
 
-void arch_late_init(void)
+void arch_pre_smp_init(void)
+{
+}
+
+void arch_post_smp_init(void)
 {
 }

arch/ppc32/src/ppc32.c

@@ -37 +37 @@
 }
 
-void arch_late_init(void)
+void arch_pre_smp_init(void)
+{
+}
+
+void arch_post_smp_init(void)
 {
 }

arch/sparc64/src/sparc64.c

@@ -37 +37 @@
 }
 
-void arch_late_init(void)
+void arch_pre_smp_init(void)
+{
+}
+
+void arch_post_smp_init(void)
 {
 }

generic/include/arch.h

@@ -67 +67 @@
 extern void arch_pre_mm_init(void);
 extern void arch_post_mm_init(void);
-extern void arch_late_init(void);
+extern void arch_pre_smp_init(void);
+extern void arch_post_smp_init(void);
 extern void calibrate_delay_loop(void);
 

generic/src/main/main.c

@@ -166 +166 @@
                 config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);
 
-        arch_late_init();
-        
+        arch_pre_smp_init();
         smp_init();
+        arch_post_smp_init();
         printf("config.memory_size=%dM\n", config.memory_size/(1024*1024));
         printf("config.cpu_count=%d\n", config.cpu_count);