Changes in uspace/lib/usb/src/request.c [4723444:ad4562c2] in mainline

File:

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

uspace/lib/usb/src/request.c

@@ -412 +412 @@
 }
 
-/** 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.
  *
@@ -569 +504 @@
  *
  * @param[in] pipe Control endpoint pipe (session must be already started).
- * @param[in] index String index (in native endianess),
- *      first index has number 1 (index from descriptors can be used directly).
+ * @param[in] index String index (in native endianess).
  * @param[in] lang String language (in native endianess).
  * @param[out] string_ptr Where to store allocated string in native encoding.
@@ -581 +515 @@
                 return EBADMEM;
         }
-        /*
-         * Index is actually one byte value and zero index is used
-         * to retrieve list of supported languages.
-         */
-        if ((index < 1) || (index > 0xFF)) {
+        /* Index is actually one byte value. */
+        if (index > 0xFF) {
                 return ERANGE;
         }