Changeset 28ecadb in mainline for kernel/genarch/src/kbd

Timestamp:

2006-09-22T21:44:54Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d684e4

Parents:

16529d5

Message:

Convert sparc64 to detect keyboard and determine
its physical address by walking the memory representation
of the OpenFirmware device tree.

Add bus-specific functions that know how to apply the
"ranges" property to one component of the "reg" property.
Buses supported so far include FHC, EBUS and PCI.

Location:

kernel/genarch/src/kbd

Files:

• i8042.c (modified) (2 diffs)
• key.c (modified) (1 diff)
• ns16550.c (modified) (2 diffs)
• z8530.c (modified) (2 diffs)

kernel/genarch/src/kbd/i8042.c

@@ -81 +81 @@
 static void i8042_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = i8042_suspend,
         .resume = i8042_resume,
-        .read = key_read
+        .read = i8042_key_read
 };
 
@@ -174 +173 @@
 }
 
-char key_read(chardev_t *d)
+char i8042_key_read(chardev_t *d)
 {
         char ch;        

kernel/genarch/src/kbd/key.c

@@ -54 +54 @@
 #define ACTIVE_READ_BUFF_SIZE 16        /* Must be power of 2 */
 
+chardev_t kbrd;
+
 static uint8_t active_read_buff[ACTIVE_READ_BUFF_SIZE];
 

kernel/genarch/src/kbd/ns16550.c

@@ -60 +60 @@
 static void ns16550_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = ns16550_suspend,
         .resume = ns16550_resume,
-        .read = key_read
+        .read = ns16550_key_read
 };
 
@@ -119 +118 @@
 }
 
-char key_read(chardev_t *d)
+char ns16550_key_read(chardev_t *d)
 {
         char ch;        

kernel/genarch/src/kbd/z8530.c

@@ -63 +63 @@
 static void z8530_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = z8530_suspend,
         .resume = z8530_resume,
-        .read = key_read
+        .read = z8530_key_read
 };
 
@@ -142 +141 @@
 }
 
-char key_read(chardev_t *d)
+char z8530_key_read(chardev_t *d)
 {
         char ch;