Changeset 44b7783 in mainline for kernel/generic/src/console/console.c

Timestamp:

2009-04-21T12:43:14Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c2417bc

Parents:

d6d04e7

Message:

rename _getc() to indev_pop_character()
implicit creation of stdin via stdin_wire()

File:

• kernel/generic/src/console/console.c (modified) (5 diffs)

kernel/generic/src/console/console.c

@@ -45 +45 @@
 #include <ipc/irq.h>
 #include <arch.h>
-#include <func.h>
 #include <print.h>
 #include <putchar.h>
@@ -71 +70 @@
 static size_t klog_uspace = 0;
 
+/** Kernel log spinlock */
+SPINLOCK_INITIALIZE(klog_lock);
+
+/** Physical memory area used for klog buffer */
+static parea_t klog_parea;
+
+static indev_operations_t stdin_ops = {
+        .poll = NULL
+};
+
 /** Silence output */
 bool silent = false;
-
-/** Kernel log spinlock */
-SPINLOCK_INITIALIZE(klog_lock);
-
-/** Physical memory area used for klog buffer */
-static parea_t klog_parea;
 
 /** Standard input and output character devices */
 indev_t *stdin = NULL;
 outdev_t *stdout = NULL;
+
+indev_t *stdin_wire(void)
+{
+        if (stdin == NULL) {
+                stdin = malloc(sizeof(indev_t), FRAME_ATOMIC);
+                if (stdin != NULL)
+                        indev_initialize("stdin", stdin, &stdin_ops);
+        }
+        
+        return stdin;
+}
 
 /** Initialize kernel logging facility
@@ -139 +153 @@
 }
 
-bool check_poll(indev_t *indev)
-{
-        if (indev == NULL)
-                return false;
-        
-        if (indev->op == NULL)
-                return false;
-        
-        return (indev->op->poll != NULL);
-}
-
-/** Get character from input character device. Do not echo character.
- *
- * @param indev Input character device.
- * @return Character read.
- *
- */
-wchar_t _getc(indev_t *indev)
-{
-        if (atomic_get(&haltstate)) {
-                /* If we are here, we are hopefully on the processor that
-                 * issued the 'halt' command, so proceed to read the character
-                 * directly from input
-                 */
-                if (check_poll(indev))
-                        return indev->op->poll(indev);
-                
-                /* No other way of interacting with user */
-                interrupts_disable();
-                
-                if (CPU)
-                        printf("cpu%u: ", CPU->id);
-                else
-                        printf("cpu: ");
-                printf("halted (no polling input)\n");
-                cpu_halt();
-        }
-        
-        waitq_sleep(&indev->wq);
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&indev->lock);
-        wchar_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
-        indev->counter--;
-        spinlock_unlock(&indev->lock);
-        interrupts_restore(ipl);
-        
-        return ch;
-}
-
 /** Get string from input character device.
  *
@@ -207 +172 @@
         
         wchar_t ch;
-        while ((ch = _getc(indev)) != '\n') {
+        while ((ch = indev_pop_character(indev)) != '\n') {
                 if (ch == '\b') {
                         if (count > 0) {
@@ -233 +198 @@
 wchar_t getc(indev_t *indev)
 {
-        wchar_t ch = _getc(indev);
+        wchar_t ch = indev_pop_character(indev);
         putchar(ch);
         return ch;