Changeset 49319ac in mainline for kernel/arch/ia64/src

Timestamp:

2007-01-03T21:41:46Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

6dbe6844

Parents:

dfe9e2c

Message:

SIMICS added as a simulator kernel runs on

Location:

kernel/arch/ia64/src

Files:

• ia64.c (modified) (6 diffs)
• simics/ega.c (added)

kernel/arch/ia64/src/ia64.c

@@ -51 +51 @@
 #include <syscall/syscall.h>
 #include <ddi/irq.h>
+#include <arch/simics/ega.h>
 
 void arch_pre_main(void)
@@ -82 +83 @@
 }
 
+
+
 void arch_post_mm_init(void)
 {
         irq_init(INR_COUNT, INR_COUNT);
+#ifdef SKI
         ski_init_console();
+#else   
+        ega_init();
+#endif  
         it_init();      
 }
@@ -99 +106 @@
 void arch_post_smp_init(void)
 {
-        thread_t *t;
 
         if (config.cpu_active == 1) {
@@ -105 +111 @@
                  * Create thread that polls keyboard.
                  */
-                t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll");
+#ifdef SKI
+                thread_t *t;
+                t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
                 if (!t)
                         panic("cannot create kkbdpoll\n");
                 thread_ready(t);
+#endif          
         }
 }
@@ -156 +165 @@
 void arch_grab_console(void)
 {
+#ifdef SKI
         ski_kbd_grab();
+#endif  
 }
 /** Return console to userspace
@@ -163 +174 @@
 void arch_release_console(void)
 {
+#ifdef SKI
         ski_kbd_release();
+#endif
 }