Changeset 8a9a41e in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

1b9fcd0

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/srv/hid/output/port/ega.c (modified) (3 diffs)

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 = '?';