Changes in uspace/drv/test/test1/test1.c [80a96d2:ef9460b] in mainline

File:

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

uspace/drv/test/test1/test1.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +40 @@
 
 static int test1_add_device(ddf_dev_t *dev);
-static int test1_dev_remove(ddf_dev_t *dev);
-static int test1_dev_gone(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,
-        .dev_remove = &test1_dev_remove,
-        .dev_gone = &test1_dev_gone,
-        .fun_online = &test1_fun_online,
-        .fun_offline = &test1_fun_offline
+        .add_device = &test1_add_device
 };
 
@@ -58 +49 @@
         .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.
@@ -75 +60 @@
 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, ddf_fun_t **pfun)
+    int expected_rc)
 {
         ddf_fun_t *fun = NULL;
@@ -118 +103 @@
         }
 
-        if (pfun != NULL)
-                *pfun = fun;
-
         return rc;
 }
@@ -144 +126 @@
 {
         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");
@@ -162 +137 @@
         }
 
-        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_category(fun_a, "virtual");
+        ddf_fun_add_to_class(fun_a, "virtual");
 
         if (str_cmp(dev->name, "null") == 0) {
                 fun_a->ops = &char_device_ops;
-                ddf_fun_add_to_category(fun_a, "virt-null");
+                ddf_fun_add_to_class(fun_a, "virt-null");
         } else if (str_cmp(dev->name, "test1") == 0) {
                 (void) register_fun_verbose(dev,
                     "cloning myself ;-)", "clone",
-                    "virtual&test1", 10, EOK, &test1->clone);
+                    "virtual&test1", 10, EOK);
                 (void) register_fun_verbose(dev,
                     "cloning myself twice ;-)", "clone",
-                    "virtual&test1", 10, EEXISTS, NULL);
+                    "virtual&test1", 10, EEXISTS);
         } else if (str_cmp(dev->name, "clone") == 0) {
                 (void) register_fun_verbose(dev,
                     "run by the same task", "child",
-                    "virtual&test1&child", 10, EOK, &test1->child);
+                    "virtual&test1&child", 10, EOK);
         }
 
@@ -192 +164 @@
 
         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 fun_unbind(ddf_fun_t *fun, const char *name)
-{
-        int rc;
-
-        ddf_msg(LVL_DEBUG, "fun_unbind(%p, '%s')", fun, name);
-        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_dev_gone(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_unbind(test1->fun_a, "a");
-                if (rc != EOK)
-                        return rc;
-        }
-
-        if (test1->clone != NULL) {
-                rc = fun_unbind(test1->clone, "clone");
-                if (rc != EOK)
-                        return rc;
-        }
-
-        if (test1->child != NULL) {
-                rc = fun_unbind(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);
 }