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

File:

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

uspace/lib/usb/src/request.c

@@ -36 +36 @@
 #include <errno.h>
 #include <assert.h>
-#include <usb/debug.h>
 
 #define MAX_DATA_LENGTH ((size_t)(0xFFFF))
@@ -210 +209 @@
  */
 int usb_request_get_descriptor(usb_endpoint_pipe_t *pipe,
-    usb_request_type_t request_type, usb_request_recipient_t recipient,
+    usb_request_type_t request_type,
     uint8_t descriptor_type, uint8_t descriptor_index,
     uint16_t language,
@@ -225 +224 @@
 
         return usb_control_request_get(pipe,
-            request_type, recipient,
+            request_type, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DEVREQ_GET_DESCRIPTOR,
             wValue, language,
@@ -243 +242 @@
  */
 int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t * pipe,
-    usb_request_type_t request_type, usb_request_recipient_t recipient,
+    usb_request_type_t request_type,
     uint8_t descriptor_type, uint8_t descriptor_index,
     uint16_t language,
@@ -259 +258 @@
         uint8_t tmp_buffer[1];
         size_t bytes_transfered;
-        rc = usb_request_get_descriptor(pipe, request_type, recipient,
+        rc = usb_request_get_descriptor(pipe, request_type,
             descriptor_type, descriptor_index, language,
             &tmp_buffer, 1, &bytes_transfered);
@@ -284 +283 @@
         }
 
-        rc = usb_request_get_descriptor(pipe, request_type, recipient,
+        rc = usb_request_get_descriptor(pipe, request_type,
             descriptor_type, descriptor_index, language,
             buffer, size, &bytes_transfered);
@@ -321 +320 @@
         usb_standard_device_descriptor_t descriptor_tmp;
         int rc = usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE, 
-            USB_DESCTYPE_DEVICE, 0, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_DEVICE,
+            0, 0,
             &descriptor_tmp, sizeof(descriptor_tmp),
             &actually_transferred);
@@ -367 +366 @@
         usb_standard_configuration_descriptor_t descriptor_tmp;
         int rc = usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_CONFIGURATION, index, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_CONFIGURATION,
+            index, 0,
             &descriptor_tmp, sizeof(descriptor_tmp),
             &actually_transferred);
@@ -407 +406 @@
 
         return usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_CONFIGURATION, index, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_CONFIGURATION,
+            index, 0,
             descriptor, descriptor_size, actual_size);
-}
-
-/** 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;
 }
 
@@ -518 +452 @@
         size_t string_descriptor_size = 0;
         rc = usb_request_get_descriptor_alloc(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_STRING, 0, 0,
+            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_STRING, 0, 0,
             (void **) &string_descriptor, &string_descriptor_size);
         if (rc != EOK) {
@@ -569 +502 @@
  *
  * @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 +513 @@
                 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;
         }
@@ -602 +531 @@
         size_t string_size;
         rc = usb_request_get_descriptor_alloc(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_STRING, index, uint16_host2usb(lang),
+            USB_REQUEST_TYPE_STANDARD, USB_DESCTYPE_STRING,
+            index, uint16_host2usb(lang),
             (void **) &string, &string_size);
         if (rc != EOK) {