Changeset 80a96d2 in mainline for uspace/drv/test/test2/test2.c

Timestamp:

2011-09-05T21:26:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b33870b

Parents:

16cc9a6

Message:

DDF support for surprise removal.

File:

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

uspace/drv/test/test2/test2.c

@@ -42 +42 @@
 static int test2_add_device(ddf_dev_t *dev);
 static int test2_dev_remove(ddf_dev_t *dev);
+static int test2_dev_gone(ddf_dev_t *dev);
 static int test2_fun_online(ddf_fun_t *fun);
 static int test2_fun_offline(ddf_fun_t *fun);
@@ -48 +49 @@
         .add_device = &test2_add_device,
         .dev_remove = &test2_dev_remove,
+        .dev_gone = &test2_dev_gone,
         .fun_online = &test2_fun_online,
         .fun_offline = &test2_fun_offline
@@ -111 +113 @@
 }
 
-/** Add child devices after some sleep.
+/** Simulate plugging and surprise unplugging.
  *
  * @param arg Parent device structure (ddf_dev_t *).
  * @return Always EOK.
  */
-static int postponed_birth(void *arg)
+static int plug_unplug(void *arg)
 {
         test2_t *test2 = (test2_t *) arg;
@@ -144 +146 @@
         test2->fun_a = fun_a;
 
+        async_usleep(10000000);
+
+        ddf_msg(LVL_NOTE, "Unbinding function test1.");
+        ddf_fun_unbind(test2->test1);
+        async_usleep(1000000);
+        ddf_msg(LVL_NOTE, "Unbinding function child.");
+        ddf_fun_unbind(test2->child);
+
         return EOK;
 }
@@ -158 +168 @@
         }
 
+        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) {
@@ -184 +209 @@
 
         if (str_cmp(dev->name, "child") != 0) {
-                fid_t postpone = fibril_create(postponed_birth, test2);
+                fid_t postpone = fibril_create(plug_unplug, test2);
                 if (postpone == 0) {
                         ddf_msg(LVL_ERROR, "fibril_create() failed.");
@@ -232 +257 @@
 }
 
+static int test2_dev_gone(ddf_dev_t *dev)
+{
+        test2_t *test2 = (test2_t *)dev->driver_data;
+        int rc;
+
+        ddf_msg(LVL_DEBUG, "test2_dev_gone(%p)", dev);
+
+        if (test2->fun_a != NULL) {
+                rc = fun_unbind(test2->fun_a, "a");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (test2->fun_err != NULL) {
+                rc = fun_unbind(test2->fun_err, "ERROR");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (test2->child != NULL) {
+                rc = fun_unbind(test2->child, "child");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        if (test2->test1 != NULL) {
+                rc = fun_unbind(test2->test1, "test1");
+                if (rc != EOK)
+                        return rc;
+        }
+
+        return EOK;
+}
+
 
 static int test2_fun_online(ddf_fun_t *fun)
@@ -248 +307 @@
 {
         printf(NAME ": HelenOS test2 virtual device driver\n");
-        ddf_log_init(NAME, LVL_ERROR);
+        ddf_log_init(NAME, LVL_NOTE);
         return ddf_driver_main(&test2_driver);
 }