Changeset f971e957 in mainline

Timestamp:

2017-10-16T12:03:56Z (7 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

bb784ae

Parents:

3afcf68

Message:

Removed hardcoded target for doorbell

Location:

uspace/drv/bus/usb/xhci

Files:

• endpoint.c (modified) (1 diff)
• endpoint.h (modified) (1 diff)
• transfers.c (modified) (5 diffs)

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

@@ -81 +81 @@
 }
 
-static inline uint8_t xhci_endpoint_ctx_offset(xhci_endpoint_t *ep)
+uint8_t xhci_endpoint_ctx_offset(xhci_endpoint_t *ep)
 {
         /* 0 is slot ctx, 1 is EP0, then it's EP1 out, in, EP2 out, in, etc. */

uspace/drv/bus/usb/xhci/endpoint.h

@@ -97 +97 @@
 void xhci_device_fini(xhci_device_t *);
 
+uint8_t xhci_endpoint_ctx_offset(xhci_endpoint_t *);
+
 int xhci_device_add_endpoint(xhci_device_t *, xhci_endpoint_t *);
 int xhci_device_remove_endpoint(xhci_device_t *, xhci_endpoint_t *);

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

@@ -167 +167 @@
                 return EINVAL;
         }
-        if (batch->ep->target.endpoint != 0 || batch->ep->transfer_type != USB_TRANSFER_CONTROL) {
+        if (batch->ep->transfer_type != USB_TRANSFER_CONTROL) {
                 /* This method only works for control transfers. */
-                usb_log_error("Attempted to schedule control transfer to non 0 endpoint.");
+                usb_log_error("Attempted to schedule a control transfer to non control endpoint.");
                 return EINVAL;
         }
@@ -176 +176 @@
 
         uint8_t slot_id = xhci_ep->device->slot_id;
-        xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[0];
+        xhci_trb_ring_t* ring = hc->dcbaa_virt[slot_id].trs[batch->ep->target.endpoint];
 
         usb_device_request_setup_packet_t* setup =
@@ -254 +254 @@
         /* For control transfers, the target is always 1. */
         // FIXME: ignoring return code
-        hc_ring_doorbell(hc, slot_id, 1);
+        const uint8_t target = xhci_endpoint_ctx_offset(xhci_ep);
+        hc_ring_doorbell(hc, slot_id, target);
 
         // Issue a Configure Endpoint command, if needed.
@@ -300 +301 @@
 
         // TODO: target = endpoint | stream_id << 16
-        hc_ring_doorbell(hc, slot_id, xhci_ep->base.target.endpoint);
+        const uint8_t target = xhci_endpoint_ctx_offset(xhci_ep);
+        hc_ring_doorbell(hc, slot_id, target);
         return EOK;
 }
@@ -337 +339 @@
         list_append(&transfer->link, &hc->transfers);
 
-        const uint8_t target = 2 * batch->ep->target.endpoint
-                + (batch->ep->direction == USB_DIRECTION_IN ? 1 : 0);
+        const uint8_t target = xhci_endpoint_ctx_offset(xhci_ep);
         usb_log_debug("Ringing doorbell for slot_id = %d, target = %d", slot_id, target);
         return hc_ring_doorbell(hc, slot_id, target);