Changeset 79d2987 in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

Timestamp:

2011-02-11T17:16:36Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4e8e1f5

Parents:

25971d2 (diff), 608afb9 (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

@@ -32 +32 @@
  * @brief UHCI driver
  */
+#include <errno.h>
 #include <usb/debug.h>
 
 #include "transfer_descriptor.h"
+#include "utils/malloc32.h"
 
 void transfer_descriptor_init(transfer_descriptor_t *instance,
-  int error_count, size_t size, bool isochronous, usb_target_t target,
-        int pid, void *buffer)
+    int error_count, size_t size, bool toggle, bool isochronous,
+    usb_target_t target, int pid, void *buffer)
 {
         assert(instance);
 
-        instance->next =
-          0 | LINK_POINTER_TERMINATE_FLAG;
+        instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
 
-
-        assert(size < 1024);
         instance->status = 0
           | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
           | TD_STATUS_ERROR_ACTIVE;
 
+        assert(size < 1024);
         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)
@@ -58 +59 @@
 
         instance->buffer_ptr = 0;
-
-        instance->next_va = NULL;
-        instance->callback = NULL;
 
         if (size) {
@@ -106 +104 @@
                 return USB_OUTCOME_CRCERROR;
 
-        assert((((status >> TD_STATUS_ERROR_POS) & TD_STATUS_ERROR_MASK)
-        | TD_STATUS_ERROR_RESERVED) == TD_STATUS_ERROR_RESERVED);
+//      assert((((status >> TD_STATUS_ERROR_POS) & TD_STATUS_ERROR_MASK)
+//      | TD_STATUS_ERROR_RESERVED) == TD_STATUS_ERROR_RESERVED);
         return USB_OUTCOME_OK;
 }
-
-void transfer_descriptor_fini(transfer_descriptor_t *instance)
+/*----------------------------------------------------------------------------*/
+int transfer_descriptor_status(transfer_descriptor_t *instance)
 {
         assert(instance);
-        callback_run(instance->callback,
-                convert_outcome(instance->status),
-                ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK
-        );
+        if (convert_outcome(instance->status))
+                return EINVAL; //TODO: use sane error value here
+        return EOK;
 }
 /**