Changeset 44b7783 in mainline for kernel/generic/src/console/chardev.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/chardev.c (modified) (3 diffs)

kernel/generic/src/console/chardev.c

@@ -36 +36 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
+#include <print.h>
+#include <func.h>
+#include <arch.h>
 
 /** Initialize input character device.
@@ -80 +83 @@
 }
 
+/** Pop character from input character device.
+ *
+ * @param indev Input character device.
+ *
+ * @return Character read.
+ *
+ */
+wchar_t indev_pop_character(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;
+}
+
 /** Initialize output character device.
  *
@@ -94 +137 @@
 }
 
+bool check_poll(indev_t *indev)
+{
+        if (indev == NULL)
+                return false;
+        
+        if (indev->op == NULL)
+                return false;
+        
+        return (indev->op->poll != NULL);
+}
+
 /** @}
  */