Changeset ea28272 in mainline for uspace/lib/drv/generic/driver.c


Ignore:
Timestamp:
2010-12-30T13:43:27Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/drv/generic/driver.c

    rd70d80ed rea28272  
    8181static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
    8282{
    83         int id = (int)IPC_GET_METHOD(*icall);
     83        int id = (int)IPC_GET_IMETHOD(*icall);
    8484        interrupt_context_t *ctx;
    8585       
     
    165165       
    166166        devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
     167        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
     168   
    167169        device_t *dev = create_device();
    168170        dev->handle = dev_handle;
     
    172174       
    173175        add_to_devices_list(dev);
     176        dev->parent = driver_get_device(&devices, parent_dev_handle);
     177       
    174178        res = driver->driver_ops->add_device(dev);
    175179        if (0 == res) {
     
    196200                ipc_callid_t callid = async_get_call(&call);
    197201
    198                 switch (IPC_GET_METHOD(call)) {
     202                switch (IPC_GET_IMETHOD(call)) {
    199203                case IPC_M_PHONE_HUNGUP:
    200204                        cont = false;
     
    250254                ipc_call_t call;
    251255                callid = async_get_call(&call);
    252                 ipcarg_t method = IPC_GET_METHOD(call);
     256                sysarg_t method = IPC_GET_IMETHOD(call);
    253257                int iface_idx;
    254258               
     
    304308
    305309                        /* get the method of the remote interface */
    306                         ipcarg_t iface_method_idx = IPC_GET_ARG1(call);
     310                        sysarg_t iface_method_idx = IPC_GET_ARG1(call);
    307311                        remote_iface_func_ptr_t iface_method_ptr =
    308312                            get_remote_method(rem_iface, iface_method_idx);
     
    342346{
    343347        /* Select interface */
    344         switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
     348        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
    345349        case DRIVER_DEVMAN:
    346350                /* handle PnP events from device manager */
     
    377381}
    378382
     383/** Wrapper for child_device_register for devices with single match id.
     384 *
     385 * @param parent Parent device.
     386 * @param child_name Child device name.
     387 * @param child_match_id Child device match id.
     388 * @param child_match_score Child device match score.
     389 * @return Error code.
     390 */
     391int child_device_register_wrapper(device_t *parent, const char *child_name,
     392    const char *child_match_id, int child_match_score)
     393{
     394        device_t *child = NULL;
     395        match_id_t *match_id = NULL;
     396        int rc;
     397
     398        child = create_device();
     399        if (child == NULL) {
     400                rc = ENOMEM;
     401                goto failure;
     402        }
     403
     404        child->name = child_name;
     405
     406        match_id = create_match_id();
     407        if (match_id == NULL) {
     408                rc = ENOMEM;
     409                goto failure;
     410        }
     411
     412        match_id->id = child_match_id;
     413        match_id->score = child_match_score;
     414        add_match_id(&child->match_ids, match_id);
     415
     416        rc = child_device_register(child, parent);
     417        if (EOK != rc)
     418                goto failure;
     419
     420        return EOK;
     421
     422failure:
     423        if (match_id != NULL) {
     424                match_id->id = NULL;
     425                delete_match_id(match_id);
     426        }
     427
     428        if (child != NULL) {
     429                child->name = NULL;
     430                delete_device(child);
     431        }
     432
     433        return rc;
     434}
     435
    379436int driver_main(driver_t *drv)
    380437{
Note: See TracChangeset for help on using the changeset viewer.