Changeset 28a5ebd in mainline for kernel/generic/src/console/chardev.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/generic/src/console/chardev.c (modified) (3 diffs)

kernel/generic/src/console/chardev.c

@@ -65 +65 @@
  *
  */
-void indev_push_character(indev_t *indev, wchar_t ch)
+void indev_push_character(indev_t *indev, char32_t ch)
 {
         assert(indev);
@@ -92 +92 @@
  *
  */
-wchar_t indev_pop_character(indev_t *indev)
+char32_t indev_pop_character(indev_t *indev)
 {
         if (atomic_load(&haltstate)) {
@@ -117 +117 @@
         waitq_sleep(&indev->wq);
         irq_spinlock_lock(&indev->lock, true);
-        wchar_t ch = indev->buffer[(indev->index - indev->counter) %
+        char32_t ch = indev->buffer[(indev->index - indev->counter) %
             INDEV_BUFLEN];
         indev->counter--;