Changeset a8c48241 in mainline

Timestamp:

2005-11-27T21:37:50Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

4a28943

Parents:

f4338d2

Message:

Keyboard support for ski (ia64 emulator)

Location:

arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• include/ski/ski.h (modified) (1 diff)
• include/types.h (modified) (1 diff)
• src/drivers/it.c (modified) (2 diffs)
• src/ia64.c (modified) (2 diffs)
• src/ski/ski.c (modified) (1 diff)

arch/ia64/Makefile.inc

@@ -57 +57 @@
         arch/$(ARCH)/src/fmath.c \
         arch/$(ARCH)/src/mm/frame.c \
-        arch/$(ARCH)/src/drivers/it.c
+        arch/$(ARCH)/src/drivers/it.c \
+        arch/$(ARCH)/src/drivers/keyboard.c

arch/ia64/include/ski/ski.h

@@ -30 +30 @@
 #define __SKI_H__
 
+#include <arch/types.h>
+
+
 #define SKI_INIT_CONSOLE        20
+#define SKI_GETCHAR             21
 #define SKI_PUTCHAR             31
 
 extern void ski_init_console(void);
 extern void ski_putchar(const char ch);
+extern  __s32 ski_getchar(void);
         
 #endif

arch/ia64/include/types.h

@@ -33 +33 @@
 
 typedef signed char __s8;
+typedef signed short int __s16;
+typedef signed int __s32;
+typedef signed long __s64;
+
+
 
 typedef unsigned char __u8;

arch/ia64/src/drivers/it.c

@@ -36 +36 @@
 #include <time/clock.h>
 
+void keyboard(void);
+
 /** Initialize Interval Timer. */
 void it_init(void)
@@ -64 +66 @@
         srlz_d();                               /* propagate changes */
         clock();
+        keyboard();
 }

arch/ia64/src/ia64.c

@@ -33 +33 @@
 #include <arch/barrier.h>
 #include <arch/types.h>
+#include <arch/drivers/keyboard.h>
+
+#include <console/console.h>
 
 void arch_pre_mm_init(void)
@@ -41 +44 @@
         
         ski_init_console();
+        keyboard_init();
         it_init();
 }

arch/ia64/src/ski/ski.c

@@ -65 +65 @@
         if (ch == '\n') ski_putchar('\r');
 }
+
+
+/** Display character on debug console
+ *
+ * Use SSC (Simulator System Call) to
+ * get character from debug console.
+ */
+__s32 ski_getchar(void)
+{
+        __u64 ch;
+        
+        __asm__ (
+                "mov r15=%0\n"
+                "break 0x80000;;\n"     /* modifies r8 */
+                "mov %1=r8;;\n"         
+
+                :
+                : "i" (SKI_GETCHAR), "r" (ch)
+                : "r15",  "r8"
+        );
+
+        return (__s32)ch;
+}