Changeset 9097c16a in mainline for uspace/drv/vhc/devices.c

Timestamp:

2011-02-04T13:14:14Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

9e7cdf8

Parents:

11797d5 (diff), ff244e6 (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 development

File:

• uspace/drv/vhc/devices.c (modified) (9 diffs)

uspace/drv/vhc/devices.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -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) {
@@ -141 +180 @@
                         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;
+                }
         }
         
@@ -149 +196 @@
         if (virtual_hub_device.address == transaction->target.address) {
                 size_t tmp;
-                dprintf(1, "sending `%s' transaction to hub",
+                usb_log_debug2("Sending `%s' transaction to hub.\n",
                     usbvirt_str_transaction_type(transaction->type));
                 switch (transaction->type) {
@@ -165 +212 @@
                                     transaction->buffer, transaction->len,
                                     &tmp);
-                                if (tmp < transaction->len) {
-                                        transaction->len = tmp;
-                                }
+                                transaction->actual_len = tmp;
                                 break;
                                 
@@ -177 +222 @@
                                 break;
                 }
-                dprintf(4, "transaction on hub processed...");
+                outcome = USB_OUTCOME_OK;
         }
         
@@ -184 +229 @@
          * real-life image.
          */
-        return USB_OUTCOME_OK;
+        return outcome;
 }