Changeset 263a9f1 in mainline

Timestamp:

2011-01-10T11:35:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

863d45e

Parents:

276aeda

Message:

A bit of refactoring

File:

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

uspace/lib/usb/src/usbdrvreq.c

@@ -164 +164 @@
     usb_address_t new_address)
 {
-        /* Prepare the target. */
-        usb_target_t target = {
-                .address = old_address,
-                .endpoint = 0
-        };
-
-        /* Prepare the setup packet. */
-        usb_device_request_setup_packet_t setup_packet = {
-                .request_type = 0,
-                .request = USB_DEVREQ_SET_ADDRESS,
-                .index = 0,
-                .length = 0,
-        };
-        setup_packet.value = new_address;
+        PREPARE_TARGET(target, old_address);
+
+        PREPARE_SETUP_PACKET(setup_packet, USB_DIRECTION_OUT,
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
+            USB_DEVREQ_SET_ADDRESS, new_address, 0, 0);
 
         int rc = usb_drv_psync_control_write(phone, target,
@@ -211 +202 @@
         }
 
-        /* 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 */
+        // FIXME: check that size is not too big
+
+        PREPARE_TARGET(target, address);
+
+        PREPARE_SETUP_PACKET_LOHI(setup_packet, USB_DIRECTION_IN,
+            request_type, USB_REQUEST_RECIPIENT_DEVICE,
+            USB_DEVREQ_GET_DESCRIPTOR, descriptor_index, descriptor_type,
+            language, size);
+
         int rc = usb_drv_psync_control_read(hc_phone, target,
             &setup_packet, sizeof(setup_packet),