Changes in uspace/drv/vhc/conndev.c [e27595b:0b31409] in mainline

File:

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

uspace/drv/vhc/conndev.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -47 +47 @@
 {
         ipc_call_t answer_data;
-        ipcarg_t answer_rc;
+        sysarg_t answer_rc;
         aid_t req;
         int rc;
@@ -83 +83 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        ipcarg_t method = IPC_GET_METHOD(*icall);
+        sysarg_t method = IPC_GET_IMETHOD(*icall);
 
         if (method == IPC_M_CONNECT_TO_ME) {
                 int callback = IPC_GET_ARG5(*icall);
                 virtdev_connection_t *dev
-                    = virtdev_add_device(callback);
+                    = virtdev_add_device(callback, (sysarg_t)fibril_get_id());
                 if (!dev) {
                         ipc_answer_0(icallid, EEXISTS);
@@ -99 +99 @@
                 int rc = get_device_name(callback, devname, DEVICE_NAME_MAXLENGTH);
 
-                dprintf(0, "virtual device connected (name: %s)",
-                    rc == EOK ? devname : "<unknown>");
-
-                /* FIXME: destroy the device when the client disconnects. */
+                usb_log_info("New virtual device `%s' (id = %x).\n",
+                    rc == EOK ? devname : "<unknown>", dev->id);
 
                 return;
@@ -110 +108 @@
 }
 
+/** Callback for DDF when client disconnects.
+ *
+ * @param d Device the client was connected to.
+ */
+void on_client_close(device_t *d)
+{
+        /*
+         * Maybe a virtual device is being unplugged.
+         */
+        virtdev_connection_t *dev = virtdev_find((sysarg_t)fibril_get_id());
+        if (dev == NULL) {
+                return;
+        }
+
+        usb_log_info("Virtual device disconnected (id = %x).\n", dev->id);
+        virtdev_destroy_device(dev);
+}
+
 
 /**