Changeset b39eb79 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2011-12-26T17:21:21Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9b56a8dd

Parents:

cf5c05c0 (diff), 7e1b130 (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:

Mainline changes.

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (7 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 
 #include <usb/usb.h>
@@ -45 +46 @@
 #define DEFAULT_ERROR_COUNT 3
 
+/** Safely destructs uhci_transfer_batch_t structure.
+ *
+ * @param[in] uhci_batch Instance to destroy.
+ */
 static void uhci_transfer_batch_dispose(uhci_transfer_batch_t *uhci_batch)
 {
@@ -54 +59 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Safely destructs uhci_transfer_batch_t structure
- *
- * @param[in] uhci_batch Instance to destroy.
- */
-void uhci_transfer_batch_call_dispose(uhci_transfer_batch_t *uhci_batch)
+/** Finishes usb_transfer_batch and destroys the structure.
+ *
+ * @param[in] uhci_batch Instance to finish and destroy.
+ */
+void uhci_transfer_batch_finish_dispose(uhci_transfer_batch_t *uhci_batch)
 {
         assert(uhci_batch);
         assert(uhci_batch->usb_batch);
         usb_transfer_batch_finish(uhci_batch->usb_batch,
-            uhci_transfer_batch_data_buffer(uhci_batch),
-            uhci_batch->usb_batch->buffer_size);
+            uhci_transfer_batch_data_buffer(uhci_batch));
         uhci_transfer_batch_dispose(uhci_batch);
 }
 /*----------------------------------------------------------------------------*/
+/** Transfer batch setup table. */
 static void (*const batch_setup[])(uhci_transfer_batch_t*, usb_direction_t);
 /*----------------------------------------------------------------------------*/
 /** Allocate memory and initialize internal data structure.
  *
- * @param[in] fun DDF function to pass to callback.
- * @param[in] ep Communication target
- * @param[in] buffer Data source/destination.
- * @param[in] buffer_size Size of the buffer.
- * @param[in] setup_buffer Setup data source (if not NULL)
- * @param[in] setup_size Size of setup_buffer (should be always 8)
- * @param[in] func_in function to call on inbound transfer completion
- * @param[in] func_out function to call on outbound transfer completion
- * @param[in] arg additional parameter to func_in or func_out
+ * @param[in] usb_batch Pointer to generic USB batch structure.
  * @return Valid pointer if all structures were successfully created,
  * NULL otherwise.
@@ -156 +153 @@
  * is reached.
  */
-bool uhci_transfer_batch_is_complete(uhci_transfer_batch_t *uhci_batch)
+bool uhci_transfer_batch_is_complete(const uhci_transfer_batch_t *uhci_batch)
 {
         assert(uhci_batch);
@@ -200 +197 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Direction to pid conversion table */
 static const usb_packet_id direction_pids[] = {
         [USB_DIRECTION_IN] = USB_PID_IN,
@@ -237 +235 @@
 
         while (remain_size > 0) {
-                const size_t packet_size =
-                    (remain_size < mps) ? remain_size : mps;
+                const size_t packet_size = min(remain_size, mps);
 
                 const td_t *next_td = (td + 1 < uhci_batch->td_count)
@@ -309 +306 @@
 
         while (remain_size > 0) {
-                const size_t packet_size =
-                    (remain_size < mps) ? remain_size : mps;
+                const size_t packet_size = min(remain_size, mps);
 
                 td_init(