Changeset 9693835 in mainline for kernel/genarch/src/drivers

Timestamp:

2009-03-13T09:00:58Z (17 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/genarch/src/drivers

Files:

• dsrln/dsrlnin.c (modified) (1 diff)
• i8042/i8042.c (modified) (1 diff)
• ns16550/ns16550.c (modified) (2 diffs)
• z8530/z8530.c (modified) (2 diffs)

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);
         }
 }