Changeset 0d107f31 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2006-10-13T20:42:54Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dcf22a

Parents:

8ce8499

Message:

Prototypical implementation of new IRQ redirector in sparc64.
The new code can support shared IRQs in kernel (and multiple IRQs per device).
Userspace support is yet to be written.
The only architecture that uses this code is actually sparc64 only.

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (5 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -41 +41 @@
 #include <genarch/kbd/ns16550.h>
 #endif
-
+#include <irq.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
@@ -52 +52 @@
 
 kbd_type_t kbd_type = KBD_UNKNOWN;
+
+static irq_t kbd_irq;
 
 /** Initialize keyboard.
@@ -102 +104 @@
         int inr;
         
+        irq_initialize(&kbd_irq);
+        
         switch (kbd_type) {
         case KBD_Z8530:
@@ -112 +116 @@
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
+                } else {
+                        kbd_irq.inr = inr;
+                        kbd_irq.devno = 0;                      /* FIXME: assign unique devno */
+                        kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
+                        kbd_irq.claim = z8530_claim;
+                        kbd_irq.handler = z8530_irq_handler;
+                        irq_register(&kbd_irq);
                 }
                 break;
+                
         case KBD_NS16550:
                 size = ((ofw_ebus_reg_t *) prop->value)->size;
@@ -123 +135 @@
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
+                } else {
+                        kbd_irq.inr = inr;
+                        kbd_irq.devno = 0;                      /* FIXME: assign unique devno */
+                        kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
+                        kbd_irq.claim = ns16550_claim;
+                        kbd_irq.handler = ns16550_irq_handler;
+                        irq_register(&kbd_irq);
                 }
                 break;
+
         default:
                 panic("Unexpected type.\n");