Changeset a5b3de6 in mainline for uspace/drv/bus/usb/xhci/bus.c

Timestamp:

2017-10-25T11:55:15Z (6 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:

c3d926f

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.

File:

• uspace/drv/bus/usb/xhci/bus.c (modified) (4 diffs)

uspace/drv/bus/usb/xhci/bus.c

@@ -63 +63 @@
 {
         /* Extract information from endpoint_desc */
-        ep->base.target = (usb_target_t) {{
-                .address = ep->base.device->address,
-                .endpoint = desc->endpoint_no,
-        }};
+        ep->base.endpoint = desc->endpoint_no;
         ep->base.direction = desc->direction;
         ep->base.transfer_type = desc->transfer_type;
@@ -109 +106 @@
 
         /* Register EP0, passing Temporary reference */
-        ep0->base.target.address = dev->base.address;
         dev->endpoints[0] = ep0;
 
@@ -254 +250 @@
                 return err;
 
-        usb_log_info("Endpoint(%d:%d) registered to XHCI bus.", ep->target.address, ep->target.endpoint);
+        usb_log_info("Endpoint(%d:%d) registered to XHCI bus.", ep->device->address, ep->endpoint);
         return xhci_device_add_endpoint(xhci_dev, xhci_ep);
 }
@@ -263 +259 @@
         assert(bus);
 
-        usb_log_info("Endpoint(%d:%d) unregistered from XHCI bus.", ep->target.address, ep->target.endpoint);
+        usb_log_info("Endpoint(%d:%d) unregistered from XHCI bus.", ep->device->address, ep->endpoint);
 
         xhci_device_t *xhci_dev = xhci_device_get(ep->device);