Changeset b4b534ac in mainline for uspace/lib/usbvirt/src/transfer.c

Timestamp:

2016-07-22T08:24:47Z (9 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/lib/usbvirt/src/transfer.c (modified) (5 diffs)

uspace/lib/usbvirt/src/transfer.c

@@ -51 +51 @@
  */
 static int usbvirt_control_transfer(usbvirt_device_t *dev,
-    void *setup, size_t setup_size,
+    const void *setup, size_t setup_size,
     void *data, size_t data_size, size_t *data_size_sent)
 {
@@ -60 +60 @@
                 return ESTALL;
         }
-        usb_device_request_setup_packet_t *setup_packet = setup;
+        const usb_device_request_setup_packet_t *setup_packet = setup;
         if (data_size != setup_packet->length) {
                 return ESTALL;
@@ -100 +100 @@
  * @return Error code.
  */
-int usbvirt_control_write(usbvirt_device_t *dev, void *setup, size_t setup_size,
-    void *data, size_t data_size)
+int usbvirt_control_write(usbvirt_device_t *dev, const void *setup,
+    size_t setup_size, void *data, size_t data_size)
 {
         return usbvirt_control_transfer(dev, setup, setup_size,
@@ -119 +119 @@
  * @return Error code.
  */
-int usbvirt_control_read(usbvirt_device_t *dev, void *setup, size_t setup_size,
+int usbvirt_control_read(usbvirt_device_t *dev, const void *setup, size_t setup_size,
     void *data, size_t data_size, size_t *data_size_sent)
 {
@@ -136 +136 @@
  */
 int usbvirt_data_out(usbvirt_device_t *dev, usb_transfer_type_t transf_type,
-    usb_endpoint_t endpoint, void *data, size_t data_size)
+    usb_endpoint_t endpoint, const void *data, size_t data_size)
 {
         if ((endpoint <= 0) || (endpoint >= USBVIRT_ENDPOINT_MAX)) {