Changeset 2677758 in mainline

Timestamp:

2005-11-22T23:44:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

607c5f9

Parents:

a7fdfe1

Message:

Add chardev_t.
This type is meant to abstract any input character device such as keyboard, serial port etc.
Add stdin.
Add dummy kconsole.

Files:

• Makefile (modified) (1 diff)
• arch/mips32/src/drivers/keyboard.c (modified) (2 diffs)
• arch/mips32/src/mips32.c (modified) (2 diffs)
• generic/include/console/chardev.h (added)
• generic/include/console/console.h (added)
• generic/include/main/kconsole.h (added)
• generic/include/typedefs.h (modified) (1 diff)
• generic/src/console/chardev.c (added)
• generic/src/console/console.c (added)
• generic/src/main/kconsole.c (added)
• generic/src/main/kinit.c (modified) (7 diffs)
• generic/src/main/main.c (modified) (1 diff)

Makefile

@@ -94 +94 @@
 
 GENERIC_SOURCES = \
+        generic/src/console/chardev.c \
+        generic/src/console/console.c \
         generic/src/cpu/cpu.c \
         generic/src/main/main.c \
+        generic/src/main/kconsole.c \
         generic/src/main/kinit.c \
         generic/src/main/uinit.c \

arch/mips32/src/drivers/keyboard.c

@@ -1 +1 @@
 /*
+ * Copyright (C) 2003 Josef Cejka
  * Copyright (C) 2005 Jakub Jermar
  * All rights reserved.
@@ -28 +29 @@
 
 #include <arch/drivers/keyboard.h>
+#include <console/chardev.h>
+#include <console/console.h>
 #include <arch/cp0.h>
 #include <putchar.h>
+#include <synch/spinlock.h>
+#include <synch/waitq.h>
+#include <typedefs.h>
 
+static chardev_t kbrd;
+
+static void keyboard_enable(void);
+
+/** Initialize keyboard subsystem. */
 void keyboard_init(void)
 {
-        /* unmask keyboard interrupt */
+        cp0_unmask_int(KEYBOARD_IRQ);
+        chardev_initialize(&kbrd, keyboard_enable);
+        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.
+ */
+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);
+}
+
+/* Called from getc(). */
+void keyboard_enable(void)
+{
         cp0_unmask_int(KEYBOARD_IRQ);
 }
-
-void keyboard(void)
-{
-        putchar(*((char *) KEYBOARD_ADDRESS));
-}

arch/mips32/src/mips32.c

@@ -38 +38 @@
 #include <arch/interrupt.h>
 #include <arch/drivers/arc.h>
+#include <arch/drivers/keyboard.h>
 #include <proc/thread.h>
 #include <print.h>
@@ -83 +84 @@
 
         console_init();
+        keyboard_init();
         arc_print_memory_map();
         arc_print_devices();

generic/include/typedefs.h

@@ -80 +80 @@
 typedef struct the the_t;
 
+typedef struct chardev chardev_t;
+
 #endif

generic/src/main/kinit.c

@@ -27 +27 @@
  */
 
+#include <main/kinit.h>
+#include <main/kconsole.h>
+#include <main/uinit.h>
 #include <config.h>
 #include <arch.h>
-#include <main/kinit.h>
-#include <main/uinit.h>
 #include <proc/scheduler.h>
 #include <proc/task.h>
@@ -83 +84 @@
                         waitq_sleep(&kmp_completion_wq);
                 }
-                else panic("thread_create/kmp");
+                else panic("thread_create/kmp\n");
         }
 #endif /* CONFIG_SMP */
@@ -110 +111 @@
                                 thread_ready(t);
                         }
-                        else panic("thread_create/kcpulb");
+                        else panic("thread_create/kcpulb\n");
 
                 }
         }
 #endif /* CONFIG_SMP */
+
+        /*
+         * Create kernel console.
+         */
+        if (t = thread_create(kconsole, NULL, TASK, 0))
+                thread_ready(t);
+        else panic("thread_create/kconsole\n");
 
         interrupts_enable();
@@ -124 +132 @@
         m = vm_create(NULL);
         if (!m)
-                panic("vm_create");
+                panic("vm_create\n");
         u = task_create(m);
         if (!u)
-                panic("task_create");
+                panic("task_create\n");
         t = thread_create(uinit, NULL, u, THREAD_USER_STACK);
         if (!t)
-                panic("thread_create");
+                panic("thread_create\n");
 
         /*
@@ -137 +145 @@
         a = vm_area_create(m, VMA_TEXT, 1, UTEXT_ADDRESS);
         if (!a)
-                panic("vm_area_create: vm_text");
+                panic("vm_area_create: vm_text\n");
         vm_area_map(a, m);
         memcpy((void *) PA2KA(a->mapping[0]), (void *) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
@@ -146 +154 @@
         a = vm_area_create(m, VMA_STACK, 1, USTACK_ADDRESS);
         if (!a)
-                panic("vm_area_create: vm_stack");
+                panic("vm_area_create: vm_stack\n");
         vm_area_map(a, m);      
         
@@ -156 +164 @@
 #endif /* CONFIG_TEST */
 
-
         while (1) {
                 thread_sleep(60);

generic/src/main/main.c

@@ -71 +71 @@
         char *revision = "";
 #endif
-char *copyright = "Copyright (C) 2001-2005 Jakub Jermar\nCopyright (C) 2005 HelenOS project";
+char *copyright = "Copyright (C) 2001-2005 HelenOS project";
 
 config_t config;