Changeset 9b2e20c in mainline

Timestamp:

2021-08-25T13:59:41Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ff6e91b

Parents:

c21cc26

git-author:

Jiri Svoboda <jiri@…> (2021-08-24 17:59:34)

git-committer:

Jiri Svoboda <jiri@…> (2021-08-25 13:59:41)

Message:

Add code page 437 support

EGA driver can now display all 256 characters (provided that the
application uses their proper Unicode code points).

Tester print4 'extended ASCII' demonstration did not work since
the introduction of Unicode, so replaced it with a demonstration
of code page 437 instead.

Location:

uspace

Files:

• app/tester/meson.build (modified) (2 diffs)
• app/tester/print/print4.c (modified) (3 diffs)
• lib/codepage/doc/doxygroups.h (added)
• lib/codepage/include/codepage/cp437.h (added)
• lib/codepage/meson.build (added)
• lib/codepage/src/cp437.c (added)
• lib/codepage/test/cp437.c (added)
• lib/codepage/test/main.c (added)
• lib/meson.build (modified) (1 diff)
• srv/hid/output/meson.build (modified) (1 diff)
• srv/hid/output/port/ega.c (modified) (3 diffs)

uspace/app/tester/meson.build

@@ -1 +1 @@
 #
+# Copyright (c) 2021 Jiri Svoboda
 # Copyright (c) 2005 Martin Decky
 # Copyright (c) 2007 Jakub Jermar
@@ -28 +29 @@
 #
 
-deps = [ 'block', 'drv', 'math' ]
+deps = [ 'block', 'codepage', 'drv', 'math' ]
 src = files(
         'tester.c',

uspace/app/tester/print/print4.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2009 Martin Decky
  * All rights reserved.
@@ -27 +28 @@
  */
 
+#include <codepage/cp437.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -51 +53 @@
         }
 
-        TPRINTF("\nExtended ASCII characters (128 - 255) using printf(\"%%lc\"):\n");
+        /*
+         * Print entire code page 437 (in Unicode)
+         *
+         * The purpose of this test is to verify that the EGA display
+         * driver can correctly map every code page 437 character back
+         * from Unicode and display it.
+         *
+         * With a Unicode-capable display this will just give you a bit
+         * of nostalgia.
+         */
+        TPRINTF("\nCode page 437 characters (converted to Unicode):\n");
 
-        for (group = 4; group < 8; group++) {
+        for (group = 0; group < 8; group++) {
                 TPRINTF("%#x: ", group << 5);
 
                 uint8_t index;
                 for (index = 0; index < 32; index++)
-                        TPRINTF("%lc", (wint_t) ((group << 5) + index));
+                        TPRINTF("%lc", cp437_decode((group << 5) + index));
 
                 TPRINTF("\n");

uspace/lib/meson.build

@@ -57 +57 @@
         'block',
         'clui',
+        'codepage',
         'compress',
         'cpp',

uspace/srv/hid/output/meson.build

@@ -28 +28 @@
 #
 
-deps = [ 'drv', 'fbfont', 'pixconv', 'ddev' ]
+deps = [ 'codepage', 'drv', 'fbfont', 'pixconv', 'ddev' ]
 src = files(
         'ctl/serial.c',

uspace/srv/hid/output/port/ega.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -31 +32 @@
  */
 
+#include <codepage/cp437.h>
 #include <errno.h>
 #include <sysinfo.h>
@@ -106 +108 @@
 {
         uint8_t glyph;
-
-        if (ascii_check(field->ch))
-                glyph = field->ch;
-        else
+        errno_t rc;
+
+        rc = cp437_encode(field->ch, &glyph);
+        if (rc != EOK)
                 glyph = '?';