Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/devman.c

    rbe12474 r4c9b28a  
    7777 *
    7878 */
    79 async_exch_t *devman_exchange_begin_blocking(iface_t iface)
     79async_exch_t *devman_exchange_begin_blocking(devman_interface_t iface)
    8080{
    8181        switch (iface) {
    82         case INTERFACE_DDF_DRIVER:
     82        case DEVMAN_DRIVER:
    8383                fibril_mutex_lock(&devman_driver_block_mutex);
    8484               
    … …  
    8989                        if (devman_driver_block_sess == NULL)
    9090                                devman_driver_block_sess =
    91                                     service_connect_blocking(SERVICE_DEVMAN,
    92                                     INTERFACE_DDF_DRIVER, 0);
     91                                    service_connect_blocking(EXCHANGE_PARALLEL,
     92                                    SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
    9393                }
    9494               
    … …  
    9999               
    100100                return async_exchange_begin(devman_driver_block_sess);
    101         case INTERFACE_DDF_CLIENT:
     101        case DEVMAN_CLIENT:
    102102                fibril_mutex_lock(&devman_client_block_mutex);
    103103               
    … …  
    108108                        if (devman_client_block_sess == NULL)
    109109                                devman_client_block_sess =
    110                                     service_connect_blocking(SERVICE_DEVMAN,
    111                                     INTERFACE_DDF_CLIENT, 0);
     110                                    service_connect_blocking(EXCHANGE_SERIALIZE,
     111                                    SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
    112112                }
    113113               
    … …  
    130130 *
    131131 */
    132 async_exch_t *devman_exchange_begin(iface_t iface)
     132async_exch_t *devman_exchange_begin(devman_interface_t iface)
    133133{
    134134        switch (iface) {
    135         case INTERFACE_DDF_DRIVER:
     135        case DEVMAN_DRIVER:
    136136                fibril_mutex_lock(&devman_driver_mutex);
    137137               
    138138                if (devman_driver_sess == NULL)
    139139                        devman_driver_sess =
    140                             service_connect(SERVICE_DEVMAN,
    141                             INTERFACE_DDF_DRIVER, 0);
     140                            service_connect(EXCHANGE_PARALLEL, SERVICE_DEVMAN,
     141                            DEVMAN_DRIVER, 0);
    142142               
    143143                fibril_mutex_unlock(&devman_driver_mutex);
    … …  
    147147               
    148148                return async_exchange_begin(devman_driver_sess);
    149         case INTERFACE_DDF_CLIENT:
     149        case DEVMAN_CLIENT:
    150150                fibril_mutex_lock(&devman_client_mutex);
    151151               
    152152                if (devman_client_sess == NULL)
    153153                        devman_client_sess =
    154                             service_connect(SERVICE_DEVMAN,
    155                             INTERFACE_DDF_CLIENT, 0);
     154                            service_connect(EXCHANGE_SERIALIZE, SERVICE_DEVMAN,
     155                            DEVMAN_CLIENT, 0);
    156156               
    157157                fibril_mutex_unlock(&devman_client_mutex);
    … …  
    179179int devman_driver_register(const char *name)
    180180{
    181         async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER);
     181        async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
    182182       
    183183        ipc_call_t answer;
    … …  
    192192        }
    193193       
    194         exch = devman_exchange_begin(INTERFACE_DDF_DRIVER);
    195         async_connect_to_me(exch, 0, 0, 0);
     194        exch = devman_exchange_begin(DEVMAN_DRIVER);
     195        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
    196196        devman_exchange_end(exch);
    197197       
    … …  
    217217    match_id_list_t *match_ids, devman_handle_t devh, devman_handle_t *funh)
    218218{
    219         unsigned long match_count = list_count(&match_ids->ids);
    220         async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER);
     219        int match_count = list_count(&match_ids->ids);
     220        async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
    221221       
    222222        ipc_call_t answer;
    … …  
    268268    const char *cat_name)
    269269{
    270         async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER);
     270        async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
    271271       
    272272        ipc_call_t answer;
    … …  
    287287}
    288288
    289 async_sess_t *devman_device_connect(devman_handle_t handle, unsigned int flags)
     289async_sess_t *devman_device_connect(exch_mgmt_t mgmt, devman_handle_t handle,
     290    unsigned int flags)
    290291{
    291292        async_sess_t *sess;
    292293       
    293294        if (flags & IPC_FLAG_BLOCKING)
    294                 sess = service_connect_blocking(SERVICE_DEVMAN,
    295                     INTERFACE_DEVMAN_DEVICE, handle);
     295                sess = service_connect_blocking(mgmt, SERVICE_DEVMAN,
     296                            DEVMAN_CONNECT_TO_DEVICE, handle);
    296297        else
    297                 sess = service_connect(SERVICE_DEVMAN,
    298                     INTERFACE_DEVMAN_DEVICE, handle);
     298                sess = service_connect(mgmt, SERVICE_DEVMAN,
     299                            DEVMAN_CONNECT_TO_DEVICE, handle);
    299300       
    300301        return sess;
    … …  
    313314        sysarg_t retval;
    314315       
    315         exch = devman_exchange_begin_blocking(INTERFACE_DDF_DRIVER);
     316        exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
    316317        retval = async_req_1_0(exch, DEVMAN_REMOVE_FUNCTION, (sysarg_t) funh);
    317318        devman_exchange_end(exch);
    … …  
    322323int devman_drv_fun_online(devman_handle_t funh)
    323324{
    324         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_DRIVER);
     325        async_exch_t *exch = devman_exchange_begin(DEVMAN_DRIVER);
    325326        if (exch == NULL)
    326327                return ENOMEM;
    … …  
    334335int devman_drv_fun_offline(devman_handle_t funh)
    335336{
    336         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_DRIVER);
     337        async_exch_t *exch = devman_exchange_begin(DEVMAN_DRIVER);
    337338        if (exch == NULL)
    338339                return ENOMEM;
    … …  
    344345}
    345346
    346 async_sess_t *devman_parent_device_connect(devman_handle_t handle,
    347     unsigned int flags)
     347async_sess_t *devman_parent_device_connect(exch_mgmt_t mgmt,
     348    devman_handle_t handle, unsigned int flags)
    348349{
    349350        async_sess_t *sess;
    350351       
    351352        if (flags & IPC_FLAG_BLOCKING)
    352                 sess = service_connect_blocking(SERVICE_DEVMAN,
    353                     INTERFACE_DEVMAN_PARENT, handle);
     353                sess = service_connect_blocking(mgmt, SERVICE_DEVMAN,
     354                            DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
    354355        else
    355                 sess = service_connect_blocking(SERVICE_DEVMAN,
    356                     INTERFACE_DEVMAN_PARENT, handle);
     356                sess = service_connect(mgmt, SERVICE_DEVMAN,
     357                            DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
    357358       
    358359        return sess;
    … …  
    365366       
    366367        if (flags & IPC_FLAG_BLOCKING)
    367                 exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT);
     368                exch = devman_exchange_begin_blocking(DEVMAN_CLIENT);
    368369        else {
    369                 exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     370                exch = devman_exchange_begin(DEVMAN_CLIENT);
    370371                if (exch == NULL)
    371372                        return ENOMEM;
    … …  
    408409        sysarg_t dretval;
    409410       
    410         exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT);
     411        exch = devman_exchange_begin_blocking(DEVMAN_CLIENT);
    411412       
    412413        ipc_call_t answer;
    … …  
    473474int devman_fun_online(devman_handle_t funh)
    474475{
    475         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     476        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    476477        if (exch == NULL)
    477478                return ENOMEM;
    … …  
    485486int devman_fun_offline(devman_handle_t funh)
    486487{
    487         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     488        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    488489        if (exch == NULL)
    489490                return ENOMEM;
    … …  
    498499    devman_handle_t *handle_buf, size_t buf_size, size_t *act_size)
    499500{
    500         async_exch_t *exch = devman_exchange_begin_blocking(INTERFACE_DDF_CLIENT);
     501        async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_CLIENT);
    501502
    502503        ipc_call_t answer;
    … …  
    577578int devman_fun_get_child(devman_handle_t funh, devman_handle_t *devh)
    578579{
    579         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     580        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    580581        if (exch == NULL)
    581582                return ENOMEM;
    … …  
    597598int devman_dev_get_parent(devman_handle_t devh, devman_handle_t *funh)
    598599{
    599         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     600        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    600601        if (exch == NULL)
    601602                return ENOMEM;
    … …  
    610611int devman_fun_sid_to_handle(service_id_t sid, devman_handle_t *handle)
    611612{
    612         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     613        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    613614        if (exch == NULL)
    614615                return ENOMEM;
    … …  
    638639        async_exch_t *exch;
    639640
    640         exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     641        exch = devman_exchange_begin(DEVMAN_CLIENT);
    641642        if (exch == NULL)
    642643                return ENOMEM;
    … …  
    693694{
    694695        sysarg_t state;
    695         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     696        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    696697        if (exch == NULL)
    697698                return ENOMEM;
    … …  
    710711int devman_driver_load(devman_handle_t drvh)
    711712{
    712         async_exch_t *exch = devman_exchange_begin(INTERFACE_DDF_CLIENT);
     713        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
    713714        if (exch == NULL)
    714715                return ENOMEM;
Note: See TracChangeset for help on using the changeset viewer.