Changes in uspace/lib/drv/generic/remote_usbhc.c [1998bcd:b7d8fd9] in mainline

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (9 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -270 +270 @@
         }
 
+        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -299 +300 @@
         trans->size = len;
 
-        rc = transfer_func(fun, target,
+        rc = transfer_func(fun, target, max_packet_size,
             buffer, len,
             callback_out, trans);
@@ -325 +326 @@
         }
 
+        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -346 +348 @@
         trans->size = len;
 
-        int rc = transfer_func(fun, target,
+        int rc = transfer_func(fun, target, max_packet_size,
             trans->buffer, len,
             callback_in, trans);
@@ -412 +414 @@
         };
         size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
+        size_t max_packet_size = DEV_IPC_GET_ARG4(*call);
 
         int rc;
@@ -447 +450 @@
         trans->size = data_buffer_len;
 
-        rc = usb_iface->control_write(fun, target,
+        rc = usb_iface->control_write(fun, target, max_packet_size,
             setup_packet, setup_packet_len,
             data_buffer, data_buffer_len,
@@ -474 +477 @@
                 .endpoint = DEV_IPC_GET_ARG2(*call)
         };
+        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
 
         int rc;
@@ -511 +515 @@
         }
 
-        rc = usb_iface->control_read(fun, target,
+        rc = usb_iface->control_read(fun, target, max_packet_size,
             setup_packet, setup_packet_len,
             trans->buffer, trans->size,
@@ -533 +537 @@
         }
 
-#define _INIT_FROM_HIGH_DATA2(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 16)
-#define _INIT_FROM_LOW_DATA2(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 16)
-#define _INIT_FROM_HIGH_DATA3(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / (1 << 16)
-#define _INIT_FROM_MIDDLE_DATA3(type, var, arg_no) \
-        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) / (1 << 8)) % (1 << 8)
-#define _INIT_FROM_LOW_DATA3(type, var, arg_no) \
-        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % (1 << 8)
-
-        _INIT_FROM_HIGH_DATA2(usb_address_t, address, 1);
-        _INIT_FROM_LOW_DATA2(usb_endpoint_t, endpoint, 1);
-
-        _INIT_FROM_HIGH_DATA3(usb_speed_t, speed, 2);
-        _INIT_FROM_MIDDLE_DATA3(usb_transfer_type_t, transfer_type, 2);
-        _INIT_FROM_LOW_DATA3(usb_direction_t, direction, 2);
-
-        _INIT_FROM_HIGH_DATA2(size_t, max_packet_size, 3);
-        _INIT_FROM_LOW_DATA2(unsigned int, interval, 3);
-
-#undef _INIT_FROM_HIGH_DATA2
-#undef _INIT_FROM_LOW_DATA2
-#undef _INIT_FROM_HIGH_DATA3
-#undef _INIT_FROM_MIDDLE_DATA3
-#undef _INIT_FROM_LOW_DATA3
-
-        int rc = usb_iface->register_endpoint(fun, address, speed, endpoint,
+#define INIT_FROM_HIGH_DATA(type, var, arg_no) \
+        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) / 256
+#define INIT_FROM_LOW_DATA(type, var, arg_no) \
+        type var = (type) DEV_IPC_GET_ARG##arg_no(*call) % 256
+
+        INIT_FROM_HIGH_DATA(usb_address_t, address, 1);
+        INIT_FROM_LOW_DATA(usb_endpoint_t, endpoint, 1);
+        INIT_FROM_HIGH_DATA(usb_transfer_type_t, transfer_type, 2);
+        INIT_FROM_LOW_DATA(usb_direction_t, direction, 2);
+
+#undef INIT_FROM_HIGH_DATA
+#undef INIT_FROM_LOW_DATA
+
+        size_t max_packet_size = (size_t) DEV_IPC_GET_ARG3(*call);
+        unsigned int interval  = (unsigned int) DEV_IPC_GET_ARG4(*call);
+
+        int rc = usb_iface->register_endpoint(fun, address, endpoint,
             transfer_type, direction, max_packet_size, interval);