Changeset e0ba26b in mainline for uspace/drv/vhc

Timestamp:

2011-01-25T19:20:26Z (15 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

Location:

uspace/drv/vhc

Files:

• conn.h (modified) (1 diff)
• conndev.c (modified) (3 diffs)
• devices.c (modified) (7 diffs)
• devices.h (modified) (1 diff)
• hcd.c (modified) (1 diff)
• hub/hub.c (modified) (2 diffs)
• hub/hub.h (modified) (1 diff)
• hub/virthub.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

@@ -58 +58 @@
 /** Create virtual device.
  *
- * @param address USB address.
  * @param phone Callback phone.
+ * @param id Device id.
  * @return New device.
- * @retval NULL Out of memory or address already occupied.
- */
-virtdev_connection_t *virtdev_add_device(int phone)
+ * @retval NULL Out of memory.
+ */
+virtdev_connection_t *virtdev_add_device(int phone, sysarg_t id)
 {
         virtdev_connection_t *dev = (virtdev_connection_t *)
             malloc(sizeof(virtdev_connection_t));
+        if (dev == NULL) {
+                return NULL;
+        }
+
         dev->phone = phone;
+        dev->id = id;
         list_append(&dev->link, &devices);
         
@@ -73 +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;
 }
 
@@ -90 +115 @@
 usb_transaction_outcome_t virtdev_send_to_all(transaction_t *transaction)
 {
+        /* For easier debugging. */
+        switch (transaction->type) {
+                case USBVIRT_TRANSACTION_SETUP:
+                case USBVIRT_TRANSACTION_OUT:
+                        transaction->actual_len = transaction->len;
+                        break;
+                case USBVIRT_TRANSACTION_IN:
+                        transaction->actual_len = 0;
+                        break;
+                default:
+                        assert(false && "unreachable branch in switch()");
+        }
+        usb_transaction_outcome_t outcome = USB_OUTCOME_BABBLE;
+
         link_t *pos;
         list_foreach(pos, &devices) {
@@ -140 +179 @@
                         transaction->actual_len = IPC_GET_ARG1(answer_data);
                         rc = (int)answer_rc;
+                }
+
+                /*
+                 * If at least one device was able to accept this
+                 * transaction and process it, we can announce success.
+                 */
+                if (rc == EOK) {
+                        outcome = USB_OUTCOME_OK;
                 }
         }
@@ -165 +212 @@
                                     transaction->buffer, transaction->len,
                                     &tmp);
-                                if (tmp < transaction->len) {
-                                        transaction->len = tmp;
-                                }
+                                transaction->actual_len = tmp;
                                 break;
                                 
@@ -178 +223 @@
                 }
                 dprintf(4, "transaction on hub processed...");
+                outcome = USB_OUTCOME_OK;
         }
         
@@ -184 +230 @@
          * real-life image.
          */
-        return USB_OUTCOME_OK;
+        return outcome;
 }
 

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
 };

uspace/drv/vhc/hub/hub.c

@@ -155 +155 @@
 }
 
+/** Disconnects a device from a hub.
+ *
+ * @param hub Hub the device was connected to.
+ * @param device Device to be disconnected.
+ * @return Error code.
+ */
+int hub_disconnect_device(hub_t *hub, void *device)
+{
+        size_t index = hub_find_device(hub, device);
+        if (index == (size_t) -1) {
+                return ENOENT;
+        }
+
+        hub_port_t *port = &hub->ports[index];
+
+        port->connected_device = NULL;
+        port->state = HUB_PORT_STATE_DISCONNECTED;
+        set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
+
+        return EOK;
+}
+
 /** Find port device is connected to.
  *
@@ -173 +195 @@
         }
 
-        return 0;
+        return -1;
 }
 

uspace/drv/vhc/hub/hub.h

@@ -94 +94 @@
 void hub_init(hub_t *);
 size_t hub_connect_device(hub_t *, void *);
+int hub_disconnect_device(hub_t *, void *);
 size_t hub_find_device(hub_t *, void *);
 void hub_acquire(hub_t *);

uspace/drv/vhc/hub/virthub.c

@@ -203 +203 @@
 
         hub_acquire(hub);
-        /* TODO: implement. */
+        hub_disconnect_device(hub, conn);
         hub_release(hub);