Changeset 8d2760f in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2008-11-29T20:24:47Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

57e76cb

Parents:

dfd77382

Message:

Add additional members to the irq_t structure so that an interrupt-driven driver
does not need to know how to clear the level interrupt. The z8530 was modified
in this way and is much more generic. The ns16550 driver has also been modified,
but awaits testing. The sparc64 interrupt mapping and dispatch code is now using
the new info and calls the clear-interrupt-routine itself.

File:

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

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

@@ -64 +64 @@
         ofw_tree_property_t *prop;
         const char *name;
+        cir_t cir;
+        void *cir_arg;
         
         name = ofw_tree_node_name(node);
@@ -110 +112 @@
                 }
                 if (!ofw_fhc_map_interrupt(node->parent,
-                    ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
+                    ((ofw_fhc_reg_t *) prop->value), interrupts, &inr, &cir,
+                    &cir_arg)) {
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
@@ -124 +127 @@
                 }
                 if (!ofw_ebus_map_interrupt(node->parent,
-                    ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
+                    ((ofw_ebus_reg_t *) prop->value), interrupts, &inr, &cir,
+                    &cir_arg)) {
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
@@ -147 +151 @@
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                z8530_init(devno, inr, vaddr);
+                z8530_init(devno, vaddr, inr, cir, cir_arg);
                 break;
 #endif
 #ifdef CONFIG_NS16550
         case KBD_NS16550:
-                ns16550_init(devno, inr, (ioport_t)vaddr);
+                ns16550_init(devno, (ioport_t)vaddr, inr, cir, cir_arg);
                 break;
 #endif