WebSVN – HelenOS – Diff – /branches/dynload/kernel/arch/sparc64/src/drivers/sgcn.c

 /** @addtogroup sparc64
  * @{
  */
 /**
  * @file
- * @brief   SGCN driver.
+ * @brief SGCN driver.
  */
 #include <arch.h>
 #include <arch/drivers/sgcn.h>
 #include <arch/drivers/kbd.h>
     ((type *) (sgcn_buffer_begin + (offset)))
 /** Returns a pointer to the console buffer header. */
 #define SGCN_BUFFER_HEADER  (SGCN_BUFFER(sgcn_buffer_header_t, 0))
-/** defined in drivers/kbd.c */
-extern kbd_type_t kbd_type;
 /** starting address of SRAM, will be set by the init_sram_begin function */
 static uintptr_t sram_begin;
 /**
  * starting address of the SGCN buffer, will be set by the
  */
 SPINLOCK_INITIALIZE(sgcn_input_lock);
 /* functions referenced from definitions of I/O operations structures */
-static void sgcn_putchar(outdev_t *, const char, bool);
+static void sgcn_putchar(outdev_t *, const wchar_t, bool);
 /** SGCN output device operations */
 static outdev_operations_t sgcnout_ops = {
     .write = sgcn_putchar
 };
-/** SGCN input device operations */
-static indev_operations_t sgcnin_ops = {
-    .poll = NULL
-};
-static indev_t sgcnin;      /**< SGCN input device. */
 static outdev_t sgcnout;    /**< SGCN output device. */
 /**
  * Set some sysinfo values (SRAM address and SRAM size).
  */
     if (initialized)
         return;
     init_sram_begin();
-    ASSERT(strcmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
+    ASSERT(str_cmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
     /* lookup TOC entry with the correct key */
     uint32_t i;
     for (i = 0; i < MAX_TOC_ENTRIES; i++) {
-        if (strcmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0)
+        if (str_cmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0)
             break;
+    }
     ASSERT(i < MAX_TOC_ENTRIES);
     sgcn_buffer_begin = sram_begin + SRAM_TOC->keys[i].offset;
     *buf_ptr = c;
     *out_wrptr_ptr = new_wrptr;
+}
 /**
- * SGCN output operation. Prints a single character to the SGCN. If the line
+ * SGCN output operation. Prints a single character to the SGCN. Newline
- * feed character is written ('\n'), the carriage return character ('\r') is
- * written straight away.
+ * character is converted to CRLF.
  */
-static void sgcn_putchar(outdev_t *od, const char c, bool silent)
+static void sgcn_putchar(outdev_t *od, const wchar_t ch, bool silent)
+{
     if (!silent) {
         spinlock_lock(&sgcn_output_lock);
-        sgcn_do_putchar(c);
+        if (ascii_check(ch)) {
-        if (c == '\n')
+            if (ch == '\n')
-            sgcn_do_putchar('\r');
+                sgcn_do_putchar('\r');
+            sgcn_do_putchar(ch);
+        } else
+            sgcn_do_putchar(U_SPECIAL);
         spinlock_unlock(&sgcn_output_lock);
+    }
+}
 /**
  * Grabs the input for kernel.
  */
 void sgcn_grab(void)
+{
-    kbd_disabled = true;
+    kbd_disabled = false;
+}
 /**
  * Releases the input so that userspace can use it.
  */
 /**
  * Function regularly called by the keyboard polling thread. Finds out whether
  * there are some unread characters in the input queue. If so, it picks them up
  * and sends them to the upper layers of HelenOS.
  */
-static void sgcn_poll()
+static void sgcn_poll(sgcn_instance_t *instance)
+{
     uint32_t begin = SGCN_BUFFER_HEADER->in_begin;
     uint32_t end = SGCN_BUFFER_HEADER->in_end;
     uint32_t size = end - begin;
         SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
     volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr);
     volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr);
     while (*in_rdptr_ptr != *in_wrptr_ptr) {
         buf_ptr = (volatile char *)
             SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
         char c = *buf_ptr;
         *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin;
-        indev_push_character(&sgcnin, c);
+        indev_push_character(instance->srlnin, c);
+    }
     spinlock_unlock(&sgcn_input_lock);
+}
 /**
  * Polling thread function.
  */
-static void kkbdpoll(void *arg) {
+static void ksgcnpoll(void *instance) {
     while (1) {
-        if (!silent) {
+        if (!silent)
-            sgcn_poll();
+            sgcn_poll(instance);
-        }
         thread_usleep(POLL_INTERVAL);
+    }
+}
 /**
  * A public function which initializes input from the Serengeti console.
  */
-indev_t *sgcnin_init(void)
+sgcn_instance_t *sgcnin_init(void)
+{
     sgcn_buffer_begin_init();
+    sgcn_instance_t *instance =
+        malloc(sizeof(sgcn_instance_t), FRAME_ATOMIC);
+    if (instance) {
+        instance->srlnin = NULL;
+        instance->thread = thread_create(ksgcnpoll, instance, TASK, 0,
+            "ksgcnpoll", true);
+        if (!instance->thread) {
+            free(instance);
+            return NULL;
+        }
+    }
+    return instance;
+}
-    kbd_type = KBD_SGCN;
+void sgcnin_wire(sgcn_instance_t *instance, indev_t *srlnin)
+{
-    sysinfo_set_item_val("kbd", NULL, true);
+    ASSERT(instance);
-    sysinfo_set_item_val("kbd.type", NULL, KBD_SGCN);
+    ASSERT(srlnin);
-    thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
-    if (!t)
-        panic("Cannot create kkbdpoll.");
+    instance->srlnin = srlnin;
-    thread_ready(t);
+    thread_ready(instance->thread);
-    indev_initialize("sgcnin", &sgcnin, &sgcnin_ops);
-    return &sgcnin;
+    sysinfo_set_item_val("kbd", NULL, true);
+}
 /**
  * A public function which initializes output to the Serengeti console.
  */

Subversion Repositories HelenOS

(root)/branches/dynload/kernel/arch/sparc64/src/drivers/sgcn.c – Rev 4346 → 4348