Changeset 7aaed09 in mainline for uspace/drv/infrastructure/root/root.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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/infrastructure/root/root.c (modified) (3 diffs)

uspace/drv/infrastructure/root/root.c

@@ -66 +66 @@
 #define VIRTUAL_FUN_MATCH_SCORE 100
 
-static int root_add_device(ddf_dev_t *dev);
+static int root_dev_add(ddf_dev_t *dev);
 static int root_fun_online(ddf_fun_t *fun);
 static int root_fun_offline(ddf_fun_t *fun);
@@ -72 +72 @@
 /** The root device driver's standard operations. */
 static driver_ops_t root_ops = {
-        .add_device = &root_add_device,
+        .dev_add = &root_dev_add,
         .fun_online = &root_fun_online,
         .fun_offline = &root_fun_offline
@@ -198 +198 @@
  *                      of HW and pseudo devices).
  */
-static int root_add_device(ddf_dev_t *dev)
-{
-        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun,
+static int root_dev_add(ddf_dev_t *dev)
+{
+        ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
             dev->handle);