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

Changeset 5863a95 in mainline for uspace/srv/devman/main.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/devman/main.c

    r70e5ad5 r5863a95  
    7474       
    7575        iid = async_get_call(&icall);
    76         if (IPC_GET_METHOD(icall) != DEVMAN_DRIVER_REGISTER) {
     76        if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) {
    7777                ipc_answer_0(iid, EREFUSED);
    7878                return NULL;
     
    109109        ipc_call_t call;
    110110        ipc_callid_t callid = async_get_call(&call);
    111         if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
     111        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
    112112                ipc_answer_0(callid, ENOTSUP);
    113113                ipc_answer_0(iid, ENOTSUP);
     
    141141       
    142142        callid = async_get_call(&call);
    143         if (DEVMAN_ADD_MATCH_ID != IPC_GET_METHOD(call)) {
     143        if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) {
    144144                printf(NAME ": ERROR: devman_receive_match_id - invalid "
    145145                    "protocol.\n");
     
    184184 * @return              Zero on success, negative error code otherwise.
    185185 */
    186 static int devman_receive_match_ids(ipcarg_t match_count,
     186static int devman_receive_match_ids(sysarg_t match_count,
    187187    match_id_list_t *match_ids)
    188188{
     
    211211{
    212212        devman_handle_t parent_handle = IPC_GET_ARG1(*call);
    213         ipcarg_t match_count = IPC_GET_ARG2(*call);
     213        sysarg_t match_count = IPC_GET_ARG2(*call);
    214214        dev_tree_t *tree = &device_tree;
    215215       
     
    367367                callid = async_get_call(&call);
    368368               
    369                 switch (IPC_GET_METHOD(call)) {
     369                switch (IPC_GET_IMETHOD(call)) {
    370370                case IPC_M_PHONE_HUNGUP:
    371371                        cont = false;
     
    420420                ipc_callid_t callid = async_get_call(&call);
    421421               
    422                 switch (IPC_GET_METHOD(call)) {
     422                switch (IPC_GET_IMETHOD(call)) {
    423423                case IPC_M_PHONE_HUNGUP:
    424424                        cont = false;
     
    486486static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
    487487{
    488         devmap_handle_t devmap_handle = IPC_GET_METHOD(*icall);
     488        devmap_handle_t devmap_handle = IPC_GET_IMETHOD(*icall);
    489489        node_t *dev;
    490490
     
    521521         * passes device handle to the driver as an ipc method.)
    522522         */
    523         if (IPC_GET_METHOD(*icall) != IPC_M_CONNECT_ME_TO)
     523        if (IPC_GET_IMETHOD(*icall) != IPC_M_CONNECT_ME_TO)
    524524                devman_connection_devmapper(iid, icall);
    525525
     
    531531       
    532532        /* Select interface. */
    533         switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
     533        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
    534534        case DEVMAN_DRIVER:
    535535                devman_connection_driver(iid, icall);
     
    599599
    600600        /* Register device manager at naming service. */
    601         ipcarg_t phonead;
     601        sysarg_t phonead;
    602602        if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAN, 0, 0, &phonead) != 0)
    603603                return -1;
Note: See TracChangeset for help on using the changeset viewer.