Changeset 6602e97 in mainline for uspace/drv/bus/usb/ehci/hw_struct

Timestamp:

2014-01-25T07:06:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a752c78c

Parents:

3f2cb17

Message:

ehci: Implement batch structure initialization

Location:

uspace/drv/bus/usb/ehci/hw_struct

Files:

• queue_head.h (modified) (1 diff)
• transfer_descriptor.c (added)
• transfer_descriptor.h (modified) (1 diff)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -178 +178 @@
 }
 
+static inline bool qh_halted(const qh_t *qh)
+{
+        assert(qh);
+        return (EHCI_MEM32_RD(qh->status) & QH_STATUS_HALTED_FLAG);
+}
+
+static inline void qh_halt(qh_t *qh)
+{
+        assert(qh);
+        EHCI_MEM32_SET(qh->status, QH_STATUS_HALTED_FLAG);
+}
+
+static inline bool qh_transfer_pending(const qh_t *qh)
+{
+        assert(qh);
+        return !(EHCI_MEM32_RD(qh->next) & LINK_POINTER_TERMINATE_FLAG);
+}
+
 
 void qh_init(qh_t *instance, const endpoint_t *ep);

uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h

@@ -67 +67 @@
 
         volatile uint32_t buffer_pointer[5];
-#define SITD_BUFFER_POINTER_MASK   0xfffff000
+#define TD_BUFFER_POINTER_MASK   0xfffff000
 /* Only the first page pointer */
-#define SITD_BUFFER_POINTER_CURRENT_MASK    0xfff
-#define SITD_BUFFER_POINTER_CURRENT_SHIFT   0
+#define TD_BUFFER_POINTER_OFFSET_MASK    0xfff
 
 } td_t;
+
+void td_init(td_t *td, const td_t *next, usb_direction_t dir, const void * buf,
+    size_t buf_size, int toggle);
+
 #endif
 /**