Changeset 132ab5d1 in mainline for uspace/srv/hid/output/ctl/serial.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/hid/output/ctl/serial.c (modified) (2 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;