Changeset 53338bda in mainline

Timestamp:

2011-02-11T17:59:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f6309b6

Parents:

518372c

Message:

remove transfers from the list

Location:

uspace/drv/uhci-hcd

Files:

• tracker.c (modified) (3 diffs)
• tracker.h (modified) (2 diffs)
• transfer_list.c (modified) (1 diff)
• transfer_list.h (modified) (3 diffs)
• uhci.c (modified) (1 diff)

uspace/drv/uhci-hcd/tracker.c

@@ -37 +37 @@
 
 #include "tracker.h"
+#include "transfer_list.h"
 #include "uhci.h"
 #include "utils/malloc32.h"
@@ -387 +388 @@
         assert(instance);
         tracker_call_in(instance);
+        transfer_list_remove_tracker(instance->scheduled_list, instance);
         free32(instance->td);
         free32(instance->packet);
@@ -396 +398 @@
         assert(instance);
         tracker_call_out(instance);
+        assert(instance->scheduled_list);
+        transfer_list_remove_tracker(instance->scheduled_list, instance);
         free32(instance->td);
         free32(instance->packet);

uspace/drv/uhci-hcd/tracker.h

@@ -47 +47 @@
 } dev_speed_t;
 
+struct transfer_list;
+
 typedef struct tracker
 {
@@ -68 +70 @@
         void (*next_step)(struct tracker*);
         unsigned toggle:1;
+
+        struct transfer_list *scheduled_list;
 } tracker_t;
 

uspace/drv/uhci-hcd/transfer_list.c

@@ -100 +100 @@
         }
 }
+/*----------------------------------------------------------------------------*/
+void transfer_list_remove_tracker(transfer_list_t *instance, tracker_t *tracker)
+{
+        assert(instance);
+        assert(tracker);
+        assert(instance->queue_head);
+        assert(tracker->td);
+
+        uint32_t pa = (uintptr_t)addr_to_phys(tracker->td);
+        if ((instance->queue_head->element & LINK_POINTER_ADDRESS_MASK) == pa) {
+                instance->queue_head->element = tracker->td->next;
+        }
+}
 /**
  * @}

uspace/drv/uhci-hcd/transfer_list.h

@@ -36 +36 @@
 
 #include "uhci_struct/queue_head.h"
+
 #include "tracker.h"
 
@@ -52 +53 @@
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
 
+
 static inline void transfer_list_fini(transfer_list_t *instance)
 {
@@ -58 +60 @@
 }
 
+void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker);
 
-void transfer_list_add_tracker(transfer_list_t *instance, tracker_t *tracker);
+void transfer_list_remove_tracker(transfer_list_t *instance, tracker_t *track);
 
 #endif

uspace/drv/uhci-hcd/uhci.c

@@ -178 +178 @@
         list_append(&tracker->link, &instance->tracker_list);
 
+        tracker->scheduled_list = list;
+
         usb_log_debug2("Scheduler(%d) releasing tracker list mutex.\n",
             fibril_get_id());