Changeset c640876 in mainline

Timestamp:

2009-03-12T20:08:43Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

afdd441

Parents:

7ee8c5b

Message:

Fix one RAW dependency.

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/ia64/include/ski/ski.h (modified) (2 diffs)
• kernel/arch/ia64/src/asm.S (modified) (1 diff)
• kernel/arch/ia64/src/ia64.c (modified) (2 diffs)
• kernel/arch/ia64/src/ski/ski.c (modified) (6 diffs)
• kernel/genarch/include/drivers/ns16550/ns16550.h (modified) (1 diff)

HelenOS.config

@@ -334 +334 @@
 @ "generic" Keyboard or serial line
 @ "none" No input device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32] CONFIG_HID_IN (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=mips32&MACHINE!=msim)] CONFIG_HID_IN (choice)
+
+% Input device class
+@ "serial" Serial line
+@ "none" No input device
+! [MACHINE=ski|MACHINE=serengeti|MACHINE=msim] CONFIG_HID_IN (choice)
+
+% Output device class
+@ "serial" Serial line
+@ "none" No output device
+! [MACHINE=ski|MACHINE=serengeti|MACHINE=msim] CONFIG_HID_OUT (choice)
 
 % Output device class
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_HID_OUT (choice)
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_HID_OUT (choice)
 
 % Output device class

kernel/arch/ia64/include/ski/ski.h

@@ -36 +36 @@
 #define KERN_ia64_SKI_H_
 
-#include <arch/types.h>
 #include <console/chardev.h>
 
@@ -43 +42 @@
 #define SKI_PUTCHAR             31
 
-extern void ski_console_init(chardev_t *);
+extern indev_t *skiin_init(void);
+extern void skiout_init(void);
 extern void ski_kbd_grab(void);
 extern void ski_kbd_release(void);

kernel/arch/ia64/src/asm.S

@@ -52 +52 @@
         adds r14 = 7, in1
         mov r2 = ar.lc
-        mov r8 = in0
+        mov r8 = in0 ;;
         and r14 = -8, r14 ;;
         cmp.ne p6, p7 = r14, in1

kernel/arch/ia64/src/ia64.c

@@ -151 +151 @@
 {
 #ifdef SKI
-        srln_init(stdin);
-        ski_console_init(&srlnin);
+        indev_t *in;
+        in = skiin_init();
+        if (in)
+                srln_init(in);
+        skiout_init();
 #endif
         
@@ -166 +169 @@
         inr = NS16550_IRQ;
         
-        indev_t *kbrdin = ns16550_init(ns16550_t *) NS16550_BASE, devno, inr, NULL, NULL);
+        indev_t *kbrdin = ns16550_init((ns16550_t *) NS16550_BASE, devno, inr, NULL, NULL);
         if (kbrdin)
                 srln_init(kbrdin);

kernel/arch/ia64/src/ski/ski.c

@@ -44 +44 @@
 #include <arch.h>
 
-static chardev_t *skiout;
-
-static chardev_t ski_stdout;
+static indev_t skiin;           /**< Ski input device. */
+static outdev_t skiout;         /**< Ski output device. */
 
 static bool kbd_disabled;
@@ -58 +57 @@
  * @param ch Character to be printed.
  */
-static void ski_putchar(chardev_t *d, const char ch, bool silent)
+static void ski_putchar(outdev_t *d, const char ch, bool silent)
 {
         if (!silent) {
@@ -75 +74 @@
 }
 
-static chardev_operations_t ski_ops = {
+static indev_operations_t skiin_ops = {
+        .poll = NULL
+};
+
+static outdev_operations_t skiout_ops = {
         .write = ski_putchar
 };
@@ -109 +112 @@
 {
         char ch;
-        ipl_t ipl;
-        
-        ipl = interrupts_disable();
-        
-        if (kbd_disabled) {
-                interrupts_restore(ipl);
+        
+        if (kbd_disabled)
                 return;
-        }
-        
         ch = ski_getchar();
         if(ch == '\r')
                 ch = '\n'; 
-        if (ch && skiout) {
-                chardev_push_character(skiout, ch);
-                interrupts_restore(ipl);
+        if (ch) {
+                indev_push_character(&skiin, ch);
                 return;
         }
-
-        interrupts_restore(ipl);
 }
 
@@ -148 +142 @@
  * to open debug console.
  */
-void ski_console_init(chardev_t *devout)
-{
+static void ski_init(void)
+{
+        static bool initialized;
+
+        if (initialized)
+                return;
+        
         asm volatile (
                 "mov r15 = %0\n"
@@ -157 +156 @@
                 : "r15", "r8"
         );
-
-        skiout = devout;
-        chardev_initialize("ski_stdout", &ski_stdout, &ski_ops);
-        stdout = &ski_stdout;
-
+        
+        initialized = true;
+}
+
+indev_t *skiin_init(void)
+{
+        ski_init();
+
+        indev_initialize("skiin", &skiin, &skiin_ops);
         thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
-        if (!t)
-                panic("Cannot create kkbdpoll.");
-        thread_ready(t);
+        if (t)
+                thread_ready(t);
+        else
+                return NULL;
 
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);
 
+        return &skiin;
+}
+
+
+void skiout_init(void)
+{
+        ski_init();
+
+        outdev_initialize("skiout", &skiout, &skiout_ops);
+        stdout = &skiout;
+
         sysinfo_set_item_val("fb", NULL, false);
 }

kernel/genarch/include/drivers/ns16550/ns16550.h

@@ -69 +69 @@
 } ns16550_instance_t;
 
-extern indev_t *ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *)
+extern indev_t *ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *);
 
 #endif