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

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 the current development

File:

• uspace/lib/usbvirt/src/callback.c (modified) (15 diffs)

uspace/lib/usbvirt/src/callback.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusbvirt usb
+/** @addtogroup libusbvirt
  * @{
  */
@@ -54 +54 @@
         
         if (address != device->address) {
-                ipc_answer_0(iid, EADDRNOTAVAIL);
+                async_answer_0(iid, EADDRNOTAVAIL);
                 return;
         }
         
         if ((endpoint < 0) || (endpoint >= USB11_ENDPOINT_MAX)) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
         
         if (expected_len == 0) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
@@ -74 +74 @@
                 
         if (rc != EOK) {
-                ipc_answer_0(iid, rc);
+                async_answer_0(iid, rc);
                 return;
         }
@@ -80 +80 @@
         rc = device->transaction_setup(device, endpoint, buffer, len);
         
-        ipc_answer_0(iid, rc);
+        async_answer_0(iid, rc);
 }
 
@@ -92 +92 @@
         
         if (address != device->address) {
-                ipc_answer_0(iid, EADDRNOTAVAIL);
+                async_answer_0(iid, EADDRNOTAVAIL);
                 return;
         }
         
         if ((endpoint < 0) || (endpoint >= USB11_ENDPOINT_MAX)) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
@@ -111 +111 @@
                         
                 if (rc != EOK) {
-                        ipc_answer_0(iid, rc);
+                        async_answer_0(iid, rc);
                         return;
                 }
@@ -122 +122 @@
         }
         
-        ipc_answer_0(iid, rc);
+        async_answer_0(iid, rc);
 }
 
@@ -135 +135 @@
         
         if (address != device->address) {
-                ipc_answer_0(iid, EADDRNOTAVAIL);
+                async_answer_0(iid, EADDRNOTAVAIL);
                 return;
         }
         
         if ((endpoint < 0) || (endpoint >= USB11_ENDPOINT_MAX)) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
@@ -157 +157 @@
                 ipc_callid_t callid;
                 if (!async_data_read_receive(&callid, &receive_len)) {
-                        ipc_answer_0(iid, EINVAL);
+                        async_answer_0(iid, EINVAL);
                         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);
+        }
+        
+        async_answer_1(iid, rc, len);
 }
 
@@ -171 +174 @@
 {
         if (device->name == NULL) {
-                ipc_answer_0(iid, ENOENT);
+                async_answer_0(iid, ENOENT);
         }
         
@@ -179 +182 @@
         size_t accepted_size;
         if (!async_data_read_receive(&callid, &accepted_size)) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
@@ -188 +191 @@
         async_data_read_finalize(callid, device->name, accepted_size);
         
-        ipc_answer_1(iid, EOK, accepted_size);
+        async_answer_1(iid, EOK, accepted_size);
 }
 
@@ -194 +197 @@
 void device_callback_connection(usbvirt_device_t *device, ipc_callid_t iid, ipc_call_t *icall)
 {
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -203 +206 @@
                 switch (IPC_GET_IMETHOD(call)) {
                         case IPC_M_PHONE_HUNGUP:
-                                ipc_answer_0(callid, EOK);
+                                async_answer_0(callid, EOK);
                                 return;
                         
@@ -223 +226 @@
                         
                         default:
-                                ipc_answer_0(callid, EINVAL);
+                                async_answer_0(callid, EINVAL);
                                 break;
                 }