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

Timestamp:

2011-08-18T18:41:03Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0cc32f2, a92cf94f, cf22ada

Parents:

3190e88 (diff), 763e0cd (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:

• uspace/drv/test/test3/test3.c (modified) (3 diffs)

uspace/drv/test/test3/test3.c

@@ -50 +50 @@
 };
 
-static int register_fun_and_add_to_class(ddf_dev_t *parent,
+static int register_fun_and_add_to_category(ddf_dev_t *parent,
      const char *base_name, size_t index, const char *class_name)
 {
@@ -77 +77 @@
         }
         
-        ddf_fun_add_to_class(fun, class_name);
+        ddf_fun_add_to_category(fun, class_name);
 
         ddf_msg(LVL_NOTE, "Registered exposed function `%s'.", fun_name);
@@ -100 +100 @@
         size_t i;
         for (i = 0; i < 20; i++) {
-                rc = register_fun_and_add_to_class(dev,
+                rc = register_fun_and_add_to_category(dev,
                     "test3_", i, "test3");
                 if (rc != EOK) {