Changeset ffa2c8ef in mainline for uspace/srv/hid/char_mouse

Timestamp:

2011-01-29T11:36:08Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

46b881c

Parents:

64d2b10

Message:

do not intermix low-level IPC methods with async framework methods

Location:

uspace/srv/hid/char_mouse

Files:

• char_mouse.c (modified) (4 diffs)
• chardev.c (modified) (3 diffs)

uspace/srv/hid/char_mouse/char_mouse.c

@@ -39 +39 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/mouse.h>
 #include <stdio.h>
@@ -83 +82 @@
         int retval;
 
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -90 +89 @@
                 case IPC_M_PHONE_HUNGUP:
                         if (client_phone != -1) {
-                                ipc_hangup(client_phone);
+                                async_hangup(client_phone);
                                 client_phone = -1;
                         }
 
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -107 +106 @@
                         retval = EINVAL;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }

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);
         }
 }