Changeset 361e61b in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-03-21T14:23:15Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

55e388a1

Parents:

c32688d (diff), 48fe0c9 (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 with development

File:

• uspace/drv/uhci-hcd/batch.h (modified) (3 diffs)

uspace/drv/uhci-hcd/batch.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup drvusbuhcihc
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief UHCI driver USB transaction structure
  */
 #ifndef DRV_UHCI_BATCH_H
@@ -39 +39 @@
 #include <usbhc_iface.h>
 #include <usb/usb.h>
+#include <usb/host/device_keeper.h>
+#include <usb/host/batch.h>
 
-#include "uhci_struct/transfer_descriptor.h"
 #include "uhci_struct/queue_head.h"
-#include "utils/device_keeper.h"
 
-typedef struct batch
-{
-        link_t link;
-        usb_speed_t speed;
-        usb_target_t target;
-        usb_transfer_type_t transfer_type;
-        union {
-                usbhc_iface_transfer_in_callback_t callback_in;
-                usbhc_iface_transfer_out_callback_t callback_out;
-        };
-        void *arg;
-        char *transport_buffer;
-        char *setup_buffer;
-        size_t setup_size;
-        char *buffer;
-        size_t buffer_size;
-        size_t max_packet_size;
-        size_t packets;
-        size_t transfered_size;
-        int error;
-        ddf_fun_t *fun;
-        queue_head_t *qh;
-        td_t *tds;
-        void (*next_step)(struct batch*);
-        device_keeper_t *manager;
-} batch_t;
-
-batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
-    usb_transfer_type_t transfer_type, size_t max_packet_size,
-    usb_speed_t speed, char *buffer, size_t size,
-                char *setup_buffer, size_t setup_size,
+batch_t * batch_get(
+    ddf_fun_t *fun,
+                usb_target_t target,
+    usb_transfer_type_t transfer_type,
+                size_t max_packet_size,
+    usb_speed_t speed,
+                char *buffer,
+                size_t size,
+                char *setup_buffer,
+                size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
-    usbhc_iface_transfer_out_callback_t func_out, void *arg,
+    usbhc_iface_transfer_out_callback_t func_out,
+                void *arg,
                 device_keeper_t *manager
                 );
+
+void batch_dispose(batch_t *instance);
 
 bool batch_is_complete(batch_t *instance);
@@ -93 +75 @@
 
 void batch_bulk_out(batch_t *instance);
+
+qh_t * batch_qh(batch_t *instance);
 #endif
 /**