Changeset 64c7e14 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2008-12-17T16:24:02Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8231246

Parents:

04de765

Message:

do not waist resources if no keyboard driver is used

File:

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

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

@@ -87 +87 @@
         uint32_t interrupts;
         prop = ofw_tree_getprop(node, "interrupts");
-        if (!prop || !prop->value)
+        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 || !prop->value)
+        if ((!prop) || (!prop->value))
                 panic("Can't find \"reg\" property.\n");
         
@@ -101 +101 @@
         size_t size;
         inr_t inr;
-        devno_t devno = device_assign_devno();
         
         switch (kbd_type) {
@@ -133 +132 @@
                 };
                 break;
-
+                
         default:
-                panic("Unexpected type.\n");
+                panic("Unexpected keyboard type.\n");
         }
         
@@ -146 +145 @@
         aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
         offset = pa - aligned_addr;
-        uintptr_t vaddr = hw_map(aligned_addr, offset + size) + offset;
-
+        
         switch (kbd_type) {
 #ifdef CONFIG_Z8530
         case KBD_Z8530:
-                z8530_init(devno, vaddr, inr, cir, cir_arg);
+                z8530_init(device_assign_devno(),
+                    hw_map(aligned_addr, offset + size) + offset, inr, cir, cir_arg);
                 break;
 #endif
 #ifdef CONFIG_NS16550
         case KBD_NS16550:
-                ns16550_init(devno, (ioport_t)vaddr, inr, cir, cir_arg);
+                ns16550_init(device_assign_devno(),
+                    (ioport_t) (hw_map(aligned_addr, offset + size) + offset), inr, cir, cir_arg);
                 break;
 #endif