Changeset 30ab05f in mainline for arch/sparc64/include

Timestamp:

2006-02-27T20:33:36Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d87c3f3

Parents:

02f441c0

Message:

sparc64 work.
Very raw and fragile preliminary standalone keyboard support - polling mode only.
Because of a workaround in Simics, the scan codes are the same as on ia32.

Location:

arch/sparc64/include

Files:

• console.h (modified) (1 diff)
• drivers/i8042.h (moved) (moved from arch/sparc64/include/drivers/keyboard.h ) (1 diff)
• interrupt.h (modified) (1 diff)

arch/sparc64/include/console.h

@@ -31 +31 @@
 
 extern void kofwinput(void *arg);
+extern void kkbdpoll(void *arg);
 extern void ofw_sparc64_console_init(void);
 extern void standalone_sparc64_console_init(void);

arch/sparc64/include/drivers/i8042.h

@@ -27 +27 @@
  */
 
-#ifndef __sparc64_KEYBOARD_H__
-#define __sparc64_KEYBOARD_H__
+#ifndef __sparc64_I8042_H__
+#define __sparc64_I8042_H__
+
+#include <arch/types.h>
 
 #define KBD_PHYS_ADDRESS        0x1fff8904000ULL
 #define KBD_VIRT_ADDRESS        0x00000d00000ULL
 
+#define STATUS_REG      4
+#define COMMAND_REG     4
+#define DATA_REG        6
+
+static inline void i8042_data_write(__u8 data)
+{
+        ((__u8 *)(KBD_VIRT_ADDRESS))[DATA_REG] = data;
+}
+
+static inline __u8 i8042_data_read(void)
+{
+        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[DATA_REG];
+}
+
+static inline __u8 i8042_status_read(void)
+{
+        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[STATUS_REG];
+}
+
+static inline void i8042_command_write(__u8 command)
+{
+        ((__u8 *)(KBD_VIRT_ADDRESS))[COMMAND_REG] = command;
+}
+
 #endif

arch/sparc64/include/interrupt.h

@@ -35 +35 @@
 #define IVT_FIRST       1
 
+/* Dummy macros. */
+#define IRQ_KBD         2
+#define VECTOR_KBD      IRQ_KBD
+
+#define trap_virtual_enable_irqs(x)
+#define trap_virtual_eoi()
+
 extern void interrupt_register(int n, const char *name, iroutine f);