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

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/ehci

Files:

• ehci_rh.c (modified) (2 diffs)
• hc.c (modified) (3 diffs)
• hw_struct/queue_head.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_rh.c

@@ -144 +144 @@
         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, (void*) batch->setup.buffer,
             batch->buffer, batch->buffer_size, &batch->transfered_size);
@@ -179 +178 @@
             instance, batch);
         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, (void*) batch->setup.buffer,
                     batch->buffer, batch->buffer_size, &batch->transfered_size);

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

@@ -215 +215 @@
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
         usb_log_debug("HC(%p) enqueue EP(%d:%d:%s:%s)\n", instance,
-            ep->target.address, ep->target.endpoint,
+            ep->device->address, ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -239 +239 @@
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
         usb_log_debug("HC(%p) dequeue EP(%d:%d:%s:%s)\n", instance,
-            ep->target.address, ep->target.endpoint,
+            ep->device->address, ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
             usb_str_direction(ep->direction));
@@ -291 +291 @@
 
         /* Check for root hub communication */
-        if (batch->ep->target.address == ehci_rh_get_address(&instance->rh)) {
+        if (batch->target.address == ehci_rh_get_address(&instance->rh)) {
                 usb_log_debug("HC(%p): Scheduling BATCH(%p) for RH(%p)",
                     instance, batch, &instance->rh);

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -66 +66 @@
         assert(ep->speed < ARRAY_SIZE(speed));
         EHCI_MEM32_WR(instance->ep_char,
-            QH_EP_CHAR_ADDR_SET(ep->target.address) |
-            QH_EP_CHAR_EP_SET(ep->target.endpoint) |
+            QH_EP_CHAR_ADDR_SET(ep->device->address) |
+            QH_EP_CHAR_EP_SET(ep->endpoint) |
             speed[ep->speed] |
             QH_EP_CHAR_MAX_LENGTH_SET(ep->max_packet_size)