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

Changeset a9b6bec in mainline for uspace/lib/c/generic/devman.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/devman.c

    r37f7cfe ra9b6bec  
    9595        aid_t req = async_send_2(phone, DEVMAN_DRIVER_REGISTER, 0, 0, &answer);
    9696       
    97         ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
     97        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
    9898        if (retval != EOK) {
    9999                async_wait_for(req, NULL);
     
    104104        async_set_client_connection(conn);
    105105       
    106         ipcarg_t callback_phonehash;
     106        sysarg_t callback_phonehash;
    107107        ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
    108108        async_wait_for(req, &retval);
     
    155155        aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer);
    156156
    157         ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
     157        sysarg_t retval = async_data_write_start(phone, name, str_size(name));
    158158        if (retval != EOK) {
    159159                async_wait_for(req, NULL);
     
    192192        aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer);
    193193       
    194         ipcarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
     194        sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
    195195        if (retval != EOK) {
    196196                async_wait_for(req, NULL);
     
    268268            &answer);
    269269       
    270         ipcarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
     270        sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname));
    271271        if (retval != EOK) {
    272272                async_wait_for(req, NULL);
Note: See TracChangeset for help on using the changeset viewer.