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

Timestamp:

2011-02-18T20:06:27Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b36e5de2

Parents:

867e6735

Message:

Max packet size actually sent over IPC

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -297 +297 @@
         }
 
-        size_t expected_len = DEV_IPC_GET_ARG3(*call);
+        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -305 +305 @@
         size_t len = 0;
         void *buffer = NULL;
-        if (expected_len > 0) {
-                int rc = async_data_write_accept(&buffer, false,
-                    1, USB_MAX_PAYLOAD_SIZE,
-                    0, &len);
-
-                if (rc != EOK) {
-                        async_answer_0(callid, rc);
-                        return;
-                }
+
+        int rc = async_data_write_accept(&buffer, false,
+            1, USB_MAX_PAYLOAD_SIZE,
+            0, &len);
+
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
         }
 
@@ -328 +327 @@
         trans->size = len;
 
-        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE,
+        rc = transfer_func(device, target, max_packet_size,
             buffer, len,
             callback_out, trans);
@@ -354 +353 @@
         }
 
-        size_t len = DEV_IPC_GET_ARG3(*call);
+        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -360 +359 @@
         };
 
+        size_t len;
         ipc_callid_t data_callid;
         if (!async_data_read_receive(&data_callid, &len)) {
@@ -375 +375 @@
         trans->size = len;
 
-        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE_INTERRUPT_IN,
+        int rc = transfer_func(device, target, max_packet_size,
             trans->buffer, len,
             callback_in, trans);
@@ -549 +549 @@
         };
         size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
+        size_t max_packet_size = DEV_IPC_GET_ARG4(*call);
 
         int rc;
@@ -584 +585 @@
         trans->size = data_buffer_len;
 
-        rc = usb_iface->control_write(device, target, HACK_MAX_PACKET_SIZE,
+        rc = usb_iface->control_write(device, target, max_packet_size,
             setup_packet, setup_packet_len,
             data_buffer, data_buffer_len,
@@ -611 +612 @@
                 .endpoint = DEV_IPC_GET_ARG2(*call)
         };
+        size_t max_packet_size = DEV_IPC_GET_ARG3(*call);
 
         int rc;
@@ -648 +650 @@
         }
 
-        rc = usb_iface->control_read(device, target, HACK_MAX_PACKET_SIZE,
+        rc = usb_iface->control_read(device, target, max_packet_size,
             setup_packet, setup_packet_len,
             trans->buffer, trans->size,