Changeset 6143ce3 in mainline for uspace/drv/uhci-hcd/batch.c

Timestamp:

2011-03-13T15:37:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8850690

Parents:

eb0dc58

Message:

Rename queue_head_t ⇒ qh_t

Refactoring

File:

• uspace/drv/uhci-hcd/batch.c (modified) (3 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -100 +100 @@
         bzero(instance, sizeof(batch_t));
 
-        instance->qh = malloc32(sizeof(queue_head_t));
+        instance->qh = malloc32(sizeof(qh_t));
         CHECK_NULL_DISPOSE_RETURN(instance->qh,
             "Failed to allocate batch queue head.\n");
-        queue_head_init(instance->qh);
+        qh_init(instance->qh);
 
         instance->packets = (size + max_packet_size - 1) / max_packet_size;
@@ -114 +114 @@
             instance->tds, "Failed to allocate transfer descriptors.\n");
         bzero(instance->tds, sizeof(td_t) * instance->packets);
-
-//      const size_t transport_size = max_packet_size * instance->packets;
 
         if (size > 0) {
@@ -143 +141 @@
         instance->speed = speed;
         instance->manager = manager;
-
-        if (func_out)
-                instance->callback_out = func_out;
-        if (func_in)
-                instance->callback_in = func_in;
-
-        queue_head_set_element_td(instance->qh, addr_to_phys(instance->tds));
+        instance->callback_out = func_out;
+        instance->callback_in = func_in;
+
+        qh_set_element_td(instance->qh, addr_to_phys(instance->tds));
 
         usb_log_debug("Batch(%p) %d:%d memory structures ready.\n",