Changeset 607c5f9 in mainline for generic/src

Timestamp:

2005-11-23T00:16:03Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a83a802

Parents:

2677758

Message:

Enable dummy kconsole for ia32 and amd64 (UP mode works).

Location:

generic/src/console

Files:

• chardev.c (modified) (2 diffs)
• console.c (modified) (1 diff)

generic/src/console/chardev.c

@@ -28 +28 @@
 
 #include <console/chardev.h>
+#include <putchar.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
 
-/** Initialize character device. */
-void chardev_initialize(chardev_t *chardev, ready_func_t r)
+/** Initialize character device.
+ *
+ * @param chardev Character device.
+ * @param op Implementation of character device operations.
+ */
+void chardev_initialize(chardev_t *chardev, chardev_operations_t *op)
 {
         waitq_initialize(&chardev->wq);
@@ -38 +43 @@
         chardev->counter = 0;
         chardev->index = 0;
-        chardev->ready_func = r;
+        chardev->op = op;
 }
+
+/** Push character read from input character device.
+ *
+ * @param chardev Character device.
+ * @param ch Character being pushed.
+ */
+void chardev_push_character(chardev_t *chardev, __u8 ch)
+{
+        spinlock_lock(&chardev->lock);
+        chardev->counter++;
+        if (chardev->counter == CHARDEV_BUFLEN - 1) {
+                /* buffer full => disable device interrupt */
+                chardev->op->suspend();
+        }
+
+        putchar(ch);
+        chardev->buffer[chardev->index++] = ch;
+        chardev->index = chardev->index % CHARDEV_BUFLEN; /* index modulo size of buffer */
+        waitq_wakeup(&chardev->wq, WAKEUP_FIRST);
+        spinlock_unlock(&chardev->lock);
+}

generic/src/console/console.c

@@ -83 +83 @@
         interrupts_restore(ipl);
 
-        chardev->ready_func();
+        chardev->op->resume();
 
         return ch;