Changeset 97bfba1 in mainline

Timestamp:

2011-01-07T16:25:51Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b95dbcf

Parents:

692c0d3e

Message:

Add generic function for GET_DESCRIPTOR request

Location:

uspace/lib/usb

Files:

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

uspace/lib/usb/include/usb/devreq.h

@@ -92 +92 @@
 int usb_drv_req_get_full_configuration_descriptor(int, usb_address_t, int,
     void *, size_t, size_t *);
+int usb_drv_req_get_descriptor(int, usb_address_t, usb_request_type_t,
+    uint8_t, uint8_t, uint16_t, void *, size_t, size_t *);
 
 

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

@@ -54 +54 @@
         USB_DIRECTION_OUT
 } usb_direction_t;
+
+/** USB request type target. */
+typedef enum {
+        USB_REQUEST_TYPE_STANDARD = 0,
+        USB_REQUEST_TYPE_CLASS = 1,
+        USB_REQUEST_TYPE_VENDOR = 2
+} usb_request_type_t;
 
 /** USB transaction outcome. */

uspace/lib/usb/src/usbdrvreq.c

@@ -73 +73 @@
 }
 
+/** 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 = {
+                .address = address,
+                .endpoint = 0
+        };
+
+        /* Prepare the setup packet. */
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 128 | (request_type << 5),
+                .request = USB_DEVREQ_GET_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.
  *