Changeset 28a5ebd in mainline for kernel/generic/include/console

Timestamp:

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

kernel/generic/include/console

Files:

• chardev.h (modified) (4 diffs)
• console.h (modified) (2 diffs)

kernel/generic/include/console/chardev.h

@@ -55 +55 @@
 typedef struct {
         /** Read character directly from device, assume interrupts disabled. */
-        wchar_t (*poll)(struct indev *);
+        char32_t (*poll)(struct indev *);
 
         /** Signal out-of-band condition. */
@@ -68 +68 @@
         /** Protects everything below. */
         IRQ_SPINLOCK_DECLARE(lock);
-        wchar_t buffer[INDEV_BUFLEN];
+        char32_t buffer[INDEV_BUFLEN];
         size_t counter;
 
@@ -82 +82 @@
 typedef struct {
         /** Write character to output. */
-        void (*write)(struct outdev *, wchar_t);
+        void (*write)(struct outdev *, char32_t);
 
         /** Redraw any previously cached characters. */
@@ -112 +112 @@
 extern void indev_initialize(const char *, indev_t *,
     indev_operations_t *);
-extern void indev_push_character(indev_t *, wchar_t);
-extern wchar_t indev_pop_character(indev_t *);
+extern void indev_push_character(indev_t *, char32_t);
+extern char32_t indev_pop_character(indev_t *);
 extern void indev_signal(indev_t *, indev_signal_t);
 

kernel/generic/include/console/console.h

@@ -57 +57 @@
 extern outdev_t *stdout;
 
-extern void early_putwchar(wchar_t);
+extern void early_putuchar(char32_t);
 
 extern indev_t *stdin_wire(void);
@@ -66 +66 @@
 extern void kio_update(void *);
 extern void kio_flush(void);
-extern void kio_push_char(const wchar_t);
+extern void kio_push_char(const char32_t);
 SPINLOCK_EXTERN(kio_lock);
 
-extern wchar_t getc(indev_t *indev);
+extern char32_t getc(indev_t *indev);
 extern size_t gets(indev_t *indev, char *buf, size_t buflen);
 extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);