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

Timestamp:

2011-12-23T18:13:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3819ce5, b39eb79, f0b74b2

Parents:

2f0dd2a (diff), 153cc76a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

USB branch changes.

+ USB device drivers use single async session to host controller, this session (represented by usb_hc_connection_t) is used for both HC requests and to back usb device connection.
+ Pipe locking was removed. Reference counting was moved to usb_hc_connection_t. Every read/write operation uses separate parallel exchange thus any contention is resolved on hc side.

• async_sess_t setup using EXCHANGE_PARALLEL uses one extra phone (session phone, each exch creates its own), thus the number of phones used by usb dvice driver might increase. Possible solutions are: make read/write calls atomic (all other calls are atomic) and use EXCHANGE_ATOMIC, any other solution provided by changes to async_sess_t.

File:

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

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

@@ -65 +65 @@
          */
         size_t setup_size;
-        /** Actually used portion of the buffer */
-        size_t transfered_size;
-        /** Indicates success/failure of the communication */
-        int error;
         /** Host controller function, passed to callback function */
         ddf_fun_t *fun;
+
+        /** Actually used portion of the buffer
+         * This member is never accessed by functions provided in this header,
+         * with the exception of usb_transfer_batch_finish. For external use.
+         */
+        size_t transfered_size;
+        /** Indicates success/failure of the communication
+         * This member is never accessed by functions provided in this header,
+         * with the exception of usb_transfer_batch_finish. For external use.
+         */
+        int error;
 
         /** Driver specific data */
@@ -106 +113 @@
 void usb_transfer_batch_destroy(const usb_transfer_batch_t *instance);
 
-void usb_transfer_batch_finish(const usb_transfer_batch_t *instance,
-    const void* data, size_t size);
+void usb_transfer_batch_finish_error(const usb_transfer_batch_t *instance,
+    const void* data, size_t size, int error);
 /*----------------------------------------------------------------------------*/
-/** Override error value and finishes transfer.
+/** Finish batch using stored error value and transferred size.
  *
  * @param[in] instance Batch structure to use.
  * @param[in] data Data to copy to the output buffer.
- * @param[in] size Size of @p data.
- * @param[in] error Set batch status to this error value.
  */
-static inline void usb_transfer_batch_finish_error(
-    usb_transfer_batch_t *instance, const void* data, size_t size, int error)
+static inline void usb_transfer_batch_finish(
+    const usb_transfer_batch_t *instance, const void* data)
 {
         assert(instance);
-        instance->error = error;
-        usb_transfer_batch_finish(instance, data, size);
+        usb_transfer_batch_finish_error(
+            instance, data, instance->transfered_size, instance->error);
 }
 /*----------------------------------------------------------------------------*/