Changes in uspace/srv/hid/input/input.c [c928bb7:c9d011e4] in mainline

File:

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

uspace/srv/hid/input/input.c

@@ -38 +38 @@
 
 #include <adt/list.h>
-#include <stdbool.h>
+#include <bool.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
@@ -62 +62 @@
 #include "input.h"
 
-#define NUM_LAYOUTS  4
+#define NUM_LAYOUTS  3
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
         &us_qwerty_ops,
         &us_dvorak_ops,
-        &cz_ops,
-        &ar_ops
+        &cz_ops
 };
 
@@ -161 +160 @@
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[2]);
-                return;
-        }
-        
-        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
-            key == KC_F4) {
-                layout_destroy(kdev->active_layout);
-                kdev->active_layout = layout_create(layout[3]);
                 return;
         }
@@ -431 +423 @@
         kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
+#if defined(UARCH_arm32) && defined(MACHINE_testarm) && defined(CONFIG_FB)
+        kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
+#endif
+#if defined(UARCH_arm32) && defined(MACHINE_testarm) && !defined(CONFIG_FB)
+        kbd_add_dev(&gxemul_port, &stty_ctl);
+#endif
 #if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
         kbd_add_dev(&pl050_port, &pc_ctl);