Changeset 607c5f9 in mainline

Timestamp:

2005-11-23T00:16:03Z (19 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).

Files:

• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/ia32/src/drivers/i8042.c (modified) (4 diffs)
• arch/mips32/src/drivers/keyboard.c (modified) (3 diffs)
• generic/include/console/chardev.h (modified) (2 diffs)
• generic/src/console/chardev.c (modified) (2 diffs)
• generic/src/console/console.c (modified) (1 diff)

arch/amd64/src/amd64.c

@@ -103 +103 @@
 void arch_post_smp_init(void)
 {
+        trap_virtual_enable_irqs(1<<IRQ_KBD);
 }
 

arch/ia32/src/drivers/i8042.c

@@ -36 +36 @@
 #include <synch/spinlock.h>
 #include <typedefs.h>
+#include <console/chardev.h>
+#include <console/console.h>
 
 /**
@@ -55 +57 @@
 static volatile int keyflags;           /**< Tracking of multiple keypresses. */
 static volatile int lockflags;          /**< Tracking of multiple keys lockings. */
+
+static void i8042_suspend(void);
+static void i8042_resume(void);
+
+static chardev_t kbrd;
+static chardev_operations_t ops = {
+        .suspend = i8042_suspend,
+        .resume = i8042_resume
+};
 
 /** Primary meaning of scancodes. */
@@ -221 +232 @@
         trap_register(VECTOR_KBD, i8042_interrupt);
         spinlock_initialize(&keylock);
+        chardev_initialize(&kbrd, &ops);
+        stdin = &kbrd;
 }
 
@@ -293 +306 @@
                 if (shift)
                         map = sc_secondary_map;
-                putchar(map[sc]);
+                chardev_push_character(&kbrd, map[sc]);
                 break;
         }
         spinlock_unlock(&keylock);
 }
+
+/* Called from getc(). */
+void i8042_resume(void)
+{
+}
+
+/* Called from getc(). */
+void i8042_suspend(void)
+{
+}

arch/mips32/src/drivers/keyboard.c

@@ -37 +37 @@
 #include <typedefs.h>
 
+static void keyboard_enable(void);
+static void keyboard_disable(void);
+
 static chardev_t kbrd;
-
-static void keyboard_enable(void);
+static chardev_operations_t ops = {
+        .resume = keyboard_enable,
+        .suspend = keyboard_disable
+};
 
 /** Initialize keyboard subsystem. */
@@ -45 +50 @@
 {
         cp0_unmask_int(KEYBOARD_IRQ);
-        chardev_initialize(&kbrd, keyboard_enable);
+        chardev_initialize(&kbrd, &ops);
         stdin = &kbrd;
 }
 
-/** Process keyboard interrupt.
- *
- * This function is called directly from the interrupt handler.
- * It feeds the keyboard buffer with characters read. When the buffer
- * is full, it simply masks the keyboard interrupt signal.
- */
+/** Process keyboard interrupt. */
 void keyboard(void)
 {
         char ch;
 
-        spinlock_lock(&kbrd.lock);
-        kbrd.counter++;
-        if (kbrd.counter == CHARDEV_BUFLEN - 1) {
-                /* buffer full => disable keyboard interrupt */
-                cp0_mask_int(KEYBOARD_IRQ);
-        }
-
         ch = *((char *) KEYBOARD_ADDRESS);
-        putchar(ch);
-        kbrd.buffer[kbrd.index++] = ch;
-        kbrd.index = kbrd.index % CHARDEV_BUFLEN; /* index modulo size of buffer */
-        waitq_wakeup(&kbrd.wq, WAKEUP_FIRST);
-        spinlock_unlock(&kbrd.lock);
+        chardev_push_character(&kbrd, ch);
 }
 
@@ -79 +68 @@
         cp0_unmask_int(KEYBOARD_IRQ);
 }
+
+/* Called from getc(). */
+void keyboard_disable(void)
+{
+        cp0_mask_int(KEYBOARD_IRQ);
+}

generic/include/console/chardev.h

@@ -35 +35 @@
 #include <synch/spinlock.h>
 
-#define CHARDEV_BUFLEN 10
+#define CHARDEV_BUFLEN 512
 
-typedef void (* ready_func_t)(void);
+/* Character device operations interface. */
+struct chardev_operations {
+        void (* suspend)(void);         /**< Suspend pushing characters. */
+        void (* resume)(void);          /**< Resume pushing characters. */
+};
+
+typedef struct chardev_operations chardev_operations_t;
 
 /** Character input device. */
@@ -46 +52 @@
         count_t counter;
         index_t index;
-        ready_func_t ready_func;        /**< Function to re-enable input from the device. */
+        chardev_operations_t *op;       /**< Implementation of chardev operations. */
 };
 
-extern void chardev_initialize(chardev_t *chardev, ready_func_t r);
+extern void chardev_initialize(chardev_t *chardev, chardev_operations_t *op);
+void chardev_push_character(chardev_t *chardev, __u8 ch);
 
 #endif /* __CHARDEV_H__ */

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;