Changeset 361e61b in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

Timestamp:

2011-03-21T14:23:15Z (13 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/uhci_struct/transfer_descriptor.c (modified) (6 diffs)

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+/** @addtogroup drvusbuhcihc
  * @{
  */
@@ -38 +38 @@
 #include "utils/malloc32.h"
 
-/** Initializes Transfer Descriptor
+/** Initialize Transfer Descriptor
  *
  * @param[in] instance Memory place to initialize.
@@ -44 +44 @@
  * @param[in] size Size of data source.
  * @param[in] toggle Value of toggle bit.
- * @param[in] iso True if TD is for Isochronous transfer.
+ * @param[in] iso True if TD represents Isochronous transfer.
  * @param[in] low_speed Target device's speed.
  * @param[in] target Address and endpoint receiving the transfer.
@@ -51 +51 @@
  * @param[in] next Net TD in transaction.
  * @return Error code.
+ *
+ * Uses a mix of supplied and default values.
+ * Implicit values:
+ *  - all TDs have vertical flag set (makes transfers to endpoints atomic)
+ *  - in the error field only active it is set
+ *  - if the packet uses PID_IN and is not isochronous SPD is set
+ *
+ * Dumps 8 bytes of buffer if PID_SETUP is used.
  */
 void td_init(td_t *instance, int err_count, size_t size, bool toggle, bool iso,
@@ -88 +96 @@
         }
 
-        usb_log_debug2("Created TD: %X:%X:%X:%X(%p).\n",
-            instance->next, instance->status, instance->device,
+        usb_log_debug2("Created TD(%p): %X:%X:%X:%X(%p).\n",
+            instance, instance->next, instance->status, instance->device,
             instance->buffer_ptr, buffer);
+        td_print_status(instance);
         if (pid == USB_PID_SETUP) {
                 usb_log_debug("SETUP BUFFER: %s\n",
-                        usb_debug_str_buffer(buffer, 8, 8));
+                    usb_debug_str_buffer(buffer, 8, 8));
         }
 }
 /*----------------------------------------------------------------------------*/
-/** Converts TD status into standard error code
+/** Convert TD status into standard error code
  *
  * @param[in] instance TD structure to use.
@@ -126 +135 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+/** Print values in status field (dw1) in a human readable way.
+ *
+ * @param[in] instance TD structure to use.
+ */
+void td_print_status(td_t *instance)
+{
+        assert(instance);
+        const uint32_t s = instance->status;
+        usb_log_debug2("TD(%p) status(%#x):%s %d,%s%s%s%s%s%s%s%s%s%s%s %d.\n",
+            instance, instance->status,
+            (s & TD_STATUS_SPD_FLAG) ? " SPD," : "",
+            (s >> TD_STATUS_ERROR_COUNT_POS) & TD_STATUS_ERROR_COUNT_MASK,
+            (s & TD_STATUS_LOW_SPEED_FLAG) ? " LOW SPEED," : "",
+            (s & TD_STATUS_ISOCHRONOUS_FLAG) ? " ISOCHRONOUS," : "",
+            (s & TD_STATUS_IOC_FLAG) ? " IOC," : "",
+            (s & TD_STATUS_ERROR_ACTIVE) ? " ACTIVE," : "",
+            (s & TD_STATUS_ERROR_STALLED) ? " STALLED," : "",
+            (s & TD_STATUS_ERROR_BUFFER) ? " BUFFER," : "",
+            (s & TD_STATUS_ERROR_BABBLE) ? " BABBLE," : "",
+            (s & TD_STATUS_ERROR_NAK) ? " NAK," : "",
+            (s & TD_STATUS_ERROR_CRC) ? " CRC/TIMEOUT," : "",
+            (s & TD_STATUS_ERROR_BIT_STUFF) ? " BIT_STUFF," : "",
+            (s & TD_STATUS_ERROR_RESERVED) ? " RESERVED," : "",
+            td_act_size(instance)
+        );
+}
 /**
  * @}