Changeset de57e060 in mainline for kernel/arch/ia64/src/ski/ski.c

Timestamp:

2006-10-18T20:51:15Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

80ca47e

Parents:

cd13c2a

Message:

Convert ia64 to the new IRQ and notification scheme.

File:

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

kernel/arch/ia64/src/ski/ski.c

@@ -38 +38 @@
 #include <arch/interrupt.h>
 #include <sysinfo/sysinfo.h>
+#include <arch/types.h>
+#include <typedefs.h>
+#include <ddi/device.h>
+#include <ddi/irq.h>
+#include <ipc/irq.h>
+#include <synch/spinlock.h>
+#include <arch/asm.h>
+
+#define SKI_KBD_INR     0
+
+static irq_t ski_kbd_irq;
+static devno_t ski_kbd_devno;
 
 chardev_t ski_console;
 chardev_t ski_uconsole;
-static bool kb_disable;
-int kbd_uspace=0;
+
+static bool kbd_disabled;
 
 static void ski_putchar(chardev_t *d, const char ch);
@@ -58 +70 @@
 {
         __asm__ volatile (
-                "mov r15=%0\n"
-                "mov r32=%1\n"          /* r32 is in0 */
+                "mov r15 = %0\n"
+                "mov r32 = %1\n"        /* r32 is in0 */
                 "break 0x80000\n"       /* modifies r8 */
                 :
@@ -84 +96 @@
         
         __asm__ volatile (
-                "mov r15=%1\n"
+                "mov r15 = %1\n"
                 "break 0x80000;;\n"     /* modifies r8 */
-                "mov %0=r8;;\n"         
+                "mov %0 = r8;;\n"               
 
                 : "=r" (ch)
                 : "i" (SKI_GETCHAR)
-                : "r15",  "r8"
+                : "r15", "r8"
         );
 
@@ -104 +116 @@
         int ch;
 
-        while(!(ch=ski_getchar()))
+        while(!(ch = ski_getchar()))
                 ;
         if(ch == '\r')
@@ -116 +128 @@
         char ch;
         static char last; 
-
-        if (kb_disable)
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
+
+        if (kbd_disabled) {
+                interrupts_restore(ipl);
                 return;
+        }
+                
+        spinlock_lock(&ski_kbd_irq.lock);
 
         ch = ski_getchar();
         if(ch == '\r')
                 ch = '\n'; 
-        if (ch){
-                if(kbd_uspace){
+        if (ch) {
+                if (ski_kbd_irq.notif_cfg.notify && ski_kbd_irq.notif_cfg.answerbox) {
                         chardev_push_character(&ski_uconsole, ch);
-                        virtual_interrupt(IRQ_KBD,NULL);
-                }
-                else {
+                        ipc_irq_send_notif(&ski_kbd_irq);
+                } else {
                         chardev_push_character(&ski_console, ch);
                 }       
-                last = ch;              
+                last = ch;
+                spinlock_unlock(&ski_kbd_irq.lock);
+                interrupts_restore(ipl);
                 return;
-        }       
-
-        if (last){
-                if(kbd_uspace){
+        }
+
+        if (last) {
+                if (ski_kbd_irq.notif_cfg.notify && ski_kbd_irq.notif_cfg.answerbox) {
                         chardev_push_character(&ski_uconsole, 0);
-                        virtual_interrupt(IRQ_KBD,NULL);
+                        ipc_irq_send_notif(&ski_kbd_irq);
                 }
-                else {
-                }       
-                last = 0;               
-        }       
-
+                last = 0;
+        }
+
+        spinlock_unlock(&ski_kbd_irq.lock);
+        interrupts_restore(ipl);
 }
 
 /* Called from getc(). */
-static void ski_kb_enable(chardev_t *d)
-{
-        kb_disable = false;
+static void ski_kbd_enable(chardev_t *d)
+{
+        kbd_disabled = false;
 }
 
 /* Called from getc(). */
-static void ski_kb_disable(chardev_t *d)
-{
-        kb_disable = true;      
+static void ski_kbd_disable(chardev_t *d)
+{
+        kbd_disabled = true;    
+}
+
+/** Decline to service hardware IRQ.
+ *
+ * This is only a virtual IRQ, so always decline.
+ *
+ * @return Always IRQ_DECLINE.
+ */
+static irq_ownership_t ski_kbd_claim(void)
+{
+        return IRQ_DECLINE;
 }
 
 static chardev_operations_t ski_ops = {
-        .resume = ski_kb_enable,
-        .suspend = ski_kb_disable,
+        .resume = ski_kbd_enable,
+        .suspend = ski_kbd_disable,
         .write = ski_putchar,
         .read = ski_getchar_blocking
@@ -174 +205 @@
 {
         __asm__ volatile (
-                "mov r15=%0\n"
+                "mov r15 = %0\n"
                 "break 0x80000\n"
                 :
@@ -186 +217 @@
         stdout = &ski_console;
 
+        ski_kbd_devno = device_assign_devno();
+        
+        irq_initialize(&ski_kbd_irq);
+        ski_kbd_irq.inr = SKI_KBD_INR;
+        ski_kbd_irq.devno = ski_kbd_devno;
+        ski_kbd_irq.claim = ski_kbd_claim;
+        irq_register(&ski_kbd_irq);
+
 }
 
@@ -196 +235 @@
 void ski_set_console_sysinfo(void)
 {
-        sysinfo_set_item_val("kbd",NULL,true);
-        sysinfo_set_item_val("kbd.irq",NULL,IRQ_KBD);
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR);
+        sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno);
+}
+
+void ski_kbd_grab(void)
+{
+        ski_kbd_irq.notif_cfg.notify = false;
+}
+
+void ski_kbd_release(void)
+{
+        if (ski_kbd_irq.notif_cfg.answerbox)
+                ski_kbd_irq.notif_cfg.notify = true;
 }