Changeset 28a5ebd in mainline for kernel/genarch


Ignore:
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/genarch
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/include/genarch/fb/font-8x16.h

    r4f663f3e r28a5ebd  
    4242#include <typedefs.h>
    4343
    44 extern uint16_t fb_font_glyph(const wchar_t ch);
     44extern uint16_t fb_font_glyph(const char32_t ch);
    4545extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
    4646

  • kernel/genarch/include/genarch/kbrd/scanc.h

    r4f663f3e r28a5ebd  
    4141#define SCANCODES  128
    4242
    43 extern wchar_t sc_primary_map[SCANCODES];
    44 extern wchar_t sc_secondary_map[SCANCODES];
     43extern char32_t sc_primary_map[SCANCODES];
     44extern char32_t sc_secondary_map[SCANCODES];
    4545
    4646#endif

  • kernel/genarch/src/drivers/dsrln/dsrlnout.c

    r4f663f3e r28a5ebd  
    4949} dsrlnout_instance_t;
    5050
    51 static void dsrlnout_putwchar(outdev_t *dev, const wchar_t ch)
     51static void dsrlnout_putuchar(outdev_t *dev, const char32_t ch)
    5252{
    5353        dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data;
    … …  
    6262
    6363static outdev_operations_t dsrlndev_ops = {
    64         .write = dsrlnout_putwchar,
     64        .write = dsrlnout_putuchar,
    6565        .redraw = NULL,
    6666        .scroll_up = NULL,

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

    r4f663f3e r28a5ebd  
    7171} ega_instance_t;
    7272
    73 static void ega_putwchar(outdev_t *, wchar_t);
     73static void ega_putuchar(outdev_t *, char32_t);
    7474static void ega_redraw(outdev_t *);
    7575
    7676static outdev_operations_t egadev_ops = {
    77         .write = ega_putwchar,
     77        .write = ega_putuchar,
    7878        .redraw = ega_redraw,
    7979        .scroll_up = NULL,
    … …  
    8181};
    8282
    83 static uint16_t ega_oem_glyph(const wchar_t ch)
    84 {
    85         if ((ch >= 0x0000) && (ch <= 0x007f))
     83static uint16_t ega_oem_glyph(const char32_t ch)
     84{
     85        if (ch <= 0x007f)
    8686                return ch;
    8787
    … …  
    515515}
    516516
    517 static void ega_display_wchar(ega_instance_t *instance, wchar_t ch)
     517static void ega_display_wchar(ega_instance_t *instance, char32_t ch)
    518518{
    519519        uint16_t index = ega_oem_glyph(ch);
    … …  
    538538}
    539539
    540 static void ega_putwchar(outdev_t *dev, wchar_t ch)
     540static void ega_putuchar(outdev_t *dev, char32_t ch)
    541541{
    542542        ega_instance_t *instance = (ega_instance_t *) dev->data;

  • kernel/genarch/src/drivers/ns16550/ns16550.c

    r4f663f3e r28a5ebd  
    112112}
    113113
    114 static void ns16550_putwchar(outdev_t *dev, wchar_t ch)
     114static void ns16550_putuchar(outdev_t *dev, char32_t ch)
    115115{
    116116        ns16550_instance_t *instance = (ns16550_instance_t *) dev->data;
    … …  
    128128
    129129static outdev_operations_t ns16550_ops = {
    130         .write = ns16550_putwchar,
     130        .write = ns16550_putuchar,
    131131        .redraw = NULL
    132132};

  • kernel/genarch/src/drivers/omap/uart.c

    r4f663f3e r28a5ebd  
    4949}
    5050
    51 static void omap_uart_putwchar(outdev_t *dev, wchar_t ch)
     51static void omap_uart_putuchar(outdev_t *dev, char32_t ch)
    5252{
    5353        omap_uart_t *uart = dev->data;
    … …  
    6262
    6363static outdev_operations_t omap_uart_ops = {
    64         .write = omap_uart_putwchar,
     64        .write = omap_uart_putuchar,
    6565        .redraw = NULL,
    6666        .scroll_up = NULL,

  • kernel/genarch/src/drivers/pl011/pl011.c

    r4f663f3e r28a5ebd  
    5656}
    5757
    58 static void pl011_uart_putwchar(outdev_t *dev, wchar_t ch)
     58static void pl011_uart_putuchar(outdev_t *dev, char32_t ch)
    5959{
    6060        pl011_uart_t *uart = dev->data;
    … …  
    7474
    7575static outdev_operations_t pl011_uart_ops = {
    76         .write = pl011_uart_putwchar,
     76        .write = pl011_uart_putuchar,
    7777        .redraw = NULL,
    7878        .scroll_up = NULL,

  • kernel/genarch/src/drivers/s3c24xx/uart.c

    r4f663f3e r28a5ebd  
    6161}
    6262
    63 static void s3c24xx_uart_putwchar(outdev_t *dev, wchar_t ch)
     63static void s3c24xx_uart_putuchar(outdev_t *dev, char32_t ch)
    6464{
    6565        s3c24xx_uart_t *uart =
    … …  
    9494
    9595static outdev_operations_t s3c24xx_uart_ops = {
    96         .write = s3c24xx_uart_putwchar,
     96        .write = s3c24xx_uart_putuchar,
    9797        .redraw = NULL,
    9898        .scroll_up = NULL,

  • kernel/genarch/src/fb/fb.c

    r4f663f3e r28a5ebd  
    123123} fb_instance_t;
    124124
    125 static void fb_putwchar(outdev_t *, wchar_t);
     125static void fb_putuchar(outdev_t *, char32_t);
    126126static void fb_redraw(outdev_t *);
    127127static void fb_scroll_up(outdev_t *);
    … …  
    129129
    130130static outdev_operations_t fbdev_ops = {
    131         .write = fb_putwchar,
     131        .write = fb_putuchar,
    132132        .redraw = fb_redraw,
    133133        .scroll_up = fb_scroll_up,
    … …  
    418418 *
    419419 */
    420 static void fb_putwchar(outdev_t *dev, wchar_t ch)
     420static void fb_putuchar(outdev_t *dev, char32_t ch)
    421421{
    422422        fb_instance_t *instance = (fb_instance_t *) dev->data;

  • kernel/genarch/src/fb/font-8x16.c

    r4f663f3e r28a5ebd  
    4343 * mark glyph if no specific glyph exists.
    4444 */
    45 uint16_t fb_font_glyph(const wchar_t ch)
     45uint16_t fb_font_glyph(const char32_t ch)
    4646{
    4747        if (ch == 0x0000)

  • kernel/genarch/src/kbrd/kbrd.c

    r4f663f3e r28a5ebd  
    7676 * @param sc Scancode of the key being released.
    7777 */
    78 static void key_released(kbrd_instance_t *instance, wchar_t sc)
     78static void key_released(kbrd_instance_t *instance, char32_t sc)
    7979{
    8080        spinlock_lock(&instance->keylock);
    … …  
    103103 * @param sc Scancode of the key being pressed.
    104104 */
    105 static void key_pressed(kbrd_instance_t *instance, wchar_t sc)
     105static void key_pressed(kbrd_instance_t *instance, char32_t sc)
    106106{
    107107        bool letter;
    108108        bool shift;
    109109        bool capslock;
    110         wchar_t ch;
     110        char32_t ch;
    111111
    112112        spinlock_lock(&instance->keylock);
    … …  
    158158
    159159        while (true) {
    160                 wchar_t sc = indev_pop_character(&instance->raw);
     160                char32_t sc = indev_pop_character(&instance->raw);
    161161
    162162                if (sc == IGNORE_CODE)

  • kernel/genarch/src/kbrd/kbrd_at.c

    r4f663f3e r28a5ebd  
    5959#define AT_SCROLL_SCAN_CODE     0x7E
    6060
    61 static bool is_lock_key(wchar_t);
     61static bool is_lock_key(char32_t);
    6262
    6363static indev_operations_t kbrd_raw_ops = {
    … …  
    6969 * @param sc Scancode of the key being released.
    7070 */
    71 static void key_released(kbrd_instance_t *instance, wchar_t sc)
     71static void key_released(kbrd_instance_t *instance, char32_t sc)
    7272{
    7373        spinlock_lock(&instance->keylock);
    … …  
    9696 * @param sc Scancode of the key being pressed.
    9797 */
    98 static void key_pressed(kbrd_instance_t *instance, wchar_t sc)
     98static void key_pressed(kbrd_instance_t *instance, char32_t sc)
    9999{
    100100        bool letter;
    … …  
    140140
    141141        while (true) {
    142                 wchar_t sc = indev_pop_character(&instance->raw);
     142                char32_t sc = indev_pop_character(&instance->raw);
    143143
    144144                if (sc == AT_KEY_RELEASE) {
    … …  
    203203}
    204204
    205 static bool is_lock_key(wchar_t sc)
     205static bool is_lock_key(char32_t sc)
    206206{
    207207        return ((sc == AT_CAPS_SCAN_CODE) || (sc == AT_NUM_SCAN_CODE) ||

  • kernel/genarch/src/kbrd/scanc_at.c

    r4f663f3e r28a5ebd  
    3939
    4040/** Primary meaning of scancodes. */
    41 wchar_t sc_primary_map[] = {
     41char32_t sc_primary_map[] = {
    4242        U_NULL, /* 0x00 */
    4343        U_SPECIAL, /* 0x01 - F9 */
    … …  
    135135
    136136/** Secondary meaning of scancodes. */
    137 wchar_t sc_secondary_map[] = {
     137char32_t sc_secondary_map[] = {
    138138        U_NULL, /* 0x00 */
    139139        U_SPECIAL, /* 0x01 - F9 */

  • kernel/genarch/src/kbrd/scanc_mac.c

    r4f663f3e r28a5ebd  
    4040
    4141/** Primary meaning of scancodes. */
    42 wchar_t sc_primary_map[SCANCODES] = {
     42char32_t sc_primary_map[SCANCODES] = {
    4343        [0x00] = 'a',
    4444        [0x01] = 's',
    … …  
    172172
    173173/** Secondary meaning of scancodes. */
    174 wchar_t sc_secondary_map[SCANCODES] = {
     174char32_t sc_secondary_map[SCANCODES] = {
    175175        [0x00] = 'A',
    176176        [0x01] = 'S',

  • kernel/genarch/src/kbrd/scanc_pc.c

    r4f663f3e r28a5ebd  
    4040
    4141/** Primary meaning of scancodes. */
    42 wchar_t sc_primary_map[SCANCODES] = {
     42char32_t sc_primary_map[SCANCODES] = {
    4343        U_NULL,         /* 0x00 - undefined */
    4444        U_ESCAPE,       /* 0x01 - Esc */
    … …  
    129129
    130130/** Secondary meaning of scancodes. */
    131 wchar_t sc_secondary_map[SCANCODES] = {
     131char32_t sc_secondary_map[SCANCODES] = {
    132132        U_NULL,         /* 0x00 - undefined */
    133133        U_ESCAPE,       /* 0x01 - Esc */

  • kernel/genarch/src/kbrd/scanc_sun.c

    r4f663f3e r28a5ebd  
    4040
    4141/** Primary meaning of scancodes. */
    42 wchar_t sc_primary_map[SCANCODES] = {
     42char32_t sc_primary_map[SCANCODES] = {
    4343        [0x00] = U_SPECIAL,
    4444        [0x01] = U_SPECIAL,
    … …  
    172172
    173173/** Secondary meaning of scancodes. */
    174 wchar_t sc_secondary_map[SCANCODES] = {
     174char32_t sc_secondary_map[SCANCODES] = {
    175175        [0x00] = U_SPECIAL,
    176176        [0x01] = U_SPECIAL,

  • kernel/genarch/src/srln/srln.c

    r4f663f3e r28a5ebd  
    5656
    5757        while (true) {
    58                 wchar_t ch = indev_pop_character(&instance->raw);
     58                char32_t ch = indev_pop_character(&instance->raw);
    5959
    6060                /* ANSI escape sequence processing */
Note: See TracChangeset for help on using the changeset viewer.