Changeset b72efe8 in mainline for uspace/drv/uhci

Timestamp:

2011-06-19T14:38:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

74464e8

Parents:

1d1bb0f

Message:

Separate list_t typedef from link_t (user-space part).

• list_t represents lists
• Use list_first(), list_last(), list_empty() where appropriate
• Use list_foreach() where possible
• assert_link_not_used()
• usb_hid_report_path_free() shall not unlink the path, caller must do it

Location:

uspace/drv/uhci

Files:

• hc.c (modified) (1 diff)
• transfer_list.c (modified) (5 diffs)
• transfer_list.h (modified) (2 diffs)

uspace/drv/uhci/hc.c

@@ -345 +345 @@
 
                 while (!list_empty(&done)) {
-                        link_t *item = done.next;
+                        link_t *item = list_first(&done);
                         list_remove(item);
                         usb_transfer_batch_t *batch =

uspace/drv/uhci/transfer_list.c

@@ -121 +121 @@
         } else {
                 /* There is something scheduled */
-                usb_transfer_batch_t *last =
-                    usb_transfer_batch_from_link(instance->batch_list.prev);
+                usb_transfer_batch_t *last = usb_transfer_batch_from_link(
+                    list_last(&instance->batch_list));
                 last_qh = batch_qh(last);
         }
@@ -146 +146 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Add completed bantches to the provided list.
+/** Add completed batches to the provided list.
  *
  * @param[in] instance List to use.
  * @param[in] done list to fill
  */
-void transfer_list_remove_finished(transfer_list_t *instance, link_t *done)
+void transfer_list_remove_finished(transfer_list_t *instance, list_t *done)
 {
         assert(instance);
@@ -157 +157 @@
 
         fibril_mutex_lock(&instance->guard);
-        link_t *current = instance->batch_list.next;
-        while (current != &instance->batch_list) {
+        link_t *current = instance->batch_list.head.next;
+        while (current != &instance->batch_list.head) {
                 link_t * const next = current->next;
                 usb_transfer_batch_t *batch =
@@ -181 +181 @@
         fibril_mutex_lock(&instance->guard);
         while (!list_empty(&instance->batch_list)) {
-                link_t * const current = instance->batch_list.next;
+                link_t * const current = list_first(&instance->batch_list);
                 usb_transfer_batch_t *batch =
                     usb_transfer_batch_from_link(current);
@@ -212 +212 @@
         qh_t *prev_qh = NULL;
         /* Remove from the hardware queue */
-        if (instance->batch_list.next == &batch->link) {
+        if (list_first(&instance->batch_list) == &batch->link) {
                 /* I'm the first one here */
                 prev_qh = instance->queue_head;

uspace/drv/uhci/transfer_list.h

@@ -51 +51 @@
         const char *name;
         /** List of all batches in this list */
-        link_t batch_list;
+        list_t batch_list;
 } transfer_list_t;
 
@@ -59 +59 @@
 void transfer_list_add_batch(
     transfer_list_t *instance, usb_transfer_batch_t *batch);
-void transfer_list_remove_finished(transfer_list_t *instance, link_t *done);
+void transfer_list_remove_finished(transfer_list_t *instance, list_t *done);
 void transfer_list_abort_all(transfer_list_t *instance);
 #endif