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

Timestamp:

2006-10-02T21:07:23Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

233af8c5

Parents:

36db5ac

Message:

Extend the OFW device tree node with a void pointer. The boot loader is
supposed to reset all pointers in all nodes. The kernel uses the pointer
to recognize that a particular device has already been visited and initialized.

Read interrupt mapping from the OFW device tree for FHC devices (z8530) and
EBUS devices (ns16550). In case of FHC devices, remove hardwired values from
the code and use only values read from the tree. FHC initialization is started
when a FHC device wants to map its interrupt. In case of EBUS devices, map
the interrupt to INO. Interrupt enabling in the interrupt controller for that
specific interrupt is not implemented yet.

File:

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

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

@@ -69 +69 @@
         name = ofw_tree_node_name(node);
         
+        /*
+         * Determine keyboard serial controller type.
+         */
         if (strcmp(name, "zs") == 0)
                 kbd_type = KBD_Z8530;
@@ -79 +82 @@
         }
         
+        /*
+         * Read 'interrupts' property.
+         */
+        uint32_t interrupts;
+        prop = ofw_tree_getprop(node, "interrupts");
+        if (!prop || !prop->value)
+                panic("Can't find \"interrupts\" property.\n");
+        interrupts = *((uint32_t *) prop->value);
+
+        /*
+         * Read 'reg' property.
+         */
         prop = ofw_tree_getprop(node, "reg");
-        if (!prop)
+        if (!prop || !prop->value)
                 panic("Can't find \"reg\" property.\n");
         
         uintptr_t pa;
         size_t size;
+        int ino;
         
         switch (kbd_type) {
@@ -93 +109 @@
                         return;
                 }
+                if (!ofw_fhc_map_interrupts(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &ino)) {
+                        printf("Failed to determine keyboard interrupts.\n");
+                        return;
+                }
                 break;
         case KBD_NS16550:
@@ -98 +118 @@
                 if (!ofw_ebus_apply_ranges(node->parent, ((ofw_ebus_reg_t *) prop->value) , &pa)) {
                         printf("Failed to determine keyboard address.\n");
+                        return;
+                }
+                if (!ofw_ebus_map_interrupts(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &ino)) {
+                        printf("Failed to determine keyboard interrupts.\n");
                         return;
                 }