Changeset 7dfc06fa in mainline for uspace/lib/drv

Timestamp:

2011-04-08T18:08:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c6cb76d

Parents:

c1b1944

Message:

Do not send max packet size with each transfer

See ticket #177, #121 and partly #49.

Location:

uspace/lib/drv

Files:

• generic/remote_usbhc.c (modified) (8 diffs)
• include/usbhc_iface.h (modified) (4 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,

uspace/lib/drv/include/usbhc_iface.h

@@ -66 +66 @@
  *   - argument #1 is target address
  *   - argument #2 is target endpoint
- *   - argument #3 is max packet size of the endpoint
  * - this call is immediately followed by IPC data read (async version)
  * - the call is not answered until the device returns some data (or until
@@ -202 +201 @@
 
 /** Out transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_out_t)(ddf_fun_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_out_t)(ddf_fun_t *, usb_target_t,
     void *, size_t,
     usbhc_iface_transfer_out_callback_t, void *);
@@ -210 +209 @@
 
 /** In transfer processing function prototype. */
-typedef int (*usbhc_iface_transfer_in_t)(ddf_fun_t *, usb_target_t, size_t,
+typedef int (*usbhc_iface_transfer_in_t)(ddf_fun_t *, usb_target_t,
     void *, size_t,
     usbhc_iface_transfer_in_callback_t, void *);
@@ -234 +233 @@
 
         int (*control_write)(ddf_fun_t *, usb_target_t,
-            size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_out_callback_t, void *);
 
         int (*control_read)(ddf_fun_t *, usb_target_t,
-            size_t,
             void *, size_t, void *, size_t,
             usbhc_iface_transfer_in_callback_t, void *);