Changeset 8c877b2 in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

Timestamp:

2011-03-04T13:05:35Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d49728c

Parents:

dff940f8 (diff), 9a422574 (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 \usb\development

File:

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

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

@@ -39 +39 @@
 
 void transfer_descriptor_init(transfer_descriptor_t *instance,
-    int error_count, size_t size, bool toggle, bool isochronous,
+    int error_count, size_t size, bool toggle, bool isochronous, bool low_speed,
     usb_target_t target, int pid, void *buffer, transfer_descriptor_t *next)
 {
@@ -50 +50 @@
         instance->status = 0
           | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
+                | (low_speed ? TD_STATUS_LOW_SPEED_FLAG : 0)
           | TD_STATUS_ERROR_ACTIVE;
 
@@ -66 +67 @@
         }
 
-        usb_log_info("Created TD: %X:%X:%X:%X(%p).\n",
+        usb_log_debug2("Created TD: %X:%X:%X:%X(%p).\n",
                 instance->next, instance->status, instance->device,
           instance->buffer_ptr, buffer);
-#if 0
-        if (size) {
-                unsigned char * buff = buffer;
-                uhci_print_verbose("TD Buffer dump(%p-%dB): ", buffer, size);
-                unsigned i = 0;
-                /* TODO: Verbose? */
-                for (; i < size; ++i) {
-                        printf((i & 1) ? "%x " : "%x", buff[i]);
-                }
-                printf("\n");
-        }
-#endif
 }
 /*----------------------------------------------------------------------------*/
@@ -88 +77 @@
 
         if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
-                return EIO;
+                return ESTALL;
 
         if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
-                return EAGAIN;
+                return EBADCHECKSUM;
 
         if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)