Changeset e1a27be in mainline for uspace/srv/hid/input

Timestamp:

2012-12-29T10:48:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb7 (diff), c928bb7 (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

Location:

uspace/srv/hid/input

Files:

• Makefile (modified) (1 diff)
• ctl/kbdev.c (modified) (1 diff)
• input.c (modified) (4 diffs)
• input.h (modified) (1 diff)
• layout.h (modified) (1 diff)
• layout/ar.c (added)
• layout/cz.c (modified) (1 diff)
• port/niagara.c (modified) (1 diff)
• port/ski.c (modified) (1 diff)
• proto/adb.c (modified) (1 diff)

uspace/srv/hid/input/Makefile

@@ -35 +35 @@
         layout/us_qwerty.c \
         layout/us_dvorak.c \
+        layout/ar.c \
         port/adb.c \
         port/adb_mouse.c \

uspace/srv/hid/input/ctl/kbdev.c

@@ -37 +37 @@
 
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <fcntl.h>

uspace/srv/hid/input/input.c

@@ -38 +38 @@
 
 #include <adt/list.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
@@ -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;
         }
@@ -423 +431 @@
         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);

uspace/srv/hid/input/input.h

@@ -39 +39 @@
 #define INPUT_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <async.h>
 

uspace/srv/hid/input/layout.h

@@ -60 +60 @@
 extern layout_ops_t us_dvorak_ops;
 extern layout_ops_t cz_ops;
+extern layout_ops_t ar_ops;
 
 extern layout_t *layout_create(layout_ops_t *);

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

@@ -35 +35 @@
 #include <io/console.h>
 #include <io/keycode.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include "../input.h"

uspace/srv/hid/input/port/niagara.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <thread.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include "../kbd_port.h"

uspace/srv/hid/input/port/ski.c

@@ -40 +40 @@
 #include <sys/types.h>
 #include <thread.h>
-#include <bool.h>
+#include <stdbool.h>
 #include "../kbd_port.h"
 #include "../kbd.h"

uspace/srv/hid/input/proto/adb.c

@@ -36 +36 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include "../mouse.h"
 #include "../mouse_port.h"