Changes in uspace/drv/vhc/conndev.c [6cb58e6:bc1c6fb] in mainline

File:

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

uspace/drv/vhc/conndev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
- * Connection handling of calls from virtual device (implementation).
+ * @brief Connection handling of calls from virtual device (implementation).
  */
 
 #include <assert.h>
 #include <errno.h>
-#include <ddf/driver.h>
+#include <usbvirt/hub.h>
+
 #include "conn.h"
+#include "hc.h"
+#include "hub.h"
 
-static fibril_local uintptr_t plugged_device_handle = 0;
+#define DEVICE_NAME_MAXLENGTH 32
+
+static int get_device_name(int phone, char *buffer, size_t len)
+{
+        ipc_call_t answer_data;
+        sysarg_t answer_rc;
+        aid_t req;
+        int rc;
+        
+        req = async_send_0(phone,
+            IPC_M_USBVIRT_GET_NAME,
+            &answer_data);
+        
+        rc = async_data_read_start(phone, buffer, len);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return EINVAL;
+        }
+        
+        async_wait_for(req, &answer_rc);
+        rc = (int)answer_rc;
+        
+        if (IPC_GET_ARG1(answer_data) < len) {
+                len = IPC_GET_ARG1(answer_data);
+        } else {
+                len--;
+        }
+        buffer[len] = 0;
+        
+        return rc;
+}
 
 /** Default handler for IPC methods not handled by DDF.
@@ -50 +83 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        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);
-                if (rc != EOK) {
-                        async_answer_0(icallid, rc);
+                virtdev_connection_t *dev
+                    = virtdev_add_device(callback, (sysarg_t)fibril_get_id());
+                if (!dev) {
+                        async_answer_0(icallid, EEXISTS);
                         async_hangup(callback);
                         return;
                 }
-
                 async_answer_0(icallid, EOK);
 
-                usb_log_info("New virtual device `%s' (id = %" PRIxn ").\n",
-                    rc == EOK ? "XXX" : "<unknown>", plugged_device_handle);
+                char devname[DEVICE_NAME_MAXLENGTH + 1];
+                int rc = get_device_name(callback, devname, DEVICE_NAME_MAXLENGTH);
+
+                usb_log_info("New virtual device `%s' (id = %x).\n",
+                    rc == EOK ? devname : "<unknown>", dev->id);
 
                 return;
@@ -74 +108 @@
 }
 
-/** Callback when client disconnects.
+/** Callback for DDF when client disconnects.
  *
- * Used to unplug virtual USB device.
- *
- * @param fun
+ * @param fun Device function the client was connected to.
  */
 void on_client_close(ddf_fun_t *fun)
 {
-        vhc_data_t *vhc = fun->dev->driver_data;
+        /*
+         * Maybe a virtual device is being unplugged.
+         */
+        virtdev_connection_t *dev = virtdev_find((sysarg_t)fibril_get_id());
+        if (dev == NULL) {
+                return;
+        }
 
-        if (plugged_device_handle != 0) {
-                usb_log_info("Virtual device disconnected (id = %" PRIxn ").\n",
-                    plugged_device_handle);
-                vhc_virtdev_unplug(vhc, plugged_device_handle);
-        }
+        usb_log_info("Virtual device disconnected (id = %x).\n", dev->id);
+        virtdev_destroy_device(dev);
 }