Changeset 13101d06 in mainline

Timestamp:

2011-01-15T11:22:51Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0950397a

Parents:

ff8ed06

Message:

Virtual USB devices set actual transfer size

Location:

uspace

Files:

• drv/vhc/devices.c (modified) (1 diff)
• drv/vhc/hc.c (modified) (2 diffs)
• drv/vhc/hc.h (modified) (1 diff)
• lib/usbvirt/src/callback.c (modified) (1 diff)

uspace/drv/vhc/devices.c

@@ -138 +138 @@
                 } else {
                         async_wait_for(req, &answer_rc);
+                        transaction->actual_len = IPC_GET_ARG1(answer_data);
                         rc = (int)answer_rc;
                 }

uspace/drv/vhc/hc.c

@@ -96 +96 @@
             usb_str_transaction_outcome(outcome));
         
-        transaction->callback(transaction->buffer, transaction->len, outcome,
-            transaction->callback_arg);
+        transaction->callback(transaction->buffer, transaction->actual_len,
+            outcome, transaction->callback_arg);
 }
 
@@ -169 +169 @@
         transaction->buffer = buffer;
         transaction->len = len;
+        transaction->actual_len = len;
         transaction->callback = callback;
         transaction->callback_arg = arg;

uspace/drv/vhc/hc.h

@@ -65 +65 @@
         /** Transaction data length. */
         size_t len;
+        /** Data length actually transfered. */
+        size_t actual_len;
         /** Callback after transaction is done. */
         hc_transaction_done_callback_t callback;

uspace/lib/usbvirt/src/callback.c

@@ -160 +160 @@
                         return;
                 }
-                async_data_read_finalize(callid, buffer, receive_len);
-        }
-        
-        ipc_answer_0(iid, rc);
+                if (len > receive_len) {
+                        len = receive_len;
+                }
+                async_data_read_finalize(callid, buffer, len);
+        }
+        
+        ipc_answer_1(iid, rc, len);
 }