Changeset a752c78c in mainline for uspace/drv/bus/usb/ehci/hw_struct

Timestamp:

2014-01-25T07:07:54Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

23e5471

Parents:

6602e97

Message:

ehci: Implement batch error checking

Location:

uspace/drv/bus/usb/ehci/hw_struct

Files:

• queue_head.h (modified) (1 diff)
• transfer_descriptor.c (modified) (2 diffs)
• transfer_descriptor.h (modified) (1 diff)

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

@@ -184 +184 @@
 }
 
-static inline void qh_halt(qh_t *qh)
-{
-        assert(qh);
-        EHCI_MEM32_SET(qh->status, QH_STATUS_HALTED_FLAG);
+static inline void qh_clear_halt(qh_t *qh)
+{
+        assert(qh);
+        EHCI_MEM32_CLR(qh->status, QH_STATUS_HALTED_FLAG);
 }
 

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

@@ -34 +34 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <macros.h>
 #include <mem.h>
@@ -40 +41 @@
 
 #include "../utils/malloc32.h"
-//#include "completion_codes.h"
 #include "mem_access.h"
 #include "transfer_descriptor.h"
+
+
+int td_error(const td_t *td)
+{
+        assert(td);
+        const uint32_t status = EHCI_MEM32_RD(td->status);
+        if (status & TD_STATUS_HALTED_FLAG) {
+                if (status & TD_STATUS_TRANS_ERR_FLAG)
+                        return EIO;
+                if (status & TD_STATUS_BABBLE_FLAG)
+                        return EIO;
+                if (status & TD_STATUS_BUFF_ERROR_FLAG)
+                        return EOVERFLOW;
+                return ESTALL;
+        }
+        if (status & TD_STATUS_ACTIVE_FLAG)
+                return EINPROGRESS;
+        return EOK;
+}
 
 /** USB direction to EHCI TD values translation table */

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

@@ -73 +73 @@
 } td_t;
 
+static inline bool td_active(const td_t *td)
+{
+        assert(td);
+        return (EHCI_MEM32_RD(td->status) & TD_STATUS_HALTED_FLAG) != 0;
+}
+
+static inline size_t td_remain_size(const td_t *td)
+{
+        assert(td);
+        return (EHCI_MEM32_RD(td->status) >> TD_STATUS_TOTAL_SHIFT) &
+            TD_STATUS_TOTAL_MASK;
+}
+
+int td_error(const td_t *td);
+
 void td_init(td_t *td, const td_t *next, usb_direction_t dir, const void * buf,
     size_t buf_size, int toggle);