Changeset b991d37 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.h

Timestamp:

2011-08-31T16:41:11Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff6dd73

Parents:

96e2d01

Message:

uhci: use uhci sepcific structure instead of generic library

revert the way uhci_transfer_batch_t and usb_transfer_batch_t are included,
don't use usb_transfer_batch_t:

-private data and data dtor
-next_step pointer
-buffer_data pointer

File:

• uspace/drv/bus/usb/uhci/uhci_batch.h (modified) (1 diff)

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -36 +36 @@
 
 #include <usb/host/batch.h>
+#include <adt/list.h>
 
 #include "hw_struct/queue_head.h"
+#include "hw_struct/transfer_descriptor.h"
 
-int batch_init_uhci(usb_transfer_batch_t *batch);
-bool batch_is_complete(usb_transfer_batch_t *batch);
-qh_t * batch_qh(usb_transfer_batch_t *batch);
+/** UHCI specific data required for USB transfer */
+typedef struct uhci_transfer_batch {
+        /** Queue head
+         * This QH is used to maintain UHCI schedule structure and the element
+         * pointer points to the first TD of this batch.
+         */
+        qh_t *qh;
+        /** List of TDs needed for the transfer */
+        td_t *tds;
+        /** Number of TDs used by the transfer */
+        size_t td_count;
+        /** Data buffer, must be accessible by the UHCI hw */
+        void *device_buffer;
+        /** Generic transfer data */
+        usb_transfer_batch_t *usb_batch;
+        /** List element */
+        link_t link;
+} uhci_transfer_batch_t;
+
+uhci_transfer_batch_t * uhci_transfer_batch_get(usb_transfer_batch_t *batch);
+void uhci_transfer_batch_call_dispose(uhci_transfer_batch_t *uhci_batch);
+bool uhci_transfer_batch_is_complete(uhci_transfer_batch_t *uhci_batch);
+
+static inline void * uhci_transfer_batch_data_buffer(
+    uhci_transfer_batch_t *uhci_batch)
+{
+        assert(uhci_batch);
+        assert(uhci_batch->usb_batch);
+        assert(uhci_batch->device_buffer);
+        return uhci_batch->device_buffer + sizeof(qh_t) +
+            uhci_batch->td_count * sizeof(td_t) +
+            uhci_batch->usb_batch->setup_size;
+}
+/*----------------------------------------------------------------------------*/
+static inline void * uhci_transfer_batch_setup_buffer(
+    uhci_transfer_batch_t *uhci_batch)
+{
+        assert(uhci_batch);
+        assert(uhci_batch->usb_batch);
+        assert(uhci_batch->device_buffer);
+        return uhci_batch->device_buffer + sizeof(qh_t) +
+            uhci_batch->td_count * sizeof(td_t);
+}
+/*----------------------------------------------------------------------------*/
+static inline uhci_transfer_batch_t *uhci_transfer_batch_from_link(link_t *l)
+{
+        assert(l);
+        return list_get_instance(l, uhci_transfer_batch_t, link);
+}
+
 #endif
 /**