Changeset db71e2a in mainline for uspace/srv/hid/input/input.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

Message:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

uspace/srv/hid/input/input.c

@@ -62 +62 @@
 #include "input.h"
 
-#define NUM_LAYOUTS  3
+#define NUM_LAYOUTS  4
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
         &us_qwerty_ops,
         &us_dvorak_ops,
-        &cz_ops
+        &cz_ops,
+        &ar_ops
 };
 
@@ -160 +161 @@
                 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;
         }
@@ -432 +440 @@
         kbd_add_dev(&msim_port, &stty_ctl);
 #endif
-#if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
-#endif
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &stty_ctl);
-#endif
 #if defined(UARCH_ppc32)
         kbd_add_dev(&adb_port, &apple_ctl);