Changeset c21e6a5 in mainline for uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

Timestamp:

2018-02-05T00:54:08Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

af16ebe

Parents:

65c059f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:27:40)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:54:08)

Message:

usbhost: prepare buffers for transfers in library

File:

• uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (4 diffs)

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -41 +41 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <usb/dma_buffer.h>
 #include <usb/request.h>
 #include <usb/usb.h>
@@ -56 +57 @@
         /** Target for communication */
         usb_target_t target;
+        /** Direction of the transfer */
+        usb_direction_t dir;
 
         /** Endpoint used for communication */
         endpoint_t *ep;
-
-        /** Direction of the transfer */
-        usb_direction_t dir;
-
-        /** Function called on completion */
-        usbhc_iface_transfer_callback_t on_complete;
-        /** Arbitrary data for the handler */
-        void *on_complete_data;
 
         /** Place to store SETUP data needed by control transfers */
@@ -75 +70 @@
         } setup;
 
-        /** Place for data to send/receive */
-        char *buffer;
-        /** Size of memory pointed to by buffer member */
+        /** DMA buffer with enforced policy */
+        dma_buffer_t dma_buffer;
+        /** Size of memory buffer */
         size_t buffer_size;
+
+        /**
+         * In case the DMA buffer is allocated, the original buffer must to be
+         * stored to be filled after the IN transaction is finished.
+         */
+        char *original_buffer;
+
+        /** Indicates success/failure of the communication */
+        errno_t error;
         /** Actually used portion of the buffer */
         size_t transferred_size;
 
-        /** Indicates success/failure of the communication */
-        errno_t error;
+        /** Function called on completion */
+        usbhc_iface_transfer_callback_t on_complete;
+        /** Arbitrary data for the handler */
+        void *on_complete_data;
 } usb_transfer_batch_t;
 
@@ -108 +114 @@
 void usb_transfer_batch_init(usb_transfer_batch_t *, endpoint_t *);
 
+/** Buffer preparation */
+errno_t usb_transfer_batch_prepare_buffer(usb_transfer_batch_t *, char *);
+
 /** Batch finalization. */
 void usb_transfer_batch_finish(usb_transfer_batch_t *);