Changeset 4a2b52f in mainline

Timestamp:

2006-02-26T16:49:35Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

481c520

Parents:

a29bd22

Message:

Itanium active keyboard

Files:

• arch/ia64/src/ski/ski.c (modified) (5 diffs)
• kernel.config (modified) (1 diff)
• test/fault/fault1/test.c (added)

arch/ia64/src/ski/ski.c

@@ -47 +47 @@
 void ski_putchar(chardev_t *d, const char ch)
 {
-        __asm__ (
+        __asm__ volatile (
                 "mov r15=%0\n"
                 "mov r32=%1\n"          /* r32 is in0 */
@@ -73 +73 @@
         __u64 ch;
         
-        __asm__ (
+        __asm__ volatile (
                 "mov r15=%1\n"
                 "break 0x80000;;\n"     /* modifies r8 */
@@ -85 +85 @@
         return (__s32) ch;
 }
+
+/**
+        This is blocking wrap function of ski_getchar
+        It active waits ... for using with non-stable kernel 
+*/
+static char ski_getchar_blocking(chardev_t *d)
+{
+        volatile int ch;
+        while(!(ch=ski_getchar()));
+        if(ch == '\r') ch = '\n'; 
+        return (char) ch;
+}
+
 
 /** Ask keyboard if a key was pressed. */
@@ -117 +130 @@
         .resume = ski_kb_enable,
         .suspend = ski_kb_disable,
-        .write = ski_putchar
+        .write = ski_putchar,
+        .read = ski_getchar_blocking
 };
 
@@ -128 +142 @@
 void ski_init_console(void)
 {
-        __asm__ (
+        __asm__ volatile (
                 "mov r15=%0\n"
                 "break 0x80000\n"

kernel.config

@@ -89 +89 @@
 @ "mm/slab1" SLAB test1 - No CPU-cache
 @ "mm/slab2" SLAB test2 - SMP CPU cache
+@ "fault/fault1" Write to NULL (maybe page fault)
 @ [ARCH=mips32] "debug/mips1" Mips breakpoint-debug test 
 ! CONFIG_TEST (choice)