Changeset 4192d3d6 in mainline

Timestamp:

2011-02-07T11:20:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

da17cf0

Parents:

4d73d71

Message:

Add new tracking mechanism for complex transfers

Location:

uspace/drv/uhci-hcd

Files:

• Makefile (modified) (1 diff)
• tracker.c (added)
• tracker.h (added)
• uhci_struct/transfer_descriptor.c (modified) (3 diffs)
• uhci_struct/transfer_descriptor.h (modified) (2 diffs)

uspace/drv/uhci-hcd/Makefile

@@ -40 +40 @@
         uhci.c \
         uhci_struct/transfer_descriptor.c \
-        pci.c 
+        pci.c \
+        tracker.c
 
 include $(USPACE_PREFIX)/Makefile.common

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

@@ -32 +32 @@
  * @brief UHCI driver
  */
+#include <errno.h>
 #include <usb/debug.h>
 
@@ -44 +45 @@
         instance->next =
           0 | LINK_POINTER_TERMINATE_FLAG;
-
 
         assert(size < 1024);
@@ -110 +110 @@
         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
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 void transfer_descriptor_fini(transfer_descriptor_t *instance)
 {

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

@@ -122 +122 @@
 }
 
+int transfer_descriptor_status(transfer_descriptor_t *instance);
+
 static inline void transfer_descriptor_append(
   transfer_descriptor_t *instance, transfer_descriptor_t *item)
@@ -127 +129 @@
         assert(instance);
         instance->next_va = item;
-        instance->next = (uintptr_t)addr_to_phys( item ) & LINK_POINTER_ADDRESS_MASK;
+        instance->next = (uintptr_t)addr_to_phys(item) & LINK_POINTER_ADDRESS_MASK;
 }
 #endif