Changeset 17aca1c in mainline for uspace/srv/hid/char_mouse/chardev.c

Timestamp:

2011-02-04T20:56:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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/char_mouse/chardev.c (modified) (3 diffs)

uspace/srv/hid/char_mouse/chardev.c

@@ -34 +34 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/char.h>
 #include <async.h>
@@ -70 +69 @@
 
         /* NB: The callback connection is slotted for removal */
-        sysarg_t taskhash;
-        sysarg_t phonehash;
-        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
         }
-
-        async_new_connection(taskhash, phonehash, 0, NULL, chardev_events);
 
         return 0;
@@ -115 +110 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }