Changeset 8f16ede6 in mainline for uspace/srv/hid/input/layout/us_dvorak.c

Timestamp:

2019-05-14T18:24:48Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

e89dc0b

Parents:

3e1bc35

Message:

Turning old layouts into dynamic libraries

Adds new makefiles which creates dynamic
libraries for every layout. Extends existing
makefile for exposing those layout in the
distributed image

File:

• uspace/srv/hid/input/layout/us_dvorak.c (modified) (4 diffs)

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

@@ -35 +35 @@
  */
 
+#if !(defined(CONFIG_KB_LAYOUT_EXTERNAL) || defined(CONFIG_KB_LAYOUT_us_dvorak))
+#error Invalid configuration of CONFIG_KB_LAYOUT
+#else
+
 #include <errno.h>
 #include <io/console.h>
@@ -45 +49 @@
 static wchar_t us_dvorak_parse_ev(layout_t *, kbd_event_t *ev);
 
-#ifdef CONFIG_KB_LAYOUT_us_dvorak
-
-layout_ops_t layout_default = {
+static const layout_ops_t layout_intern = {
         .create = us_dvorak_create,
         .destroy = us_dvorak_destroy,
@@ -53 +55 @@
 };
 
-#else
-
+#ifdef CONFIG_KB_LAYOUT_EXTERNAL
 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;
-}
-
+layout_ops_t get_layout(void)
+{
+        return layout_intern;
+}
+#else 
+layout_ops_t layout_default = layout_intern;
+layout_ops_t layout_active = layout_intern;
 #endif
 
@@ -273 +272 @@
 }
 
+#endif
+
 /**
  * @}