Changes in uspace/drv/vhc/conndev.c [8869f7b:79ae36dd] in mainline

File:

• uspace/drv/vhc/conndev.c (modified) (4 diffs)

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.
  *
@@ -84 +85 @@
         plugged_device_name[len] = 0;
 }
+#endif
 
 /** Default handler for IPC methods not handled by DDF.
@@ -91 +93 @@
  * @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;
-        
-        async_sess_t *callback =
-            async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
-        
-        if (callback) {
-                int rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
+        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);
                 if (rc != EOK) {
                         async_answer_0(icallid, rc);
@@ -106 +114 @@
                         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);
-        } else
-                async_answer_0(icallid, EINVAL);
+
+                return;
+        }
+#endif
+
+        async_answer_0(icallid, EINVAL);
 }