Changeset 8ff0bd2 in mainline for uspace/drv/test/test1/test1.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/test/test1/test1.c (moved) (moved from uspace/drv/test1/test1.c ) (9 diffs)

uspace/drv/test/test1/test1.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +41 @@
 
 static int test1_add_device(ddf_dev_t *dev);
+static int test1_dev_remove(ddf_dev_t *dev);
+static int test1_fun_online(ddf_fun_t *fun);
+static int test1_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
-        .add_device = &test1_add_device
+        .add_device = &test1_add_device,
+        .dev_remove = &test1_dev_remove,
+        .fun_online = &test1_fun_online,
+        .fun_offline = &test1_fun_offline
 };
 
@@ -49 +56 @@
         .driver_ops = &driver_ops
 };
+
+typedef struct {
+        ddf_fun_t *fun_a;
+        ddf_fun_t *clone;
+        ddf_fun_t *child;
+} test1_t;
 
 /** Register child and inform user about it.
@@ -60 +73 @@
 static int register_fun_verbose(ddf_dev_t *parent, const char *message,
     const char *name, const char *match_id, int match_score,
-    int expected_rc)
+    int expected_rc, ddf_fun_t **pfun)
 {
         ddf_fun_t *fun = NULL;
@@ -74 +87 @@
         }
 
-        rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score);
+        rc = ddf_fun_add_match_id(fun, match_id, match_score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
@@ -103 +116 @@
         }
 
+        if (pfun != NULL)
+                *pfun = fun;
+
         return rc;
 }
@@ -126 +142 @@
 {
         ddf_fun_t *fun_a;
+        test1_t *test1;
         int rc;
 
         ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)",
             dev->name, (int) dev->handle);
+
+        test1 = ddf_dev_data_alloc(dev, sizeof(test1_t));
+        if (test1 == NULL) {
+                ddf_msg(LVL_ERROR, "Failed allocating soft state.\n");
+                return ENOMEM;
+        }
 
         fun_a = ddf_fun_create(dev, fun_exposed, "a");
@@ -137 +160 @@
         }
 
+        test1->fun_a = fun_a;
+
         rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding function 'a'.");
+                ddf_fun_destroy(fun_a);
                 return rc;
         }
 
-        ddf_fun_add_to_class(fun_a, "virtual");
+        ddf_fun_add_to_category(fun_a, "virtual");
 
         if (str_cmp(dev->name, "null") == 0) {
                 fun_a->ops = &char_device_ops;
-                ddf_fun_add_to_class(fun_a, "virt-null");
+                ddf_fun_add_to_category(fun_a, "virt-null");
         } else if (str_cmp(dev->name, "test1") == 0) {
                 (void) register_fun_verbose(dev,
                     "cloning myself ;-)", "clone",
-                    "virtual&test1", 10, EOK);
+                    "virtual&test1", 10, EOK, &test1->clone);
                 (void) register_fun_verbose(dev,
                     "cloning myself twice ;-)", "clone",
-                    "virtual&test1", 10, EEXISTS);
+                    "virtual&test1", 10, EEXISTS, NULL);
         } else if (str_cmp(dev->name, "clone") == 0) {
                 (void) register_fun_verbose(dev,
                     "run by the same task", "child",
-                    "virtual&test1&child", 10, EOK);
+                    "virtual&test1&child", 10, EOK, &test1->child);
         }
 
@@ -164 +190 @@
 
         return EOK;
+}
+
+static int fun_remove(ddf_fun_t *fun, const char *name)
+{
+        int rc;
+
+        ddf_msg(LVL_DEBUG, "fun_remove(%p, '%s')", fun, name);
+        rc = ddf_fun_offline(fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error offlining function '%s'.", name);
+                return rc;
+        }
+
+        rc = ddf_fun_unbind(fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed unbinding function '%s'.", name);
+                return rc;
+        }
+
+        ddf_fun_destroy(fun);
+        return EOK;
+}
+
+static int test1_dev_remove(ddf_dev_t *dev)
+{
+        test1_t *test1 = (test1_t *)dev->driver_data;
+        int rc;
+
+        ddf_msg(LVL_DEBUG, "test1_dev_remove(%p)", dev);
+
+        if (test1->fun_a != NULL) {
+                rc = fun_remove(test1->fun_a, "a");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (test1->clone != NULL) {
+                rc = fun_remove(test1->clone, "clone");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (test1->child != NULL) {
+                rc = fun_remove(test1->child, "child");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        return EOK;
+}
+
+static int test1_fun_online(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "test1_fun_online()");
+        return ddf_fun_online(fun);
+}
+
+static int test1_fun_offline(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "test1_fun_offline()");
+        return ddf_fun_offline(fun);
 }