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


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/test/test2/test2.c

    rb12ca16 rd5ba17f  
    4040#define NAME "test2"
    4141
    42 static int test2_add_device(ddf_dev_t *dev);
     42static int test2_dev_add(ddf_dev_t *dev);
    4343static int test2_dev_remove(ddf_dev_t *dev);
    4444static int test2_dev_gone(ddf_dev_t *dev);
     
    4747
    4848static driver_ops_t driver_ops = {
    49         .add_device = &test2_add_device,
     49        .dev_add = &test2_dev_add,
    5050        .dev_remove = &test2_dev_remove,
    5151        .dev_gone = &test2_dev_gone,
     
    193193}
    194194
    195 static int test2_add_device(ddf_dev_t *dev)
     195static int test2_dev_add(ddf_dev_t *dev)
    196196{
    197197        test2_t *test2;
    198198
    199         ddf_msg(LVL_DEBUG, "test2_add_device(name=\"%s\", handle=%d)",
     199        ddf_msg(LVL_DEBUG, "test2_dev_add(name=\"%s\", handle=%d)",
    200200            dev->name, (int) dev->handle);
    201201
Note: See TracChangeset for help on using the changeset viewer.