Changeset 7dfc06fa in mainline for uspace/drv/ohci

Timestamp:

2011-04-08T18:08:46Z (15 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.

File:

• uspace/drv/ohci/iface.c (modified) (12 diffs)

uspace/drv/ohci/iface.c

@@ -196 +196 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] target Target pipe (address and endpoint number) specification.
- * @param[in] max_packet_size Max packet size for the transfer.
  * @param[in] data Data to be sent (in USB endianess, allocated and deallocated
  *      by the caller).
@@ -205 +204 @@
  */
 static int interrupt_out(
-    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
+    ddf_fun_t *fun, usb_target_t target, void *data,
     size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
         assert(fun);
+
+        // FIXME: get from endpoint manager
+        size_t max_packet_size = 8;
+
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -239 +242 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] target Target pipe (address and endpoint number) specification.
- * @param[in] max_packet_size Max packet size for the transfer.
  * @param[in] data Buffer where to store the data (in USB endianess,
  *      allocated and deallocated by the caller).
@@ -248 +250 @@
  */
 static int interrupt_in(
-    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
+    ddf_fun_t *fun, usb_target_t target, void *data,
     size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
         assert(fun);
+
+        // FIXME: get from endpoint manager
+        size_t max_packet_size = 8;
+
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -281 +287 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] target Target pipe (address and endpoint number) specification.
- * @param[in] max_packet_size Max packet size for the transfer.
  * @param[in] data Data to be sent (in USB endianess, allocated and deallocated
  *      by the caller).
@@ -290 +295 @@
  */
 static int bulk_out(
-    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
+    ddf_fun_t *fun, usb_target_t target, void *data,
     size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
         assert(fun);
+
+        // FIXME: get from endpoint manager
+        size_t max_packet_size = 8;
+
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -324 +333 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] target Target pipe (address and endpoint number) specification.
- * @param[in] max_packet_size Max packet size for the transfer.
  * @param[in] data Buffer where to store the data (in USB endianess,
  *      allocated and deallocated by the caller).
@@ -333 +341 @@
  */
 static int bulk_in(
-    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size, void *data,
+    ddf_fun_t *fun, usb_target_t target, void *data,
     size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
         assert(fun);
+
+        // FIXME: get from endpoint manager
+        size_t max_packet_size = 8;
+
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -366 +378 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] target Target pipe (address and endpoint number) specification.
- * @param[in] max_packet_size Max packet size for the transfer.
  * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
  *      and deallocated by the caller).
@@ -378 +389 @@
  */
 static int control_write(
-    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
+    ddf_fun_t *fun, usb_target_t target,
     void *setup_data, size_t setup_size, void *data, size_t size,
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
         assert(fun);
+
+        // FIXME: get from endpoint manager
+        size_t max_packet_size = 8;
+
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
@@ -417 +432 @@
  * @param[in] fun Device function the action was invoked on.
  * @param[in] target Target pipe (address and endpoint number) specification.
- * @param[in] max_packet_size Max packet size for the transfer.
  * @param[in] setup_packet Setup packet buffer (in USB endianess, allocated
  *      and deallocated by the caller).
@@ -429 +443 @@
  */
 static int control_read(
-    ddf_fun_t *fun, usb_target_t target, size_t max_packet_size,
+    ddf_fun_t *fun, usb_target_t target,
     void *setup_data, size_t setup_size, void *data, size_t size,
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
         assert(fun);
+
+        // FIXME: get from endpoint manager
+        size_t max_packet_size = 8;
+
         hc_t *hc = fun_to_hc(fun);
         assert(hc);