Changeset c61338a in mainline

Timestamp:

2011-03-23T10:15:13Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5bf82ee

Parents:

20a1e76

Message:

Fix the use of the word packet.

Location:

uspace/drv/uhci-hcd

Files:

• hc.c (modified) (3 diffs)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• iface.c (modified) (1 diff)

uspace/drv/uhci-hcd/hc.c

@@ -67 +67 @@
 static int hc_debug_checker(void *arg);
 
-static bool allowed_usb_packet(
+static bool usb_is_allowed(
     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 (!allowed_usb_packet(
+        if (!usb_is_allowed(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
                 usb_log_warning(
-                    "Invalid USB packet specified %s SPEED %d %zu.\n",
+                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
                     low_speed ? "LOW" : "FULL" , batch->transfer_type,
                     batch->max_packet_size);
@@ -471 +471 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check transfer packets, for USB validity
+/** Check transfers for USB validity
  *
  * @param[in] low_speed Transfer speed.
  * @param[in] transfer Transer type
- * @param[in] size Maximum size of used packets
+ * @param[in] size Size of data packets
  * @return True if transaction is allowed by USB specs, false otherwise
  */
-bool allowed_usb_packet(
+bool usb_is_allowed(
     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 recieved and packet is marked as SPD.
+/** Check whether less than max data were received on SPD marked transfer.
  *
  * @param[in] instance TD structure to use.
- * @return True if packet is short (less than max bytes and SPD set), false
- *     otherwise.
+ * @return True if data 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 packet.
- * @param[in] setup_size Size of data to send with SETUP packet (should be 8B).
+ * @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] data Source of data.
  * @param[in] size Size of data source.