Changeset 6a44ee4 in mainline for uspace/srv/hid/input/generic/stroke.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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.

File:

• uspace/srv/hid/input/generic/stroke.c (moved) (moved from uspace/srv/hid/kbd/genarch/stroke.c ) (6 diffs)

uspace/srv/hid/input/generic/stroke.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbd
+/** @addtogroup input
  * @{
  */
@@ -52 +52 @@
 
 /** Simulate keystroke using sequences of key presses and releases. */
-void stroke_sim(unsigned mod, unsigned key)
+void stroke_sim(kbd_dev_t *kdev, unsigned mod, unsigned key)
 {
         int i;
@@ -60 +60 @@
         while (mods_keys[i][0] != 0) {
                 if (mod & mods_keys[i][0]) {
-                        kbd_push_ev(KEY_PRESS, mods_keys[i][1]);
+                        kbd_push_event(kdev, KEY_PRESS, mods_keys[i][1]);
                 }
                 ++i;
@@ -67 +67 @@
         /* Simulate key press and release. */
         if (key != 0) {
-                kbd_push_ev(KEY_PRESS, key);
-                kbd_push_ev(KEY_RELEASE, key);
+                kbd_push_event(kdev, KEY_PRESS, key);
+                kbd_push_event(kdev, KEY_RELEASE, key);
         }
 
@@ -75 +75 @@
         while (mods_keys[i][0] != 0) {
                 if (mod & mods_keys[i][0]) {
-                        kbd_push_ev(KEY_RELEASE, mods_keys[i][1]);
+                        kbd_push_event(kdev, KEY_RELEASE, mods_keys[i][1]);
                 }
                 ++i;