Changeset 095bddfc in mainline

Timestamp:

2011-11-25T18:05:26Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

272f46f8

Parents:

02fc5c4

Message:

libusbdev, usbmid: Minor changes.

Location:

uspace

Files:

• drv/bus/usb/usbmid/explore.c (modified) (1 diff)
• lib/usbdev/include/usb/dev/request.h (modified) (1 diff)
• lib/usbdev/src/request.c (modified) (2 diffs)

uspace/drv/bus/usb/usbmid/explore.c

@@ -54 +54 @@
  * @return Interface @p interface_no is already present in the list.
  */
-static bool interface_in_list(list_t *list, int interface_no)
+static bool interface_in_list(const list_t *list, int interface_no)
 {
         list_foreach(*list, l) {

uspace/lib/usbdev/include/usb/dev/request.h

@@ -82 +82 @@
          */
         uint8_t request_type;
+#define SETUP_REQUEST_TYPE_DEVICE_TO_HOST (1 << 7)
+
         /** Request identification. */
         uint8_t request;

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;
 }
 
@@ -276 +275 @@
         }
 
-        uint16_t wValue = descriptor_index | (descriptor_type << 8);
+        const uint16_t wValue = descriptor_index | (descriptor_type << 8);
 
         return usb_control_request_get(pipe,