Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/async.c

    r8e80d3f re35bf88  
    4343 * framework will automatically take care of most synchronization problems.
    4444 *
     45 * Default semantics:
     46 * - async_send_*(): Send asynchronously. If the kernel refuses to send
     47 *                   more messages, [ try to get responses from kernel, if
     48 *                   nothing found, might try synchronous ]
     49 *
    4550 * Example of use (pseudo C):
    4651 *
     
    5358 *   int fibril1(void *arg)
    5459 *   {
    55  *     conn = async_connect_me_to();
     60 *     conn = ipc_connect_me_to();
    5661 *     c1 = async_send(conn);
    5762 *     c2 = async_send(conn);
     
    7277 *   {
    7378 *     if (want_refuse) {
    74  *       async_answer_0(icallid, ELIMIT);
     79 *       ipc_answer_0(icallid, ELIMIT);
    7580 *       return;
    7681 *     }
    77  *     async_answer_0(icallid, EOK);
     82 *     ipc_answer_0(icallid, EOK);
    7883 *
    7984 *     callid = async_get_call(&call);
    8085 *     somehow_handle_the_call(callid, call);
    81  *     async_answer_2(callid, 1, 2, 3);
     86 *     ipc_answer_2(callid, 1, 2, 3);
    8287 *
    8388 *     callid = async_get_call(&call);
     
    8792 */
    8893
    89 #define LIBC_ASYNC_C_
    90 #include <ipc/ipc.h>
     94#include <futex.h>
    9195#include <async.h>
    92 #undef LIBC_ASYNC_C_
    93 
    94 #include <futex.h>
     96#include <async_priv.h>
    9597#include <fibril.h>
    9698#include <stdio.h>
    9799#include <adt/hash_table.h>
    98100#include <adt/list.h>
     101#include <ipc/ipc.h>
    99102#include <assert.h>
    100103#include <errno.h>
     
    102105#include <arch/barrier.h>
    103106#include <bool.h>
    104 #include "private/async.h"
    105107
    106108atomic_t async_futex = FUTEX_INITIALIZER;
     
    118120        ipc_call_t *dataptr;
    119121       
    120         sysarg_t retval;
     122        ipcarg_t retval;
    121123} amsg_t;
    122124
    123125/**
    124  * Structures of this type are used to group information about
    125  * a call and about a message queue link.
     126 * Structures of this type are used to group information about a call and a
     127 * message queue link.
    126128 */
    127129typedef struct {
     
    132134
    133135typedef struct {
    134         sysarg_t in_task_hash;
    135         link_t link;
    136         int refcnt;
    137         void *data;
    138 } client_t;
    139 
    140 typedef struct {
    141136        awaiter_t wdata;
    142137       
     
    144139        link_t link;
    145140       
    146         /** Incoming client task hash. */
    147         sysarg_t in_task_hash;
    148141        /** Incoming phone hash. */
    149         sysarg_t in_phone_hash;
    150        
    151         /** Link to the client tracking structure. */
    152         client_t *client;
     142        ipcarg_t in_phone_hash;
    153143       
    154144        /** Messages that should be delivered to this fibril. */
     
    168158
    169159/** Identifier of the incoming connection handled by the current fibril. */
    170 static fibril_local connection_t *FIBRIL_connection;
    171 
    172 static void *default_client_data_constructor(void)
    173 {
    174         return NULL;
    175 }
    176 
    177 static void default_client_data_destructor(void *data)
    178 {
    179 }
    180 
    181 static async_client_data_ctor_t async_client_data_create =
    182     default_client_data_constructor;
    183 static async_client_data_dtor_t async_client_data_destroy =
    184     default_client_data_destructor;
    185 
    186 void async_set_client_data_constructor(async_client_data_ctor_t ctor)
    187 {
    188         async_client_data_create = ctor;
    189 }
    190 
    191 void async_set_client_data_destructor(async_client_data_dtor_t dtor)
    192 {
    193         async_client_data_destroy = dtor;
    194 }
    195 
    196 void *async_client_data_get(void)
    197 {
    198         assert(FIBRIL_connection);
    199         return FIBRIL_connection->client->data;
    200 }
    201 
    202 /** Default fibril function that gets called to handle new connection.
    203  *
    204  * This function is defined as a weak symbol - to be redefined in user code.
    205  *
    206  * @param callid Hash of the incoming call.
    207  * @param call   Data of the incoming call.
    208  *
    209  */
    210 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
    211 {
    212         ipc_answer_0(callid, ENOENT);
    213 }
     160fibril_local connection_t *FIBRIL_connection;
     161
     162static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
     163static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call);
    214164
    215165/**
     
    217167 */
    218168static async_client_conn_t client_connection = default_client_connection;
    219 
    220 /** Default fibril function that gets called to handle interrupt notifications.
    221  *
    222  * This function is defined as a weak symbol - to be redefined in user code.
    223  *
    224  * @param callid Hash of the incoming call.
    225  * @param call   Data of the incoming call.
    226  *
    227  */
    228 static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
    229 {
    230 }
    231169
    232170/**
     
    236174static async_client_conn_t interrupt_received = default_interrupt_received;
    237175
    238 static hash_table_t client_hash_table;
    239176static hash_table_t conn_hash_table;
    240177static LIST_INITIALIZE(timeout_list);
    241178
    242 #define CLIENT_HASH_TABLE_BUCKETS  32
    243 #define CONN_HASH_TABLE_BUCKETS    32
    244 
    245 static hash_index_t client_hash(unsigned long key[])
     179#define CONN_HASH_TABLE_CHAINS  32
     180
     181/** Compute hash into the connection hash table based on the source phone hash.
     182 *
     183 * @param key Pointer to source phone hash.
     184 *
     185 * @return Index into the connection hash table.
     186 *
     187 */
     188static hash_index_t conn_hash(unsigned long *key)
    246189{
    247190        assert(key);
    248         return (((key[0]) >> 4) % CLIENT_HASH_TABLE_BUCKETS);
    249 }
    250 
    251 static int client_compare(unsigned long key[], hash_count_t keys, link_t *item)
    252 {
    253         client_t *client = hash_table_get_instance(item, client_t, link);
    254         return (key[0] == client->in_task_hash);
    255 }
    256 
    257 static void client_remove(link_t *item)
    258 {
    259 }
    260 
    261 /** Operations for the client hash table. */
    262 static hash_table_operations_t client_hash_table_ops = {
    263         .hash = client_hash,
    264         .compare = client_compare,
    265         .remove_callback = client_remove
    266 };
    267 
    268 /** Compute hash into the connection hash table based on the source phone hash.
    269  *
    270  * @param key Pointer to source phone hash.
    271  *
    272  * @return Index into the connection hash table.
    273  *
    274  */
    275 static hash_index_t conn_hash(unsigned long key[])
    276 {
    277         assert(key);
    278         return (((key[0]) >> 4) % CONN_HASH_TABLE_BUCKETS);
     191        return (((*key) >> 4) % CONN_HASH_TABLE_CHAINS);
    279192}
    280193
     
    290203static int conn_compare(unsigned long key[], hash_count_t keys, link_t *item)
    291204{
    292         connection_t *conn = hash_table_get_instance(item, connection_t, link);
    293         return (key[0] == conn->in_phone_hash);
    294 }
    295 
     205        connection_t *hs = hash_table_get_instance(item, connection_t, link);
     206        return (key[0] == hs->in_phone_hash);
     207}
     208
     209/** Connection hash table removal callback function.
     210 *
     211 * This function is called whenever a connection is removed from the connection
     212 * hash table.
     213 *
     214 * @param item Connection hash table item being removed.
     215 *
     216 */
    296217static void conn_remove(link_t *item)
    297218{
    298 }
     219        free(hash_table_get_instance(item, connection_t, link));
     220}
     221
    299222
    300223/** Operations for the connection hash table. */
     
    317240        link_t *tmp = timeout_list.next;
    318241        while (tmp != &timeout_list) {
    319                 awaiter_t *cur
    320                     = list_get_instance(tmp, awaiter_t, to_event.link);
     242                awaiter_t *cur;
    321243               
     244                cur = list_get_instance(tmp, awaiter_t, to_event.link);
    322245                if (tv_gteq(&cur->to_event.expires, &wd->to_event.expires))
    323246                        break;
    324                
    325247                tmp = tmp->next;
    326248        }
     
    339261 *
    340262 * @return False if the call doesn't match any connection.
    341  * @return True if the call was passed to the respective connection fibril.
     263 *         True if the call was passed to the respective connection fibril.
    342264 *
    343265 */
     
    366288        list_append(&msg->link, &conn->msg_queue);
    367289       
    368         if (IPC_GET_IMETHOD(*call) == IPC_M_PHONE_HUNGUP)
     290        if (IPC_GET_METHOD(*call) == IPC_M_PHONE_HUNGUP)
    369291                conn->close_callid = callid;
    370292       
     
    430352       
    431353        fid_t fid = fibril_create(notification_fibril, msg);
    432         if (fid == 0) {
    433                 free(msg);
    434                 futex_up(&async_futex);
    435                 return false;
    436         }
    437        
    438354        fibril_add_ready(fid);
    439355       
     
    482398                         * the first IPC_M_PHONE_HUNGUP call and continues to
    483399                         * call async_get_call_timeout(). Repeat
    484                          * IPC_M_PHONE_HUNGUP until the caller notices.
     400                         * IPC_M_PHONE_HUNGUP until the caller notices. 
    485401                         */
    486402                        memset(call, 0, sizeof(ipc_call_t));
    487                         IPC_SET_IMETHOD(*call, IPC_M_PHONE_HUNGUP);
     403                        IPC_SET_METHOD(*call, IPC_M_PHONE_HUNGUP);
    488404                        futex_up(&async_futex);
    489405                        return conn->close_callid;
    490406                }
    491                
     407
    492408                if (usecs)
    493409                        async_insert_timeout(&conn->wdata);
     
    527443}
    528444
     445/** Default fibril function that gets called to handle new connection.
     446 *
     447 * This function is defined as a weak symbol - to be redefined in user code.
     448 *
     449 * @param callid Hash of the incoming call.
     450 * @param call   Data of the incoming call.
     451 *
     452 */
     453static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
     454{
     455        ipc_answer_0(callid, ENOENT);
     456}
     457
     458/** Default fibril function that gets called to handle interrupt notifications.
     459 *
     460 * This function is defined as a weak symbol - to be redefined in user code.
     461 *
     462 * @param callid Hash of the incoming call.
     463 * @param call   Data of the incoming call.
     464 *
     465 */
     466static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call)
     467{
     468}
     469
    529470/** Wrapper for client connection fibril.
    530471 *
     
    540481{
    541482        /*
    542          * Setup fibril-local connection pointer.
     483         * Setup fibril-local connection pointer and call client_connection().
     484         *
    543485         */
    544486        FIBRIL_connection = (connection_t *) arg;
    545        
    546         futex_down(&async_futex);
    547        
    548         /*
    549          * Add our reference for the current connection in the client task
    550          * tracking structure. If this is the first reference, create and
    551          * hash in a new tracking structure.
    552          */
    553        
    554         unsigned long key = FIBRIL_connection->in_task_hash;
    555         link_t *lnk = hash_table_find(&client_hash_table, &key);
    556        
    557         client_t *client;
    558        
    559         if (lnk) {
    560                 client = hash_table_get_instance(lnk, client_t, link);
    561                 client->refcnt++;
    562         } else {
    563                 client = malloc(sizeof(client_t));
    564                 if (!client) {
    565                         ipc_answer_0(FIBRIL_connection->callid, ENOMEM);
    566                         futex_up(&async_futex);
    567                         return 0;
    568                 }
    569                
    570                 client->in_task_hash = FIBRIL_connection->in_task_hash;
    571                
    572                 async_serialize_start();
    573                 client->data = async_client_data_create();
    574                 async_serialize_end();
    575                
    576                 client->refcnt = 1;
    577                 hash_table_insert(&client_hash_table, &key, &client->link);
    578         }
    579        
    580         futex_up(&async_futex);
    581        
    582         FIBRIL_connection->client = client;
    583        
    584         /*
    585          * Call the connection handler function.
    586          */
    587487        FIBRIL_connection->cfibril(FIBRIL_connection->callid,
    588488            &FIBRIL_connection->call);
    589489       
    590         /*
    591          * Remove the reference for this client task connection.
    592          */
    593         bool destroy;
    594        
     490        /* Remove myself from the connection hash table */
    595491        futex_down(&async_futex);
    596        
    597         if (--client->refcnt == 0) {
    598                 hash_table_remove(&client_hash_table, &key, 1);
    599                 destroy = true;
    600         } else
    601                 destroy = false;
    602        
    603         futex_up(&async_futex);
    604        
    605         if (destroy) {
    606                 if (client->data)
    607                         async_client_data_destroy(client->data);
    608                
    609                 free(client);
    610         }
    611        
    612         /*
    613          * Remove myself from the connection hash table.
    614          */
    615         futex_down(&async_futex);
    616         key = FIBRIL_connection->in_phone_hash;
     492        unsigned long key = FIBRIL_connection->in_phone_hash;
    617493        hash_table_remove(&conn_hash_table, &key, 1);
    618494        futex_up(&async_futex);
    619495       
    620         /*
    621          * Answer all remaining messages with EHANGUP.
    622          */
     496        /* Answer all remaining messages with EHANGUP */
    623497        while (!list_empty(&FIBRIL_connection->msg_queue)) {
    624                 msg_t *msg =
    625                     list_get_instance(FIBRIL_connection->msg_queue.next, msg_t,
    626                     link);
     498                msg_t *msg;
    627499               
     500                msg = list_get_instance(FIBRIL_connection->msg_queue.next,
     501                    msg_t, link);
    628502                list_remove(&msg->link);
    629503                ipc_answer_0(msg->callid, EHANGUP);
     
    631505        }
    632506       
    633         /*
    634          * If the connection was hung-up, answer the last call,
    635          * i.e. IPC_M_PHONE_HUNGUP.
    636          */
    637507        if (FIBRIL_connection->close_callid)
    638508                ipc_answer_0(FIBRIL_connection->close_callid, EOK);
    639509       
    640         free(FIBRIL_connection);
    641510        return 0;
    642511}
     
    648517 * particular fibrils.
    649518 *
    650  * @param in_task_hash  Identification of the incoming connection.
    651519 * @param in_phone_hash Identification of the incoming connection.
    652520 * @param callid        Hash of the opening IPC_M_CONNECT_ME_TO call.
     
    661529 *
    662530 */
    663 fid_t async_new_connection(sysarg_t in_task_hash, sysarg_t in_phone_hash,
    664     ipc_callid_t callid, ipc_call_t *call,
    665     void (*cfibril)(ipc_callid_t, ipc_call_t *))
     531fid_t async_new_connection(ipcarg_t in_phone_hash, ipc_callid_t callid,
     532    ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
    666533{
    667534        connection_t *conn = malloc(sizeof(*conn));
     
    669536                if (callid)
    670537                        ipc_answer_0(callid, ENOMEM);
    671                
    672                 return (uintptr_t) NULL;
    673         }
    674        
    675         conn->in_task_hash = in_task_hash;
     538                return NULL;
     539        }
     540       
    676541        conn->in_phone_hash = in_phone_hash;
    677542        list_initialize(&conn->msg_queue);
     
    687552        conn->wdata.fid = fibril_create(connection_fibril, conn);
    688553       
    689         if (conn->wdata.fid == 0) {
     554        if (!conn->wdata.fid) {
    690555                free(conn);
    691                
    692556                if (callid)
    693557                        ipc_answer_0(callid, ENOMEM);
    694                
    695                 return (uintptr_t) NULL;
     558                return NULL;
    696559        }
    697560       
     
    719582static void handle_call(ipc_callid_t callid, ipc_call_t *call)
    720583{
    721         /* Unrouted call - take some default action */
     584        /* Unrouted call - do some default behaviour */
    722585        if ((callid & IPC_CALLID_NOTIFICATION)) {
    723586                process_notification(callid, call);
    724                 return;
    725         }
    726        
    727         switch (IPC_GET_IMETHOD(*call)) {
     587                goto out;
     588        }
     589       
     590        switch (IPC_GET_METHOD(*call)) {
    728591        case IPC_M_CONNECT_ME:
    729592        case IPC_M_CONNECT_ME_TO:
    730                 /* Open new connection with fibril, etc. */
    731                 async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
    732                     callid, call, client_connection);
    733                 return;
     593                /* Open new connection with fibril etc. */
     594                async_new_connection(IPC_GET_ARG5(*call), callid, call,
     595                    client_connection);
     596                goto out;
    734597        }
    735598       
    736599        /* Try to route the call through the connection hash table */
    737600        if (route_call(callid, call))
    738                 return;
     601                goto out;
    739602       
    740603        /* Unknown call from unknown phone - hang it up */
    741604        ipc_answer_0(callid, EHANGUP);
     605        return;
     606       
     607out:
     608        ;
    742609}
    743610
     
    752619        link_t *cur = timeout_list.next;
    753620        while (cur != &timeout_list) {
    754                 awaiter_t *waiter =
    755                     list_get_instance(cur, awaiter_t, to_event.link);
     621                awaiter_t *waiter;
    756622               
     623                waiter = list_get_instance(cur, awaiter_t, to_event.link);
    757624                if (tv_gt(&waiter->to_event.expires, &tv))
    758625                        break;
    759                
     626
    760627                cur = cur->next;
    761                
     628
    762629                list_remove(&waiter->to_event.link);
    763630                waiter->to_event.inlist = false;
     
    786653        while (true) {
    787654                if (fibril_switch(FIBRIL_FROM_MANAGER)) {
    788                         futex_up(&async_futex);
     655                        futex_up(&async_futex); 
    789656                        /*
    790657                         * async_futex is always held when entering a manager
     
    809676                                continue;
    810677                        } else
    811                                 timeout = tv_sub(&waiter->to_event.expires, &tv);
     678                                timeout = tv_sub(&waiter->to_event.expires,
     679                                    &tv);
    812680                } else
    813681                        timeout = SYNCH_NO_TIMEOUT;
    814682               
    815683                futex_up(&async_futex);
    816                
     684
    817685                atomic_inc(&threads_in_ipc_wait);
    818686               
     
    822690               
    823691                atomic_dec(&threads_in_ipc_wait);
    824                
     692
    825693                if (!callid) {
    826694                        handle_expired_timeouts();
     
    861729{
    862730        fid_t fid = fibril_create(async_manager_fibril, NULL);
    863         if (fid != 0)
    864                 fibril_add_manager(fid);
     731        fibril_add_manager(fid);
    865732}
    866733
     
    873740/** Initialize the async framework.
    874741 *
    875  */
    876 void __async_init(void)
    877 {
    878         if (!hash_table_create(&client_hash_table, CLIENT_HASH_TABLE_BUCKETS, 1,
    879             &client_hash_table_ops))
    880                 abort();
    881        
    882         if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_BUCKETS, 1,
    883             &conn_hash_table_ops))
    884                 abort();
     742 * @return Zero on success or an error code.
     743 */
     744int __async_init(void)
     745{
     746        if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_CHAINS, 1,
     747            &conn_hash_table_ops)) {
     748                printf("%s: Cannot create async hash table\n", "libc");
     749                return ENOMEM;
     750        }
     751       
     752        return 0;
    885753}
    886754
     
    895763 * @param retval Value returned in the answer.
    896764 * @param data   Call data of the answer.
    897  *
    898765 */
    899766static void reply_received(void *arg, int retval, ipc_call_t *data)
     
    940807 *
    941808 */
    942 aid_t async_send_fast(int phoneid, sysarg_t method, sysarg_t arg1,
    943     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
    944 {
    945         amsg_t *msg = malloc(sizeof(amsg_t));
     809aid_t async_send_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     810    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
     811{
     812        amsg_t *msg = malloc(sizeof(*msg));
    946813       
    947814        if (!msg)
     
    952819       
    953820        msg->wdata.to_event.inlist = false;
    954        
    955         /*
    956          * We may sleep in the next method,
    957          * but it will use its own means
    958          */
     821        /* We may sleep in the next method, but it will use its own mechanism */
    959822        msg->wdata.active = true;
    960823       
     
    983846 *
    984847 */
    985 aid_t async_send_slow(int phoneid, sysarg_t method, sysarg_t arg1,
    986     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
     848aid_t async_send_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
     849    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5,
    987850    ipc_call_t *dataptr)
    988851{
    989         amsg_t *msg = malloc(sizeof(amsg_t));
     852        amsg_t *msg = malloc(sizeof(*msg));
    990853       
    991854        if (!msg)
     
    996859       
    997860        msg->wdata.to_event.inlist = false;
    998        
    999         /*
    1000          * We may sleep in the next method,
    1001          * but it will use its own means
    1002          */
     861        /* We may sleep in next method, but it will use its own mechanism */
    1003862        msg->wdata.active = true;
    1004863       
     
    1016875 *
    1017876 */
    1018 void async_wait_for(aid_t amsgid, sysarg_t *retval)
     877void async_wait_for(aid_t amsgid, ipcarg_t *retval)
    1019878{
    1020879        amsg_t *msg = (amsg_t *) amsgid;
     
    1052911 *
    1053912 */
    1054 int async_wait_timeout(aid_t amsgid, sysarg_t *retval, suseconds_t timeout)
     913int async_wait_timeout(aid_t amsgid, ipcarg_t *retval, suseconds_t timeout)
    1055914{
    1056915        amsg_t *msg = (amsg_t *) amsgid;
     
    1099958void async_usleep(suseconds_t timeout)
    1100959{
    1101         amsg_t *msg = malloc(sizeof(amsg_t));
     960        amsg_t *msg = malloc(sizeof(*msg));
    1102961       
    1103962        if (!msg)
     
    11641023 *
    11651024 */
    1166 sysarg_t async_req_fast(int phoneid, sysarg_t method, sysarg_t arg1,
    1167     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2,
    1168     sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     1025ipcarg_t async_req_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     1026    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t *r1, ipcarg_t *r2,
     1027    ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
    11691028{
    11701029        ipc_call_t result;
     
    11721031            &result);
    11731032       
    1174         sysarg_t rc;
     1033        ipcarg_t rc;
    11751034        async_wait_for(eid, &rc);
    11761035       
     
    12131072 *
    12141073 */
    1215 sysarg_t async_req_slow(int phoneid, sysarg_t method, sysarg_t arg1,
    1216     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1,
    1217     sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5)
     1074ipcarg_t async_req_slow(int phoneid, ipcarg_t method, ipcarg_t arg1,
     1075    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5, ipcarg_t *r1,
     1076    ipcarg_t *r2, ipcarg_t *r3, ipcarg_t *r4, ipcarg_t *r5)
    12181077{
    12191078        ipc_call_t result;
     
    12211080            &result);
    12221081       
    1223         sysarg_t rc;
     1082        ipcarg_t rc;
    12241083        async_wait_for(eid, &rc);
    12251084       
     
    12421101}
    12431102
    1244 void async_msg_0(int phone, sysarg_t imethod)
    1245 {
    1246         ipc_call_async_0(phone, imethod, NULL, NULL, true);
    1247 }
    1248 
    1249 void async_msg_1(int phone, sysarg_t imethod, sysarg_t arg1)
    1250 {
    1251         ipc_call_async_1(phone, imethod, arg1, NULL, NULL, true);
    1252 }
    1253 
    1254 void async_msg_2(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2)
    1255 {
    1256         ipc_call_async_2(phone, imethod, arg1, arg2, NULL, NULL, true);
    1257 }
    1258 
    1259 void async_msg_3(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2,
    1260     sysarg_t arg3)
    1261 {
    1262         ipc_call_async_3(phone, imethod, arg1, arg2, arg3, NULL, NULL, true);
    1263 }
    1264 
    1265 void async_msg_4(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2,
    1266     sysarg_t arg3, sysarg_t arg4)
    1267 {
    1268         ipc_call_async_4(phone, imethod, arg1, arg2, arg3, arg4, NULL, NULL,
    1269             true);
    1270 }
    1271 
    1272 void async_msg_5(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2,
    1273     sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
    1274 {
    1275         ipc_call_async_5(phone, imethod, arg1, arg2, arg3, arg4, arg5, NULL,
    1276             NULL, true);
    1277 }
    1278 
    1279 sysarg_t async_answer_0(ipc_callid_t callid, sysarg_t retval)
    1280 {
    1281         return ipc_answer_0(callid, retval);
    1282 }
    1283 
    1284 sysarg_t async_answer_1(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1)
    1285 {
    1286         return ipc_answer_1(callid, retval, arg1);
    1287 }
    1288 
    1289 sysarg_t async_answer_2(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
    1290     sysarg_t arg2)
    1291 {
    1292         return ipc_answer_2(callid, retval, arg1, arg2);
    1293 }
    1294 
    1295 sysarg_t async_answer_3(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
    1296     sysarg_t arg2, sysarg_t arg3)
    1297 {
    1298         return ipc_answer_3(callid, retval, arg1, arg2, arg3);
    1299 }
    1300 
    1301 sysarg_t async_answer_4(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
    1302     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
    1303 {
    1304         return ipc_answer_4(callid, retval, arg1, arg2, arg3, arg4);
    1305 }
    1306 
    1307 sysarg_t async_answer_5(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
    1308     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5)
    1309 {
    1310         return ipc_answer_5(callid, retval, arg1, arg2, arg3, arg4, arg5);
    1311 }
    1312 
    1313 int async_forward_fast(ipc_callid_t callid, int phoneid, sysarg_t imethod,
    1314     sysarg_t arg1, sysarg_t arg2, unsigned int mode)
    1315 {
    1316         return ipc_forward_fast(callid, phoneid, imethod, arg1, arg2, mode);
    1317 }
    1318 
    1319 int async_forward_slow(ipc_callid_t callid, int phoneid, sysarg_t imethod,
    1320     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5,
    1321     unsigned int mode)
    1322 {
    1323         return ipc_forward_slow(callid, phoneid, imethod, arg1, arg2, arg3, arg4,
    1324             arg5, mode);
    1325 }
    1326 
    1327 /** Wrapper for making IPC_M_CONNECT_TO_ME calls using the async framework.
    1328  *
     1103/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework.
     1104 *
    13291105 * Ask through phone for a new connection to some service.
    13301106 *
    1331  * @param phone           Phone handle used for contacting the other side.
    1332  * @param arg1            User defined argument.
    1333  * @param arg2            User defined argument.
    1334  * @param arg3            User defined argument.
    1335  * @param client_receiver Connection handing routine.
    1336  *
    1337  * @return New phone handle on success or a negative error code.
    1338  *
    1339  */
    1340 int async_connect_to_me(int phone, sysarg_t arg1, sysarg_t arg2,
    1341     sysarg_t arg3, async_client_conn_t client_receiver)
    1342 {
    1343         sysarg_t task_hash;
    1344         sysarg_t phone_hash;
    1345         int rc = async_req_3_5(phone, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
    1346             NULL, NULL, NULL, &task_hash, &phone_hash);
    1347         if (rc != EOK)
     1107 * @param phoneid       Phone handle used for contacting the other side.
     1108 * @param arg1          User defined argument.
     1109 * @param arg2          User defined argument.
     1110 * @param arg3          User defined argument.
     1111 *
     1112 * @return              New phone handle on success or a negative error code.
     1113 */
     1114int
     1115async_connect_me_to(int phoneid, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3)
     1116{
     1117        int rc;
     1118        ipcarg_t newphid;
     1119
     1120        rc = async_req_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, NULL,
     1121            NULL, NULL, NULL, &newphid);
     1122       
     1123        if (rc != EOK) 
    13481124                return rc;
    1349        
    1350         if (client_receiver != NULL)
    1351                 async_new_connection(task_hash, phone_hash, 0, NULL,
    1352                     client_receiver);
    1353        
    1354         return EOK;
     1125
     1126        return newphid;
    13551127}
    13561128
    13571129/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework.
    1358  *
    1359  * Ask through phone for a new connection to some service.
    1360  *
    1361  * @param phone Phone handle used for contacting the other side.
    1362  * @param arg1  User defined argument.
    1363  * @param arg2  User defined argument.
    1364  * @param arg3  User defined argument.
    1365  *
    1366  * @return New phone handle on success or a negative error code.
    1367  *
    1368  */
    1369 int async_connect_me_to(int phone, sysarg_t arg1, sysarg_t arg2,
    1370     sysarg_t arg3)
    1371 {
    1372         sysarg_t newphid;
    1373         int rc = async_req_3_5(phone, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
    1374             NULL, NULL, NULL, NULL, &newphid);
    1375        
    1376         if (rc != EOK)
    1377                 return rc;
    1378        
    1379         return newphid;
    1380 }
    1381 
    1382 /** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework.
    1383  *
     1130 *
    13841131 * Ask through phone for a new connection to some service and block until
    13851132 * success.
    13861133 *
    1387  * @param phoneid Phone handle used for contacting the other side.
    1388  * @param arg1    User defined argument.
    1389  * @param arg2    User defined argument.
    1390  * @param arg3    User defined argument.
    1391  *
    1392  * @return New phone handle on success or a negative error code.
    1393  *
    1394  */
    1395 int async_connect_me_to_blocking(int phoneid, sysarg_t arg1, sysarg_t arg2,
    1396     sysarg_t arg3)
    1397 {
    1398         sysarg_t newphid;
    1399         int rc = async_req_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
     1134 * @param phoneid       Phone handle used for contacting the other side.
     1135 * @param arg1          User defined argument.
     1136 * @param arg2          User defined argument.
     1137 * @param arg3          User defined argument.
     1138 *
     1139 * @return              New phone handle on success or a negative error code.
     1140 */
     1141int
     1142async_connect_me_to_blocking(int phoneid, ipcarg_t arg1, ipcarg_t arg2,
     1143    ipcarg_t arg3)
     1144{
     1145        int rc;
     1146        ipcarg_t newphid;
     1147
     1148        rc = async_req_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
    14001149            IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid);
    14011150       
    1402         if (rc != EOK)
     1151        if (rc != EOK) 
    14031152                return rc;
    1404        
     1153
    14051154        return newphid;
    14061155}
    14071156
    1408 /** Connect to a task specified by id.
    1409  *
    1410  */
    1411 int async_connect_kbox(task_id_t id)
    1412 {
    1413         return ipc_connect_kbox(id);
    1414 }
    1415 
    1416 /** Wrapper for ipc_hangup.
    1417  *
    1418  * @param phone Phone handle to hung up.
    1419  *
    1420  * @return Zero on success or a negative error code.
    1421  *
    1422  */
    1423 int async_hangup(int phone)
    1424 {
    1425         return ipc_hangup(phone);
    1426 }
    1427 
    1428 /** Interrupt one thread of this task from waiting for IPC. */
    1429 void async_poke(void)
    1430 {
    1431         ipc_poke();
    1432 }
    1433 
    1434 /** Wrapper for IPC_M_SHARE_IN calls using the async framework.
    1435  *
    1436  * @param phoneid Phone that will be used to contact the receiving side.
    1437  * @param dst     Destination address space area base.
    1438  * @param size    Size of the destination address space area.
    1439  * @param arg     User defined argument.
    1440  * @param flags   Storage for the received flags. Can be NULL.
    1441  *
    1442  * @return Zero on success or a negative error code from errno.h.
    1443  *
    1444  */
    1445 int async_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg,
    1446     unsigned int *flags)
    1447 {
     1157/** Wrapper for making IPC_M_SHARE_IN calls using the async framework.
     1158 *
     1159 * @param phoneid       Phone that will be used to contact the receiving side.
     1160 * @param dst           Destination address space area base.
     1161 * @param size          Size of the destination address space area.
     1162 * @param arg           User defined argument.
     1163 * @param flags         Storage where the received flags will be stored. Can be
     1164 *                      NULL.
     1165 *
     1166 * @return              Zero on success or a negative error code from errno.h.
     1167 */
     1168int async_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
     1169    int *flags)
     1170{
     1171        int res;
    14481172        sysarg_t tmp_flags;
    1449         int res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst,
    1450             (sysarg_t) size, arg, NULL, &tmp_flags);
    1451        
     1173        res = async_req_3_2(phoneid, IPC_M_SHARE_IN, (ipcarg_t) dst,
     1174            (ipcarg_t) size, arg, NULL, &tmp_flags);
    14521175        if (flags)
    1453                 *flags = (unsigned int) tmp_flags;
    1454        
     1176                *flags = tmp_flags;
    14551177        return res;
    14561178}
     
    14581180/** Wrapper for receiving the IPC_M_SHARE_IN calls using the async framework.
    14591181 *
    1460  * This wrapper only makes it more comfortable to receive IPC_M_SHARE_IN
    1461  * calls so that the user doesn't have to remember the meaning of each IPC
    1462  * argument.
     1182 * This wrapper only makes it more comfortable to receive IPC_M_SHARE_IN calls
     1183 * so that the user doesn't have to remember the meaning of each IPC argument.
    14631184 *
    14641185 * So far, this wrapper is to be used from within a connection fibril.
    14651186 *
    1466  * @param callid Storage for the hash of the IPC_M_SHARE_IN call.
    1467  * @param size   Destination address space area size.
    1468  *
    1469  * @return True on success, false on failure.
    1470  *
    1471  */
    1472 bool async_share_in_receive(ipc_callid_t *callid, size_t *size)
    1473 {
     1187 * @param callid        Storage where the hash of the IPC_M_SHARE_IN call will
     1188 *                      be stored.
     1189 * @param size          Destination address space area size.   
     1190 *
     1191 * @return              Non-zero on success, zero on failure.
     1192 */
     1193int async_share_in_receive(ipc_callid_t *callid, size_t *size)
     1194{
     1195        ipc_call_t data;
     1196       
    14741197        assert(callid);
    14751198        assert(size);
    1476        
     1199
     1200        *callid = async_get_call(&data);
     1201        if (IPC_GET_METHOD(data) != IPC_M_SHARE_IN)
     1202                return 0;
     1203        *size = (size_t) IPC_GET_ARG2(data);
     1204        return 1;
     1205}
     1206
     1207/** Wrapper for answering the IPC_M_SHARE_IN calls using the async framework.
     1208 *
     1209 * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ calls
     1210 * so that the user doesn't have to remember the meaning of each IPC argument.
     1211 *
     1212 * @param callid        Hash of the IPC_M_DATA_READ call to answer.
     1213 * @param src           Source address space base.
     1214 * @param flags         Flags to be used for sharing. Bits can be only cleared.
     1215 *
     1216 * @return              Zero on success or a value from @ref errno.h on failure.
     1217 */
     1218int async_share_in_finalize(ipc_callid_t callid, void *src, int flags)
     1219{
     1220        return ipc_share_in_finalize(callid, src, flags);
     1221}
     1222
     1223/** Wrapper for making IPC_M_SHARE_OUT calls using the async framework.
     1224 *
     1225 * @param phoneid       Phone that will be used to contact the receiving side.
     1226 * @param src           Source address space area base address.
     1227 * @param flags         Flags to be used for sharing. Bits can be only cleared.
     1228 *
     1229 * @return              Zero on success or a negative error code from errno.h.
     1230 */
     1231int async_share_out_start(int phoneid, void *src, int flags)
     1232{
     1233        return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
     1234            (ipcarg_t) flags);
     1235}
     1236
     1237/** Wrapper for receiving the IPC_M_SHARE_OUT calls using the async framework.
     1238 *
     1239 * This wrapper only makes it more comfortable to receive IPC_M_SHARE_OUT calls
     1240 * so that the user doesn't have to remember the meaning of each IPC argument.
     1241 *
     1242 * So far, this wrapper is to be used from within a connection fibril.
     1243 *
     1244 * @param callid        Storage where the hash of the IPC_M_SHARE_OUT call will
     1245 *                      be stored.
     1246 * @param size          Storage where the source address space area size will be
     1247 *                      stored.
     1248 * @param flags         Storage where the sharing flags will be stored.
     1249 *
     1250 * @return              Non-zero on success, zero on failure.
     1251 */
     1252int async_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags)
     1253{
    14771254        ipc_call_t data;
    1478         *callid = async_get_call(&data);
    1479        
    1480         if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_IN)
    1481                 return false;
    1482        
    1483         *size = (size_t) IPC_GET_ARG2(data);
    1484         return true;
    1485 }
    1486 
    1487 /** Wrapper for answering the IPC_M_SHARE_IN calls using the async framework.
    1488  *
    1489  * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
    1490  * calls so that the user doesn't have to remember the meaning of each IPC
    1491  * argument.
    1492  *
    1493  * @param callid Hash of the IPC_M_DATA_READ call to answer.
    1494  * @param src    Source address space base.
    1495  * @param flags  Flags to be used for sharing. Bits can be only cleared.
    1496  *
    1497  * @return Zero on success or a value from @ref errno.h on failure.
    1498  *
    1499  */
    1500 int async_share_in_finalize(ipc_callid_t callid, void *src, unsigned int flags)
    1501 {
    1502         return ipc_share_in_finalize(callid, src, flags);
    1503 }
    1504 
    1505 /** Wrapper for IPC_M_SHARE_OUT calls using the async framework.
    1506  *
    1507  * @param phoneid Phone that will be used to contact the receiving side.
    1508  * @param src     Source address space area base address.
    1509  * @param flags   Flags to be used for sharing. Bits can be only cleared.
    1510  *
    1511  * @return Zero on success or a negative error code from errno.h.
    1512  *
    1513  */
    1514 int async_share_out_start(int phoneid, void *src, unsigned int flags)
    1515 {
    1516         return async_req_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0,
    1517             (sysarg_t) flags);
    1518 }
    1519 
    1520 /** Wrapper for receiving the IPC_M_SHARE_OUT calls using the async framework.
    1521  *
    1522  * This wrapper only makes it more comfortable to receive IPC_M_SHARE_OUT
    1523  * calls so that the user doesn't have to remember the meaning of each IPC
    1524  * argument.
    1525  *
    1526  * So far, this wrapper is to be used from within a connection fibril.
    1527  *
    1528  * @param callid Storage for the hash of the IPC_M_SHARE_OUT call.
    1529  * @param size   Storage for the source address space area size.
    1530  * @param flags  Storage for the sharing flags.
    1531  *
    1532  * @return True on success, false on failure.
    1533  *
    1534  */
    1535 bool async_share_out_receive(ipc_callid_t *callid, size_t *size, unsigned int *flags)
    1536 {
     1255       
    15371256        assert(callid);
    15381257        assert(size);
    15391258        assert(flags);
    1540        
     1259
     1260        *callid = async_get_call(&data);
     1261        if (IPC_GET_METHOD(data) != IPC_M_SHARE_OUT)
     1262                return 0;
     1263        *size = (size_t) IPC_GET_ARG2(data);
     1264        *flags = (int) IPC_GET_ARG3(data);
     1265        return 1;
     1266}
     1267
     1268/** Wrapper for answering the IPC_M_SHARE_OUT calls using the async framework.
     1269 *
     1270 * This wrapper only makes it more comfortable to answer IPC_M_SHARE_OUT calls
     1271 * so that the user doesn't have to remember the meaning of each IPC argument.
     1272 *
     1273 * @param callid        Hash of the IPC_M_DATA_WRITE call to answer.
     1274 * @param dst           Destination address space area base address.   
     1275 *
     1276 * @return              Zero on success or a value from @ref errno.h on failure.
     1277 */
     1278int async_share_out_finalize(ipc_callid_t callid, void *dst)
     1279{
     1280        return ipc_share_out_finalize(callid, dst);
     1281}
     1282
     1283
     1284/** Wrapper for making IPC_M_DATA_READ calls using the async framework.
     1285 *
     1286 * @param phoneid       Phone that will be used to contact the receiving side.
     1287 * @param dst           Address of the beginning of the destination buffer.
     1288 * @param size          Size of the destination buffer.
     1289 *
     1290 * @return              Zero on success or a negative error code from errno.h.
     1291 */
     1292int async_data_read_start(int phoneid, void *dst, size_t size)
     1293{
     1294        return async_req_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
     1295            (ipcarg_t) size);
     1296}
     1297
     1298/** Wrapper for receiving the IPC_M_DATA_READ calls using the async framework.
     1299 *
     1300 * This wrapper only makes it more comfortable to receive IPC_M_DATA_READ calls
     1301 * so that the user doesn't have to remember the meaning of each IPC argument.
     1302 *
     1303 * So far, this wrapper is to be used from within a connection fibril.
     1304 *
     1305 * @param callid        Storage where the hash of the IPC_M_DATA_READ call will
     1306 *                      be stored.
     1307 * @param size          Storage where the maximum size will be stored. Can be
     1308 *                      NULL.
     1309 *
     1310 * @return              Non-zero on success, zero on failure.
     1311 */
     1312int async_data_read_receive(ipc_callid_t *callid, size_t *size)
     1313{
    15411314        ipc_call_t data;
     1315       
     1316        assert(callid);
     1317
    15421318        *callid = async_get_call(&data);
    1543        
    1544         if (IPC_GET_IMETHOD(data) != IPC_M_SHARE_OUT)
    1545                 return false;
    1546        
    1547         *size = (size_t) IPC_GET_ARG2(data);
    1548         *flags = (unsigned int) IPC_GET_ARG3(data);
    1549         return true;
    1550 }
    1551 
    1552 /** Wrapper for answering the IPC_M_SHARE_OUT calls using the async framework.
    1553  *
    1554  * This wrapper only makes it more comfortable to answer IPC_M_SHARE_OUT
    1555  * calls so that the user doesn't have to remember the meaning of each IPC
    1556  * argument.
    1557  *
    1558  * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
    1559  * @param dst    Destination address space area base address.
    1560  *
    1561  * @return Zero on success or a value from @ref errno.h on failure.
    1562  *
    1563  */
    1564 int async_share_out_finalize(ipc_callid_t callid, void *dst)
    1565 {
    1566         return ipc_share_out_finalize(callid, dst);
    1567 }
    1568 
    1569 /** Wrapper for IPC_M_DATA_READ calls using the async framework.
    1570  *
    1571  * @param phoneid Phone that will be used to contact the receiving side.
    1572  * @param dst     Address of the beginning of the destination buffer.
    1573  * @param size    Size of the destination buffer.
    1574  * @param flags   Flags to control the data transfer.
    1575  *
    1576  * @return Zero on success or a negative error code from errno.h.
    1577  *
    1578  */
    1579 int
    1580 async_data_read_start_generic(int phoneid, void *dst, size_t size, int flags)
    1581 {
    1582         return async_req_3_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
    1583             (sysarg_t) size, (sysarg_t) flags);
    1584 }
    1585 
    1586 /** Wrapper for receiving the IPC_M_DATA_READ calls using the async framework.
    1587  *
    1588  * This wrapper only makes it more comfortable to receive IPC_M_DATA_READ
    1589  * calls so that the user doesn't have to remember the meaning of each IPC
    1590  * argument.
    1591  *
    1592  * So far, this wrapper is to be used from within a connection fibril.
    1593  *
    1594  * @param callid Storage for the hash of the IPC_M_DATA_READ.
    1595  * @param size   Storage for the maximum size. Can be NULL.
    1596  *
    1597  * @return True on success, false on failure.
    1598  *
    1599  */
    1600 bool async_data_read_receive(ipc_callid_t *callid, size_t *size)
    1601 {
    1602         assert(callid);
    1603        
    1604         ipc_call_t data;
    1605         *callid = async_get_call(&data);
    1606        
    1607         if (IPC_GET_IMETHOD(data) != IPC_M_DATA_READ)
    1608                 return false;
    1609        
     1319        if (IPC_GET_METHOD(data) != IPC_M_DATA_READ)
     1320                return 0;
    16101321        if (size)
    16111322                *size = (size_t) IPC_GET_ARG2(data);
    1612        
    1613         return true;
     1323        return 1;
    16141324}
    16151325
    16161326/** Wrapper for answering the IPC_M_DATA_READ calls using the async framework.
    16171327 *
    1618  * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ
    1619  * calls so that the user doesn't have to remember the meaning of each IPC
    1620  * argument.
    1621  *
    1622  * @param callid Hash of the IPC_M_DATA_READ call to answer.
    1623  * @param src    Source address for the IPC_M_DATA_READ call.
    1624  * @param size   Size for the IPC_M_DATA_READ call. Can be smaller than
    1625  *               the maximum size announced by the sender.
    1626  *
    1627  * @return Zero on success or a value from @ref errno.h on failure.
    1628  *
     1328 * This wrapper only makes it more comfortable to answer IPC_M_DATA_READ calls
     1329 * so that the user doesn't have to remember the meaning of each IPC argument.
     1330 *
     1331 * @param callid        Hash of the IPC_M_DATA_READ call to answer.
     1332 * @param src           Source address for the IPC_M_DATA_READ call.
     1333 * @param size          Size for the IPC_M_DATA_READ call. Can be smaller than
     1334 *                      the maximum size announced by the sender.
     1335 *
     1336 * @return              Zero on success or a value from @ref errno.h on failure.
    16291337 */
    16301338int async_data_read_finalize(ipc_callid_t callid, const void *src, size_t size)
     
    16351343/** Wrapper for forwarding any read request
    16361344 *
    1637  */
    1638 int async_data_read_forward_fast(int phoneid, sysarg_t method, sysarg_t arg1,
    1639     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
     1345 *
     1346 */
     1347int async_data_read_forward_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     1348    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
    16401349{
    16411350        ipc_callid_t callid;
     
    16601369        }
    16611370       
    1662         sysarg_t rc;
     1371        ipcarg_t rc;
    16631372        async_wait_for(msg, &rc);
    16641373       
     
    16661375}
    16671376
    1668 /** Wrapper for IPC_M_DATA_WRITE calls using the async framework.
     1377/** Wrapper for making IPC_M_DATA_WRITE calls using the async framework.
    16691378 *
    16701379 * @param phoneid Phone that will be used to contact the receiving side.
    16711380 * @param src     Address of the beginning of the source buffer.
    16721381 * @param size    Size of the source buffer.
    1673  * @param flags   Flags to control the data transfer.
    16741382 *
    16751383 * @return Zero on success or a negative error code from errno.h.
    16761384 *
    16771385 */
    1678 int
    1679 async_data_write_start_generic(int phoneid, const void *src, size_t size,
    1680     int flags)
    1681 {
    1682         return async_req_3_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
    1683             (sysarg_t) size, (sysarg_t) flags);
     1386int async_data_write_start(int phoneid, const void *src, size_t size)
     1387{
     1388        return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
     1389            (ipcarg_t) size);
    16841390}
    16851391
    16861392/** Wrapper for receiving the IPC_M_DATA_WRITE calls using the async framework.
    16871393 *
    1688  * This wrapper only makes it more comfortable to receive IPC_M_DATA_WRITE
    1689  * calls so that the user doesn't have to remember the meaning of each IPC
    1690  * argument.
     1394 * This wrapper only makes it more comfortable to receive IPC_M_DATA_WRITE calls
     1395 * so that the user doesn't have to remember the meaning of each IPC argument.
    16911396 *
    16921397 * So far, this wrapper is to be used from within a connection fibril.
    16931398 *
    1694  * @param callid Storage for the hash of the IPC_M_DATA_WRITE.
    1695  * @param size   Storage for the suggested size. May be NULL.
    1696  *
    1697  * @return True on success, false on failure.
    1698  *
    1699  */
    1700 bool async_data_write_receive(ipc_callid_t *callid, size_t *size)
    1701 {
     1399 * @param callid Storage where the hash of the IPC_M_DATA_WRITE call will
     1400 *               be stored.
     1401 * @param size   Storage where the suggested size will be stored. May be
     1402 *               NULL
     1403 *
     1404 * @return Non-zero on success, zero on failure.
     1405 *
     1406 */
     1407int async_data_write_receive(ipc_callid_t *callid, size_t *size)
     1408{
     1409        ipc_call_t data;
     1410       
    17021411        assert(callid);
    17031412       
    1704         ipc_call_t data;
    17051413        *callid = async_get_call(&data);
    1706        
    1707         if (IPC_GET_IMETHOD(data) != IPC_M_DATA_WRITE)
    1708                 return false;
     1414        if (IPC_GET_METHOD(data) != IPC_M_DATA_WRITE)
     1415                return 0;
    17091416       
    17101417        if (size)
    17111418                *size = (size_t) IPC_GET_ARG2(data);
    17121419       
    1713         return true;
     1420        return 1;
    17141421}
    17151422
    17161423/** Wrapper for answering the IPC_M_DATA_WRITE calls using the async framework.
    17171424 *
    1718  * This wrapper only makes it more comfortable to answer IPC_M_DATA_WRITE
    1719  * calls so that the user doesn't have to remember the meaning of each IPC
    1720  * argument.
     1425 * This wrapper only makes it more comfortable to answer IPC_M_DATA_WRITE calls
     1426 * so that the user doesn't have to remember the meaning of each IPC argument.
    17211427 *
    17221428 * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
     
    18141520 *
    18151521 */
    1816 void async_data_write_void(sysarg_t retval)
     1522void async_data_write_void(const int retval)
    18171523{
    18181524        ipc_callid_t callid;
     
    18231529/** Wrapper for forwarding any data that is about to be received
    18241530 *
    1825  */
    1826 int async_data_write_forward_fast(int phoneid, sysarg_t method, sysarg_t arg1,
    1827     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr)
     1531 *
     1532 */
     1533int async_data_write_forward_fast(int phoneid, ipcarg_t method, ipcarg_t arg1,
     1534    ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipc_call_t *dataptr)
    18281535{
    18291536        ipc_callid_t callid;
     
    18481555        }
    18491556       
    1850         sysarg_t rc;
     1557        ipcarg_t rc;
    18511558        async_wait_for(msg, &rc);
    18521559       
Note: See TracChangeset for help on using the changeset viewer.