Changes in / [e18e0d6:11dd29b] in mainline

Location:

uspace/drv

Files:

• ohci/main.c (modified) (1 diff)
• uhci-hcd/batch.c (modified) (13 diffs)
• uhci-hcd/hc.c (modified) (3 diffs)
• uhci-hcd/hw_struct/transfer_descriptor.h (modified) (1 diff)
• uhci-hcd/iface.c (modified) (1 diff)
• uhci-hcd/transfer_list.c (modified) (6 diffs)
• uhci-hcd/uhci.c (modified) (1 diff)

uspace/drv/ohci/main.c

@@ -158 +158 @@
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s.\n",
-                    str_error(ret));
+                    str_error(rc));
                 usb_log_info("HW interrupts not available, " \
                     "falling back to polling.\n");

uspace/drv/uhci-hcd/batch.c

@@ -48 +48 @@
         qh_t *qh;
         td_t *tds;
-        size_t transfers;
+        size_t packets;
         usb_device_keeper_t *manager;
 } uhci_batch_t;
@@ -64 +64 @@
  * @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 +77 @@
  * 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.
@@ -117 +117 @@
         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));
@@ -166 +166 @@
         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;
@@ -298 +298 @@
  *
  * @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.
+ * The last packet is marked with IOC flag.
  */
 void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid)
@@ -314 +314 @@
         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 +325 @@
                     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]);
+                ++packet;
+        }
+        td_set_ioc(&data->tds[packet - 1]);
         usb_device_keeper_set_toggle(data->manager, instance->target,
             instance->direction, toggle);
@@ -349 +349 @@
  *
  * @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.
+ * The last packet is marked with IOC.
  */
 void batch_control(usb_transfer_batch_t *instance,
@@ -363 +363 @@
         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 +374 @@
 
         /* data stage */
-        size_t transfer = 1;
+        size_t packet = 1;
         size_t remain_size = instance->buffer_size;
         while (remain_size > 0) {
@@ -388 +388 @@
 
                 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 +399 @@
 
         /* 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);
+            data->tds[packet].status);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/hc.c

@@ -67 +67 @@
 static int hc_debug_checker(void *arg);
 
-static bool usb_is_allowed(
+static bool allowed_usb_packet(
     bool low_speed, usb_transfer_type_t transfer, size_t size);
 /*----------------------------------------------------------------------------*/
@@ -323 +323 @@
         assert(batch);
         const int low_speed = (batch->speed == USB_SPEED_LOW);
-        if (!usb_is_allowed(
+        if (!allowed_usb_packet(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
                 usb_log_warning(
-                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
+                    "Invalid USB packet specified %s SPEED %d %zu.\n",
                     low_speed ? "LOW" : "FULL" , batch->transfer_type,
                     batch->max_packet_size);
@@ -471 +471 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check transfers for USB validity
+/** Check transfer packets, for USB validity
  *
  * @param[in] low_speed Transfer speed.
  * @param[in] transfer Transer type
- * @param[in] size Size of data packets
+ * @param[in] size Maximum size of used packets
  * @return True if transaction is allowed by USB specs, false otherwise
  */
-bool usb_is_allowed(
+bool allowed_usb_packet(
     bool low_speed, usb_transfer_type_t transfer, size_t size)
 {

uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h

@@ -108 +108 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check whether less than max data were received on SPD marked transfer.
+/** Check whether less than max data were recieved and packet is marked as SPD.
  *
  * @param[in] instance TD structure to use.
- * @return True if data packet is short (less than max bytes and SPD set),
- * false otherwise.
+ * @return True if packet is short (less than max bytes and SPD set), false
+ *     otherwise.
  */
 static inline bool td_is_short(td_t *instance)

uspace/drv/uhci-hcd/iface.c

@@ -279 +279 @@
  * @param[in] target USB device to write to.
  * @param[in] max_packet_size maximum size of data packet the device accepts.
- * @param[in] setup_data Data to send with SETUP transfer.
- * @param[in] setup_size Size of data to send with SETUP transfer (always 8B).
+ * @param[in] setup_data Data to send with SETUP packet.
+ * @param[in] setup_size Size of data to send with SETUP packet (should be 8B).
  * @param[in] data Source of data.
  * @param[in] size Size of data source.

uspace/drv/uhci-hcd/transfer_list.c

@@ -91 +91 @@
  * The batch is added to the end of the list and queue.
  */
-void transfer_list_add_batch(
-    transfer_list_t *instance, usb_transfer_batch_t *batch)
+void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -147 +146 @@
         while (current != &instance->batch_list) {
                 link_t *next = current->next;
-                usb_transfer_batch_t *batch =
-                    list_get_instance(current, usb_transfer_batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
 
                 if (batch_is_complete(batch)) {
@@ -162 +160 @@
                 link_t *item = done.next;
                 list_remove(item);
-                usb_transfer_batch_t *batch =
-                    list_get_instance(item, usb_transfer_batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(item, usb_transfer_batch_t, link);
                 batch->next_step(batch);
         }
@@ -177 +174 @@
         while (!list_empty(&instance->batch_list)) {
                 link_t *current = instance->batch_list.next;
-                usb_transfer_batch_t *batch =
-                    list_get_instance(current, usb_transfer_batch_t, link);
+                usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
                 transfer_list_remove_batch(instance, batch);
                 usb_transfer_batch_finish(batch, EIO);
@@ -193 +189 @@
  * Does not lock the transfer list, caller is responsible for that.
  */
-void transfer_list_remove_batch(
-    transfer_list_t *instance, usb_transfer_batch_t *batch)
+void transfer_list_remove_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);
@@ -215 +210 @@
         } else {
                 usb_transfer_batch_t *prev =
-                    list_get_instance(
-                        batch->link.prev, usb_transfer_batch_t, link);
+                    list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
                 assert((batch_qh(prev)->next & LINK_POINTER_ADDRESS_MASK)
                     == addr_to_phys(batch_qh(batch)));

uspace/drv/uhci-hcd/uhci.c

@@ -182 +182 @@
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s.\n",
-                    str_error(ret));
+                    str_error(rc));
                 usb_log_info("HW interrupts not available, " \
                     "falling back to polling.\n");