Changeset a523af4 in mainline for uspace/lib/usb/src/usbdrvreq.c

Timestamp:

2011-01-07T16:37:50Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

56184b2, 93fb170c, a97ea0f

Parents:

72fea5a (diff), 9b95dbc (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:

Merged vojtechhorky/ - code refactoring

File:

• uspace/lib/usb/src/usbdrvreq.c (modified) (4 diffs)

uspace/lib/usb/src/usbdrvreq.c

@@ -73 +73 @@
 }
 
-/** Retrieve device descriptor of connected USB device.
- *
- * @param[in] phone Open phone to HC driver.
- * @param[in] address Device USB address.
- * @param[out] descriptor Storage for the device descriptor.
- * @return Error code.
- * @retval EBADMEM @p descriptor is NULL.
- */
-int usb_drv_req_get_device_descriptor(int phone, usb_address_t address,
-    usb_standard_device_descriptor_t *descriptor)
-{
-        if (descriptor == NULL) {
-                return EBADMEM;
-        }
-
+/** Retrieve USB descriptor of connected USB device.
+ *
+ * @param[in] hc_phone Open phone to HC driver.
+ * @param[in] address Device USB address.
+ * @param[in] request_type Request type (standard/class/vendor).
+ * @param[in] descriptor_type Descriptor type (device/configuration/HID/...).
+ * @param[in] descriptor_index Descriptor index.
+ * @param[in] langauge Language index.
+ * @param[out] buffer Buffer where to store the retrieved descriptor.
+ * @param[in] size Size of the @p buffer.
+ * @param[out] actual_size Number of bytes actually transferred.
+ * @return Error code.
+ */
+int usb_drv_req_get_descriptor(int hc_phone, usb_address_t address,
+    usb_request_type_t request_type,
+    uint8_t descriptor_type, uint8_t descriptor_index,
+    uint16_t language,
+    void *buffer, size_t size, size_t *actual_size)
+{
         /* Prepare the target. */
         usb_target_t target = {
@@ -96 +100 @@
         /* Prepare the setup packet. */
         usb_device_request_setup_packet_t setup_packet = {
-                .request_type = 128,
+                .request_type = 128 | (request_type << 5),
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
-                .index = 0,
-                .length = sizeof(usb_standard_device_descriptor_t)
-        };
-        setup_packet.value_high = USB_DESCTYPE_DEVICE;
-        setup_packet.value_low = 0;
-
-        /* Prepare local descriptor. */
+                .index = language,
+                .length = (uint16_t) size,
+        };
+        setup_packet.value_high = descriptor_type;
+        setup_packet.value_low = descriptor_index;
+        
+        /* Perform CONTROL READ */
+        int rc = usb_drv_psync_control_read(hc_phone, target,
+            &setup_packet, sizeof(setup_packet),
+            buffer, size, actual_size);
+        
+        return rc;
+}
+
+/** Retrieve device descriptor of connected USB device.
+ *
+ * @param[in] phone Open phone to HC driver.
+ * @param[in] address Device USB address.
+ * @param[out] descriptor Storage for the device descriptor.
+ * @return Error code.
+ * @retval EBADMEM @p descriptor is NULL.
+ */
+int usb_drv_req_get_device_descriptor(int phone, usb_address_t address,
+    usb_standard_device_descriptor_t *descriptor)
+{
+        if (descriptor == NULL) {
+                return EBADMEM;
+        }
+        
         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);
+        int rc = usb_drv_req_get_descriptor(phone, address,
+            USB_REQUEST_TYPE_STANDARD,
+            USB_DESCTYPE_DEVICE, 0,
+            0,
+            &descriptor_tmp, sizeof(descriptor_tmp),
+            &actually_transferred);
 
         if (rc != EOK) {
@@ -150 +177 @@
                 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_configuration_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);
+        int rc = usb_drv_req_get_descriptor(phone, address,
+            USB_REQUEST_TYPE_STANDARD,
+            USB_DESCTYPE_CONFIGURATION, 0,
+            0,
+            &descriptor_tmp, sizeof(descriptor_tmp),
+            &actually_transferred);
 
         if (rc != EOK) {
@@ -214 +225 @@
         }
 
-        /* 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 = buffer_size
-        };
-        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);
+        int rc = usb_drv_req_get_descriptor(phone, address,
+            USB_REQUEST_TYPE_STANDARD,
+            USB_DESCTYPE_CONFIGURATION, 0,
+            0,
+            buffer, buffer_size,
+            actual_buffer_size);
 
         return rc;