Changeset fdbc3ff in mainline for uspace/srv/hid/kbd/generic/kbd.c

Timestamp:

2010-11-19T23:50:06Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/kbd/generic/kbd.c (modified) (1 diff)

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;