Changeset 960bee9 in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

Timestamp:

2011-03-07T16:51:59Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

97ff14d

Parents:

a6add7a (diff), d4beec3 (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 development/ changes

File:

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

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

@@ -38 +38 @@
 #include "utils/malloc32.h"
 
-void transfer_descriptor_init(transfer_descriptor_t *instance,
-    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)
+void td_init(td_t *instance, int err_count, size_t size, bool toggle, bool iso,
+    bool low_speed, usb_target_t target, usb_packet_id pid, void *buffer, td_t *next)
 {
         assert(instance);
+        assert(size < 1024);
+        assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN) || (pid == USB_PID_OUT));
 
         instance->next = 0
@@ -49 +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;
+            | ((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)
+            | TD_STATUS_ERROR_ACTIVE;
 
-        assert(size < 1024);
+        if (pid == USB_PID_IN && !iso) {
+                instance->status |= TD_STATUS_SPD_FLAG;
+        }
+
         instance->device = 0
-                | (((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)
-                | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
+            | (((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)
+            | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
         instance->buffer_ptr = 0;
@@ -68 +73 @@
 
         usb_log_debug2("Created TD: %X:%X:%X:%X(%p).\n",
-                instance->next, instance->status, instance->device,
-          instance->buffer_ptr, buffer);
+            instance->next, instance->status, instance->device,
+            instance->buffer_ptr, buffer);
+        if (pid == USB_PID_SETUP) {
+                usb_log_debug("SETUP BUFFER: %s\n",
+                        usb_debug_str_buffer(buffer, 8, 8));
+        }
 }
 /*----------------------------------------------------------------------------*/
-int transfer_descriptor_status(transfer_descriptor_t *instance)
+int td_status(td_t *instance)
 {
         assert(instance);