Changeset 28eee11c in mainline for uspace/drv/uhci-hcd/transfer_list.c

Timestamp:

2011-03-21T15:12:04Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5287502

Parents:

5971dd3 (diff), 7102aa5 (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:

Function and types renaming

This merge does not involve any change in functionality.

Types and functions that were renamed (see individual commits for details):

• usb_endpoint_pipe_* ⇒ usb_pipe_*
• device_keeper_* ⇒ usb_device_keeper_*
  • some functions has more descriptive names now
• batch_* ⇒ usb_transfer_batch_ *

Also fixed some wrong Doxygen caused by migration from individual drivers.

File:

• uspace/drv/uhci-hcd/transfer_list.c (modified) (9 diffs)

uspace/drv/uhci-hcd/transfer_list.c

@@ -38 +38 @@
 
 static void transfer_list_remove_batch(
-    transfer_list_t *instance, batch_t *batch);
+    transfer_list_t *instance, usb_transfer_batch_t *batch);
 /*----------------------------------------------------------------------------*/
 /** Initialize transfer list structures.
@@ -92 +92 @@
  * The batch is added to the end of the list and queue.
  */
-void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch)
+void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -115 +115 @@
         } else {
                 /* There is something scheduled */
-                batch_t *last = list_get_instance(
-                    instance->batch_list.prev, batch_t, link);
+                usb_transfer_batch_t *last = list_get_instance(
+                    instance->batch_list.prev, usb_transfer_batch_t, link);
                 qh_set_next_qh(batch_qh(last), pa);
         }
@@ -122 +122 @@
         list_append(&batch->link, &instance->batch_list);
 
-        batch_t *first = list_get_instance(
-            instance->batch_list.next, batch_t, link);
+        usb_transfer_batch_t *first = list_get_instance(
+            instance->batch_list.next, usb_transfer_batch_t, link);
         usb_log_debug("Batch(%p) added to queue %s, first is %p.\n",
                 batch, instance->name, first);
@@ -148 +148 @@
         while (current != &instance->batch_list) {
                 link_t *next = current->next;
-                batch_t *batch = list_get_instance(current, batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
 
                 if (batch_is_complete(batch)) {
@@ -162 +162 @@
                 link_t *item = done.next;
                 list_remove(item);
-                batch_t *batch = list_get_instance(item, batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(item, usb_transfer_batch_t, link);
                 batch->next_step(batch);
         }
@@ -176 +176 @@
         while (list_empty(&instance->batch_list)) {
                 link_t *current = instance->batch_list.next;
-                batch_t *batch = list_get_instance(current, batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
                 transfer_list_remove_batch(instance, batch);
-                batch_finish(batch, EIO);
+                usb_transfer_batch_finish(batch, EIO);
         }
         fibril_mutex_unlock(&instance->guard);
@@ -191 +191 @@
  * Does not lock the transfer list, caller is responsible for that.
  */
-void transfer_list_remove_batch(transfer_list_t *instance, batch_t *batch)
+void transfer_list_remove_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -207 +207 @@
                 pos = "FIRST";
         } else {
-                batch_t *prev =
-                    list_get_instance(batch->link.prev, batch_t, link);
+                usb_transfer_batch_t *prev =
+                    list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
                 qh_set_next_qh(batch_qh(prev), batch_qh(batch)->next);
                 pos = "NOT FIRST";