Changeset 8ff0bd2 in mainline for uspace/srv/hid/input/generic/gsp.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/gsp.c (moved) (moved from uspace/srv/hid/kbd/genarch/gsp.c ) (4 diffs)

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

@@ -29 +29 @@
 /**
  * @addtogroup kbdgen generic
- * @ingroup  kbd
+ * @ingroup  input
  * @{
  */ 
@@ -104 +104 @@
                 if (key == 0) break;
 
-                /* Insert one sequence. */              
+                /* Insert one sequence. */
                 rc = gsp_insert_seq(p, dp, mods, key);
                 if (rc != 0)
@@ -197 +197 @@
 
         if (t == NULL) {
-                printf("gsp_step: not found\n");
+                printf("gsp_step: not found, state=%d, input=0x%x\n",
+                    state, input);
                 *mods = 0;
                 *key = 0;
@@ -205 +206 @@
         *mods = t->out_mods;
         *key = t->out_key;
+
         return t->new_state;
 }