Changeset 6843a9c in mainline for uspace/drv/test/test1/test1.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/drv/test/test1/test1.c (modified) (4 diffs)

uspace/drv/test/test1/test1.c

@@ -40 +40 @@
 #include "test1.h"
 
-static int test1_add_device(ddf_dev_t *dev);
+static int test1_dev_add(ddf_dev_t *dev);
 static int test1_dev_remove(ddf_dev_t *dev);
 static int test1_dev_gone(ddf_dev_t *dev);
@@ -47 +47 @@
 
 static driver_ops_t driver_ops = {
-        .add_device = &test1_add_device,
+        .dev_add = &test1_dev_add,
         .dev_remove = &test1_dev_remove,
         .dev_gone = &test1_dev_gone,
@@ -141 +141 @@
  * @return Error code reporting success of the operation.
  */
-static int test1_add_device(ddf_dev_t *dev)
+static int test1_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun_a;
@@ -147 +147 @@
         int rc;
 
-        ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)",
+        ddf_msg(LVL_DEBUG, "dev_add(name=\"%s\", handle=%d)",
             dev->name, (int) dev->handle);