Changeset 6967c14 in mainline

Timestamp:

2011-01-25T17:44:06Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

875e7227

Parents:

afc4fbb

Message:

VHC registers device unplugging

The virtual host controller is now able to register that a virtual USB device
was unplugged (i.e. that the task representing the device closed the
connection).

However, the change is not yet propagated to the root hub of the host
controller.

Location:

uspace/drv/vhc

Files:

• conn.h (modified) (1 diff)
• conndev.c (modified) (3 diffs)
• devices.c (modified) (3 diffs)
• devices.h (modified) (1 diff)
• hcd.c (modified) (1 diff)

uspace/drv/vhc/conn.h

@@ -51 +51 @@
 
 void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);
+void on_client_close(device_t *);
 
 

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);
+}
+
 
 /**

uspace/drv/vhc/devices.c

@@ -59 +59 @@
  *
  * @param phone Callback phone.
+ * @param id Device id.
  * @return New device.
  * @retval NULL Out of memory.
  */
-virtdev_connection_t *virtdev_add_device(int phone)
+virtdev_connection_t *virtdev_add_device(int phone, sysarg_t id)
 {
         virtdev_connection_t *dev = (virtdev_connection_t *)
@@ -71 +72 @@
 
         dev->phone = phone;
+        dev->id = id;
         list_append(&dev->link, &devices);
         
@@ -76 +78 @@
         
         return dev;
+}
+
+/** Find virtual device by id.
+ *
+ * @param id Device id.
+ * @return Device with given id.
+ * @retval NULL No such device.
+ */
+virtdev_connection_t *virtdev_find(sysarg_t id)
+{
+        link_t *pos;
+        list_foreach(pos, &devices) {
+                virtdev_connection_t *dev
+                    = list_get_instance(pos, virtdev_connection_t, link);
+                if (dev->id == id) {
+                        return dev;
+                }
+        }
+
+        return NULL;
 }
 

uspace/drv/vhc/devices.h

@@ -45 +45 @@
         /** Phone used when sending data to device. */
         int phone;
+        /** Unique identification. */
+        sysarg_t id;
         /** Linked-list handle. */
         link_t link;
 } virtdev_connection_t;
 
-virtdev_connection_t *virtdev_add_device(int);
-virtdev_connection_t *virtdev_get_mine(void);
+virtdev_connection_t *virtdev_add_device(int, sysarg_t);
+virtdev_connection_t *virtdev_find(sysarg_t);
 void virtdev_destroy_device(virtdev_connection_t *);
 usb_transaction_outcome_t virtdev_send_to_all(transaction_t *);

uspace/drv/vhc/hcd.c

@@ -69 +69 @@
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
         .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .close = on_client_close,
         .default_handler = default_connection_handler
 };