Changeset e50cd7f in mainline for uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (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:

new report structure fixes

File:

• uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c (modified) (4 diffs)

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

@@ -77 +77 @@
 
         instance->status = 0
-            | ((err_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
+            | ((err_count & TD_STATUS_ERROR_COUNT_MASK)
+                << TD_STATUS_ERROR_COUNT_POS)
             | (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0)
             | (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0)
@@ -89 +90 @@
             | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)
             | (toggle ? TD_DEVICE_DATA_TOGGLE_ONE_FLAG : 0)
-            | ((target.address & TD_DEVICE_ADDRESS_MASK) << TD_DEVICE_ADDRESS_POS)
-            | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) << TD_DEVICE_ENDPOINT_POS)
+            | ((target.address & TD_DEVICE_ADDRESS_MASK)
+                << TD_DEVICE_ADDRESS_POS)
+            | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK)
+                << TD_DEVICE_ENDPOINT_POS)
             | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
@@ -114 +117 @@
         assert(instance);
 
-        /* this is hc internal error it should never be reported */
+        /* This is hc internal error it should never be reported. */
         if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
                 return EAGAIN;
@@ -123 +126 @@
                 return EBADCHECKSUM;
 
-        /* hc does not end transaction on these, it should never be reported */
+        /* HC does not end transactions on these, it should never be reported */
         if ((instance->status & TD_STATUS_ERROR_NAK) != 0)
                 return EAGAIN;
 
-        /* buffer overrun or underrun */
+        /* Buffer overrun or underrun */
         if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)
                 return ERANGE;
 
-        /* device babble is something serious */
+        /* Device babble is something serious */
         if ((instance->status & TD_STATUS_ERROR_BABBLE) != 0)
                 return EIO;
 
-        /* stall might represent err count reaching zero or stall response from
-         * the device, is err count reached zero, one of the above is reported*/
+        /* Stall might represent err count reaching zero or stall response from
+         * the device. If err count reached zero, one of the above is reported*/
         if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
                 return ESTALL;