Changeset 08fed0a in mainline

Timestamp:

2009-03-12T19:16:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

29295cd

Parents:

91ea7c4

Message:

Update the SGCN driver to match the latest character I/O changes.

Location:

kernel/arch/sparc64

Files:

• include/drivers/sgcn.h (modified) (1 diff)
• src/console.c (modified) (1 diff)
• src/drivers/sgcn.c (modified) (9 diffs)

kernel/arch/sparc64/include/drivers/sgcn.h

@@ -119 +119 @@
 void sgcn_grab(void);
 void sgcn_release(void);
-void sgcn_init(chardev_t *);
+indev_t *sgcnin_init(void);
+void sgcnout_init(void);
 
 #endif

kernel/arch/sparc64/src/console.c

@@ -97 +97 @@
 static void serengeti_init(void)
 {
-#ifdef CONFIG_SRLN
-        srln_init(stdin);
-        sgcn_init(&srlnin);
+#ifdef CONFIG_SGCN_KBD
+        indev_t *kbrdin;
+        kbrdin = sgcnin_init();
+        if (kbrdin)
+                srlnin_init(kbrdin);
+#endif
+#ifdef CONFIG_SGCN_PRN
+        sgcnout_init();
 #endif
 }

kernel/arch/sparc64/src/drivers/sgcn.c

@@ -131 +131 @@
 
 /* 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 char sgcn_key_read(chardev_t *);
-
-/** character device operations */
-static chardev_operations_t sgcn_ops = {
-        .suspend = sgcn_noop,
-        .resume = sgcn_noop,
-        .read = sgcn_key_read,
+static void sgcn_putchar(outdev_t *, const char, bool);
+
+/** SGCN output device operations */
+static outdev_operations_t sgcnout_ops = {
         .write = sgcn_putchar
 };
 
-/** SGCN character device */
-chardev_t sgcn_io;
-
-/** Address of the chardev, which is connected to SGCN. */
-static chardev_t *sgcnout;
+/** 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. */
 
 /**
@@ -204 +201 @@
 static void sgcn_buffer_begin_init(void)
 {
+        static bool initialized;
+        
+        if (initialized)
+                return;
+
         init_sram_begin();
                 
@@ -220 +222 @@
         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;
 }
 
@@ -272 +269 @@
  * 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) {
@@ -286 +283 @@
 
 /**
- * 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.
  */
@@ -338 +327 @@
                 *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin;
                         
-                if (sgcnout)
-                        chardev_push_character(sgcnout, c);     
+                indev_push_character(&sgcnin, c);       
         }       
 
@@ -358 +346 @@
 
 /**
- * A public function which initializes I/O from/to Serengeti console
- * and sets it as a default input/output. 
- */
-void sgcn_init(chardev_t *devout)
+ * A public function which initializes input from the Serengeti console.
+ */
+indev_t *sgcnin_init(void)
 {
         sgcn_buffer_begin_init();
@@ -369 +356 @@
         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);
@@ -376 +362 @@
         thread_ready(t);
         
-        chardev_initialize("sgcn_io", &sgcn_io, &sgcn_ops);
-        stdout = &sgcn_io;
-
-        sgcnout = devout;
+        indev_initialize("sgcnin", &sgcnin, &sgcnin_ops);
+
+        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);   
+        stdout = &sgcnout;
 }