Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/async/client.c

    r4805495 r01900b6  
    216216        fibril_rmutex_lock(&message_mutex);
    217217
    218         msg->retval = IPC_GET_RETVAL(*data);
     218        msg->retval = ipc_get_retval(data);
    219219
    220220        /* Copy data inside lock, just in case the call was detached */
    … …  
    486486
    487487        if (r1)
    488                 *r1 = IPC_GET_ARG1(result);
     488                *r1 = ipc_get_arg1(&result);
    489489
    490490        if (r2)
    491                 *r2 = IPC_GET_ARG2(result);
     491                *r2 = ipc_get_arg2(&result);
    492492
    493493        if (r3)
    494                 *r3 = IPC_GET_ARG3(result);
     494                *r3 = ipc_get_arg3(&result);
    495495
    496496        if (r4)
    497                 *r4 = IPC_GET_ARG4(result);
     497                *r4 = ipc_get_arg4(&result);
    498498
    499499        if (r5)
    500                 *r5 = IPC_GET_ARG5(result);
     500                *r5 = ipc_get_arg5(&result);
    501501
    502502        return rc;
    … …  
    538538
    539539        if (r1)
    540                 *r1 = IPC_GET_ARG1(result);
     540                *r1 = ipc_get_arg1(&result);
    541541
    542542        if (r2)
    543                 *r2 = IPC_GET_ARG2(result);
     543                *r2 = ipc_get_arg2(&result);
    544544
    545545        if (r3)
    546                 *r3 = IPC_GET_ARG3(result);
     546                *r3 = ipc_get_arg3(&result);
    547547
    548548        if (r4)
    549                 *r4 = IPC_GET_ARG4(result);
     549                *r4 = ipc_get_arg4(&result);
    550550
    551551        if (r5)
    552                 *r5 = IPC_GET_ARG5(result);
     552                *r5 = ipc_get_arg5(&result);
    553553
    554554        return rc;
    … …  
    557557errno_t async_req_0_0(async_exch_t *exch, sysarg_t imethod)
    558558{
    559         return async_req_fast(exch, imethod, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
     559        return async_req_fast(exch, imethod, 0, 0, 0, 0, NULL, NULL, NULL, NULL,
     560            NULL);
    560561}
    561562
    562563errno_t async_req_0_1(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1)
    563564{
    564         return async_req_fast(exch, imethod, 0, 0, 0, 0, r1, NULL, NULL, NULL, NULL);
    565 }
    566 
    567 errno_t async_req_0_2(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1, sysarg_t *r2)
     565        return async_req_fast(exch, imethod, 0, 0, 0, 0, r1, NULL, NULL, NULL,
     566            NULL);
     567}
     568
     569errno_t async_req_0_2(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1,
     570    sysarg_t *r2)
    568571{
    569572        return async_req_fast(exch, imethod, 0, 0, 0, 0, r1, r2, NULL, NULL, NULL);
    570573}
    571574
    572 errno_t async_req_0_3(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
     575errno_t async_req_0_3(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1,
     576    sysarg_t *r2, sysarg_t *r3)
    573577{
    574578        return async_req_fast(exch, imethod, 0, 0, 0, 0, r1, r2, r3, NULL, NULL);
    575579}
    576580
    577 errno_t async_req_0_4(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
     581errno_t async_req_0_4(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1,
     582    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
    578583{
    579584        return async_req_fast(exch, imethod, 0, 0, 0, 0, r1, r2, r3, r4, NULL);
    580585}
    581586
    582 errno_t async_req_0_5(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     587errno_t async_req_0_5(async_exch_t *exch, sysarg_t imethod, sysarg_t *r1,
     588    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
    583589{
    584590        return async_req_fast(exch, imethod, 0, 0, 0, 0, r1, r2, r3, r4, r5);
    … …  
    587593errno_t async_req_1_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1)
    588594{
    589         return async_req_fast(exch, imethod, arg1, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
    590 }
    591 
    592 errno_t async_req_1_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t *r1)
    593 {
    594         return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, NULL, NULL, NULL, NULL);
    595 }
    596 
    597 errno_t async_req_1_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t *r1, sysarg_t *r2)
    598 {
    599         return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, r2, NULL, NULL, NULL);
    600 }
    601 
    602 errno_t async_req_1_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
    603 {
    604         return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, r2, r3, NULL, NULL);
    605 }
    606 
    607 errno_t async_req_1_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
     595        return async_req_fast(exch, imethod, arg1, 0, 0, 0, NULL, NULL, NULL, NULL,
     596            NULL);
     597}
     598
     599errno_t async_req_1_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     600    sysarg_t *r1)
     601{
     602        return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, NULL, NULL, NULL,
     603            NULL);
     604}
     605
     606errno_t async_req_1_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     607    sysarg_t *r1, sysarg_t *r2)
     608{
     609        return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, r2, NULL, NULL,
     610            NULL);
     611}
     612
     613errno_t async_req_1_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     614    sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
     615{
     616        return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, r2, r3, NULL,
     617            NULL);
     618}
     619
     620errno_t async_req_1_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     621    sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
    608622{
    609623        return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, r2, r3, r4, NULL);
    610624}
    611625
    612 errno_t async_req_1_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     626errno_t async_req_1_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     627    sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
    613628{
    614629        return async_req_fast(exch, imethod, arg1, 0, 0, 0, r1, r2, r3, r4, r5);
    615630}
    616631
    617 errno_t async_req_2_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2)
    618 {
    619         return async_req_fast(exch, imethod, arg1, arg2, 0, 0, NULL, NULL, NULL, NULL, NULL);
    620 }
    621 
    622 errno_t async_req_2_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t *r1)
    623 {
    624         return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, NULL, NULL, NULL, NULL);
    625 }
    626 
    627 errno_t async_req_2_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t *r1, sysarg_t *r2)
    628 {
    629         return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, NULL, NULL, NULL);
    630 }
    631 
    632 errno_t async_req_2_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
    633 {
    634         return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, r3, NULL, NULL);
    635 }
    636 
    637 errno_t async_req_2_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
    638 {
    639         return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, r3, r4, NULL);
    640 }
    641 
    642 errno_t async_req_2_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     632errno_t async_req_2_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     633    sysarg_t arg2)
     634{
     635        return async_req_fast(exch, imethod, arg1, arg2, 0, 0, NULL, NULL, NULL,
     636            NULL, NULL);
     637}
     638
     639errno_t async_req_2_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     640    sysarg_t arg2, sysarg_t *r1)
     641{
     642        return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, NULL, NULL,
     643            NULL, NULL);
     644}
     645
     646errno_t async_req_2_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     647    sysarg_t arg2, sysarg_t *r1, sysarg_t *r2)
     648{
     649        return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, NULL,
     650            NULL, NULL);
     651}
     652
     653errno_t async_req_2_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     654    sysarg_t arg2, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
     655{
     656        return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, r3, NULL,
     657            NULL);
     658}
     659
     660errno_t async_req_2_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     661    sysarg_t arg2, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
     662{
     663        return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, r3, r4,
     664            NULL);
     665}
     666
     667errno_t async_req_2_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     668    sysarg_t arg2, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
    643669{
    644670        return async_req_fast(exch, imethod, arg1, arg2, 0, 0, r1, r2, r3, r4, r5);
    645671}
    646672
    647 errno_t async_req_3_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
    648 {
    649         return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, NULL, NULL, NULL, NULL, NULL);
    650 }
    651 
    652 errno_t async_req_3_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t *r1)
    653 {
    654         return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, NULL, NULL, NULL, NULL);
    655 }
    656 
    657 errno_t async_req_3_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2)
    658 {
    659         return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, NULL, NULL, NULL);
    660 }
    661 
    662 errno_t async_req_3_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
    663 {
    664         return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, r3, NULL, NULL);
    665 }
    666 
    667 errno_t async_req_3_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
    668 {
    669         return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, r3, r4, NULL);
    670 }
    671 
    672 errno_t async_req_3_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
    673 {
    674         return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, r3, r4, r5);
    675 }
    676 
    677 errno_t async_req_4_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
    678 {
    679         return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, NULL, NULL, NULL, NULL, NULL);
    680 }
    681 
    682 errno_t async_req_4_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1)
    683 {
    684         return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, NULL, NULL, NULL, NULL);
    685 }
    686 
    687 errno_t async_req_4_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2)
    688 {
    689         return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, NULL, NULL, NULL);
    690 }
    691 
    692 errno_t async_req_4_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
    693 {
    694         return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, r3, NULL, NULL);
    695 }
    696 
    697 errno_t async_req_4_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
    698 {
    699         return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, r3, r4, NULL);
    700 }
    701 
    702 errno_t async_req_4_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
    703 {
    704         return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, r3, r4, r5);
    705 }
    706 
    707 errno_t async_req_5_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
    708 {
    709         return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, NULL, NULL, NULL, NULL, NULL);
    710 }
    711 
    712 errno_t async_req_5_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1)
    713 {
    714         return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, NULL, NULL, NULL, NULL);
    715 }
    716 
    717 errno_t async_req_5_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1, sysarg_t *r2)
    718 {
    719         return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2, NULL, NULL, NULL);
    720 }
    721 
    722 errno_t async_req_5_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
    723 {
    724         return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2, r3, NULL, NULL);
    725 }
    726 
    727 errno_t async_req_5_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
    728 {
    729         return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2, r3, r4, NULL);
    730 }
    731 
    732 errno_t async_req_5_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
    733 {
    734         return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2, r3, r4, r5);
     673errno_t async_req_3_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     674    sysarg_t arg2, sysarg_t arg3)
     675{
     676        return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, NULL, NULL, NULL,
     677            NULL, NULL);
     678}
     679
     680errno_t async_req_3_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     681    sysarg_t arg2, sysarg_t arg3, sysarg_t *r1)
     682{
     683        return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, NULL, NULL,
     684            NULL, NULL);
     685}
     686
     687errno_t async_req_3_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     688    sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2)
     689{
     690        return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, NULL,
     691            NULL, NULL);
     692}
     693
     694errno_t async_req_3_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     695    sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3)
     696{
     697        return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, r3, NULL,
     698            NULL);
     699}
     700
     701errno_t async_req_3_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     702    sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3,
     703    sysarg_t *r4)
     704{
     705        return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, r3, r4,
     706            NULL);
     707}
     708
     709errno_t async_req_3_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     710    sysarg_t arg2, sysarg_t arg3, sysarg_t *r1, sysarg_t *r2, sysarg_t *r3,
     711    sysarg_t *r4, sysarg_t *r5)
     712{
     713        return async_req_fast(exch, imethod, arg1, arg2, arg3, 0, r1, r2, r3, r4,
     714            r5);
     715}
     716
     717errno_t async_req_4_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     718    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
     719{
     720        return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, NULL, NULL,
     721            NULL, NULL, NULL);
     722}
     723
     724errno_t async_req_4_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     725    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1)
     726{
     727        return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, NULL,
     728            NULL, NULL, NULL);
     729}
     730
     731errno_t async_req_4_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     732    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2)
     733{
     734        return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, NULL,
     735            NULL, NULL);
     736}
     737
     738errno_t async_req_4_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     739    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     740    sysarg_t *r3)
     741{
     742        return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, r3,
     743            NULL, NULL);
     744}
     745
     746errno_t async_req_4_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     747    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     748    sysarg_t *r3, sysarg_t *r4)
     749{
     750        return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, r3,
     751            r4, NULL);
     752}
     753
     754errno_t async_req_4_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     755    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
     756    sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     757{
     758        return async_req_fast(exch, imethod, arg1, arg2, arg3, arg4, r1, r2, r3,
     759            r4, r5);
     760}
     761
     762errno_t async_req_5_0(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     763    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
     764{
     765        return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, NULL,
     766            NULL, NULL, NULL, NULL);
     767}
     768
     769errno_t async_req_5_1(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     770    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1)
     771{
     772        return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1,
     773            NULL, NULL, NULL, NULL);
     774}
     775
     776errno_t async_req_5_2(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     777    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     778    sysarg_t *r2)
     779{
     780        return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2,
     781            NULL, NULL, NULL);
     782}
     783
     784errno_t async_req_5_3(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     785    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     786    sysarg_t *r2, sysarg_t *r3)
     787{
     788        return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2,
     789            r3, NULL, NULL);
     790}
     791
     792errno_t async_req_5_4(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     793    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     794    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4)
     795{
     796        return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2,
     797            r3, r4, NULL);
     798}
     799
     800errno_t async_req_5_5(async_exch_t *exch, sysarg_t imethod, sysarg_t arg1,
     801    sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
     802    sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     803{
     804        return async_req_slow(exch, imethod, arg1, arg2, arg3, arg4, arg5, r1, r2,
     805            r3, r4, r5);
    735806}
    736807
    … …  
    805876                return rc;
    806877
    807         *out_phone = (cap_phone_handle_t) IPC_GET_ARG5(result);
     878        *out_phone = (cap_phone_handle_t) ipc_get_arg5(&result);
    808879        return EOK;
    809880}
    … …  
    818889 * @param arg2  User defined argument.
    819890 * @param arg3  User defined argument.
     891 * @param rc    Placeholder for return code. Unused if NULL.
    820892 *
    821893 * @return New session on success or NULL on error.
    … …  
    823895 */
    824896async_sess_t *async_connect_me_to(async_exch_t *exch, iface_t iface,
    825     sysarg_t arg2, sysarg_t arg3)
     897    sysarg_t arg2, sysarg_t arg3, errno_t *rc)
    826898{
    827899        if (exch == NULL) {
    828                 errno = ENOENT;
     900                if (rc != NULL)
     901                        *rc = ENOENT;
     902
    829903                return NULL;
    830904        }
    … …  
    832906        async_sess_t *sess = calloc(1, sizeof(async_sess_t));
    833907        if (sess == NULL) {
    834                 errno = ENOMEM;
     908                if (rc != NULL)
     909                        *rc = ENOMEM;
     910
    835911                return NULL;
    836912        }
    837913
    838914        cap_phone_handle_t phone;
    839         errno_t rc = async_connect_me_to_internal(exch->phone, iface, arg2,
     915        errno_t ret = async_connect_me_to_internal(exch->phone, iface, arg2,
    840916            arg3, 0, &phone);
    841         if (rc != EOK) {
    842                 errno = rc;
     917        if (ret != EOK) {
     918                if (rc != NULL)
     919                        *rc = ret;
     920
    843921                free(sess);
    844922                return NULL;
    … …  
    886964 * @param arg2  User defined argument.
    887965 * @param arg3  User defined argument.
     966 * @param rc    Placeholder for return code. Unused if NULL.
    888967 *
    889968 * @return New session on success or NULL on error.
    … …  
    891970 */
    892971async_sess_t *async_connect_me_to_blocking(async_exch_t *exch, iface_t iface,
    893     sysarg_t arg2, sysarg_t arg3)
     972    sysarg_t arg2, sysarg_t arg3, errno_t *rc)
    894973{
    895974        if (exch == NULL) {
    896                 errno = ENOENT;
     975                if (rc != NULL)
     976                        *rc = ENOENT;
     977
    897978                return NULL;
    898979        }
    … …  
    900981        async_sess_t *sess = calloc(1, sizeof(async_sess_t));
    901982        if (sess == NULL) {
    902                 errno = ENOMEM;
     983                if (rc != NULL)
     984                        *rc = ENOMEM;
     985
    903986                return NULL;
    904987        }
    905988
    906989        cap_phone_handle_t phone;
    907         errno_t rc = async_connect_me_to_internal(exch->phone, iface, arg2,
     990        errno_t ret = async_connect_me_to_internal(exch->phone, iface, arg2,
    908991            arg3, IPC_FLAG_BLOCKING, &phone);
    909         if (rc != EOK) {
    910                 errno = rc;
     992        if (ret != EOK) {
     993                if (rc != NULL)
     994                        *rc = ret;
     995
    911996                free(sess);
    912997                return NULL;
    … …  
    9281013/** Connect to a task specified by id.
    9291014 *
    930  */
    931 async_sess_t *async_connect_kbox(task_id_t id)
     1015 * @param id Task to which to connect.
     1016 * @param rc Placeholder for return code. Unused if NULL.
     1017 *
     1018 * @return New session on success or NULL on error.
     1019 *
     1020 */
     1021async_sess_t *async_connect_kbox(task_id_t id, errno_t *rc)
    9321022{
    9331023        async_sess_t *sess = calloc(1, sizeof(async_sess_t));
    9341024        if (sess == NULL) {
    935                 errno = ENOMEM;
     1025                if (rc != NULL)
     1026                        *rc = ENOMEM;
     1027
    9361028                return NULL;
    9371029        }
    9381030
    9391031        cap_phone_handle_t phone;
    940         errno_t rc = ipc_connect_kbox(id, &phone);
    941         if (rc != EOK) {
    942                 errno = rc;
     1032        errno_t ret = ipc_connect_kbox(id, &phone);
     1033        if (ret != EOK) {
     1034                if (rc != NULL)
     1035                        *rc = ret;
     1036
    9431037                free(sess);
    9441038                return NULL;
    … …  
    12601354{
    12611355        return async_req_5_0(exch, IPC_M_STATE_CHANGE_AUTHORIZE,
    1262             arg1, arg2, arg3, 0, CAP_HANDLE_RAW(other_exch->phone));
     1356            arg1, arg2, arg3, 0, cap_handle_raw(other_exch->phone));
    12631357}
    12641358
Note: See TracChangeset for help on using the changeset viewer.