Changeset f2962621 in mainline for uspace/lib/usbvirt/src/callback.c

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• uspace/lib/usbvirt/src/callback.c (moved) (moved from uspace/lib/usbvirt/callback.c ) (3 diffs)

uspace/lib/usbvirt/src/callback.c

@@ -40 +40 @@
 #include <mem.h>
 
-#include "hub.h"
-#include "device.h"
 #include "private.h"
 
@@ -155 +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;
@@ -203 +201 @@
                 
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                         case IPC_M_PHONE_HUNGUP:
                                 ipc_answer_0(callid, EOK);