Changeset 3e828ea in mainline for uspace/srv/hid

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

Location:

uspace/srv/hid

Files:

• compositor/compositor.c (modified) (1 diff)
• compositor/meson.build (added)
• console/Makefile (deleted)
• console/meson.build (added)
• input/Makefile (deleted)
• input/input.c (modified) (1 diff)
• input/meson.build (moved) (moved from uspace/app/getterm/Makefile ) (1 diff)
• input/port/chardev.c (modified) (1 diff)
• isdv4_tablet/Makefile (deleted)
• isdv4_tablet/meson.build (added)
• output/Makefile (deleted)
• output/meson.build (moved) (moved from uspace/app/mkfat/Makefile ) (1 diff)
• output/port/chardev.c (modified) (1 diff)
• remcons/meson.build (added)
• rfb/meson.build (added)
• s3c24xx_ts/meson.build (added)

uspace/srv/hid/compositor/compositor.c

@@ -67 +67 @@
 #include <transform.h>
 #include <rectangle.h>
-#include <surface.h>
-#include <cursor.h>
-#include <source.h>
-#include <drawctx.h>
-#include <codec/tga.h>
+#include <draw/surface.h>
+#include <draw/cursor.h>
+#include <draw/source.h>
+#include <draw/drawctx.h>
+#include <draw/codec.h>
 
 #include "compositor.h"

uspace/srv/hid/input/input.c

@@ -630 +630 @@
         kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
+#if defined(UARCH_arm64) && defined(MACHINE_virt)
+        kbd_add_dev(&chardev_port, &stty_ctl);
+#endif
         /* Silence warning on abs32le about kbd_add_dev() being unused */
         (void) kbd_add_dev;

uspace/srv/hid/input/meson.build

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-DEFS = -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)"
-BINARY = getterm
-
-SOURCES = \
-        getterm.c \
-        version.c \
-        welcome.c
-
-include $(USPACE_PREFIX)/Makefile.common
+deps = [ 'drv' ]
+src = files(
+        'layout/cz.c',
+        'layout/us_qwerty.c',
+        'layout/us_dvorak.c',
+        'layout/ar.c',
+        'port/chardev.c',
+        'proto/mousedev.c',
+        'ctl/kbdev.c',
+        'ctl/stty.c',
+        'ctl/sun.c',
+        'gsp.c',
+        'input.c',
+        'layout.c',
+        'stroke.c',
+)

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"
 };
 

uspace/srv/hid/output/meson.build

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-LIBS = block
-BINARY = mkfat
-
-SOURCES = \
-        mkfat.c
-
-include $(USPACE_PREFIX)/Makefile.common
+deps = [ 'drv' ]
+src = files(
+        'ctl/serial.c',
+        'port/ega.c',
+        'port/chardev.c',
+        'proto/vt100.c',
+        'output.c',
+)

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

@@ -216 +216 @@
 #elif defined(MACHINE_msim)
                 /* OK */
+#elif defined(UARCH_arm64) && defined(MACHINE_virt)
+                /* OK */
 #else
                 return EOK;