Changeset 6095342 in mainline

Timestamp:

2005-12-10T01:28:08Z (19 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.

Files:

• Makefile (modified) (1 diff)
• arch/ia64/include/drivers/keyboard.h (deleted)
• arch/ia64/include/ski/ski.h (modified) (1 diff)
• arch/ia64/src/drivers/it.c (modified) (1 diff)
• arch/ia64/src/drivers/keyboard.c (deleted)
• arch/ia64/src/ia64.c (modified) (2 diffs)
• arch/ia64/src/ski/ski.c (modified) (3 diffs)
• arch/mips32/src/drivers/arc.c (modified) (3 diffs)
• arch/mips32/src/drivers/serial.c (modified) (3 diffs)
• arch/ppc32/src/console.c (modified) (2 diffs)

Makefile

@@ -175 +175 @@
         ln -sfn ../../genarch/include/ generic/include/genarch
 
-depend: archlinks Makefile.depend
-
-Makefile.depend:
+depend: archlinks
         -makedepend $(DEFS) $(CFLAGS) -f - $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) >Makefile.depend 2>/dev/null
         #$(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend

arch/ia64/include/ski/ski.h

@@ -38 +38 @@
 
 extern void ski_init_console(void);
-extern void ski_putchar(const char ch);
-extern  __s32 ski_getchar(void);
+extern void poll_keyboard(void);
         
 #endif

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;
+}

arch/mips32/src/drivers/arc.c

@@ -189 +189 @@
 }
 
-static int kbd_polling_enabled;
+static bool kbd_polling_enabled;
 static chardev_t console;
 
@@ -221 +221 @@
 static void arc_enable(chardev_t *dev)
 {
-        kbd_polling_enabled = 1;        
+        kbd_polling_enabled = true;
 }
 
 static void arc_disable(chardev_t *dev)
 {
-        kbd_polling_enabled = 0;
+        kbd_polling_enabled = false;
 }
 
@@ -247 +247 @@
 chardev_t * arc_console(void)
 {
-        kbd_polling_enabled = 1;
+        kbd_polling_enabled = true;
         
         chardev_initialize("arc_console", &console, &arc_ops);

arch/mips32/src/drivers/serial.c

@@ -34 +34 @@
 
 static chardev_t console;
-
 static serial_t sconf[SERIAL_MAX];
+static bool kb_enabled;
 
 static void serial_write(chardev_t *d, const char ch)
@@ -52 +52 @@
 static void serial_enable(chardev_t *d)
 {
+        kb_enabled = true;
 }
 
 static void serial_disable(chardev_t *d)
 {
+        kb_enabled = false;
 }
 
@@ -108 +110 @@
         chardev_initialize("serial_console", &console, &serial_ops);
         console.data = sd;
+        kb_enabled = true;
 
 //      exc_register(2, "serial_drvr", serial_interrupt);

arch/ppc32/src/console.c

@@ -29 +29 @@
 #include <putchar.h>
 #include <genarch/ofw/ofw.h>
+#include <console/chardev.h>
+#include <console/console.h>
 
 /** Print one character.
@@ -34 +36 @@
  * @param ch Character to be printed.
  */
-void putchar(const char ch)
+static void ofw_write(chardev_t *d, const char ch)
 {
         ofw_putchar(ch);
 }
+
+chardev_t ofw_console;
+static chardev_operations_t ofw_ops = {
+        .write = ofw_write
+};
+
+/** Initialize console to use ofw output */
+void console_init(void)
+{
+        chardev_initialize("ofw_out", &ofw_console, &ofw_ops);
+        stdout = &ofw_console;
+}