Changeset e0df6c2 in mainline

Timestamp:

2011-02-12T03:04:40Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67b6fc5

Parents:

d6115e5

Message:

Fix: properly check whether the removed batch is the first in the list
Add mutex to guard tranfser list

Location:

uspace/drv/uhci-hcd

Files:

• main.c (modified) (1 diff)
• transfer_list.c (modified) (7 diffs)
• transfer_list.h (modified) (3 diffs)

uspace/drv/uhci-hcd/main.c

@@ -134 +134 @@
          */
         sleep(5);
-        usb_log_enable(USB_LOG_LEVEL_DEBUG2, NAME);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);

uspace/drv/uhci-hcd/transfer_list.c

@@ -52 +52 @@
         queue_head_init(instance->queue_head);
         list_initialize(&instance->batch_list);
+        fibril_mutex_initialize(&instance->guard);
         return EOK;
 }
@@ -76 +77 @@
         batch->qh->next_queue = instance->queue_head->next_queue;
 
+        fibril_mutex_lock(&instance->guard);
+
         if (instance->queue_head->element == instance->queue_head->next_queue) {
                 /* there is nothing scheduled */
@@ -82 +85 @@
                 usb_log_debug2("Added batch(%p) to queue %s first.\n",
                         batch, instance->name);
+                fibril_mutex_unlock(&instance->guard);
                 return;
         }
@@ -94 +98 @@
         usb_log_debug2("Added batch(%p) to queue %s last, first is %p.\n",
                 batch, instance->name, first );
+        fibril_mutex_unlock(&instance->guard);
 }
 /*----------------------------------------------------------------------------*/
@@ -105 +110 @@
 
         /* I'm the first one here */
-        if (batch->link.next == &instance->batch_list) {
+        if (batch->link.prev == &instance->batch_list) {
                 usb_log_debug("Removing tracer %p was first, next element %x.\n",
                         batch, batch->qh->next_queue);
@@ -121 +126 @@
 {
         assert(instance);
+        fibril_mutex_lock(&instance->guard);
         link_t *current = instance->batch_list.next;
         while (current != &instance->batch_list) {
@@ -132 +138 @@
                 current = next;
         }
+        fibril_mutex_unlock(&instance->guard);
 }
 /**

uspace/drv/uhci-hcd/transfer_list.h

@@ -35 +35 @@
 #define DRV_UHCI_TRANSFER_LIST_H
 
+#include <fibril_synch.h>
+
 #include "uhci_struct/queue_head.h"
 
@@ -41 +43 @@
 typedef struct transfer_list
 {
+        fibril_mutex_t guard;
         queue_head_t *queue_head;
         uint32_t queue_head_pa;
@@ -51 +54 @@
 
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
-
 
 static inline void transfer_list_fini(transfer_list_t *instance)