Changeset 7e1b130 in mainline for uspace/lib/usbhost/src/usb_transfer_batch.c

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/src/usb_transfer_batch.c (modified) (5 diffs)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -33 +33 @@
  */
 #include <errno.h>
-#include <str_error.h>
+#include <macros.h>
 
 #include <usb/usb.h>
@@ -48 +48 @@
  * @param func_in callback on IN transfer completion.
  * @param func_out callback on OUT transfer completion.
+ * @param fun DDF function (passed to callback function).
  * @param arg Argument to pass to the callback function.
  * @param private_data driver specific per batch data.
@@ -121 +122 @@
  * @param[in] data Data to copy to the output buffer.
  * @param[in] size Size of @p data.
+ * @param[in] error Error value to use.
  */
-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)
 {
         assert(instance);
@@ -133 +135 @@
                 /* Check for commands that reset toggle bit */
                 if (instance->ep->transfer_type == USB_TRANSFER_CONTROL
-                    && instance->error == EOK) {
+                    && error == EOK) {
                         const usb_target_t target =
                             {{ instance->ep->address, instance->ep->endpoint }};
@@ -139 +141 @@
                             instance->setup_buffer);
                 }
-                instance->callback_out(instance->fun,
-                    instance->error, instance->arg);
+                instance->callback_out(instance->fun, error, instance->arg);
         }
 
         if (instance->callback_in) {
                 /* We care about the data and there are some to copy */
+                const size_t safe_size = min(size, instance->buffer_size);
                 if (data) {
-                        const size_t min_size = size < instance->buffer_size
-                            ? size : instance->buffer_size;
-                        memcpy(instance->buffer, data, min_size);
+                        memcpy(instance->buffer, data, safe_size);
                 }
-                instance->callback_in(instance->fun, instance->error,
-                    instance->transfered_size, instance->arg);
+                instance->callback_in(instance->fun, error,
+                    safe_size, instance->arg);
         }
 }