Changeset a5b3de6 in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2017-10-25T11:55:15Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2b35478

Parents:

c3d926f3

Message:

usbhost endpoint: removed target

The reasons for having usb_target_t inside endpoint have been dismissed. Enpoint is not a target of a transaction, so this was just misleading.

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (1 diff)
• hw_struct/endpoint_descriptor.c (modified) (2 diffs)
• ohci_rh.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -287 +287 @@
 
         /* Check for root hub communication */
-        if (batch->ep->target.address == ohci_rh_get_address(&instance->rh)) {
+        if (batch->target.address == ohci_rh_get_address(&instance->rh)) {
                 usb_log_debug("OHCI root hub request.\n");
                 return ohci_rh_schedule(&instance->rh, batch);

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -40 +40 @@
 #include <usb/usb.h>
 #include <usb/host/utils/malloc32.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/bus.h>
 
 #include "mem_access.h"
@@ -79 +81 @@
         /* Status: address, endpoint nr, direction mask and max packet size. */
         OHCI_MEM32_WR(instance->status,
-            ((ep->target.address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
-            | ((ep->target.endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT)
+            ((ep->device->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
+            | ((ep->endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT)
             | ((dir[ep->direction] & ED_STATUS_D_MASK) << ED_STATUS_D_SHIFT)
             | ((ep->max_packet_size & ED_STATUS_MPS_MASK)

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -178 +178 @@
         assert(instance);
         assert(batch);
-        const usb_target_t target = batch->ep->target;
-        batch->error = virthub_base_request(&instance->base, target,
+        batch->error = virthub_base_request(&instance->base, batch->target,
             batch->dir, &batch->setup.packet,
             batch->buffer, batch->buffer_size, &batch->transfered_size);
@@ -207 +206 @@
         instance->unfinished_interrupt_transfer = NULL;
         if (batch) {
-                const usb_target_t target = batch->ep->target;
-                batch->error = virthub_base_request(&instance->base, target,
+                batch->error = virthub_base_request(&instance->base, batch->target,
                     batch->dir, &batch->setup.packet,
                     batch->buffer, batch->buffer_size, &batch->transfered_size);