Changeset 28a5ebd in mainline for uspace/srv/hid/output/ctl

Timestamp:

2020-06-18T15:39:50Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ce52c333

Parents:

4f663f3e

Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

Location:

uspace/srv/hid/output/ctl

Files:

• serial.c (modified) (2 diffs)
• serial.h (modified) (1 diff)

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

@@ -57 +57 @@
         vt100_goto(state, col, row);
         vt100_set_attr(state, field->attrs);
-        vt100_putwchar(state, field->ch);
+        vt100_putuchar(state, field->ch);
 }
 
@@ -122 +122 @@
 };
 
-errno_t serial_init(vt100_putwchar_t putwchar_fn,
+errno_t serial_init(vt100_putuchar_t putuchar_fn,
     vt100_control_puts_t control_puts_fn, vt100_flush_t flush_fn)
 {
         vt100_state_t *state =
-            vt100_state_create(SERIAL_COLS, SERIAL_ROWS, putwchar_fn,
+            vt100_state_create(SERIAL_COLS, SERIAL_ROWS, putuchar_fn,
             control_puts_fn, flush_fn);
         if (state == NULL)

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

@@ -37 +37 @@
 #include "../proto/vt100.h"
 
-extern errno_t serial_init(vt100_putwchar_t, vt100_control_puts_t, vt100_flush_t);
+extern errno_t serial_init(vt100_putuchar_t, vt100_control_puts_t, vt100_flush_t);
 
 #endif