Changeset a39cfb8 in mainline for uspace/lib/usb/include/usb/host/batch.h

Timestamp:

2011-04-14T07:54:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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:

merge from development

File:

• uspace/lib/usb/include/usb/host/batch.h (modified) (3 diffs)

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

@@ -43 +43 @@
 typedef struct usb_transfer_batch usb_transfer_batch_t;
 struct usb_transfer_batch {
+        endpoint_t *ep;
         link_t link;
-        usb_target_t target;
-        usb_transfer_type_t transfer_type;
-        usb_speed_t speed;
-        usb_direction_t direction;
         usbhc_iface_transfer_in_callback_t callback_in;
         usbhc_iface_transfer_out_callback_t callback_out;
+        void *arg;
         char *buffer;
-        char *transport_buffer;
+        char *data_buffer;
         size_t buffer_size;
         char *setup_buffer;
         size_t setup_size;
-        size_t max_packet_size;
         size_t transfered_size;
         void (*next_step)(usb_transfer_batch_t *);
         int error;
         ddf_fun_t *fun;
-        void *arg;
-        endpoint_t *ep;
         void *private_data;
+        void (*private_data_dtor)(void *p_data);
 };
 
 void usb_transfer_batch_init(
     usb_transfer_batch_t *instance,
-    usb_target_t target,
-    usb_transfer_type_t transfer_type,
-    usb_speed_t speed,
-    size_t max_packet_size,
+    endpoint_t *ep,
     char *buffer,
-    char *transport_buffer,
+    char *data_buffer,
     size_t buffer_size,
     char *setup_buffer,
@@ -80 +73 @@
     void *arg,
     ddf_fun_t *fun,
-                endpoint_t *ep,
-    void *private_data
+    void *private_data,
+    void (*private_data_dtor)(void *p_data)
 );
 
-static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *l)
-{
-        assert(l);
-        return list_get_instance(l, usb_transfer_batch_t, link);
-}
-
-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_call_in_and_dispose(usb_transfer_batch_t *instance);
+void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance);
 void usb_transfer_batch_finish(usb_transfer_batch_t *instance);
+void usb_transfer_batch_dispose(usb_transfer_batch_t *instance);
 
 static inline void usb_transfer_batch_finish_error(
@@ -102 +90 @@
 }
 
+static inline usb_transfer_batch_t *usb_transfer_batch_from_link(link_t *l)
+{
+        assert(l);
+        return list_get_instance(l, usb_transfer_batch_t, link);
+}
+
 #endif
 /**