Changes in uspace/lib/drv/generic/remote_usbhc.c [27736cf:bbce2c2] in mainline

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -55 +55 @@
 static remote_iface_func_ptr_t remote_usbhc_iface_ops[] = {
         [IPC_M_USBHC_REQUEST_ADDRESS] = remote_usbhc_request_address,
-        [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
         [IPC_M_USBHC_BIND_ADDRESS] = remote_usbhc_bind_address,
         [IPC_M_USBHC_GET_HANDLE_BY_ADDRESS] = remote_usbhc_find_by_address,
+        [IPC_M_USBHC_RELEASE_ADDRESS] = remote_usbhc_release_address,
 
         [IPC_M_USBHC_REGISTER_ENDPOINT] = remote_usbhc_register_endpoint,
@@ -118 +118 @@
         }
 
-        usb_address_t address = DEV_IPC_GET_ARG1(*call);
-        const bool strict = DEV_IPC_GET_ARG2(*call);
-        const usb_speed_t speed = DEV_IPC_GET_ARG3(*call);
-
-        const int rc = usb_iface->request_address(fun, &address, strict, speed);
+        usb_speed_t speed = DEV_IPC_GET_ARG1(*call);
+
+        usb_address_t address;
+        int rc = usb_iface->request_address(fun, speed, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -234 +233 @@
 
 #define _INIT_FROM_HIGH_DATA2(type, var, arg_no) \
-        type var = (type) (DEV_IPC_GET_ARG##arg_no(*call) >> 16)
+        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) & 0xffff)
+        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)
 
         const usb_target_t target = { .packed = DEV_IPC_GET_ARG1(*call) };
 
-        _INIT_FROM_HIGH_DATA2(usb_transfer_type_t, transfer_type, 2);
-        _INIT_FROM_LOW_DATA2(usb_direction_t, direction, 2);
+        _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);
@@ -248 +254 @@
 #undef _INIT_FROM_HIGH_DATA2
 #undef _INIT_FROM_LOW_DATA2
-
-        int rc = usb_iface->register_endpoint(fun, target.address,
+#undef _INIT_FROM_HIGH_DATA3
+#undef _INIT_FROM_MIDDLE_DATA3
+#undef _INIT_FROM_LOW_DATA3
+
+        int rc = usb_iface->register_endpoint(fun, target.address, speed,
             target.endpoint, transfer_type, direction, max_packet_size, interval);