Ignore:
Timestamp:
2011-11-18T15:32:24Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
528e5b3
Parents:
b12ca16 (diff), 0c0f823b (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/infrastructure/rootvirt/rootvirt.c

    rb12ca16 rd5ba17f  
    6262};
    6363
    64 static int rootvirt_add_device(ddf_dev_t *dev);
     64static int rootvirt_dev_add(ddf_dev_t *dev);
    6565static int rootvirt_dev_remove(ddf_dev_t *dev);
    6666static int rootvirt_fun_online(ddf_fun_t *fun);
     
    6868
    6969static driver_ops_t rootvirt_ops = {
    70         .add_device = &rootvirt_add_device,
     70        .dev_add = &rootvirt_dev_add,
    7171        .dev_remove = &rootvirt_dev_remove,
    7272        .fun_online = &rootvirt_fun_online,
     
    172172
    173173
    174 static int rootvirt_add_device(ddf_dev_t *dev)
     174static int rootvirt_dev_add(ddf_dev_t *dev)
    175175{
    176176        rootvirt_t *rootvirt;
     
    183183        }
    184184
    185         ddf_msg(LVL_DEBUG, "add_device(handle=%d)", (int)dev->handle);
     185        ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)dev->handle);
    186186
    187187        rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
Note: See TracChangeset for help on using the changeset viewer.