Changeset 6095342 in mainline for arch/ia64/src

Timestamp:

2005-12-10T01:28:08Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

aace6624

Parents:

fcfac420

Message:

Some small fixes, basic changes to ia64 & ppc32 without testing.

Location:

arch/ia64/src

Files:

• drivers/it.c (modified) (1 diff)
• drivers/keyboard.c (deleted)
• ia64.c (modified) (2 diffs)
• ski/ski.c (modified) (3 diffs)

arch/ia64/src/drivers/it.c

@@ -30 +30 @@
  
 #include <arch/drivers/it.h>
-#include <arch/drivers/keyboard.h>
+#include <arch/ski/ski.h>
 #include <arch/interrupt.h>
 #include <arch/register.h>

arch/ia64/src/ia64.c

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

arch/ia64/src/ski/ski.c

@@ -28 +28 @@
 
 #include <arch/ski/ski.h>
+#include <console/console.h>
+#include <console/chardev.h>
 
-/** Initialize debug console
- *
- * Issue SSC (Simulator System Call) to
- * to open debug console.
- */
-void ski_init_console(void)
-{
-        __asm__ (
-                "mov r15=%0\n"
-                "break 0x80000\n"
-                :
-                : "i" (SKI_INIT_CONSOLE)
-                : "r15", "r8"
-        );
-}
+static chardev_t ski_console;
+static bool kb_disable;
 
 /** Display character on debug console
@@ -52 +41 @@
  * @param ch   Character to be printed.
  */
-void ski_putchar(const char ch)
+void ski_write(chardev_t *d, const char ch)
 {
         __asm__ (
@@ -91 +80 @@
         return (__s32)ch;
 }
+
+/** Ask keyboard if a key was pressed. */
+void poll_keyboard(void)
+{
+        char ch;
+
+        if (kb_disable)
+                return;
+
+        ch = ski_getchar();
+        if(ch == '\r')
+                ch = '\n'; 
+        if (ch)
+                chardev_push_character(&ski_console, ch);
+}
+
+/* Called from getc(). */
+static void ski_kb_enable(chardev_t *)
+{
+        kb_disable = false;
+}
+
+/* Called from getc(). */
+static void ski_kb_disable(chardev_t *d)
+{
+        kb_disable = true;      
+}
+
+
+static chardev_operations_t ski_ops = {
+        .resume = ski_kb_enable,
+        .suspend = ski_kb_disable,
+        .write = ski_write
+};
+
+
+/** Initialize debug console
+ *
+ * Issue SSC (Simulator System Call) to
+ * to open debug console.
+ */
+void ski_init_console(void)
+{
+        __asm__ (
+                "mov r15=%0\n"
+                "break 0x80000\n"
+                :
+                : "i" (SKI_INIT_CONSOLE)
+                : "r15", "r8"
+        );
+
+        chardev_initialize("ski_console", &ski_console, &ski_ops);
+        stdin = &ski_console;
+        stdout = &ski_console;
+}