Changeset 19a1800 in mainline for uspace/drv/vhc/conndev.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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:

Merge with the current development

File:

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

uspace/drv/vhc/conndev.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -76 +76 @@
 /** Default handler for IPC methods not handled by DDF.
  *
- * @param dev Device handling the call.
+ * @param fun Device handling the call.
  * @param icallid Call id.
  * @param icall Call data.
  */
-void default_connection_handler(device_t *dev,
+void default_connection_handler(ddf_fun_t *fun,
     ipc_callid_t icallid, ipc_call_t *icall)
 {
@@ -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);
-                        ipc_hangup(callback);
+                        async_answer_0(icallid, EEXISTS);
+                        async_hangup(callback);
                         return;
                 }
-                ipc_answer_0(icallid, EOK);
+                async_answer_0(icallid, EOK);
 
                 char devname[DEVICE_NAME_MAXLENGTH + 1];
                 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;
         }
 
-        ipc_answer_0(icallid, EINVAL);
+        async_answer_0(icallid, EINVAL);
+}
+
+/** Callback for DDF when client disconnects.
+ *
+ * @param d Device the client was connected to.
+ */
+void on_client_close(ddf_fun_t *fun)
+{
+        /*
+         * 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);
 }