Changeset 82da5f5 in mainline for arch/sparc64/include/drivers/i8042.h

Timestamp:

2006-05-24T13:38:39Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

567807b1

Parents:

8182031

Message:

Modify sparc64 to choose optimal page size in each invocation of hw_map().
Use hw_map() to map keyboard device memory.

File:

• arch/sparc64/include/drivers/i8042.h (modified) (2 diffs)

arch/sparc64/include/drivers/i8042.h

@@ -33 +33 @@
 
 #define KBD_PHYS_ADDRESS        0x1fff8904000ULL
-#define KBD_VIRT_ADDRESS        0x000d0000000ULL
 
 #define STATUS_REG      4
@@ -39 +38 @@
 #define DATA_REG        6
 
+#define LAST_REG        DATA_REG
+
+extern volatile __u8 *kbd_virt_address;
+
 static inline void i8042_data_write(__u8 data)
 {
-        ((volatile __u8 *)(KBD_VIRT_ADDRESS))[DATA_REG] = data;
+        kbd_virt_address[DATA_REG] = data;
 }
 
 static inline __u8 i8042_data_read(void)
 {
-        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[DATA_REG];
+        return kbd_virt_address[DATA_REG];
 }
 
 static inline __u8 i8042_status_read(void)
 {
-        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[STATUS_REG];
+        return kbd_virt_address[STATUS_REG];
 }
 
 static inline void i8042_command_write(__u8 command)
 {
-        ((volatile __u8 *)(KBD_VIRT_ADDRESS))[COMMAND_REG] = command;
+        kbd_virt_address[COMMAND_REG] = command;
 }
 
+extern void kbd_init(void);
+
 #endif