Changeset 4723444 in mainline

Timestamp:

2011-03-02T18:06:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d70e0a3c

Parents:

c081780

Message:

Add allocating "get full config descriptor"

This function encapsulates two phase retrieval of full configuration
descriptor.

Location:

uspace/lib/usb

Files:

• include/usb/request.h (modified) (1 diff)
• src/request.c (modified) (1 diff)

uspace/lib/usb/include/usb/request.h

@@ -106 +106 @@
 int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *, int,
     void *, size_t, size_t *);
+int usb_request_get_full_configuration_descriptor_alloc(usb_endpoint_pipe_t *,
+    int, void **, size_t *);
 int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
 

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.
  *