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

Changeset a9b6bec in mainline for uspace/srv/fs/devfs/devfs_ops.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/srv/fs/devfs/devfs_ops.c

    r37f7cfe ra9b6bec  
    420420       
    421421        /* Accept the mount options */
    422         ipcarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
     422        sysarg_t retval = async_data_write_accept((void **) &opts, true, 0, 0,
    423423            0, NULL);
    424424        if (retval != EOK) {
     
    575575                /* Make a request at the driver */
    576576                ipc_call_t answer;
    577                 aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
     577                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
    578578                    IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
    579579                    IPC_GET_ARG3(*request), &answer);
     
    584584               
    585585                /* Wait for reply from the driver. */
    586                 ipcarg_t rc;
     586                sysarg_t rc;
    587587                async_wait_for(msg, &rc);
    588588                size_t bytes = IPC_GET_ARG1(answer);
     
    638638                /* Make a request at the driver */
    639639                ipc_call_t answer;
    640                 aid_t msg = async_send_3(dev->phone, IPC_GET_METHOD(*request),
     640                aid_t msg = async_send_3(dev->phone, IPC_GET_IMETHOD(*request),
    641641                    IPC_GET_ARG1(*request), IPC_GET_ARG2(*request),
    642642                    IPC_GET_ARG3(*request), &answer);
     
    648648               
    649649                /* Wait for reply from the driver. */
    650                 ipcarg_t rc;
     650                sysarg_t rc;
    651651                async_wait_for(msg, &rc);
    652652                size_t bytes = IPC_GET_ARG1(answer);
     
    746746                /* Make a request at the driver */
    747747                ipc_call_t answer;
    748                 aid_t msg = async_send_2(dev->phone, IPC_GET_METHOD(*request),
     748                aid_t msg = async_send_2(dev->phone, IPC_GET_IMETHOD(*request),
    749749                    IPC_GET_ARG1(*request), IPC_GET_ARG2(*request), &answer);
    750750               
     
    752752               
    753753                /* Wait for reply from the driver */
    754                 ipcarg_t rc;
     754                sysarg_t rc;
    755755                async_wait_for(msg, &rc);
    756756               
Note: See TracChangeset for help on using the changeset viewer.