Changeset 7bdcc45 in mainline for uspace/srv/hid/kbd/port/adb.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/port/adb.c (modified) (2 diffs)

uspace/srv/hid/kbd/port/adb.c

@@ -71 +71 @@
 
         /* NB: The callback connection is slotted for removal */
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
@@ -105 +105 @@
                 int retval;
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */