Changeset bbc6277 in mainline

Timestamp:

2017-11-30T17:00:09Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b5abaf7

Parents:

7f345cd0

Message:

Chardev output needs buffering.

Location:

uspace/srv/hid/output

Files:

• ctl/serial.c (modified) (2 diffs)
• ctl/serial.h (modified) (1 diff)
• output.c (modified) (3 diffs)
• output.h (modified) (1 diff)
• port/chardev.c (modified) (3 diffs)
• port/ega.c (modified) (2 diffs)
• proto/vt100.c (modified) (3 diffs)
• proto/vt100.h (modified) (3 diffs)

uspace/srv/hid/output/ctl/serial.c

@@ -105 +105 @@
 }
 
+static void serial_flush(outdev_t *dev)
+{
+        vt100_state_t *state = (vt100_state_t *) dev->data;
+
+        vt100_flush(state);
+}
+
 static outdev_ops_t serial_ops = {
         .yield = serial_yield,
@@ -111 +118 @@
         .get_caps = serial_get_caps,
         .cursor_update = serial_cursor_update,
-        .char_update = serial_char_update
+        .char_update = serial_char_update,
+        .flush = serial_flush
 };
 
 int serial_init(vt100_putchar_t putchar_fn,
-    vt100_control_puts_t control_puts_fn)
+    vt100_control_puts_t control_puts_fn, vt100_flush_t flush_fn)
 {
         vt100_state_t *state =
             vt100_state_create(SERIAL_COLS, SERIAL_ROWS, putchar_fn,
-            control_puts_fn);
+            control_puts_fn, flush_fn);
         if (state == NULL)
                 return ENOMEM;

uspace/srv/hid/output/ctl/serial.h

@@ -36 +36 @@
 #include "../proto/vt100.h"
 
-extern int serial_init(vt100_putchar_t, vt100_control_puts_t);
+extern int serial_init(vt100_putchar_t, vt100_control_puts_t, vt100_flush_t);
 
 #endif

uspace/srv/hid/output/output.c

@@ -219 +219 @@
                 dev->ops.cursor_update(dev, prev_col, prev_row, col, row,
                     visible);
+                dev->ops.flush(dev);
+
         }
         
@@ -342 +344 @@
                         }
                 }
-        }
+                
+                dev->ops.flush(dev);
+        }
+        
         
         async_answer_0(iid, EOK);
@@ -380 +385 @@
                         }
                 }
-        }
-        
+                dev->ops.flush(dev);
+
+        }
         async_answer_0(iid, EOK);
 }

uspace/srv/hid/output/output.h

@@ -52 +52 @@
             sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible);
         void (* char_update)(struct outdev *dev, sysarg_t col, sysarg_t row);
+        void (* flush)(struct outdev *dev);
 } outdev_ops_t;
 

uspace/srv/hid/output/port/chardev.c

@@ -46 +46 @@
 #include "chardev.h"
 
+enum {
+        chardev_buf_size = 4096
+};
+
 static char *console;
 
@@ -53 +57 @@
 static service_id_t console_cat_id;
 
+static uint8_t chardev_buf[chardev_buf_size];
+static size_t chardev_bused;
+
 static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
 static bool discovery_finished;
 static FIBRIL_CONDVAR_INITIALIZE(discovery_cv);
 
+static void chardev_flush(void)
+{
+        size_t nwr;
+
+        if (chardev_bused == 0)
+                return;
+
+        chardev_write(chardev, chardev_buf, chardev_bused, &nwr);
+        /* XXX Handle error */
+
+        chardev_bused = 0;
+}
+
 static void chardev_putchar(wchar_t ch)
 {
-        uint8_t byte = (uint8_t) ch;
-        size_t nwr;
-        chardev_write(chardev, &byte, 1, &nwr);
-        /* XXX Handle error */
+        if (chardev_bused == chardev_buf_size)
+                chardev_flush();
+        if (!ascii_check(ch))
+                ch = '?';
+        chardev_buf[chardev_bused++] = (uint8_t) ch;
 }
 
 static void chardev_control_puts(const char *str)
 {
-        size_t nwr;
-        chardev_write(chardev, (void *) str, str_size(str), &nwr);
-        /* XXX Handle error */
+        const char *p;
+
+        p = str;
+        while (*p != '\0')
+                chardev_putchar(*p++);
 }
 
@@ -175 +198 @@
         }
 
-        serial_init(chardev_putchar, chardev_control_puts);
+        serial_init(chardev_putchar, chardev_control_puts, chardev_flush);
 
         discovery_finished = true;

uspace/srv/hid/output/port/ega.c

@@ -169 +169 @@
 }
 
+static void ega_flush(outdev_t *dev)
+{
+}
+
 static outdev_ops_t ega_ops = {
         .yield = ega_yield,
@@ -175 +179 @@
         .get_caps = ega_get_caps,
         .cursor_update = ega_cursor_update,
-        .char_update = ega_char_update
+        .char_update = ega_char_update,
+        .flush = ega_flush
 };
 

uspace/srv/hid/output/proto/vt100.c

@@ -139 +139 @@
 
 vt100_state_t *vt100_state_create(sysarg_t cols, sysarg_t rows,
-    vt100_putchar_t putchar_fn, vt100_control_puts_t control_puts_fn)
+    vt100_putchar_t putchar_fn, vt100_control_puts_t control_puts_fn,
+        vt100_flush_t flush_fn)
 {
         vt100_state_t *state = malloc(sizeof(vt100_state_t));
@@ -147 +148 @@
         state->putchar = putchar_fn;
         state->control_puts = control_puts_fn;
+        state->flush = flush_fn;
         
         state->cols = cols;
@@ -228 +230 @@
 }
 
+void vt100_flush(vt100_state_t *state)
+{
+        state->flush();
+}
+
 /** @}
  */

uspace/srv/hid/output/proto/vt100.h

@@ -37 +37 @@
 typedef void (* vt100_putchar_t)(wchar_t ch);
 typedef void (* vt100_control_puts_t)(const char *str);
+typedef void (* vt100_flush_t)(void);
 
 typedef struct {
@@ -48 +49 @@
         vt100_putchar_t putchar;
         vt100_control_puts_t control_puts;
+        vt100_flush_t flush;
 } vt100_state_t;
 
 extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putchar_t,
-    vt100_control_puts_t);
+    vt100_control_puts_t, vt100_flush_t);
 extern void vt100_state_destroy(vt100_state_t *);
 
@@ -62 +64 @@
 extern void vt100_cursor_visibility(vt100_state_t *, bool);
 extern void vt100_putchar(vt100_state_t *, wchar_t);
+extern void vt100_flush(vt100_state_t *);
 
 #endif