Changes in / [b93d637:c979591b] in mainline

Location:

uspace

Files:

• drv/vhc/devices.c (modified) (4 diffs)
• lib/drv/generic/remote_usbhc.c (modified) (2 diffs)

uspace/drv/vhc/devices.c

@@ -90 +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) {
@@ -140 +154 @@
                         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;
                 }
         }
@@ -178 +200 @@
                 }
                 dprintf(4, "transaction on hub processed...");
+                outcome = USB_OUTCOME_OK;
         }
         
@@ -184 +207 @@
          * real-life image.
          */
-        return USB_OUTCOME_OK;
+        return outcome;
 }
 

uspace/lib/drv/generic/remote_usbhc.c

@@ -243 +243 @@
 
         // FIXME - answer according to outcome
-        ipc_answer_0(trans->caller, EOK);
+        ipc_answer_0(trans->caller, outcome);
 
         free(trans);
@@ -254 +254 @@
 
         // FIXME - answer according to outcome
-        ipc_answer_1(trans->caller, EOK, (sysarg_t)trans);
+        ipc_answer_1(trans->caller, outcome, (sysarg_t)trans);
 
         trans->size = actual_size;