Changeset e0ba26b in mainline for uspace/drv/vhc/conndev.c

Timestamp:

2011-01-25T19:20:26Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

192a0063

Parents:

a088d15 (diff), 68a68705 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged vojtechhorky/ - various fixes

The merge includes following changes

• USB transaction outcome is propagated to clients
• virtual host controller handles device unplugging
• Doxygen documentation fixes

File:

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

uspace/drv/vhc/conndev.c

@@ -88 +88 @@
                 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. */
+                dprintf(0, "virtual device connected (name: %s, id: %x)",
+                    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;
+        }
+
+        dprintf(0, "virtual device disconnected (id: %x)", dev->id);
+        virtdev_destroy_device(dev);
+}
+
 
 /**