Changeset d0c5901 in mainline

Timestamp:

2006-06-02T14:07:29Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

c034b16

Parents:

116d1ef4

Message:

IA64 uspace keyboard kernel part

Files:

• arch/ia64/include/arch.h (modified) (1 diff)
• arch/ia64/include/interrupt.h (modified) (2 diffs)
• arch/ia64/include/ski/ski.h (modified) (2 diffs)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/ia64/src/interrupt.c (modified) (4 diffs)
• arch/ia64/src/ski/ski.c (modified) (3 diffs)
• generic/include/ipc/irq.h (modified) (1 diff)
• generic/src/ipc/irq.c (modified) (2 diffs)

arch/ia64/include/arch.h

@@ -32 +32 @@
 #define LOADED_PROG_STACK_PAGES_NO 2
 
+#include <arch/ski/ski.h>
+
 #endif

arch/ia64/include/interrupt.h

@@ -34 +34 @@
 #include <arch/register.h>
 
-#define IRQ_COUNT               1       /* TODO */
+#define IRQ_COUNT               257 /* 256 NOT suppotred IRQS*//* TODO */
+#define IRQ_KBD                 256 /* One simulated interrupt for ski simulator keyboard*/
 
 /** External Interrupt vectors. */
@@ -120 +121 @@
 extern void nop_handler(__u64 vector, istate_t *istate);
 extern void external_interrupt(__u64 vector, istate_t *istate);
+extern void virtual_interrupt(__u64 irq, void *param);
 extern void disabled_fp_register(__u64 vector, istate_t *istate);
 

arch/ia64/include/ski/ski.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <console/console.h>
 
 #define SKI_INIT_CONSOLE        20
@@ -37 +38 @@
 
 extern void ski_init_console(void);
+extern void ski_set_console_sysinfo(void);
 extern void poll_keyboard(void);
 
+extern chardev_t ski_uconsole;
+extern int kbd_uspace;
+
 #endif

arch/ia64/src/ia64.c

@@ -73 +73 @@
 void arch_post_mm_init(void)
 {
+        ski_set_console_sysinfo();
 }
 

arch/ia64/src/interrupt.c

@@ -45 +45 @@
 #include <proc/scheduler.h>
 #include <ipc/sysipc.h>
+#include <ipc/irq.h>
+#include <ipc/ipc.h>
 
 
@@ -53 +55 @@
 
 #define BUNDLE_SIZE             16
+
 
 char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
@@ -135 +138 @@
         printf("Interrupted context dump:\n");
         printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp, istate->ar_bspstore);
-        printf("ar.rnat=%#llx\tar.rsc=%$llx\n", istate->ar_rnat, istate->ar_rsc);
-        printf("ar.ifs=%#llx\tar.pfs=%#llx\n", istate->ar_ifs, istate->ar_pfs);
-        printf("cr.isr=%#llx\tcr.ipsr=%#llx\t\n", istate->cr_isr.value, istate->cr_ipsr);
+        printf("ar.rnat=%#018llx\tar.rsc=%#018llx\n", istate->ar_rnat, istate->ar_rsc);
+        printf("ar.ifs=%#018llx\tar.pfs=%#018llx\n", istate->ar_ifs, istate->ar_pfs);
+        printf("cr.isr=%#018llx\tcr.ipsr=%#018llx\t\n", istate->cr_isr.value, istate->cr_ipsr);
         
-        printf("cr.iip=%#llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, iip ? iip : "?");
-        printf("cr.iipa=%#llx\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
-        printf("cr.ifa=%#llx\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
+        printf("cr.iip=%#018llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, iip);
+        printf("cr.iipa=%#018llx\t(%s)\n", istate->cr_iipa, iipa);
+        printf("cr.ifa=%#018llx\t(%s)\n", istate->cr_ifa, ifa);
 }
 
@@ -243 +246 @@
 }
 
+void virtual_interrupt(__u64 irq,void *param)
+{
+        switch(irq) {
+                case IRQ_KBD:
+                        if(kbd_uspace) ipc_irq_send_notif(irq);
+                        break;
+                default:
+                        panic("\nUnhandled Virtual Interrupt request %d\n", irq);
+                break;
+        }
+}
+
 /* Reregister irq to be IPC-ready */
 void irq_ipc_bind_arch(__native irq)
 {
+        if(irq==IRQ_KBD) {
+                kbd_uspace=1;
+                return;
+        }
         panic("not implemented\n");
         /* TODO */
 }
+
+
+

arch/ia64/src/ski/ski.c

@@ -30 +30 @@
 #include <console/console.h>
 #include <console/chardev.h>
+#include <arch/interrupt.h>
+#include <sysinfo/sysinfo.h>
 
-static chardev_t ski_console;
+chardev_t ski_console;
+chardev_t ski_uconsole;
 static bool kb_disable;
+int kbd_uspace=0;
 
 static void ski_putchar(chardev_t *d, const char ch);
@@ -112 +116 @@
         if(ch == '\r')
                 ch = '\n'; 
-        if (ch)
-                chardev_push_character(&ski_console, ch);
+        if (ch){
+                if(kbd_uspace){
+                        chardev_push_character(&ski_uconsole, ch);
+                        virtual_interrupt(IRQ_KBD,NULL);
+                }
+                else {
+                        chardev_push_character(&ski_console, ch);
+
+                }       
+                
+        }       
 }
 
@@ -153 +166 @@
 
         chardev_initialize("ski_console", &ski_console, &ski_ops);
+        chardev_initialize("ski_uconsole", &ski_uconsole, &ski_ops);
         stdin = &ski_console;
         stdout = &ski_console;
+
 }
+/** Setup console sysinfo (i.e. Keyboard IRQ)
+ *
+ * Because sysinfo neads memory allocation/dealocation
+ * this functions should be called separetely from init.
+ *
+ */
+void ski_set_console_sysinfo(void)
+{
+        sysinfo_set_item_val("kbd",NULL,true);
+        sysinfo_set_item_val("kbd.irq",NULL,IRQ_KBD);
+}

generic/include/ipc/irq.h

@@ -43 +43 @@
         CMD_PORT_READ_1,
         CMD_PORT_WRITE_1,
+        CMD_IA64_GETCHAR,
         CMD_LAST
 } irq_cmd_type;

generic/src/ipc/irq.c

@@ -49 +49 @@
 #include <atomic.h>
 #include <syscall/copy.h>
+#include <console/console.h>
 
 typedef struct {
@@ -102 +103 @@
                 case CMD_PORT_WRITE_1:
                         outb((long)code->cmds[i].addr, code->cmds[i].value);
+                        break;
+#endif
+#if defined(ia64) 
+                case CMD_IA64_GETCHAR:
+                        IPC_SET_ARG2(call->data, _getc(&ski_uconsole));
                         break;
 #endif