Changeset 75732da in mainline for uspace/lib/usbvirt

Timestamp:

2010-12-13T07:20:20Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

309dea52

Parents:

84439d7 (diff), 37f7cfe (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:

Merge development/ changes

Location:

uspace/lib/usbvirt/src

Files:

• callback.c (modified) (1 diff)
• main.c (modified) (2 diffs)
• transaction.c (modified) (1 diff)

uspace/lib/usbvirt/src/callback.c

@@ -153 +153 @@
          * If the request was processed, we will send data back.
          */
-        if (rc == EOK) {
+        if ((rc == EOK) && (expected_len > 0)) {
                 size_t receive_len;
                 ipc_callid_t callid;

uspace/lib/usbvirt/src/main.c

@@ -183 +183 @@
 /** Create necessary phones for communication with virtual HCD.
  * This function wraps following calls:
- * -# open <code>/dev/devices/\\vhc</code> for reading
+ * -# open <code>/dev/devices/\\virt\\usbhc for reading
  * -# access phone of file opened in previous step
  * -# create callback through just opened phone
@@ -203 +203 @@
         }
         
-        const char *vhc_path = "/vhc";
+        const char *vhc_path = "/virt/usbhc";
         int rc;
         devman_handle_t handle;

uspace/lib/usbvirt/src/transaction.c

@@ -183 +183 @@
                                 actual_size = size;
                         }
+                        device->lib_debug(device, 1, USBVIRT_DEBUGTAG_TRANSACTION,
+                            "in transaction: will copy %zu bytes", actual_size);
                         if (actual_size > 0) {
                                 memcpy(buffer, transfer->data, actual_size);