Changes in uspace/srv/hid/output/port/ega.c [bdf06ad:4122410] in mainline

File:

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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -32 +31 @@
  */
 
-#include <codepage/cp437.h>
 #include <errno.h>
 #include <sysinfo.h>
@@ -90 +88 @@
                 break;
         case CHAR_ATTR_RGB:
-                attr =
-                    ((RED(attrs.val.rgb.fgcolor) >= 0x80) ? 0x40 : 0) |
-                    ((GREEN(attrs.val.rgb.fgcolor) >= 0x80) ? 0x20 : 0) |
-                    ((BLUE(attrs.val.rgb.fgcolor) >= 0x80) ? 0x10 : 0) |
-                    ((RED(attrs.val.rgb.bgcolor) >= 0x80) ? 0x04 : 0) |
-                    ((GREEN(attrs.val.rgb.bgcolor) >= 0x80) ? 0x02 : 0) |
-                    ((BLUE(attrs.val.rgb.bgcolor) >= 0x80) ? 0x01 : 0);
+                attr = (attrs.val.rgb.bgcolor < attrs.val.rgb.fgcolor) ?
+                    ega.style_inverted : ega.style_normal;
                 break;
         }
@@ -113 +106 @@
 {
         uint8_t glyph;
-        errno_t rc;
-
-        rc = cp437_encode(field->ch, &glyph);
-        if (rc != EOK)
+
+        if (ascii_check(field->ch))
+                glyph = field->ch;
+        else
                 glyph = '?';