Changeset 97663ee in mainline

Timestamp:

2013-01-05T12:48:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d1974966

Parents:

f704194

Message:

libusbvirt: Add few const qualifiers.

Location:

uspace

Files:

• app/vuhid/device.c (modified) (1 diff)
• lib/usbvirt/include/usbvirt/device.h (modified) (4 diffs)
• lib/usbvirt/src/stdreq.c (modified) (3 diffs)

uspace/app/vuhid/device.c

@@ -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));

uspace/lib/usbvirt/include/usbvirt/device.h

@@ -111 +111 @@
 typedef struct {
         /** Actual data. */
-        uint8_t *data;
+        const uint8_t *data;
         /** Data length. */
         size_t length;
@@ -121 +121 @@
         usb_standard_configuration_descriptor_t *descriptor;
         /** Array of extra data. */
-        usbvirt_device_configuration_extras_t *extra;
+        const usbvirt_device_configuration_extras_t *extra;
         /** Length of @c extra array. */
         size_t extra_count;
@@ -131 +131 @@
          * There is always only one such descriptor for the device.
          */
-        usb_standard_device_descriptor_t *device;
+        const usb_standard_device_descriptor_t *device;
 
         /** Configurations. */
@@ -206 +206 @@
 
 void usbvirt_control_reply_helper(const usb_device_request_setup_packet_t *,
-    uint8_t *, size_t *, void *, size_t);
+    uint8_t *, size_t *, const void *, size_t);
 
 int usbvirt_control_write(usbvirt_device_t *, void *, size_t, void *, size_t);

uspace/lib/usbvirt/src/stdreq.c

@@ -51 +51 @@
 void usbvirt_control_reply_helper(const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_size,
-    void *actual_data, size_t actual_data_size)
+    const void *actual_data, size_t actual_data_size)
 {
         size_t expected_size = setup_packet->length;
@@ -98 +98 @@
                 }
                 /* Copy the data. */
-                usbvirt_device_configuration_t *config = &device->descriptors
-                    ->configuration[index];
+                const usbvirt_device_configuration_t *config =
+                    &device->descriptors->configuration[index];
                 uint8_t *all_data = malloc(config->descriptor->total_length);
                 if (all_data == NULL) {
@@ -110 +110 @@
                 size_t i;
                 for (i = 0; i < config->extra_count; i++) {
-                        usbvirt_device_configuration_extras_t *extra
+                        const usbvirt_device_configuration_extras_t *extra
                             = &config->extra[i];
                         memcpy(ptr, extra->data, extra->length);