Changeset 1387692 in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-03-21T15:01:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c92c13f

Parents:

e34e77a

Message:

Rename batch_* ⇒ usb_transfer_batch_*

No change in functionality.

File:

• uspace/drv/ohci/batch.c (modified) (11 diffs)

uspace/drv/ohci/batch.c

@@ -41 +41 @@
 #include "utils/malloc32.h"
 
-static void batch_call_in_and_dispose(batch_t *instance);
-static void batch_call_out_and_dispose(batch_t *instance);
+static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
+static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
 
 #define DEFAULT_ERROR_COUNT 3
-batch_t * batch_get(
+usb_transfer_batch_t * batch_get(
     ddf_fun_t *fun,
                 usb_target_t target,
@@ -70 +70 @@
         } else (void)0
 
-        batch_t *instance = malloc(sizeof(batch_t));
+        usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
-        batch_init(instance, target, transfer_type, speed, max_packet_size,
+        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
             buffer, NULL, buffer_size, NULL, setup_size, func_in,
             func_out, arg, fun, NULL);
@@ -94 +94 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_dispose(batch_t *instance)
+void batch_dispose(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -102 +102 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_control_write(batch_t *instance)
+void batch_control_write(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -113 +113 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_control_read(batch_t *instance)
+void batch_control_read(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -121 +121 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_in(batch_t *instance)
+void batch_interrupt_in(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -130 +130 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_out(batch_t *instance)
+void batch_interrupt_out(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -142 +142 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_in(batch_t *instance)
+void batch_bulk_in(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -151 +151 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_out(batch_t *instance)
+void batch_bulk_out(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -164 +164 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_in_and_dispose(batch_t *instance)
+void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
 {
         assert(instance);
-        batch_call_in(instance);
+        usb_transfer_batch_call_in(instance);
         batch_dispose(instance);
 }
@@ -175 +175 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_out_and_dispose(batch_t *instance)
+void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
 {
         assert(instance);
-        batch_call_out(instance);
+        usb_transfer_batch_call_out(instance);
         batch_dispose(instance);
 }