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

Timestamp:

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

Author:

GitHub <noreply@…>

Children:

9ea3a41

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/chardev.c (modified) (2 diffs)

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

@@ -78 +78 @@
 }
 
-static void chardev_putuchar(char32_t ch)
+static void chardev_putchar(char ch)
 {
         if (chardev_bused == chardev_buf_size)
                 chardev_flush();
-        if (!ascii_check(ch))
-                ch = '?';
         chardev_buf[chardev_bused++] = (uint8_t) ch;
+}
+
+static void chardev_putuchar(char32_t ch)
+{
+        char buf[STR_BOUNDS(1)];
+        size_t off;
+        size_t i;
+        errno_t rc;
+
+        off = 0;
+        rc = chr_encode(ch, buf, &off, sizeof(buf));
+        if (rc != EOK)
+                return;
+
+        for (i = 0; i < off; i++)
+                chardev_putchar(buf[i]);
 }
 
@@ -218 +232 @@
 #elif defined(UARCH_arm64) && defined(MACHINE_virt)
                 /* OK */
+#elif defined(UARCH_arm64) && defined(MACHINE_hikey960)
+                /* OK */
 #else
                 return EOK;