Changeset cdc1aa1 in mainline for uspace/lib/usb/src

Timestamp:

2010-12-10T09:50:58Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7964475, bf2063e9

Parents:

040068c (diff), 99ea659c (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 retrieval of configuration descriptor

The merge also includes extension of `usbinfo' app.

Location:

uspace/lib/usb/src

Files:

• drvpsync.c (modified) (2 diffs)
• usbdrvreq.c (modified) (2 diffs)

uspace/lib/usb/src/drvpsync.c

@@ -100 +100 @@
 
 
+/** Perform complete control write transaction over USB.
+ *
+ * The DATA stage is performed only when @p data is not NULL and
+ * @p data_size is greater than zero.
+ *
+ * @param phone Open phone to host controller.
+ * @param target Target device and endpoint.
+ * @param setup_packet Setup packet data.
+ * @param setup_packet_size Size of the setup packet.
+ * @param data Data to be sent.
+ * @param data_size Size of the @p data buffer.
+ * @return Error code.
+ */
+int usb_drv_psync_control_write(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *data, size_t data_size)
+{
+        int rc;
+        
+        rc = usb_drv_psync_control_write_setup(phone, target,
+            setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if ((data != NULL) && (data_size > 0)) {
+                rc = usb_drv_psync_control_write_data(phone, target,
+                    data, data_size);
+                if (rc != EOK) {
+                        return rc;
+                }
+        }
+
+        rc = usb_drv_psync_control_write_status(phone, target);
+
+        return rc;
+}
+
 
 int usb_drv_psync_control_read_setup(int phone, usb_target_t target,
@@ -137 +175 @@
 }
 
+
+/** Perform complete control read transaction over USB.
+ *
+ * @param phone Open phone to host controller.
+ * @param target Target device and endpoint.
+ * @param setup_packet Setup packet data.
+ * @param setup_packet_size Size of the setup packet.
+ * @param data Storage for read data.
+ * @param data_size Size of the @p data buffer.
+ * @param actual_data_size Storage for number of actually transferred data from
+ *        device.
+ * @return Error code.
+ */
+int usb_drv_psync_control_read(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *data, size_t data_size, size_t *actual_data_size)
+{
+        int rc;
+        
+        rc = usb_drv_psync_control_read_setup(phone, target,
+            setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_drv_psync_control_read_data(phone, target,
+            data, data_size, actual_data_size);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_drv_psync_control_read_status(phone, target);
+
+        return rc;
+}
+
+
+
+
 /**
  * @}

uspace/lib/usb/src/usbdrvreq.c

@@ -67 +67 @@
         setup_packet.value = new_address;
 
-        usb_handle_t handle;
-        int rc;
-
-        /* Start the control write transfer. */
-        rc = usb_drv_async_control_write_setup(phone, target,
-            &setup_packet, sizeof(setup_packet), &handle);
-        if (rc != EOK) {
-                return rc;
-        }
-        rc = usb_drv_async_wait_for(handle);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        /* Finish the control write transfer. */
-        rc = usb_drv_async_control_write_status(phone, target, &handle);
-        if (rc != EOK) {
-                return rc;
-        }
-        rc = usb_drv_async_wait_for(handle);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        return EOK;
+        int rc = usb_drv_psync_control_write(phone, target,
+            &setup_packet, sizeof(setup_packet), NULL, 0);
+
+        return rc;
 }
 
@@ -125 +104 @@
         setup_packet.value_low = 0;
 
-        usb_handle_t handle;
-        int rc;
-
-        /* Start the control read transfer. */
-        rc = usb_drv_async_control_read_setup(phone, target,
-            &setup_packet, sizeof(usb_device_request_setup_packet_t), &handle);
+        /* Prepare local descriptor. */
+        size_t actually_transferred = 0;
+        usb_standard_device_descriptor_t descriptor_tmp;
+
+        /* Perform the control read transaction. */
+        int rc = usb_drv_psync_control_read(phone, target,
+            &setup_packet, sizeof(setup_packet),
+            &descriptor_tmp, sizeof(descriptor_tmp), &actually_transferred);
+
         if (rc != EOK) {
                 return rc;
         }
-        rc = usb_drv_async_wait_for(handle);
+
+        /* Verify that all data has been transferred. */
+        if (actually_transferred < sizeof(descriptor_tmp)) {
+                return ELIMIT;
+        }
+
+        /* Everything is okay, copy the descriptor. */
+        memcpy(descriptor, &descriptor_tmp,
+            sizeof(descriptor_tmp));
+
+        return EOK;
+}
+
+
+/** Retrieve configuration descriptor of connected USB device.
+ *
+ * The function does not retrieve additional data binded with configuration
+ * descriptor (such as its interface and endpoint descriptors) - use
+ * usb_drv_req_get_full_configuration_descriptor() instead.
+ *
+ * @param[in] phone Open phone to HC driver.
+ * @param[in] address Device USB address.
+ * @param[in] index Configuration descriptor index.
+ * @param[out] descriptor Storage for the configuration descriptor.
+ * @return Error code.
+ * @retval EBADMEM @p descriptor is NULL.
+ */
+int usb_drv_req_get_bare_configuration_descriptor(int phone,
+    usb_address_t address, int index,
+    usb_standard_configuration_descriptor_t *descriptor)
+{
+        if (descriptor == NULL) {
+                return EBADMEM;
+        }
+
+        /* Prepare the target. */
+        usb_target_t target = {
+                .address = address,
+                .endpoint = 0
+        };
+
+        /* Prepare the setup packet. */
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 128,
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .index = 0,
+                .length = sizeof(usb_standard_device_descriptor_t)
+        };
+        setup_packet.value_high = USB_DESCTYPE_CONFIGURATION;
+        setup_packet.value_low = index;
+
+        /* Prepare local descriptor. */
+        size_t actually_transferred = 0;
+        usb_standard_configuration_descriptor_t descriptor_tmp;
+
+        /* Perform the control read transaction. */
+        int rc = usb_drv_psync_control_read(phone, target,
+            &setup_packet, sizeof(setup_packet),
+            &descriptor_tmp, sizeof(descriptor_tmp), &actually_transferred);
+
         if (rc != EOK) {
                 return rc;
         }
 
-        /* Retrieve the descriptor. */
-        size_t actually_transferred = 0;
-        usb_standard_device_descriptor_t descriptor_tmp;
-        rc = usb_drv_async_control_read_data(phone, target,
-            &descriptor_tmp, sizeof(usb_standard_device_descriptor_t),
-            &actually_transferred, &handle);
-        if (rc != EOK) {
-                return rc;
-        }
-        rc = usb_drv_async_wait_for(handle);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        /* Finish the control read transfer. */
-        rc = usb_drv_async_control_read_status(phone, target, &handle);
-        if (rc != EOK) {
-                return rc;
-        }
-        rc = usb_drv_async_wait_for(handle);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        if (actually_transferred < sizeof(usb_standard_device_descriptor_t)) {
+        /* Verify that all data has been transferred. */
+        if (actually_transferred < sizeof(descriptor_tmp)) {
                 return ELIMIT;
         }
 
-        /*
-         * Everything is okay, copy the descriptor.
-         */
+        /* Everything is okay, copy the descriptor. */
         memcpy(descriptor, &descriptor_tmp,
-            sizeof(usb_standard_device_descriptor_t));
+            sizeof(descriptor_tmp));
 
         return EOK;
 }
 
+/** Retrieve full configuration descriptor of connected USB device.
+ *
+ * @warning The @p buffer might be touched (i.e. its contents changed)
+ * even when error occurres.
+ *
+ * @param[in] phone Open phone to HC driver.
+ * @param[in] address Device USB address.
+ * @param[in] index Configuration descriptor index.
+ * @param[out] buffer Buffer for the whole configuration descriptor.
+ * @param[in] buffer_size Size of the prepared @p buffer.
+ * @param[out] actual_buffer_size Bytes actually transfered.
+ * @return Error code.
+ * @retval EBADMEM @p descriptor is NULL.
+ */
+int usb_drv_req_get_full_configuration_descriptor(int phone,
+    usb_address_t address, int index,
+    void *buffer, size_t buffer_size, size_t *actual_buffer_size)
+{
+        if (buffer == NULL) {
+                return EBADMEM;
+        }
+
+        /* Prepare the target. */
+        usb_target_t target = {
+                .address = address,
+                .endpoint = 0
+        };
+
+        /* Prepare the setup packet. */
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 128,
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .index = 0,
+                .length = sizeof(usb_standard_device_descriptor_t)
+        };
+        setup_packet.value_high = USB_DESCTYPE_CONFIGURATION;
+        setup_packet.value_low = index;
+
+        /* Perform the control read transaction. */
+        int rc = usb_drv_psync_control_read(phone, target,
+            &setup_packet, sizeof(setup_packet),
+            buffer, buffer_size, actual_buffer_size);
+
+        return rc;
+}