Changeset 8436590 in mainline for uspace/drv/test1/test1.c

Timestamp:

2011-04-07T21:38:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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/test1/test1.c (modified) (4 diffs)

uspace/drv/test1/test1.c

@@ -59 +59 @@
  */
 static int register_fun_verbose(ddf_dev_t *parent, const char *message,
-    const char *name, const char *match_id, int match_score)
+    const char *name, const char *match_id, int match_score,
+    int expected_rc)
 {
-        ddf_fun_t *fun;
+        ddf_fun_t *fun = NULL;
         int rc;
 
-        ddf_msg(LVL_DEBUG, "Registering function `%s': %s.\n", name, message);
+        ddf_msg(LVL_DEBUG, "Registering function `%s': %s.", name, message);
 
         fun = ddf_fun_create(parent, fun_inner, name);
         if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating function %s\n", name);
-                return ENOMEM;
+                ddf_msg(LVL_ERROR, "Failed creating function %s", name);
+                rc = ENOMEM;
+                goto leave;
         }
 
-        rc = ddf_fun_add_match_id(fun, match_id, match_score);
+        rc = ddf_fun_add_match_id(fun, str_dup(match_id), match_score);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s\n",
+                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
                     name);
-                ddf_fun_destroy(fun);
-                return rc;
+                goto leave;
         }
 
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s\n", name,
+                ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name,
                     str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
+                goto leave;
         }
 
-        ddf_msg(LVL_NOTE, "Registered child device `%s'\n", name);
-        return EOK;
+        ddf_msg(LVL_NOTE, "Registered child device `%s'", name);
+        rc = EOK;
+
+leave:
+        if (rc != expected_rc) {
+                fprintf(stderr,
+                    NAME ": Unexpected error registering function `%s'.\n" 
+                    NAME ":     Expected \"%s\" but got \"%s\".\n",
+                    name, str_error(expected_rc), str_error(rc));
+        }
+
+        if ((rc != EOK) && (fun != NULL)) {
+                ddf_fun_destroy(fun);
+        }
+
+        return rc;
 }
 
@@ -114 +128 @@
         int rc;
 
-        ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)\n",
+        ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)",
             dev->name, (int) dev->handle);
 
         fun_a = ddf_fun_create(dev, fun_exposed, "a");
         if (fun_a == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating function 'a'.\n");
+                ddf_msg(LVL_ERROR, "Failed creating function 'a'.");
                 return ENOMEM;
         }
@@ -125 +139 @@
         rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function 'a'.\n");
+                ddf_msg(LVL_ERROR, "Failed binding function 'a'.");
                 return rc;
         }
@@ -135 +149 @@
                 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);
+                (void) register_fun_verbose(dev,
+                    "cloning myself ;-)", "clone",
+                    "virtual&test1", 10, EOK);
+                (void) register_fun_verbose(dev,
+                    "cloning myself twice ;-)", "clone",
+                    "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);
+                (void) register_fun_verbose(dev,
+                    "run by the same task", "child",
+                    "virtual&test1&child", 10, EOK);
         }
 
-        ddf_msg(LVL_DEBUG, "Device `%s' accepted.\n", dev->name);
+        ddf_msg(LVL_DEBUG, "Device `%s' accepted.", dev->name);
 
         return EOK;