Changeset d2fc1c2 in mainline for uspace/lib/usb/src/request.c

Timestamp:

2011-03-08T18:18:05Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

48d2765, 8e9becf6

Parents:

d477734 (diff), a8e98498 (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:

Merged changes from development.

File:

• uspace/lib/usb/src/request.c (modified) (8 diffs)

uspace/lib/usb/src/request.c

@@ -110 +110 @@
   *     (must be in USB endianness).
   * @param data Buffer where to store data accepted during the DATA stage.
-  *     (they will come in USB endianess).
+  *     (they will come in USB endianness).
   * @param data_size Size of the @p data buffer
   *     (in native endianness).
@@ -161 +161 @@
  * the new address.
  *
- * @see usb_drv_reserve_default_address
- * @see usb_drv_release_default_address
- * @see usb_drv_request_address
- * @see usb_drv_release_address
- * @see usb_drv_bind_address
- *
  * @param pipe Control endpoint pipe (session must be already started).
  * @param new_address New USB address to be set (in native endianness).
@@ -201 +195 @@
  * @param[in] pipe Control endpoint pipe (session must be already started).
  * @param[in] request_type Request type (standard/class/vendor).
+ * @param[in] recipient Request recipient (device/interface/endpoint).
  * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
  * @param[in] descriptor_index Descriptor index.
@@ -235 +230 @@
  * @param[in] pipe Control endpoint pipe (session must be already started).
  * @param[in] request_type Request type (standard/class/vendor).
+ * @param[in] recipient Request recipient (device/interface/endpoint).
  * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
  * @param[in] descriptor_index Descriptor index.
@@ -528 +524 @@
                 return EEMPTY;
         }
-        /* Substract first 2 bytes (length and descriptor type). */
+        /* Subtract first 2 bytes (length and descriptor type). */
         string_descriptor_size -= 2;
 
@@ -548 +544 @@
         size_t i;
         for (i = 0; i < langs_count; i++) {
-                /* Language code from the descriptor is in USB endianess. */
+                /* Language code from the descriptor is in USB endianness. */
                 /* FIXME: is this really correct? */
                 uint16_t lang_code = (string_descriptor[2 + 2 * i + 1] << 8)
@@ -569 +565 @@
  *
  * @param[in] pipe Control endpoint pipe (session must be already started).
- * @param[in] index String index (in native endianess),
+ * @param[in] index String index (in native endianness),
  *      first index has number 1 (index from descriptors can be used directly).
- * @param[in] lang String language (in native endianess).
+ * @param[in] lang String language (in native endianness).
  * @param[out] string_ptr Where to store allocated string in native encoding.
  * @return Error code.
@@ -613 +609 @@
                 goto leave;
         }
-        /* Substract first 2 bytes (length and descriptor type). */
+        /* Subtract first 2 bytes (length and descriptor type). */
         string_size -= 2;