Changeset 1387692 in mainline for uspace/lib

Timestamp:

2011-03-21T15:01:52Z (15 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.

Location:

uspace/lib/usb

Files:

• include/usb/host/batch.h (modified) (3 diffs)
• src/host/batch.c (modified) (4 diffs)

uspace/lib/usb/include/usb/host/batch.h

@@ -40 +40 @@
 #include <usb/usb.h>
 
-typedef struct batch
-{
+typedef struct usb_transfer_batch usb_transfer_batch_t;
+struct usb_transfer_batch {
         link_t link;
         usb_target_t target;
@@ -56 +56 @@
         size_t max_packet_size;
         size_t transfered_size;
-        void (*next_step)(struct batch*);
+        void (*next_step)(usb_transfer_batch_t *);
         int error;
         ddf_fun_t *fun;
         void *arg;
         void *private_data;
-} batch_t;
+};
 
-void batch_init(
-    batch_t *instance,
+void usb_transfer_batch_init(
+    usb_transfer_batch_t *instance,
     usb_target_t target,
     usb_transfer_type_t transfer_type,
@@ -81 +81 @@
 );
 
-static inline batch_t *batch_from_link(link_t *link_ptr)
+static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *link_ptr)
 {
         assert(link_ptr);
-        return list_get_instance(link_ptr, batch_t, link);
+        return list_get_instance(link_ptr, usb_transfer_batch_t, link);
 }
 
-void batch_call_in(batch_t *instance);
-void batch_call_out(batch_t *instance);
-void batch_finish(batch_t *instance, int error);
+void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
+void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
+void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error);
+
 #endif
 /**

uspace/lib/usb/src/host/batch.c

@@ -39 +39 @@
 #include <usb/host/batch.h>
 
-void batch_init(
-    batch_t *instance,
+void usb_transfer_batch_init(
+    usb_transfer_batch_t *instance,
     usb_target_t target,
     usb_transfer_type_t transfer_type,
@@ -85 +85 @@
  *
  */
-void batch_finish(batch_t *instance, int error)
+void usb_transfer_batch_finish(usb_transfer_batch_t *instance, int error)
 {
         assert(instance);
@@ -98 +98 @@
  * parameters.
  */
-void batch_call_in(batch_t *instance)
+void usb_transfer_batch_call_in(usb_transfer_batch_t *instance)
 {
         assert(instance);
@@ -120 +120 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_out(batch_t *instance)
+void usb_transfer_batch_call_out(usb_transfer_batch_t *instance)
 {
         assert(instance);