Changeset 00aece0 in mainline for uspace/lib/usbdev/src/request.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/lib/usbdev/src/request.c (modified) (5 diffs)

uspace/lib/usbdev/src/request.c

@@ -143 +143 @@
          */
 
-        usb_device_request_setup_packet_t setup_packet;
-        setup_packet.request_type = 128 | (request_type << 5) | recipient;
-        setup_packet.request = request;
-        setup_packet.value = value;
-        setup_packet.index = index;
-        setup_packet.length = (uint16_t) data_size;
-
-        int rc = usb_pipe_control_read(pipe,
-            &setup_packet, sizeof(setup_packet),
+        const usb_device_request_setup_packet_t setup_packet = {
+                .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST
+                    | (request_type << 5) | recipient,
+                .request = request,
+                .value = value,
+                .index = index,
+                .length = (uint16_t) data_size,
+        };
+
+        return usb_pipe_control_read(pipe, &setup_packet, sizeof(setup_packet),
             data, data_size, actual_data_size);
-
-        return rc;
 }
 
@@ -248 +247 @@
 
         return rc;
-}
-
-/** Change address of connected device.
- * This function automatically updates the backing connection to point to
- * the new address.
- *
- * @param pipe Control endpoint pipe (session must be already started).
- * @param new_address New USB address to be set (in native endianness).
- * @return Error code.
- */
-int usb_request_set_address(usb_pipe_t *pipe,
-    usb_address_t new_address)
-{
-        if ((new_address < 0) || (new_address >= USB11_ADDRESS_MAX)) {
-                return EINVAL;
-        }
-
-        uint16_t addr = uint16_host2usb((uint16_t)new_address);
-
-        int rc = usb_control_request_set(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DEVREQ_SET_ADDRESS,
-            addr, 0,
-            NULL, 0);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        assert(pipe->wire != NULL);
-        /* TODO: prevent other from accessing wire now. */
-        pipe->wire->address = new_address;
-
-        return EOK;
 }
 
@@ -310 +275 @@
         }
 
-        uint16_t wValue = descriptor_index | (descriptor_type << 8);
+        const uint16_t wValue = descriptor_index | (descriptor_type << 8);
 
         return usb_control_request_get(pipe,
@@ -425 +390 @@
 
         /* Everything is okay, copy the descriptor. */
-        memcpy(descriptor, &descriptor_tmp,
-            sizeof(descriptor_tmp));
+        memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
 
         return EOK;
@@ -470 +434 @@
 
         /* Everything is okay, copy the descriptor. */
-        memcpy(descriptor, &descriptor_tmp,
-            sizeof(descriptor_tmp));
+        memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
 
         return EOK;