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

Changeset 5863a95 in mainline for uspace/srv/devmap/devmap.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/devmap/devmap.c

    r70e5ad5 r5863a95  
    6161        link_t devices;
    6262        /** Phone asociated with this driver */
    63         ipcarg_t phone;
     63        sysarg_t phone;
    6464        /** Device driver name */
    6565        char *name;
     
    387387        ipc_callid_t iid = async_get_call(&icall);
    388388       
    389         if (IPC_GET_METHOD(icall) != DEVMAP_DRIVER_REGISTER) {
     389        if (IPC_GET_IMETHOD(icall) != DEVMAP_DRIVER_REGISTER) {
    390390                ipc_answer_0(iid, EREFUSED);
    391391                return NULL;
     
    416416        ipc_callid_t callid = async_get_call(&call);
    417417       
    418         if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
     418        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
    419419                free(driver->name);
    420420                free(driver);
     
    823823        }
    824824       
    825         ipcarg_t retval = async_data_read_finalize(callid, desc, size);
     825        sysarg_t retval = async_data_read_finalize(callid, desc, size);
    826826       
    827827        free(desc);
     
    890890        }
    891891       
    892         ipcarg_t retval = async_data_read_finalize(callid, desc, size);
     892        sysarg_t retval = async_data_read_finalize(callid, desc, size);
    893893       
    894894        free(desc);
     
    964964        fibril_mutex_unlock(&null_devices_mutex);
    965965       
    966         ipc_answer_1(iid, EOK, (ipcarg_t) i);
     966        ipc_answer_1(iid, EOK, (sysarg_t) i);
    967967}
    968968
    969969static void devmap_null_destroy(ipc_callid_t iid, ipc_call_t *icall)
    970970{
    971         ipcarg_t i = IPC_GET_ARG1(*icall);
     971        sysarg_t i = IPC_GET_ARG1(*icall);
    972972        if (i >= NULL_DEVICES) {
    973973                ipc_answer_0(iid, ELIMIT);
     
    10271027                ipc_callid_t callid = async_get_call(&call);
    10281028               
    1029                 switch (IPC_GET_METHOD(call)) {
     1029                switch (IPC_GET_IMETHOD(call)) {
    10301030                case IPC_M_PHONE_HUNGUP:
    10311031                        cont = false;
     
    10781078                ipc_callid_t callid = async_get_call(&call);
    10791079               
    1080                 switch (IPC_GET_METHOD(call)) {
     1080                switch (IPC_GET_IMETHOD(call)) {
    10811081                case IPC_M_PHONE_HUNGUP:
    10821082                        cont = false;
     
    11211121{
    11221122        /* Select interface */
    1123         switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
     1123        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
    11241124        case DEVMAP_DRIVER:
    11251125                devmap_connection_driver(iid, icall);
     
    11541154       
    11551155        /* Register device mapper at naming service */
    1156         ipcarg_t phonead;
     1156        sysarg_t phonead;
    11571157        if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0)
    11581158                return -1;
Note: See TracChangeset for help on using the changeset viewer.