Changeset 1d758fc in mainline for uspace/lib/usbhost/src/endpoint.c

Timestamp:

2018-02-12T10:11:47Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

File:

• uspace/lib/usbhost/src/endpoint.c (modified) (4 diffs)

uspace/lib/usbhost/src/endpoint.c

@@ -75 +75 @@
         ep->max_transfer_size = ep->max_packet_size * ep->packets_per_uframe;
         ep->transfer_buffer_policy = DMA_POLICY_STRICT;
+        ep->required_transfer_buffer_policy = DMA_POLICY_STRICT;
 }
 
@@ -207 +208 @@
  *
  * @param endpoint Endpoint for which to send the batch
- * @param target The target of the transfer.
- * @param direction A direction of the transfer.
- * @param data A pointer to the data buffer.
- * @param size Size of the data buffer.
- * @param setup_data Data to use in the setup stage (Control communication type)
- * @param on_complete Callback which is called after the batch is complete
- * @param arg Callback parameter.
- * @param name Communication identifier (for nicer output).
- */
-errno_t endpoint_send_batch(endpoint_t *ep, usb_target_t target,
-    usb_direction_t direction, char *data, size_t size, uint64_t setup_data,
-    usbhc_iface_transfer_callback_t on_complete, void *arg, const char *name)
-{
-        if (!ep)
-                return EBADMEM;
+ */
+errno_t endpoint_send_batch(endpoint_t *ep, const transfer_request_t *req)
+{
+        assert(ep);
+        assert(req);
 
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
-                usb_log_debug("%s %d:%d %zu/%zuB, setup %#016" PRIx64, name,
-                    target.address, target.endpoint, size, ep->max_packet_size,
-                    setup_data);
+                usb_log_debug("%s %d:%d %zu/%zuB, setup %#016" PRIx64, req->name,
+                    req->target.address, req->target.endpoint,
+                    req->size, ep->max_packet_size,
+                    req->setup);
         } else {
-                usb_log_debug("%s %d:%d %zu/%zuB", name, target.address,
-                    target.endpoint, size, ep->max_packet_size);
+                usb_log_debug("%s %d:%d %zu/%zuB", req->name,
+                    req->target.address, req->target.endpoint,
+                    req->size, ep->max_packet_size);
         }
 
@@ -244 +237 @@
         }
 
+        size_t size = req->size;
         /*
          * Limit transfers with reserved bandwidth to the amount reserved.
          * OUT transfers are rejected, IN can be just trimmed in advance.
          */
-        if ((ep->transfer_type == USB_TRANSFER_INTERRUPT || ep->transfer_type == USB_TRANSFER_ISOCHRONOUS) && size > ep->max_transfer_size) {
-                if (direction == USB_DIRECTION_OUT)
+        if (size > ep->max_transfer_size &&
+            (ep->transfer_type == USB_TRANSFER_INTERRUPT
+             || ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)) {
+                if (req->dir == USB_DIRECTION_OUT)
                         return ENOSPC;
                 else
                         size = ep->max_transfer_size;
-
         }
 
@@ -266 +261 @@
         }
 
-        batch->target = target;
-        batch->setup.packed = setup_data;
-        batch->dir = direction;
-        batch->buffer_size = size;
-
-        errno_t err;
-        if ((err = usb_transfer_batch_prepare_buffer(batch, data))) {
-                usb_log_warning("Failed to prepare buffer for batch: %s", str_error(err));
-                usb_transfer_batch_destroy(batch);
-                return err;
-        }
-
-        batch->on_complete = on_complete;
-        batch->on_complete_data = arg;
+        batch->target = req->target;
+        batch->setup.packed = req->setup;
+        batch->dir = req->dir;
+        batch->size = size;
+        batch->offset = req->offset;
+        batch->dma_buffer = req->buffer;
+
+        dma_buffer_acquire(&batch->dma_buffer);
+
+        if (batch->offset != 0) {
+                usb_log_debug("A transfer with nonzero offset requested.");
+                usb_transfer_batch_bounce(batch);
+        }
+
+        if (usb_transfer_batch_bounce_required(batch))
+                usb_transfer_batch_bounce(batch);
+
+        batch->on_complete = req->on_complete;
+        batch->on_complete_data = req->arg;
 
         const int ret = ops->batch_schedule(batch);