Changeset 59e4864 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2008-11-11T08:00:42Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

f3c4a26

Parents:

a2a5529

Message:

Alfa of SMP support on IA64

File:

• kernel/arch/ia64/src/ia64.c (modified) (7 diffs)

kernel/arch/ia64/src/ia64.c

@@ -55 +55 @@
 #include <arch/bootinfo.h>
 #include <genarch/kbd/i8042.h>
+#include <genarch/kbd/ns16550.h>
+#include <smp/smp.h>
+#include <smp/ipi.h>
+#include <arch/atomic.h>
+#include <panic.h>
+#include <print.h>
+
+/*NS16550 as a COM 1*/
+#define NS16550_IRQ 4
+#define NS16550_PORT 0x3f8
 
 bootinfo_t *bootinfo;
@@ -103 +113 @@
 void arch_post_mm_init(void)
 {
-        irq_init(INR_COUNT, INR_COUNT);
-#ifdef SKI
-        ski_init_console();
+        if(config.cpu_active==1)
+        {
+                irq_init(INR_COUNT, INR_COUNT);
+#ifdef SKI
+                ski_init_console();
 #else   
-        ega_init();
+                ega_init();
 #endif  
+        }
         it_init();      
 }
@@ -128 +141 @@
         while (1) {
                 i8042_poll();
+#ifdef CONFIG_NS16550
+                ns16550_poll();
+#endif
                 thread_usleep(POLL_INTERVAL);
         }
@@ -136 +152 @@
 {
 
-        if (config.cpu_active == 1) {
+        {
                 /*
                  * Create thread that polls keyboard.
@@ -154 +170 @@
                 i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
 
+#ifdef CONFIG_NS16550
+                ns16550_init(kbd, NS16550_IRQ, NS16550_PORT); // as a COM 1
+#else
+#endif
                 thread_t *t;
                 t = thread_create(i8042_kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
@@ -164 +184 @@
         }
 }
+
 
 /** Enter userspace and never return. */
@@ -225 +246 @@
 void arch_reboot(void)
 {
-        // TODO
+        outb(0x64,0xfe);
         while (1);
 }