Changeset f1d6866 in mainline for uspace/drv/bus/usb/ohci/ohci_batch.h

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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 mainline changes

File:

• uspace/drv/bus/usb/ohci/ohci_batch.h (moved) (moved from uspace/drv/bus/usb/ohci/batch.h ) (1 diff)

uspace/drv/bus/usb/ohci/ohci_batch.h

@@ -35 +35 @@
 #define DRV_OHCI_BATCH_H
 
+#include <adt/list.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 <usb/host/usb_transfer_batch.h>
 
-usb_transfer_batch_t * batch_get(
-    ddf_fun_t *fun, endpoint_t *ep, char *buffer, size_t size,
-    const 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);
+#include "hw_struct/transfer_descriptor.h"
+#include "hw_struct/endpoint_descriptor.h"
 
-bool batch_is_complete(usb_transfer_batch_t *instance);
+/** OHCI specific data required for USB transfer */
+typedef struct ohci_transfer_batch {
+        /** Link */
+        link_t link;
+        /** Endpoint descriptor of the target endpoint. */
+        ed_t *ed;
+        /** List of TDs needed for the transfer */
+        td_t **tds;
+        /** Number of TDs used by the transfer */
+        size_t td_count;
+        /** Dummy TD to be left at the ED and used by the next transfer */
+        size_t leave_td;
+        /** Data buffer, must be accessible by the OHCI hw. */
+        char *device_buffer;
+        /** Generic USB transfer structure */
+        usb_transfer_batch_t *usb_batch;
+} ohci_transfer_batch_t;
 
-void batch_commit(usb_transfer_batch_t *instance);
-
-void batch_control_write(usb_transfer_batch_t *instance);
-
-void batch_control_read(usb_transfer_batch_t *instance);
-
-void batch_interrupt_in(usb_transfer_batch_t *instance);
-
-void batch_interrupt_out(usb_transfer_batch_t *instance);
-
-void batch_bulk_in(usb_transfer_batch_t *instance);
-
-void batch_bulk_out(usb_transfer_batch_t *instance);
+ohci_transfer_batch_t * ohci_transfer_batch_get(usb_transfer_batch_t *batch);
+bool ohci_transfer_batch_is_complete(ohci_transfer_batch_t *batch);
+void ohci_transfer_batch_commit(ohci_transfer_batch_t *batch);
+void ohci_transfer_batch_finish_dispose(ohci_transfer_batch_t *batch);
+/*----------------------------------------------------------------------------*/
+static inline ohci_transfer_batch_t *ohci_transfer_batch_from_link(link_t *l)
+{
+        assert(l);
+        return list_get_instance(l, ohci_transfer_batch_t, link);
+}
 #endif
 /**