Changeset dc4c19e in mainline for uspace/drv/ohci/batch.h

Timestamp:

2011-04-10T12:18:09Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

60c0573

Parents:

a49e171 (diff), 82e8861 (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:

Development changes

File:

• uspace/drv/ohci/batch.h (modified) (2 diffs)

uspace/drv/ohci/batch.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbohci
+/** @addtogroup drvusbuhcihc
  * @{
  */
 /** @file
- * @brief OHCI driver USB transaction structure
+ * @brief UHCI driver USB transaction structure
  */
-#ifndef DRV_OHCI_BATCH_H
-#define DRV_OHCI_BATCH_H
-
+#ifndef DRV_UHCI_BATCH_H
+#define DRV_UHCI_BATCH_H
 
 #include <usbhc_iface.h>
 #include <usb/usb.h>
 #include <usb/host/device_keeper.h>
+#include <usb/host/endpoint.h>
 #include <usb/host/batch.h>
 
+#include "hw_struct/endpoint_descriptor.h"
+
 usb_transfer_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,
+    ddf_fun_t *fun, endpoint_t *ep, 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,
-                usb_device_keeper_t *manager
-                );
+    void *arg);
 
 void batch_dispose(usb_transfer_batch_t *instance);
+
+bool batch_is_complete(usb_transfer_batch_t *instance);
 
 void batch_control_write(usb_transfer_batch_t *instance);
@@ -70 +65 @@
 
 void batch_bulk_out(usb_transfer_batch_t *instance);
+
+ed_t * batch_ed(usb_transfer_batch_t *instance);
 #endif
 /**