Changeset 8ff0bd2 in mainline for uspace/drv/infrastructure/root/root.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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 (moved) (moved from uspace/drv/root/root.c ) (3 diffs)

uspace/drv/infrastructure/root/root.c

@@ -67 +67 @@
 
 static int root_add_device(ddf_dev_t *dev);
+static int root_fun_online(ddf_fun_t *fun);
+static int root_fun_offline(ddf_fun_t *fun);
 
 /** The root device driver's standard operations. */
 static driver_ops_t root_ops = {
-        .add_device = &root_add_device
+        .add_device = &root_add_device,
+        .fun_online = &root_fun_online,
+        .fun_offline = &root_fun_offline
 };
 
@@ -175 +179 @@
                 return rc;
         }
+
+        free(match_id);
 
         rc = ddf_fun_bind(fun);
@@ -212 +218 @@
 }
 
+static int root_fun_online(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "root_fun_online()");
+        return ddf_fun_online(fun);
+}
+
+static int root_fun_offline(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "root_fun_offline()");
+        return ddf_fun_offline(fun);
+}
+
 int main(int argc, char *argv[])
 {