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

Timestamp:

2011-03-21T14:23:15Z (14 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/transfer_list.h (modified) (3 diffs)

uspace/drv/uhci-hcd/transfer_list.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 transfer list structure
  */
 #ifndef DRV_UHCI_TRANSFER_LIST_H
@@ -44 +44 @@
 {
         fibril_mutex_t guard;
-        queue_head_t *queue_head;
+        qh_t *queue_head;
         uint32_t queue_head_pa;
-        struct transfer_list *next;
         const char *name;
         link_t batch_list;
 } transfer_list_t;
+
+/** Dispose transfer list structures.
+ *
+ * @param[in] instance Memory place to use.
+ *
+ * Frees memory for internal qh_t structure.
+ */
+static inline void transfer_list_fini(transfer_list_t *instance)
+{
+        assert(instance);
+        free32(instance->queue_head);
+}
 
 int transfer_list_init(transfer_list_t *instance, const char *name);
@@ -55 +66 @@
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
 
-static inline void transfer_list_fini(transfer_list_t *instance)
-{
-        assert(instance);
-        free32(instance->queue_head);
-}
+void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);
+
 void transfer_list_remove_finished(transfer_list_t *instance);
 
-void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);
+void transfer_list_abort_all(transfer_list_t *instance);
 #endif
 /**