Changeset 3e828ea in mainline for uspace/srv/hid/input/port/chardev.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• uspace/srv/hid/input/port/chardev.c (modified) (1 diff)

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

@@ -64 +64 @@
         "char/s3c24xx_uart",
         /** Ski console, MSIM console, Sun4v console */
-        "devices/\\hw\\console\\a"
+        "devices/\\hw\\console\\a",
+        /** PL011 serial console */
+        "devices/\\hw\\uart\\a"
 };