Changeset 89c57b6 in mainline for uspace/srv/hid/char_mouse/char_mouse.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/char_mouse.c (modified) (4 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) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 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);
         }
 }
@@ -134 +133 @@
         snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
 
-        dev_handle_t dev_handle;
-        if (devmap_device_register(dev_path, &dev_handle) != EOK) {
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register(dev_path, &devmap_handle) != EOK) {
                 printf(NAME ": Unable to register device %s\n", dev_path);
                 return -1;