Changeset 8436590 in mainline for uspace/drv/test2/test2.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/test2/test2.c (modified) (8 diffs)

uspace/drv/test2/test2.c

@@ -65 +65 @@
         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);
+                ddf_msg(LVL_ERROR, "Failed creating function %s", name);
                 return ENOMEM;
         }
@@ -75 +75 @@
         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\n",
+                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
                     name);
                 ddf_fun_destroy(fun);
@@ -83 +83 @@
         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);
@@ -89 +89 @@
         }
 
-        ddf_msg(LVL_NOTE, "Registered child device `%s'\n", name);
+        ddf_msg(LVL_NOTE, "Registered child device `%s'", name);
         return EOK;
 }
@@ -113 +113 @@
         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;
         }
@@ -119 +119 @@
         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;
         }
@@ -130 +130 @@
 static int test2_add_device(ddf_dev_t *dev)
 {
-        ddf_msg(LVL_DEBUG, "test2_add_device(name=\"%s\", handle=%d)\n",
+        ddf_msg(LVL_DEBUG, "test2_add_device(name=\"%s\", handle=%d)",
             dev->name, (int) dev->handle);
 
@@ -136 +136 @@
                 fid_t postpone = fibril_create(postponed_birth, dev);
                 if (postpone == 0) {
-                        ddf_msg(LVL_ERROR, "fibril_create() failed.\n");
+                        ddf_msg(LVL_ERROR, "fibril_create() failed.");
                         return ENOMEM;
                 }