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

Timestamp:

2012-07-20T20:29:54Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

34bc2fe

Parents:

4cdac68 (diff), 6de2d766 (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 with mainline

File:

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

uspace/lib/usbdev/src/request.c

@@ -114 +114 @@
   *     (in native endianness).
   * @param actual_data_size Actual size of transfered data
-  *     (in native endianness).
+  *        (in native endianness).
   * @return Error code.
   * @retval EBADMEM @p pipe is NULL.
@@ -147 +147 @@
                     | (request_type << 5) | recipient,
                 .request = request,
-                .value = value,
-                .index = index,
-                .length = (uint16_t) data_size,
+                .value = uint16_host2usb(value),
+                .index = uint16_host2usb(index),
+                .length = uint16_host2usb(data_size),
         };
 
@@ -375 +375 @@
         usb_standard_device_descriptor_t descriptor_tmp;
         int rc = usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE, 
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_DEVICE, 0, 0,
             &descriptor_tmp, sizeof(descriptor_tmp),
@@ -435 +435 @@
         /* Everything is okay, copy the descriptor. */
         memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
-
         return EOK;
 }
@@ -495 +494 @@
                 return ENOENT;
         }
-        if (bare_config.total_length < sizeof(bare_config)) {
+
+        const size_t total_length = uint16_usb2host(bare_config.total_length);
+        if (total_length < sizeof(bare_config)) {
                 return ELIMIT;
         }
 
-        void *buffer = malloc(bare_config.total_length);
+        void *buffer = malloc(total_length);
         if (buffer == NULL) {
                 return ENOMEM;
@@ -506 +507 @@
         size_t transferred = 0;
         rc = usb_request_get_full_configuration_descriptor(pipe, index,
-            buffer, bare_config.total_length, &transferred);
+            buffer, total_length, &transferred);
         if (rc != EOK) {
                 free(buffer);
@@ -512 +513 @@
         }
 
-        if (transferred != bare_config.total_length) {
+        if (transferred != total_length) {
                 free(buffer);
                 return ELIMIT;
@@ -522 +523 @@
 
         if (descriptor_size != NULL) {
-                *descriptor_size = bare_config.total_length;
+                *descriptor_size = total_length;
         }