Changes in uspace/drv/vhc/conndev.c [8869f7b:00b6c73] in mainline

File:

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

uspace/drv/vhc/conndev.c

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <usbvirt/ipc.h>
-#include <async.h>
 #include "conn.h"
 
@@ -49 +48 @@
  * @warning Errors are silently ignored.
  *
- * @param sess Session to the virtual device.
- *
+ * @param phone Phone to the virtual device.
  */
-static void receive_device_name(async_sess_t *sess)
+static void receive_device_name(int phone)
 {
-        async_exch_t *exch = async_exchange_begin(sess);
-        
-        aid_t opening_request = async_send_0(exch, IPC_M_USBVIRT_GET_NAME, NULL);
+        aid_t opening_request = async_send_0(phone, IPC_M_USBVIRT_GET_NAME, NULL);
         if (opening_request == 0) {
-                async_exchange_end(exch);
                 return;
         }
-        
+
+
         ipc_call_t data_request_call;
-        aid_t data_request = async_data_read(exch, plugged_device_name,
-             PLUGGED_DEVICE_NAME_MAXLEN, &data_request_call);
-        
-        async_exchange_end(exch);
-        
+        aid_t data_request = async_data_read(phone,
+             plugged_device_name, PLUGGED_DEVICE_NAME_MAXLEN,
+             &data_request_call);
+
         if (data_request == 0) {
                 async_wait_for(opening_request, NULL);
                 return;
         }
-        
+
         sysarg_t data_request_rc;
         sysarg_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
-        
-        if ((data_request_rc != EOK) || (opening_request_rc != EOK))
+
+        if ((data_request_rc != EOK) || (opening_request_rc != EOK)) {
                 return;
-        
+        }
+
         size_t len = IPC_GET_ARG2(data_request_call);
         plugged_device_name[len] = 0;
@@ -91 +87 @@
  * @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)
 {
         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 +102 @@
                         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;
+        }
+
+        async_answer_0(icallid, EINVAL);
 }