Changes in uspace/drv/vhc/devices.c [bd8c753d:13101d06] in mainline

File:

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

uspace/drv/vhc/devices.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbvhc
+/** @addtogroup usb
  * @{
  */
@@ -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.
+ * @retval NULL Out of memory or address already occupied.
  */
-virtdev_connection_t *virtdev_add_device(int phone, sysarg_t id)
+virtdev_connection_t *virtdev_add_device(int phone)
 {
         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);
         
@@ -78 +73 @@
         
         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;
 }
 
@@ -115 +90 @@
 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) {
@@ -180 +141 @@
                         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;
-                }
         }
         
@@ -212 +165 @@
                                     transaction->buffer, transaction->len,
                                     &tmp);
-                                transaction->actual_len = tmp;
+                                if (tmp < transaction->len) {
+                                        transaction->len = tmp;
+                                }
                                 break;
                                 
@@ -223 +178 @@
                 }
                 dprintf(4, "transaction on hub processed...");
-                outcome = USB_OUTCOME_OK;
         }
         
@@ -230 +184 @@
          * real-life image.
          */
-        return outcome;
+        return USB_OUTCOME_OK;
 }