Changeset 400735e in mainline for uspace/drv/uhci-hcd/transfer_list.c

Timestamp:

2011-05-28T14:30:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fb5a3e

Parents:

e8f826b (diff), 48141f0 (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/transfer_list.c (modified) (6 diffs)

uspace/drv/uhci-hcd/transfer_list.c

@@ -36 +36 @@
 #include <arch/barrier.h>
 
+
 #include "transfer_list.h"
+#include "batch.h"
 
 static void transfer_list_remove_batch(
@@ -58 +60 @@
                 return ENOMEM;
         }
-        uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
+        const uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
         usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32" ).\n",
             name, instance->queue_head, queue_head_pa);
@@ -90 +92 @@
 {
         assert(instance);
+        assert(instance->queue_head);
         assert(next);
-        if (!instance->queue_head)
-                return;
         /* Set queue_head.next to point to the follower */
         qh_set_next_qh(instance->queue_head, next->queue_head);
@@ -137 +138 @@
         write_barrier();
 
-        /* Add to the driver list */
+        /* Add to the driver's list */
         list_append(&batch->link, &instance->batch_list);
 
@@ -160 +161 @@
         link_t *current = instance->batch_list.next;
         while (current != &instance->batch_list) {
-                link_t *next = current->next;
+                link_t * const next = current->next;
                 usb_transfer_batch_t *batch =
                     usb_transfer_batch_from_link(current);
@@ -182 +183 @@
         fibril_mutex_lock(&instance->guard);
         while (!list_empty(&instance->batch_list)) {
-                link_t *current = instance->batch_list.next;
+                link_t * const current = instance->batch_list.next;
                 usb_transfer_batch_t *batch =
                     usb_transfer_batch_from_link(current);