Changeset 703d19c in mainline

Timestamp:

2010-11-30T14:21:47Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2edcb63

Parents:

5bee897

Message:

A bit of refactoring

Location:

uspace

Files:

• drv/test1/test1.c (modified) (2 diffs)
• srv/devman/devman.c (modified) (2 diffs)

uspace/drv/test1/test1.c

@@ -49 +49 @@
 };
 
+/** Register child and inform user about it.
+ *
+ * @param parent Parent device.
+ * @param message Message for the user.
+ * @param name Device name.
+ * @param match_id Device match id.
+ * @param score Device match score.
+ */
+static void register_child_verbose(device_t *parent, const char *message,
+    const char *name, const char *match_id, int match_score)
+{
+        printf(NAME ": registering child device `%s': %s.\n",
+           name, message);
+
+        int rc = child_device_register_wrapper(parent, name,
+            match_id, match_score);
+
+        if (rc != EOK) {
+                printf(NAME ": failed to register child `%s' (%s).\n",
+                    name, str_error(rc));
+        }
+}
+
 /** Callback when new device is passed to this driver.
  * This function is the body of the test: it shall register new child
@@ -68 +91 @@
 static int add_device(device_t *dev)
 {
-        int rc;
         printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
             dev->name, (int) dev->handle);
 
+        add_device_to_class(dev, "virtual");
+
         if (dev->parent == NULL) {
-                printf(NAME ": cloning myself ;-).\n");
-                rc = child_device_register_wrapper(dev, "clone",
+                register_child_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);
-                if (rc != EOK) {
-                        printf(NAME ": failed to register clone (%s).\n",
-                            str_error(rc));
-                }
         } else if (str_cmp(dev->name, "clone") == 0) {
-                printf(NAME ": registering child device run by the same task.\n");
-                rc = child_device_register_wrapper(dev, "child",
+                register_child_verbose(dev, "run by the same task", "child",
                     "virtual&test1&child", 10);
-                if (rc != EOK) {
-                        printf(NAME ": failed to register child (%s).\n",
-                            str_error(rc));
-                }
         }
 

uspace/srv/devman/devman.c

@@ -516 +516 @@
         int phone;
 
-        printf(NAME ": pass_devices_to_driver\n");
+        printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
 
         fibril_mutex_lock(&driver->driver_mutex);
@@ -586 +586 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-        printf(NAME ": initialize_running_driver\n");
+        printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
         
         /*