Changeset b4b534ac in mainline for uspace/app/vuhid/device.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/app/vuhid/device.c (modified) (2 diffs)

uspace/app/vuhid/device.c

@@ -60 +60 @@
 static int on_data_to_device(usbvirt_device_t *dev,
     usb_endpoint_t ep, usb_transfer_type_t tr_type,
-    void *data, size_t data_size)
+    const void *data, size_t data_size)
 {
         vuhid_data_t *vuhid = dev->device_data;
@@ -254 +254 @@
 
         /* Extend existing extra descriptors with these ones. */
-        usbvirt_device_configuration_extras_t *extra_descriptors
-            = dev->descriptors->configuration->extra;
-        extra_descriptors = realloc(extra_descriptors,
+        usbvirt_device_configuration_extras_t *extra_descriptors;
+        extra_descriptors = realloc(dev->descriptors->configuration->extra,
             sizeof(usbvirt_device_configuration_extras_t)
             * (dev->descriptors->configuration->extra_count + descr_count));