Changeset 8869f7b in mainline

Timestamp:

2011-06-08T19:44:33Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4a4c8bcf

Parents:

0eff68e

Message:

async framework: add support for in-band IPC_M_CONNECT_TO_ME processing

Location:

uspace

Files:

• drv/vhc/conndev.c (modified) (4 diffs)
• lib/c/generic/async.c (modified) (2 diffs)
• lib/c/include/async.h (modified) (1 diff)

uspace/drv/vhc/conndev.c

@@ -45 +45 @@
 static fibril_local char plugged_device_name[PLUGGED_DEVICE_NAME_MAXLEN + 1] = "<unknown>";
 
-#if 0
 /** Receive device name.
  *
@@ -85 +84 @@
         plugged_device_name[len] = 0;
 }
-#endif
 
 /** Default handler for IPC methods not handled by DDF.
@@ -93 +91 @@
  * @param icall Call data.
  */
-void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid,
+    ipc_call_t *icall)
 {
-// FIXME:
-// This code needs to be refactored since the async
-// framework does not support automatic callback connections
-// yet.
-
-#if 0
         vhc_data_t *vhc = fun->dev->driver_data;
-        sysarg_t method = IPC_GET_IMETHOD(*icall);
-
-        if (method == IPC_M_CONNECT_TO_ME) {
-                int callback = IPC_GET_ARG5(*icall);
-                int rc = vhc_virtdev_plug(vhc, callback,
-                    &plugged_device_handle);
+        
+        async_sess_t *callback =
+            async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+        
+        if (callback) {
+                int rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
                 if (rc != EOK) {
                         async_answer_0(icallid, rc);
@@ -114 +106 @@
                         return;
                 }
-
+                
                 async_answer_0(icallid, EOK);
-
+                
                 receive_device_name(callback);
-
+                
                 usb_log_info("New virtual device `%s' (id: %" PRIxn ").\n",
                     plugged_device_name, plugged_device_handle);
-
-                return;
-        }
-#endif
-
-        async_answer_0(icallid, EINVAL);
+        } else
+                async_answer_0(icallid, EINVAL);
 }
 

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/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