Changes in uspace/drv/uhci-hcd/batch.c [20a1e76:c15070c] in mainline

File:

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

uspace/drv/uhci-hcd/batch.c

@@ -40 +40 @@
 #include "batch.h"
 #include "transfer_list.h"
-#include "hw_struct/transfer_descriptor.h"
+#include "uhci_hc.h"
 #include "utils/malloc32.h"
+#include "uhci_struct/transfer_descriptor.h"
 
 #define DEFAULT_ERROR_COUNT 3
@@ -48 +49 @@
         qh_t *qh;
         td_t *tds;
-        size_t transfers;
-        usb_device_keeper_t *manager;
+        size_t packets;
+        device_keeper_t *manager;
 } uhci_batch_t;
 
-static void batch_control(usb_transfer_batch_t *instance,
+static void batch_control(batch_t *instance,
     usb_packet_id data_stage, usb_packet_id status_stage);
-static void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid);
-static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
-static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
+static void batch_data(batch_t *instance, usb_packet_id pid);
+static void batch_call_in_and_dispose(batch_t *instance);
+static void batch_call_out_and_dispose(batch_t *instance);
 
 
@@ -64 +65 @@
  * @param[in] target Device and endpoint target of the transaction.
  * @param[in] transfer_type Interrupt, Control or Bulk.
- * @param[in] max_packet_size maximum allowed size of data transfers.
+ * @param[in] max_packet_size maximum allowed size of data packets.
  * @param[in] speed Speed of the transaction.
  * @param[in] buffer Data source/destination.
@@ -77 +78 @@
  * NULL otherwise.
  *
- * Determines the number of needed transfers (TDs). Prepares a transport buffer
+ * Determines the number of needed packets (TDs). Prepares a transport buffer
  * (that is accessible by the hardware). Initializes parameters needed for the
  * transaction and callback.
  */
-usb_transfer_batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
+batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
     usb_speed_t speed, char *buffer, size_t buffer_size,
@@ -87 +88 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out, void *arg,
-    usb_device_keeper_t *manager
+    device_keeper_t *manager
     )
 {
@@ -102 +103 @@
         } else (void)0
 
-        usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
+        batch_t *instance = malloc(sizeof(batch_t));
         CHECK_NULL_DISPOSE_RETURN(instance,
             "Failed to allocate batch instance.\n");
-        usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
+        batch_init(instance, target, transfer_type, speed, max_packet_size,
             buffer, NULL, buffer_size, NULL, setup_size, func_in,
             func_out, arg, fun, NULL);
@@ -117 +118 @@
         instance->private_data = data;
 
-        data->transfers = (buffer_size + max_packet_size - 1) / max_packet_size;
+        data->packets = (buffer_size + max_packet_size - 1) / max_packet_size;
         if (transfer_type == USB_TRANSFER_CONTROL) {
-                data->transfers += 2;
-        }
-
-        data->tds = malloc32(sizeof(td_t) * data->transfers);
+                data->packets += 2;
+        }
+
+        data->tds = malloc32(sizeof(td_t) * data->packets);
         CHECK_NULL_DISPOSE_RETURN(
             data->tds, "Failed to allocate transfer descriptors.\n");
-        bzero(data->tds, sizeof(td_t) * data->transfers);
+        bzero(data->tds, sizeof(td_t) * data->packets);
 
         data->qh = malloc32(sizeof(qh_t));
@@ -160 +161 @@
  * is reached.
  */
-bool batch_is_complete(usb_transfer_batch_t *instance)
+bool batch_is_complete(batch_t *instance)
 {
         assert(instance);
@@ -166 +167 @@
         assert(data);
 
-        usb_log_debug2("Batch(%p) checking %d transfer(s) for completion.\n",
-            instance, data->transfers);
+        usb_log_debug2("Batch(%p) checking %d packet(s) for completion.\n",
+            instance, data->packets);
         instance->transfered_size = 0;
         size_t i = 0;
-        for (;i < data->transfers; ++i) {
+        for (;i < data->packets; ++i) {
                 if (td_is_active(&data->tds[i])) {
                         return false;
@@ -181 +182 @@
                         td_print_status(&data->tds[i]);
 
-                        usb_device_keeper_set_toggle(data->manager,
+                        device_keeper_set_toggle(data->manager,
                             instance->target, instance->direction,
                             td_toggle(&data->tds[i]));
@@ -204 +205 @@
  * Uses genercir control function with pids OUT and IN.
  */
-void batch_control_write(usb_transfer_batch_t *instance)
+void batch_control_write(batch_t *instance)
 {
         assert(instance);
@@ -221 +222 @@
  * Uses generic control with pids IN and OUT.
  */
-void batch_control_read(usb_transfer_batch_t *instance)
+void batch_control_read(batch_t *instance)
 {
         assert(instance);
@@ -235 +236 @@
  * Data transaction with PID_IN.
  */
-void batch_interrupt_in(usb_transfer_batch_t *instance)
+void batch_interrupt_in(batch_t *instance)
 {
         assert(instance);
@@ -250 +251 @@
  * Data transaction with PID_OUT.
  */
-void batch_interrupt_out(usb_transfer_batch_t *instance)
+void batch_interrupt_out(batch_t *instance)
 {
         assert(instance);
@@ -268 +269 @@
  * Data transaction with PID_IN.
  */
-void batch_bulk_in(usb_transfer_batch_t *instance)
+void batch_bulk_in(batch_t *instance)
 {
         assert(instance);
@@ -283 +284 @@
  * Data transaction with PID_OUT.
  */
-void batch_bulk_out(usb_transfer_batch_t *instance)
+void batch_bulk_out(batch_t *instance)
 {
         assert(instance);
@@ -298 +299 @@
  *
  * @param[in] instance Batch structure to use.
- * @param[in] pid Pid to use for data transfers.
+ * @param[in] pid to use for data packets.
  *
  * Packets with alternating toggle bit and supplied pid value.
- * The last transfer is marked with IOC flag.
- */
-void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid)
+ * The last packet is marked with IOC flag.
+ */
+void batch_data(batch_t *instance, usb_packet_id pid)
 {
         assert(instance);
@@ -310 +311 @@
 
         const bool low_speed = instance->speed == USB_SPEED_LOW;
-        int toggle = usb_device_keeper_get_toggle(
+        int toggle = device_keeper_get_toggle(
             data->manager, instance->target, instance->direction);
         assert(toggle == 0 || toggle == 1);
 
-        size_t transfer = 0;
+        size_t packet = 0;
         size_t remain_size = instance->buffer_size;
         while (remain_size > 0) {
@@ -325 +326 @@
                     remain_size : instance->max_packet_size;
 
-                td_t *next_transfer = (transfer + 1 < data->transfers)
-                    ? &data->tds[transfer + 1] : NULL;
-
-                assert(transfer < data->transfers);
+                td_t *next_packet = (packet + 1 < data->packets)
+                    ? &data->tds[packet + 1] : NULL;
+
+                assert(packet < data->packets);
                 assert(packet_size <= remain_size);
 
                 td_init(
-                    &data->tds[transfer], DEFAULT_ERROR_COUNT, packet_size,
+                    &data->tds[packet], DEFAULT_ERROR_COUNT, packet_size,
                     toggle, false, low_speed, instance->target, pid, trans_data,
-                    next_transfer);
+                    next_packet);
 
 
                 toggle = 1 - toggle;
                 remain_size -= packet_size;
-                ++transfer;
-        }
-        td_set_ioc(&data->tds[transfer - 1]);
-        usb_device_keeper_set_toggle(data->manager, instance->target,
+                ++packet;
+        }
+        td_set_ioc(&data->tds[packet - 1]);
+        device_keeper_set_toggle(data->manager, instance->target,
             instance->direction, toggle);
 }
@@ -349 +350 @@
  *
  * @param[in] instance Batch structure to use.
- * @param[in] data_stage Pid to use for data transfers.
- * @param[in] status_stage Pid to use for data transfers.
+ * @param[in] data_stage to use for data packets.
+ * @param[in] status_stage to use for data packets.
  *
  * Setup stage with toggle 0 and USB_PID_SETUP.
  * Data stage with alternating toggle and pid supplied by parameter.
  * Status stage with toggle 1 and pid supplied by parameter.
- * The last transfer is marked with IOC.
- */
-void batch_control(usb_transfer_batch_t *instance,
+ * The last packet is marked with IOC.
+ */
+void batch_control(batch_t *instance,
    usb_packet_id data_stage, usb_packet_id status_stage)
 {
@@ -363 +364 @@
         uhci_batch_t *data = instance->private_data;
         assert(data);
-        assert(data->transfers >= 2);
+        assert(data->packets >= 2);
 
         const bool low_speed = instance->speed == USB_SPEED_LOW;
@@ -374 +375 @@
 
         /* data stage */
-        size_t transfer = 1;
+        size_t packet = 1;
         size_t remain_size = instance->buffer_size;
         while (remain_size > 0) {
@@ -388 +389 @@
 
                 td_init(
-                    &data->tds[transfer], DEFAULT_ERROR_COUNT, packet_size,
+                    &data->tds[packet], DEFAULT_ERROR_COUNT, packet_size,
                     toggle, false, low_speed, instance->target, data_stage,
-                    control_data, &data->tds[transfer + 1]);
-
-                ++transfer;
-                assert(transfer < data->transfers);
+                    control_data, &data->tds[packet + 1]);
+
+                ++packet;
+                assert(packet < data->packets);
                 assert(packet_size <= remain_size);
                 remain_size -= packet_size;
@@ -399 +400 @@
 
         /* status stage */
-        assert(transfer == data->transfers - 1);
+        assert(packet == data->packets - 1);
 
         td_init(
-            &data->tds[transfer], DEFAULT_ERROR_COUNT, 0, 1, false, low_speed,
+            &data->tds[packet], DEFAULT_ERROR_COUNT, 0, 1, false, low_speed,
             instance->target, status_stage, NULL, NULL);
-        td_set_ioc(&data->tds[transfer]);
+        td_set_ioc(&data->tds[packet]);
 
         usb_log_debug2("Control last TD status: %x.\n",
-            data->tds[transfer].status);
-}
-/*----------------------------------------------------------------------------*/
-qh_t * batch_qh(usb_transfer_batch_t *instance)
+            data->tds[packet].status);
+}
+/*----------------------------------------------------------------------------*/
+qh_t * batch_qh(batch_t *instance)
 {
         assert(instance);
@@ -422 +423 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
-{
-        assert(instance);
-        usb_transfer_batch_call_in(instance);
+void batch_call_in_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_in(instance);
         batch_dispose(instance);
 }
@@ -433 +434 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
-{
-        assert(instance);
-        usb_transfer_batch_call_out(instance);
+void batch_call_out_and_dispose(batch_t *instance)
+{
+        assert(instance);
+        batch_call_out(instance);
         batch_dispose(instance);
 }
@@ -444 +445 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_dispose(usb_transfer_batch_t *instance)
+void batch_dispose(batch_t *instance)
 {
         assert(instance);