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

  */
 SPINLOCK_INITIALIZE(sgcn_input_lock);
 /* functions referenced from definitions of I/O operations structures */
-static void sgcn_noop(chardev_t *);
-static void sgcn_putchar(chardev_t *, const char, bool);
+static void sgcn_putchar(outdev_t *, const char, bool);
-static char sgcn_key_read(chardev_t *);
-/** character device operations */
+/** SGCN output device operations */
-static chardev_operations_t sgcn_ops = {
+static outdev_operations_t sgcnout_ops = {
-    .suspend = sgcn_noop,
-    .resume = sgcn_noop,
-    .read = sgcn_key_read,
     .write = sgcn_putchar
 };
-/** SGCN character device */
+/** SGCN input device operations */
-chardev_t sgcn_io;
+static indev_operations_t sgcnin_ops = {
+    .poll = NULL
+};
-/** Address of the chardev, which is connected to SGCN. */
+static indev_t sgcnin;      /**< SGCN input device. */
-static chardev_t *sgcnout;
+static outdev_t sgcnout;    /**< SGCN output device. */
 /**
  * Set some sysinfo values (SRAM address and SRAM size).
  */
 static void register_sram(uintptr_t sram_begin_physical)
  * This function also writes the offset of the SGCN buffer within SRAM
  * under the sram.buffer.offset sysinfo key.
  */
 static void sgcn_buffer_begin_init(void)
+{
+    static bool initialized;
+    if (initialized)
+        return;
     init_sram_begin();
     ASSERT(strcmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0);
     /* lookup TOC entry with the correct key */
     sgcn_buffer_begin = sram_begin + SRAM_TOC->keys[i].offset;
     sysinfo_set_item_val("sram.buffer.offset", NULL,
         SRAM_TOC->keys[i].offset);
-}
-/**
- * Default suspend/resume operation for the input device.
- */
-static void sgcn_noop(chardev_t *d)
+    initialized = true;
-{
+}
 /**
  * Writes a single character to the SGCN (circular) output buffer
  * and updates the output write pointer so that SGCN gets to know
 /**
  * SGCN output operation. Prints a single character to the SGCN. If the line
  * feed character is written ('\n'), the carriage return character ('\r') is
  * written straight away.
  */
-static void sgcn_putchar(struct chardev * cd, const char c, bool silent)
+static void sgcn_putchar(outdev_t *od, const char c, bool silent)
+{
     if (!silent) {
         spinlock_lock(&sgcn_output_lock);
         sgcn_do_putchar(c);
         spinlock_unlock(&sgcn_output_lock);
+    }
+}
 /**
- * Called when actively reading the character. Not implemented yet.
- */
-static char sgcn_key_read(chardev_t *d)
-{
-    return (char) 0;
-}
-/**
  * Grabs the input for kernel.
  */
 void sgcn_grab(void)
+{
     kbd_disabled = true;
         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;
-        if (sgcnout)
-            chardev_push_character(sgcnout, c);
+        indev_push_character(&sgcnin, c);
+    }
     spinlock_unlock(&sgcn_input_lock);
+}
         thread_usleep(POLL_INTERVAL);
+    }
+}
 /**
- * A public function which initializes I/O from/to Serengeti console
+ * A public function which initializes input from the Serengeti console.
- * and sets it as a default input/output.
  */
-void sgcn_init(chardev_t *devout)
+indev_t *sgcnin_init(void)
+{
     sgcn_buffer_begin_init();
     kbd_type = KBD_SGCN;
     sysinfo_set_item_val("kbd", NULL, true);
     sysinfo_set_item_val("kbd.type", NULL, KBD_SGCN);
-    sysinfo_set_item_val("fb.kind", NULL, 4);
     thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
     if (!t)
         panic("Cannot create kkbdpoll.");
     thread_ready(t);
-    chardev_initialize("sgcn_io", &sgcn_io, &sgcn_ops);
+    indev_initialize("sgcnin", &sgcnin, &sgcnin_ops);
-    stdout = &sgcn_io;
+    return &sgcnin;
+}
+/**
+ * A public function which initializes output to the Serengeti console.
+ */
+void sgcnout_init(void)
+{
+    sgcn_buffer_begin_init();
+    sysinfo_set_item_val("fb.kind", NULL, 4);
+    outdev_initialize("sgcnout", &sgcnout, &sgcnout_ops);
-    sgcnout = devout;
+    stdout = &sgcnout;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/trunk/kernel/arch/sparc64/src/drivers/sgcn.c – Rev 4071 → 4111