Changeset 9693835 in mainline for kernel

Timestamp:

2009-03-13T09:00:58Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b16e9d

Parents:

648c9d9

Message:

get back support for framebuffer and keyboard for sparc64 (generic)

Location:

kernel

Files:

• arch/sparc64/Makefile.inc (modified) (2 diffs)
• arch/sparc64/src/console.c (modified) (1 diff)
• arch/sparc64/src/drivers/kbd.c (modified) (4 diffs)
• genarch/include/drivers/z8530/z8530.h (modified) (1 diff)
• genarch/src/drivers/dsrln/dsrlnin.c (modified) (1 diff)
• genarch/src/drivers/i8042/i8042.c (modified) (1 diff)
• genarch/src/drivers/ns16550/ns16550.c (modified) (2 diffs)
• genarch/src/drivers/z8530/z8530.c (modified) (2 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -77 +77 @@
         arch/$(KARCH)/src/drivers/kbd.c \
         arch/$(KARCH)/src/drivers/sgcn.c \
-        arch/$(KARCH)/src/drivers/pci.c
+        arch/$(KARCH)/src/drivers/pci.c \
+        arch/$(KARCH)/src/drivers/fhc.c
 
 ifeq ($(CONFIG_FB),y)
@@ -94 +95 @@
                 arch/$(KARCH)/src/mm/tsb.c
 endif
-
-ifdef CONFIG_Z8530
-        ARCH_SOURCES += \
-                arch/$(KARCH)/src/drivers/fhc.c
-endif

kernel/arch/sparc64/src/console.c

@@ -63 +63 @@
 {
 #ifdef CONFIG_FB
-        ofw_tree_property_t *prop;
-        ofw_tree_node_t *screen;
-        ofw_tree_node_t *keyboard;
+        ofw_tree_property_t *prop_scr = ofw_tree_getprop(aliases, "screen");
+        if (!prop_scr)
+                panic("Cannot find property 'screen'.");
+        if (!prop_scr->value)
+                panic("Cannot find screen alias.");
+        ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value);
+        if (!screen)
+                panic("Cannot find %s.", prop_scr->value);
         
-        prop = ofw_tree_getprop(aliases, "screen");
-        if (!prop)
-                panic("Cannot find property 'screen'.");
-        if (!prop->value)
-                panic("Cannot find screen alias.");
-        screen = ofw_tree_lookup(prop->value);
-        if (!screen)
-                panic("Cannot find %s.", prop->value);
+        scr_init(screen);
+#endif
 
-        scr_init(screen);
-
-        prop = ofw_tree_getprop(aliases, "keyboard");
-        if (!prop)
+#ifdef CONFIG_SUN_KBD
+        ofw_tree_property_t *prop_kbd = ofw_tree_getprop(aliases, "keyboard");
+        if (!prop_kbd)
                 panic("Cannot find property 'keyboard'.");
-        if (!prop->value)
+        if (!prop_kbd->value)
                 panic("Cannot find keyboard alias.");
-        keyboard = ofw_tree_lookup(prop->value);
+        ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value);
         if (!keyboard)
-                panic("Cannot find %s.", prop->value);
-
+                panic("Cannot find %s.", prop_kbd->value);
+        
         kbd_init(keyboard);
-#else
-        panic("Standard console requires FB, "
-              "but the kernel is not compiled with FB support.");
 #endif
 }

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

@@ -58 +58 @@
 kbd_type_t kbd_type = KBD_UNKNOWN;
 
-#if defined (CONFIG_Z8530) || defined (CONFIG_NS16550)
+#ifdef CONFIG_SUN_KBD
 
 /** Initialize keyboard.
@@ -169 +169 @@
                     offset;
                 
-                indev_t *kbrdin = z8530_init(z8530, devno, inr, cir, cir_arg);
-                if (kbrdin)
-                        kbrd_init(kbrdin);
+                indev_t *kbrdin_z8530 = z8530_init(z8530, devno, inr, cir, cir_arg);
+                if (kbrdin_z8530)
+                        kbrd_init(kbrdin_z8530);
                 
                 /*
@@ -192 +192 @@
                     offset;
                 
-                indev_t *kbrdin = ns16550_init(ns16550, devno, inr, cir, cir_arg);
-                if (kbrdin)
-                        kbrd_init(kbrdin);
+                indev_t *kbrdin_ns16550 = ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                if (kbrdin_ns16550)
+                        kbrd_init(kbrdin_ns16550);
                 
                 /*
@@ -215 +215 @@
 }
 
-        #endif
+#endif
+
 /** @}
  */

kernel/genarch/include/drivers/z8530/z8530.h

@@ -121 +121 @@
 } z8530_instance_t;
 
-extern devin_t *z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *);
+extern indev_t *z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *);
 
 #endif

kernel/genarch/src/drivers/dsrln/dsrlnin.c

@@ -40 +40 @@
 #include <arch/asm.h>
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
         .poll = NULL
 };

kernel/genarch/src/drivers/i8042/i8042.c

@@ -43 +43 @@
 #include <mm/slab.h>
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
         .poll = NULL
 };

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -43 +43 @@
 #define LSR_DATA_READY  0x01
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
         .poll = NULL
 };
@@ -65 +65 @@
         if (pio_read_8(&dev->lsr) & LSR_DATA_READY) {
                 uint8_t x = pio_read_8(&dev->rbr);
-                chardev_push_character(&instance->kbrdin, x);
+                indev_push_character(&instance->kbrdin, x);
         }
 }

kernel/genarch/src/drivers/z8530/z8530.c

@@ -41 +41 @@
 #include <mm/slab.h>
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
         .poll = NULL
 };
@@ -83 +83 @@
         if (z8530_read(&dev->ctl_a, RR0) & RR0_RCA) {
                 uint8_t x = z8530_read(&dev->ctl_a, RR8);
-                chardev_push_character(&instance->kbrdin, x);
+                indev_push_character(&instance->kbrdin, x);
         }
 }