Changeset 3e1bc35 in mainline

Timestamp:

2019-05-12T15:03:14Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

8f16ede6

Parents:

cb9313e

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-05-12 13:37:28)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-05-12 15:03:14)

Message:

Adding makefiles which build the layouts as dynamic library. All *.c files addedd to the directory uspace/srv/hid/input/layout will be treated as such

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• srv/hid/input/Makefile (modified) (1 diff)
• srv/hid/input/layout/Makefile (added)
• srv/hid/input/layout/Makefile.helper (added)
• srv/hid/input/layout/ar.c (modified) (1 diff)
• srv/hid/input/layout/cz.c (modified) (2 diffs)
• srv/hid/input/layout/us_dvorak.c (modified) (1 diff)
• srv/hid/input/layout/us_qwerty.c (modified) (1 diff)

uspace/Makefile

@@ -220 +220 @@
 endif
 
+## build keyboard layouts
+ifeq ($(CONFIG_RTLD),y)
+        DIRS += srv/hid/input/layout
+endif
+
 ## System libraries
 #

uspace/srv/hid/input/Makefile

@@ -53 +53 @@
         stroke.c
 
-
 include $(USPACE_PREFIX)/Makefile.common
-

uspace/srv/hid/input/layout/ar.c

@@ -54 +54 @@
 };
 
+#else
+
+layout_ops_t get_layout(void);
+layout_ops_t get_layout(void) {
+        layout_ops_t layout_default = {
+                .create = ar_create,
+                .destroy = ar_destroy,
+                .parse_ev = ar_parse_ev
+        };
+        return layout_default;
+}
+
 #endif
 

uspace/srv/hid/input/layout/cz.c

@@ -57 +57 @@
 } layout_cz_t;
 
-#ifdef CONFIG_KB_LAYOUT_us_qwerty
+#ifdef CONFIG_KB_LAYOUT_cz
 
 layout_ops_t layout_default = {
@@ -64 +64 @@
         .parse_ev = cz_parse_ev
 };
+
+#else
+
+layout_ops_t get_layout(void);
+layout_ops_t get_layout(void) {
+        layout_ops_t layout_default = {
+                .create = cz_create,
+                .destroy = cz_destroy,
+                .parse_ev = cz_parse_ev
+        };
+        return layout_default;
+}
 
 #endif

uspace/srv/hid/input/layout/us_dvorak.c

@@ -53 +53 @@
 };
 
+#else
+
+layout_ops_t get_layout(void);
+layout_ops_t get_layout(void) {
+        layout_ops_t layout_default = {
+                .create = us_dvorak_create,
+                .destroy = us_dvorak_destroy,
+                .parse_ev = us_dvorak_parse_ev
+        };
+        return layout_default;
+}
+
 #endif
 

uspace/srv/hid/input/layout/us_qwerty.c

@@ -53 +53 @@
 };
 
+#else
+
+layout_ops_t get_layout(void);
+layout_ops_t get_layout(void) {
+        layout_ops_t layout_default = {
+                .create = us_qwerty_create,
+                .destroy = us_qwerty_destroy,
+                .parse_ev = us_qwerty_parse_ev
+        };
+        return layout_default;
+}
+
 #endif