Changeset f167f55 in mainline

Timestamp:

2011-12-06T12:06:41Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2582d8f

Parents:

3f162ab

Message:

lilbusbhost: Do not use usb_transfer_batch_t.error field in finish_error variant

Location:

uspace/lib/usbhost

Files:

• include/usb/host/usb_transfer_batch.h (modified) (1 diff)
• src/usb_transfer_batch.c (modified) (5 diffs)

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

@@ -106 +106 @@
 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.
  *
  * @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, size_t size)
 {
         assert(instance);
-        instance->error = error;
-        usb_transfer_batch_finish(instance, data, size);
+        usb_transfer_batch_finish_error(instance, data, size, instance->error);
 }
 /*----------------------------------------------------------------------------*/

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -33 +33 @@
  */
 #include <errno.h>
-#include <str_error.h>
 #include <macros.h>
 
@@ -122 +121 @@
  * @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);
@@ -134 +134 @@
                 /* 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 }};
@@ -140 +140 @@
                             instance->setup_buffer);
                 }
-                instance->callback_out(instance->fun,
-                    instance->error, instance->arg);
+                instance->callback_out(instance->fun, error, instance->arg);
         }
 
@@ -150 +149 @@
                         memcpy(instance->buffer, data, minsize);
                 }
-                instance->callback_in(instance->fun, instance->error,
+                instance->callback_in(instance->fun, error,
                     instance->transfered_size, instance->arg);
         }