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

Timestamp:

2011-03-11T15:42:43Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

0bd4810c

Parents:

60a228f (diff), a8def7d (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:

merge with hidd

File:

• uspace/lib/usb/src/request.c (modified) (10 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.
@@ -412 +408 @@
 }
 
+/** Retrieve full configuration descriptor, allocate space for it.
+ *
+ * The function takes care that full configuration descriptor is returned
+ * (i.e. the function will fail when less data then descriptor.totalLength
+ * is returned).
+ *
+ * @param[in] pipe Control endpoint pipe (session must be already started).
+ * @param[in] index Configuration index.
+ * @param[out] descriptor_ptr Where to store pointer to allocated buffer.
+ * @param[out] descriptor_size Where to store the size of the descriptor.
+ * @return Error code.
+ */
+int usb_request_get_full_configuration_descriptor_alloc(
+    usb_endpoint_pipe_t *pipe, int index,
+    void **descriptor_ptr, size_t *descriptor_size)
+{
+        int rc;
+
+        if (descriptor_ptr == NULL) {
+                return EBADMEM;
+        }
+
+        usb_standard_configuration_descriptor_t bare_config;
+        rc = usb_request_get_bare_configuration_descriptor(pipe, index,
+            &bare_config);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (bare_config.descriptor_type != USB_DESCTYPE_CONFIGURATION) {
+                return ENOENT;
+        }
+        if (bare_config.total_length < sizeof(bare_config)) {
+                return ELIMIT;
+        }
+
+        void *buffer = malloc(bare_config.total_length);
+        if (buffer == NULL) {
+                return ENOMEM;
+        }
+
+        size_t transferred = 0;
+        rc = usb_request_get_full_configuration_descriptor(pipe, index,
+            buffer, bare_config.total_length, &transferred);
+        if (rc != EOK) {
+                free(buffer);
+                return rc;
+        }
+
+        if (transferred != bare_config.total_length) {
+                free(buffer);
+                return ELIMIT;
+        }
+
+        /* Everything looks okay, copy the pointers. */
+
+        *descriptor_ptr = buffer;
+
+        if (descriptor_size != NULL) {
+                *descriptor_size = bare_config.total_length;
+        }
+
+        return EOK;
+}
+
 /** Set configuration of USB device.
  *
@@ -463 +524 @@
                 return EEMPTY;
         }
-        /* Substract first 2 bytes (length and descriptor type). */
+        /* Subtract first 2 bytes (length and descriptor type). */
         string_descriptor_size -= 2;
 
@@ -483 +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)
@@ -504 +565 @@
  *
  * @param[in] pipe Control endpoint pipe (session must be already started).
- * @param[in] index String index (in native endianess).
- * @param[in] lang String language (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 endianness).
  * @param[out] string_ptr Where to store allocated string in native encoding.
  * @return Error code.
@@ -515 +577 @@
                 return EBADMEM;
         }
-        /* Index is actually one byte value. */
-        if (index > 0xFF) {
+        /*
+         * Index is actually one byte value and zero index is used
+         * to retrieve list of supported languages.
+         */
+        if ((index < 1) || (index > 0xFF)) {
                 return ERANGE;
         }
@@ -544 +609 @@
                 goto leave;
         }
-        /* Substract first 2 bytes (length and descriptor type). */
+        /* Subtract first 2 bytes (length and descriptor type). */
         string_size -= 2;