Changeset a9d67aa in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2011-04-09T17:15:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

97e7e8a

Parents:

5410c04 (diff), 77223f8 (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:

Refactoring: libusb, USBHC interface protocol

Highlights:

• refactoring of libusb (not complete)
• max packet size is not send during each transfer
• reserving of default address is possible via endpoint registration
• endpoint registration can send speed as well

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),
@@ -300 +299 @@
         trans->size = len;
 
-        rc = transfer_func(fun, target, max_packet_size,
+        rc = transfer_func(fun, target,
             buffer, len,
             callback_out, trans);
@@ -326 +325 @@
         }
 
-        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -348 +346 @@
         trans->size = len;
 
-        int rc = transfer_func(fun, target, max_packet_size,
+        int rc = transfer_func(fun, target,
             trans->buffer, len,
             callback_in, trans);
@@ -414 +412 @@
         };
         size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
-        size_t max_packet_size = DEV_IPC_GET_ARG4(*call);
 
         int rc;
@@ -450 +447 @@
         trans->size = data_buffer_len;
 
-        rc = usb_iface->control_write(fun, target, max_packet_size,
+        rc = usb_iface->control_write(fun, target,
             setup_packet, setup_packet_len,
             data_buffer, data_buffer_len,
@@ -477 +474 @@
                 .endpoint = DEV_IPC_GET_ARG2(*call)
         };
-        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
 
         int rc;
@@ -515 +511 @@
         }
 
-        rc = usb_iface->control_read(fun, target, max_packet_size,
+        rc = usb_iface->control_read(fun, target,
             setup_packet, setup_packet_len,
             trans->buffer, trans->size,
@@ -537 +533 @@
         }
 
-#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,
+#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,
             transfer_type, direction, max_packet_size, interval);