Changeset d5ba17f in mainline for uspace/drv/test/test3/test3.c


Ignore:
Timestamp:
2011-11-18T15:32:24Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
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/test/test3/test3.c

    rb12ca16 rd5ba17f  
    4141#define NUM_FUNCS 20
    4242
    43 static int test3_add_device(ddf_dev_t *dev);
     43static int test3_dev_add(ddf_dev_t *dev);
    4444static int test3_dev_remove(ddf_dev_t *dev);
    4545static int test3_fun_online(ddf_fun_t *fun);
     
    4747
    4848static driver_ops_t driver_ops = {
    49         .add_device = &test3_add_device,
     49        .dev_add = &test3_dev_add,
    5050        .dev_remove = &test3_dev_remove,
    5151        .fun_online = &test3_fun_online,
     
    127127}
    128128
    129 static int test3_add_device(ddf_dev_t *dev)
     129static int test3_dev_add(ddf_dev_t *dev)
    130130{
    131131        int rc = EOK;
    132132        test3_t *test3;
    133133
    134         ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)",
     134        ddf_msg(LVL_DEBUG, "dev_add(name=\"%s\", handle=%d)",
    135135            dev->name, (int) dev->handle);
    136136
Note: See TracChangeset for help on using the changeset viewer.