Changeset a837544 in mainline for uspace/lib/usbhost/src/iface.c

Timestamp:

2011-09-13T12:30:05Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4cbb6e4

Parents:

3822f7c9

Message:

libusbhost: Use uint64_t to pass setup_data

File:

• uspace/lib/usbhost/src/iface.c (modified) (9 diffs)

uspace/lib/usbhost/src/iface.c

@@ -41 +41 @@
 static inline int send_batch(
     ddf_fun_t *fun, usb_target_t target, usb_direction_t direction,
-    void *data, size_t size, void * setup_data,
+    void *data, size_t size, uint64_t setup_data,
     usbhc_iface_transfer_in_callback_t in,
     usbhc_iface_transfer_out_callback_t out, void *arg, const char* name)
@@ -236 +236 @@
 {
         return send_batch(fun, target, USB_DIRECTION_OUT, data, size,
-            NULL, NULL, callback, arg, "Interrupt OUT");
+            0, NULL, callback, arg, "Interrupt OUT");
 }
 /*----------------------------------------------------------------------------*/
@@ -254 +254 @@
 {
         return send_batch(fun, target, USB_DIRECTION_IN, data, size,
-            NULL, callback, NULL, arg, "Interrupt IN");
+            0, callback, NULL, arg, "Interrupt IN");
 }
 /*----------------------------------------------------------------------------*/
@@ -272 +272 @@
 {
         return send_batch(fun, target, USB_DIRECTION_OUT, data, size,
-            NULL, NULL, callback, arg, "Bulk OUT");
+            0, NULL, callback, arg, "Bulk OUT");
 }
 /*----------------------------------------------------------------------------*/
@@ -290 +290 @@
 {
         return send_batch(fun, target, USB_DIRECTION_IN, data, size,
-            NULL, callback, NULL, arg, "Bulk IN");
+            0, callback, NULL, arg, "Bulk IN");
 }
 /*----------------------------------------------------------------------------*/
@@ -310 +310 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
+        uint64_t setup_buffer;
+        memcpy(&setup_buffer, setup_data, 8);
         return send_batch(fun, target, USB_DIRECTION_BOTH, data, size,
-            setup_data, NULL, callback, arg, "Control WRITE");
+            setup_buffer, NULL, callback, arg, "Control WRITE");
 }
 /*----------------------------------------------------------------------------*/
@@ -331 +333 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
+        uint64_t setup_buffer;
+        memcpy(&setup_buffer, setup_data, 8);
         return send_batch(fun, target, USB_DIRECTION_BOTH, data, size,
-            setup_data, callback, NULL, arg, "Control READ");
+            setup_buffer, callback, NULL, arg, "Control READ");
 }
 /*----------------------------------------------------------------------------*/
@@ -340 +344 @@
 {
         return send_batch(fun, target, USB_DIRECTION_IN, data, size,
-            &setup_data, callback, NULL, arg, "READ");
+            setup_data, callback, NULL, arg, "READ");
 }
 /*----------------------------------------------------------------------------*/
@@ -348 +352 @@
 {
         return send_batch(fun, target, USB_DIRECTION_OUT, (uint8_t*)data, size,
-            &setup_data, NULL, callback, arg, "WRITE");
+            setup_data, NULL, callback, arg, "WRITE");
 }
 /*----------------------------------------------------------------------------*/