Changeset 8fb1bf82 in mainline for uspace/srv/hid/kbd

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/kbd

Files:

• genarch/gsp.c (modified) (1 diff)
• generic/kbd.c (modified) (1 diff)

uspace/srv/hid/kbd/genarch/gsp.c

@@ -198 +198 @@
         if (t == NULL) {
                 printf("gsp_step: not found\n");
-                *mods = NULL;
-                *key = NULL;
+                *mods = 0;
+                *key = 0;
                 return 0;
         }

uspace/srv/hid/kbd/generic/kbd.c

@@ -250 +250 @@
         snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
         
-        dev_handle_t dev_handle;
-        if (devmap_device_register(kbd, &dev_handle) != EOK) {
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register(kbd, &devmap_handle) != EOK) {
                 printf("%s: Unable to register device %s\n", NAME, kbd);
                 return -1;