Changeset 28a5ebd in mainline for kernel/genarch/src/drivers/ega/ega.c

Timestamp:

2020-06-18T15:39:50Z (4 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.

File:

• kernel/genarch/src/drivers/ega/ega.c (modified) (4 diffs)

kernel/genarch/src/drivers/ega/ega.c

@@ -71 +71 @@
 } ega_instance_t;
 
-static void ega_putwchar(outdev_t *, wchar_t);
+static void ega_putuchar(outdev_t *, char32_t);
 static void ega_redraw(outdev_t *);
 
 static outdev_operations_t egadev_ops = {
-        .write = ega_putwchar,
+        .write = ega_putuchar,
         .redraw = ega_redraw,
         .scroll_up = NULL,
@@ -81 +81 @@
 };
 
-static uint16_t ega_oem_glyph(const wchar_t ch)
-{
-        if ((ch >= 0x0000) && (ch <= 0x007f))
+static uint16_t ega_oem_glyph(const char32_t ch)
+{
+        if (ch <= 0x007f)
                 return ch;
 
@@ -515 +515 @@
 }
 
-static void ega_display_wchar(ega_instance_t *instance, wchar_t ch)
+static void ega_display_wchar(ega_instance_t *instance, char32_t ch)
 {
         uint16_t index = ega_oem_glyph(ch);
@@ -538 +538 @@
 }
 
-static void ega_putwchar(outdev_t *dev, wchar_t ch)
+static void ega_putuchar(outdev_t *dev, char32_t ch)
 {
         ega_instance_t *instance = (ega_instance_t *) dev->data;