Changeset ea28272 in mainline for uspace/srv/hid/kbd/port/chardev.c

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/chardev.c (modified) (2 diffs)

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

@@ -91 +91 @@
 
         /* 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");
@@ -125 +125 @@
                 int retval;
 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         /* TODO: Handle hangup */