Changeset a40dea3 in mainline for uspace/srv/hid/adb_mouse/adb_dev.c

Timestamp:

2011-06-20T20:04:39Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6a0ff7f4

Parents:

5203e256

Message:

Eliminate devmap_obsolete API.

File:

• uspace/srv/hid/adb_mouse/adb_dev.c (modified) (3 diffs)

uspace/srv/hid/adb_mouse/adb_dev.c

@@ -40 +40 @@
 #include <errno.h>
 #include <devmap.h>
-#include <devmap_obsolete.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <kernel/ipc/ipc_methods.h>
 
@@ -53 +51 @@
 {
         devmap_handle_t handle;
-        int rc = devmap_device_get_handle("adb/mouse", &handle,
+        async_exch_t *exch;
+        int rc;
+        
+        rc = devmap_device_get_handle("adb/mouse", &handle,
             IPC_FLAG_BLOCKING);
-        
         if (rc != EOK) {
                 printf("%s: Failed resolving ADB\n", NAME);
@@ -61 +61 @@
         }
         
-        int dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
-        if (dev_phone < 0) {
+        async_sess_t *dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+            IPC_FLAG_BLOCKING);
+        if (dev_sess == NULL) {
                 printf("%s: Failed connecting to ADB\n", NAME);
                 return ENOENT;
         }
         
+        exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with ADB\n", NAME);
+                async_hangup(dev_sess);
+                return ENOMEM;
+        }
+        
         /* NB: The callback connection is slotted for removal */
-        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events,
-            NULL) != 0) {
+        rc = async_connect_to_me(exch, 0, 0, 0, adb_dev_events, NULL);
+        async_exchange_end(exch);
+        
+        if (rc != 0) {
                 printf(NAME ": Failed to create callback from device\n");
-                return false;
+                async_hangup(dev_sess);
+                return ENOENT;
         }