Changeset 9b95dbcf in mainline

Timestamp:

2011-01-07T16:33:39Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

56184b2, a523af4

Parents:

97bfba1

Message:

Code refactoring

File:

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

uspace/lib/usb/src/usbdrvreq.c

@@ -130 +130 @@
                 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_DEVICE;
-        setup_packet.value_low = 0;
-
-        /* 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);
+        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) {
@@ -193 +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) {
@@ -257 +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;