Changeset ab87db5 in mainline for uspace/lib/c/generic/async/client.c
- Timestamp:
- 2019-02-23T17:16:01Z (5 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8c193d83, ca0e838
- Parents:
- bc417660 (diff), 95a47b0 (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. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)
- git-committer:
- GitHub <noreply@…> (2019-02-23 17:16:01)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/async/client.c
rbc417660 rab87db5 216 216 fibril_rmutex_lock(&message_mutex); 217 217 218 msg->retval = IPC_GET_RETVAL(*data);218 msg->retval = ipc_get_retval(data); 219 219 220 220 /* Copy data inside lock, just in case the call was detached */ … … 486 486 487 487 if (r1) 488 *r1 = IPC_GET_ARG1(result);488 *r1 = ipc_get_arg1(&result); 489 489 490 490 if (r2) 491 *r2 = IPC_GET_ARG2(result);491 *r2 = ipc_get_arg2(&result); 492 492 493 493 if (r3) 494 *r3 = IPC_GET_ARG3(result);494 *r3 = ipc_get_arg3(&result); 495 495 496 496 if (r4) 497 *r4 = IPC_GET_ARG4(result);497 *r4 = ipc_get_arg4(&result); 498 498 499 499 if (r5) 500 *r5 = IPC_GET_ARG5(result);500 *r5 = ipc_get_arg5(&result); 501 501 502 502 return rc; … … 538 538 539 539 if (r1) 540 *r1 = IPC_GET_ARG1(result);540 *r1 = ipc_get_arg1(&result); 541 541 542 542 if (r2) 543 *r2 = IPC_GET_ARG2(result);543 *r2 = ipc_get_arg2(&result); 544 544 545 545 if (r3) 546 *r3 = IPC_GET_ARG3(result);546 *r3 = ipc_get_arg3(&result); 547 547 548 548 if (r4) 549 *r4 = IPC_GET_ARG4(result);549 *r4 = ipc_get_arg4(&result); 550 550 551 551 if (r5) 552 *r5 = IPC_GET_ARG5(result);552 *r5 = ipc_get_arg5(&result); 553 553 554 554 return rc; … … 805 805 return rc; 806 806 807 *out_phone = (cap_phone_handle_t) IPC_GET_ARG5(result);807 *out_phone = (cap_phone_handle_t) ipc_get_arg5(&result); 808 808 return EOK; 809 809 } … … 1260 1260 { 1261 1261 return async_req_5_0(exch, IPC_M_STATE_CHANGE_AUTHORIZE, 1262 arg1, arg2, arg3, 0, CAP_HANDLE_RAW(other_exch->phone));1262 arg1, arg2, arg3, 0, cap_handle_raw(other_exch->phone)); 1263 1263 } 1264 1264
Note:
See TracChangeset
for help on using the changeset viewer.