Changeset 50ba203 in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

Timestamp:

2011-02-20T15:46:48Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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) (2 diffs)

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

@@ -40 +40 @@
 void transfer_descriptor_init(transfer_descriptor_t *instance,
     int error_count, size_t size, bool toggle, bool isochronous,
-    usb_target_t target, int pid, void *buffer)
+    usb_target_t target, int pid, void *buffer, transfer_descriptor_t *next)
 {
         assert(instance);
 
-        instance->next = 0 | LINK_POINTER_TERMINATE_FLAG;
+        instance->next = 0
+            | LINK_POINTER_VERTICAL_FLAG
+            | ((next != NULL) ? addr_to_phys(next) : LINK_POINTER_TERMINATE_FLAG);
 
         instance->status = 0
@@ -80 +82 @@
 #endif
 }
-
-static inline usb_transaction_outcome_t convert_outcome(uint32_t status)
-{
-        /*TODO: refactor into something sane */
-        /*TODO: add additional usb_errors to usb_outcome_t */
-
-        if (status & TD_STATUS_ERROR_STALLED)
-                return USB_OUTCOME_CRCERROR;
-
-        if (status & TD_STATUS_ERROR_BUFFER)
-                return USB_OUTCOME_CRCERROR;
-
-        if (status & TD_STATUS_ERROR_BABBLE)
-                return USB_OUTCOME_BABBLE;
-
-        if (status & TD_STATUS_ERROR_NAK)
-                return USB_OUTCOME_CRCERROR;
-
-  if (status & TD_STATUS_ERROR_CRC)
-                return USB_OUTCOME_CRCERROR;
-
-        if (status & TD_STATUS_ERROR_BIT_STUFF)
-                return USB_OUTCOME_CRCERROR;
-
-//      assert((((status >> TD_STATUS_ERROR_POS) & TD_STATUS_ERROR_MASK)
-//      | TD_STATUS_ERROR_RESERVED) == TD_STATUS_ERROR_RESERVED);
-        return USB_OUTCOME_OK;
-}
 /*----------------------------------------------------------------------------*/
 int transfer_descriptor_status(transfer_descriptor_t *instance)
 {
         assert(instance);
-        if (convert_outcome(instance->status))
-                return EINVAL; //TODO: use sane error value here
+
+        if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
+                return EIO;
+
+        if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
+                return EAGAIN;
+
+        if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)
+                return EAGAIN;
+
+        if ((instance->status & TD_STATUS_ERROR_BABBLE) != 0)
+                return EIO;
+
+        if ((instance->status & TD_STATUS_ERROR_NAK) != 0)
+                return EAGAIN;
+
+        if ((instance->status & TD_STATUS_ERROR_BIT_STUFF) != 0)
+                return EAGAIN;
+
         return EOK;
 }