Changeset b670523 in mainline for uspace/lib

Timestamp:

2011-06-09T20:42:27Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

9ec25a6

Parents:

503e4e3 (diff), 390d80d (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

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (2 diffs)
• generic/devman.c (modified) (3 diffs)
• include/async.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -2339 +2339 @@
  * @param mgmt Exchange management style.
  *
- * @return New async session or NULL on failure.
+ * @return New async session.
+ * @return NULL on failure.
  *
  */
@@ -2377 +2378 @@
 }
 
+/** Wrapper for receiving the IPC_M_CONNECT_TO_ME calls.
+ *
+ * If the call is IPC_M_CONNECT_TO_ME then a new
+ * async session is created. However, the phone is
+ * not accepted automatically.
+ *
+ * @param mgmt   Exchange management style.
+ * @param call   Call data.
+ *
+ * @return New async session.
+ * @return NULL on failure.
+ * @return NULL if the call is not IPC_M_CONNECT_TO_ME.
+ *
+ */
+async_sess_t *async_callback_receive_start(exch_mgmt_t mgmt, ipc_call_t *call)
+{
+        int phone = (int) IPC_GET_ARG5(*call);
+        
+        if ((IPC_GET_IMETHOD(*call) != IPC_M_CONNECT_TO_ME) ||
+            (phone < 0))
+                return NULL;
+        
+        async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t));
+        if (sess == NULL)
+                return NULL;
+        
+        sess->mgmt = mgmt;
+        sess->phone = phone;
+        sess->arg1 = 0;
+        sess->arg2 = 0;
+        sess->arg3 = 0;
+        
+        list_initialize(&sess->exch_list);
+        fibril_mutex_initialize(&sess->mutex);
+        atomic_set(&sess->refcnt, 0);
+        
+        return sess;
+}
+
 /** @}
  */

uspace/lib/c/generic/devman.c

@@ -231 +231 @@
         }
         
-        async_wait_for(req, &retval);
-        if (retval != EOK) {
-                devman_exchange_end(exch);
-                
-                if (funh != NULL)
-                        *funh = -1;
-                
-                return retval;
-        }
-        
-        if (funh != NULL)
-                *funh = (int) IPC_GET_ARG1(answer);
-        
         link_t *link = match_ids->ids.next;
         match_id_t *match_id = NULL;
@@ -250 +237 @@
                 match_id = list_get_instance(link, match_id_t, link);
                 
-                ipc_call_t answer;
-                aid_t req = async_send_1(exch, DEVMAN_ADD_MATCH_ID,
-                    match_id->score, &answer);
+                ipc_call_t answer2;
+                aid_t req2 = async_send_1(exch, DEVMAN_ADD_MATCH_ID,
+                    match_id->score, &answer2);
                 retval = async_data_write_start(exch, match_id->id,
                     str_size(match_id->id));
+                if (retval != EOK) {
+                        devman_exchange_end(exch);
+                        async_wait_for(req2, NULL);
+                        async_wait_for(req, NULL);
+                        return retval;
+                }
+                
+                async_wait_for(req2, &retval);
                 if (retval != EOK) {
                         devman_exchange_end(exch);
@@ -261 +256 @@
                 }
                 
-                async_wait_for(req, &retval);
-                if (retval != EOK) {
-                        devman_exchange_end(exch);
-                        return retval;
-                }
-                
                 link = link->next;
         }
         
         devman_exchange_end(exch);
-        return EOK;
+        
+        async_wait_for(req, &retval);
+        if (retval == EOK) {
+                if (funh != NULL)
+                        *funh = (int) IPC_GET_ARG1(answer);
+        } else {
+                if (funh != NULL)
+                        *funh = -1;
+        }
+        
+        return retval;
 }
 

uspace/lib/c/include/async.h

@@ -464 +464 @@
 extern async_sess_t *async_clone_receive(exch_mgmt_t);
 extern async_sess_t *async_callback_receive(exch_mgmt_t);
+extern async_sess_t *async_callback_receive_start(exch_mgmt_t, ipc_call_t *);
 
 #endif