Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/lib/c/generic/devmap.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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 mainline changes

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

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

    r37f7cfe ra9b6bec  
    107107        aid_t req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
    108108       
    109         ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
     109        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
    110110        if (retval != EOK) {
    111111                async_wait_for(req, NULL);
     
    116116        async_set_client_connection(conn);
    117117       
    118         ipcarg_t callback_phonehash;
     118        sysarg_t callback_phonehash;
    119119        ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
    120120        async_wait_for(req, &retval);
     
    145145            &answer);
    146146       
    147         ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
     147        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
    148148        if (retval != EOK) {
    149149                async_wait_for(req, NULL);
     
    181181            &answer);
    182182       
    183         ipcarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
     183        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
    184184        if (retval != EOK) {
    185185                async_wait_for(req, NULL);
     
    217217            &answer);
    218218       
    219         ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
     219        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
    220220        if (retval != EOK) {
    221221                async_wait_for(req, NULL);
     
    247247                return phone;
    248248       
    249         ipcarg_t type;
     249        sysarg_t type;
    250250        int retval = async_req_1_1(phone, DEVMAP_HANDLE_PROBE, handle, &type);
    251251        if (retval != EOK)
     
    277277                return -1;
    278278       
    279         ipcarg_t null_id;
     279        sysarg_t null_id;
    280280        int retval = async_req_0_1(phone, DEVMAP_NULL_CREATE, &null_id);
    281281        if (retval != EOK)
     
    292292                return;
    293293       
    294         async_req_1_0(phone, DEVMAP_NULL_DESTROY, (ipcarg_t) null_id);
     294        async_req_1_0(phone, DEVMAP_NULL_DESTROY, (sysarg_t) null_id);
    295295}
    296296
    297297static size_t devmap_count_namespaces_internal(int phone)
    298298{
    299         ipcarg_t count;
     299        sysarg_t count;
    300300        int retval = async_req_0_1(phone, DEVMAP_GET_NAMESPACE_COUNT, &count);
    301301        if (retval != EOK)
     
    307307static size_t devmap_count_devices_internal(int phone, devmap_handle_t ns_handle)
    308308{
    309         ipcarg_t count;
     309        sysarg_t count;
    310310        int retval = async_req_1_1(phone, DEVMAP_GET_DEVICE_COUNT, ns_handle, &count);
    311311        if (retval != EOK)
     
    375375                }
    376376               
    377                 ipcarg_t retval;
     377                sysarg_t retval;
    378378                async_wait_for(req, &retval);
    379379                async_serialize_end();
     
    427427                }
    428428               
    429                 ipcarg_t retval;
     429                sysarg_t retval;
    430430                async_wait_for(req, &retval);
    431431                async_serialize_end();
Note: See TracChangeset for help on using the changeset viewer.