Changeset 132ab5d1 in mainline for uspace/srv/hid/output/proto/vt100.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/proto/vt100.c (modified) (4 diffs)

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

@@ -32 +32 @@
 #include <inttypes.h>
 #include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <io/color.h>
 #include <types/common.h>
@@ -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();
+}
+
 /** @}
  */