Changeset 432a269 in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/hw/bus/cuda_adb/cuda_adb.c (modified) (6 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -48 +48 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <assert.h>
 #include "cuda_adb.h"
 
-// FIXME: remove this header
-#include <abi/ipc/methods.h>
-
-#define NAME "cuda_adb"
+#define NAME  "cuda_adb"
 
 static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -154 +150 @@
 
         for (i = 0; i < ADB_MAX_ADDR; ++i) {
-                adb_dev[i].client_phone = -1;
+                adb_dev[i].client_sess = NULL;
                 adb_dev[i].service_id = 0;
         }
@@ -199 +195 @@
         sysarg_t method;
         service_id_t dsid;
-        int retval;
         int dev_addr, i;
 
@@ -220 +215 @@
         async_answer_0(iid, EOK);
 
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
@@ -230 +225 @@
                 }
                 
-                switch (method) {
-                case IPC_M_CONNECT_TO_ME:
-                        if (adb_dev[dev_addr].client_phone != -1) {
-                                retval = ELIMIT;
-                                break;
-                        }
-                        adb_dev[dev_addr].client_phone = IPC_GET_ARG5(call);
-                        /*
-                         * A hack so that we send the data to the phone
-                         * regardless of which address the device is on.
-                         */
-                        for (i = 0; i < ADB_MAX_ADDR; ++i) {
-                                if (adb_dev[i].service_id == dsid) {
-                                        adb_dev[i].client_phone = IPC_GET_ARG5(call);
+                async_sess_t *sess =
+                    async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
+                if (sess != NULL) {
+                        if (adb_dev[dev_addr].client_sess == NULL) {
+                                adb_dev[dev_addr].client_sess = sess;
+                                
+                                /*
+                                 * A hack so that we send the data to the session
+                                 * regardless of which address the device is on.
+                                 */
+                                for (i = 0; i < ADB_MAX_ADDR; ++i) {
+                                        if (adb_dev[i].service_id == dsid)
+                                                adb_dev[i].client_sess = sess;
                                 }
-                        }
-                        retval = 0;
-                        break;
-                default:
-                        retval = EINVAL;
-                        break;
-                }
-                async_answer_0(callid, retval);
+                                
+                                async_answer_0(callid, EOK);
+                        } else
+                                async_answer_0(callid, ELIMIT);
+                } else
+                        async_answer_0(callid, EINVAL);
         }
 }
@@ -483 +475 @@
         reg_val = ((uint16_t) data[1] << 8) | (uint16_t) data[2];
 
-        if (adb_dev[dev_addr].client_phone == -1)
-                return;
-
-        async_obsolete_msg_1(adb_dev[dev_addr].client_phone, ADB_REG_NOTIF, reg_val);
+        if (adb_dev[dev_addr].client_sess == NULL)
+                return;
+
+        async_exch_t *exch =
+            async_exchange_begin(adb_dev[dev_addr].client_sess);
+        async_msg_1(exch, ADB_REG_NOTIF, reg_val);
+        async_exchange_end(exch);
 }