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

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

Files:

• hc.c (modified) (1 diff)
• uhci_batch.c (modified) (3 diffs)
• uhci_rh.c (modified) (1 diff)

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

@@ -461 +461 @@
         assert(batch);
 
-        if (batch->ep->target.address == uhci_rh_get_address(&instance->rh))
+        if (batch->target.address == uhci_rh_get_address(&instance->rh))
                 return uhci_rh_schedule(&instance->rh, batch);
 

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -222 +222 @@
             uhci_batch->base.ep->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->base.ep->max_packet_size;
-        const usb_target_t target = uhci_batch->base.ep->target;
 
         int toggle = endpoint_toggle_get(uhci_batch->base.ep);
@@ -240 +239 @@
                 td_init(
                     &uhci_batch->tds[td], DEFAULT_ERROR_COUNT, packet_size,
-                    toggle, false, low_speed, target, pid, buffer, next_td);
+                    toggle, false, low_speed, uhci_batch->base.target, pid, buffer, next_td);
 
                 ++td;
@@ -285 +284 @@
             uhci_batch->base.ep->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->base.ep->max_packet_size;
-        const usb_target_t target = uhci_batch->base.ep->target;
+        const usb_target_t target = uhci_batch->base.target;
 
         /* setup stage */

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -104 +104 @@
         assert(batch);
 
-        const usb_target_t target = batch->ep->target;
         do {
-                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);