Changeset 3e53ab7 in mainline for kernel/arch/sparc64

Timestamp:

2008-11-28T19:33:10Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7905360

Parents:

4c4ddbe9

Message:

Initial support for interrupt driven driver for ns16550.

Location:

kernel/arch/sparc64/src

Files:

• console.c (modified) (1 diff)
• drivers/kbd.c (modified) (3 diffs)

kernel/arch/sparc64/src/console.c

@@ -113 +113 @@
 #endif
 
+#ifdef CONFIG_NS16550
+#ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
+        if (kbd_type == KBD_NS16550) {
+                /*
+                 * The ns16550 driver is interrupt-driven.
+                 */
+                return;
+        }
+#endif
+#endif
         while (1) {
 #ifdef CONFIG_NS16550
+#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
                 if (kbd_type == KBD_NS16550)
                         ns16550_poll();
+#endif
 #endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);

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

@@ -104 +104 @@
         case KBD_Z8530:
                 size = ((ofw_fhc_reg_t *) prop->value)->size;
-                if (!ofw_fhc_apply_ranges(node->parent, ((ofw_fhc_reg_t *) prop->value) , &pa)) {
+                if (!ofw_fhc_apply_ranges(node->parent,
+                    ((ofw_fhc_reg_t *) prop->value), &pa)) {
                         printf("Failed to determine keyboard address.\n");
                         return;
                 }
-                if (!ofw_fhc_map_interrupt(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
+                if (!ofw_fhc_map_interrupt(node->parent,
+                    ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) {
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
@@ -116 +118 @@
         case KBD_NS16550:
                 size = ((ofw_ebus_reg_t *) prop->value)->size;
-                if (!ofw_ebus_apply_ranges(node->parent, ((ofw_ebus_reg_t *) prop->value) , &pa)) {
+                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_interrupt(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
+                if (!ofw_ebus_map_interrupt(node->parent,
+                    ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) {
                         printf("Failed to determine keyboard interrupt.\n");
                         return;
@@ -152 +156 @@
 #endif
         default:
-                printf("Kernel is not compiled with the necessary keyboard driver this machine requires.\n");
+                printf("Kernel is not compiled with the necessary keyboard "
+                    "driver this machine requires.\n");
         }
 }