Changes in uspace/drv/root/root.c [ebcb05a:eff1f033] in mainline

File:

• uspace/drv/root/root.c (modified) (10 diffs)

uspace/drv/root/root.c

@@ -2 +2 @@
  * Copyright (c) 2010 Lenka Trochtova
  * Copyright (c) 2010 Vojtech Horky
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +44 @@
 #include <stdlib.h>
 #include <str.h>
-#include <str_error.h>
 #include <ctype.h>
 #include <macros.h>
@@ -51 +49 @@
 #include <sysinfo.h>
 
-#include <ddf/driver.h>
-#include <ddf/log.h>
+#include <driver.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -58 +55 @@
 #define NAME "root"
 
-#define PLATFORM_FUN_NAME "hw"
-#define PLATFORM_FUN_MATCH_ID_FMT "platform/%s"
-#define PLATFORM_FUN_MATCH_SCORE 100
+#define PLATFORM_DEVICE_NAME "hw"
+#define PLATFORM_DEVICE_MATCH_ID_FMT "platform/%s"
+#define PLATFORM_DEVICE_MATCH_SCORE 100
 
-#define VIRTUAL_FUN_NAME "virt"
-#define VIRTUAL_FUN_MATCH_ID "rootvirt"
-#define VIRTUAL_FUN_MATCH_SCORE 100
+#define VIRTUAL_DEVICE_NAME "virt"
+#define VIRTUAL_DEVICE_MATCH_ID "rootvirt"
+#define VIRTUAL_DEVICE_MATCH_SCORE 100
 
-static int root_add_device(ddf_dev_t *dev);
+static int root_add_device(device_t *dev);
 
 /** The root device driver's standard operations. */
@@ -79 +76 @@
 };
 
-/** Create the function which represents the root of virtual device tree.
+/** Create the device which represents the root of virtual device tree.
  *
- * @param dev   Device
- * @return      EOK on success or negative error code
+ * @param parent Parent of the newly created device.
+ * @return Error code.
  */
-static int add_virtual_root_fun(ddf_dev_t *dev)
+static int add_virtual_root_child(device_t *parent)
 {
-        const char *name = VIRTUAL_FUN_NAME;
-        ddf_fun_t *fun;
-        int rc;
+        printf(NAME ": adding new child for virtual devices.\n");
+        printf(NAME ":   device node is `%s' (%d %s)\n", VIRTUAL_DEVICE_NAME,
+            VIRTUAL_DEVICE_MATCH_SCORE, VIRTUAL_DEVICE_MATCH_ID);
 
-        ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. "
-            "Function node is `%s' (%d %s)", name,
-            VIRTUAL_FUN_MATCH_SCORE, VIRTUAL_FUN_MATCH_ID);
+        int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
+            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
 
-        fun = ddf_fun_create(dev, fun_inner, name);
-        if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating function %s", name);
-                return ENOMEM;
-        }
-
-        rc = ddf_fun_add_match_id(fun, VIRTUAL_FUN_MATCH_ID,
-            VIRTUAL_FUN_MATCH_SCORE);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
-                    name);
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-
-        rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name,
-                    str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-
-        return EOK;
+        return res;
 }
 
-/** Create the function which represents the root of HW device tree.
+/** Create the device which represents the root of HW device tree.
  *
- * @param dev   Device
- * @return      EOK on success or negative error code
+ * @param parent        Parent of the newly created device.
+ * @return 0 on success, negative error number otherwise.
  */
-static int add_platform_fun(ddf_dev_t *dev)
+static int add_platform_child(device_t *parent)
 {
         char *match_id;
         char *platform;
         size_t platform_size;
-
-        const char *name = PLATFORM_FUN_NAME;
-        ddf_fun_t *fun;
-        int rc;
+        int res;
 
         /* Get platform name from sysinfo. */
+
         platform = sysinfo_get_data("platform", &platform_size);
         if (platform == NULL) {
-                ddf_msg(LVL_ERROR, "Failed to obtain platform name.");
+                printf(NAME ": Failed to obtain platform name.\n");
                 return ENOENT;
         }
@@ -145 +116 @@
         platform = realloc(platform, platform_size + 1);
         if (platform == NULL) {
-                ddf_msg(LVL_ERROR, "Memory allocation failed.");
+                printf(NAME ": Memory allocation failed.\n");
                 return ENOMEM;
         }
@@ -152 +123 @@
 
         /* Construct match ID. */
-        if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
-                ddf_msg(LVL_ERROR, "Memory allocation failed.");
+
+        if (asprintf(&match_id, PLATFORM_DEVICE_MATCH_ID_FMT, platform) == -1) {
+                printf(NAME ": Memory allocation failed.\n");
                 return ENOMEM;
         }
 
-        /* Add function. */
-        ddf_msg(LVL_DEBUG, "Adding platform function. Function node is `%s' "
-            " (%d %s)", PLATFORM_FUN_NAME, PLATFORM_FUN_MATCH_SCORE,
-            match_id);
+        /* Add child. */
 
-        fun = ddf_fun_create(dev, fun_inner, name);
-        if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Error creating function %s", name);
-                return ENOMEM;
-        }
+        printf(NAME ": adding new child for platform device.\n");
+        printf(NAME ":   device node is `%s' (%d %s)\n", PLATFORM_DEVICE_NAME,
+            PLATFORM_DEVICE_MATCH_SCORE, match_id);
 
-        rc = ddf_fun_add_match_id(fun, match_id, PLATFORM_FUN_MATCH_SCORE);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
-                    name);
-                ddf_fun_destroy(fun);
-                return rc;
-        }
+        res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
+            match_id, PLATFORM_DEVICE_MATCH_SCORE);
 
-        rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s: %s", name,
-                    str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-
-        return EOK;
+        return res;
 }
 
@@ -192 +146 @@
  *                      of HW and pseudo devices).
  */
-static int root_add_device(ddf_dev_t *dev)
+static int root_add_device(device_t *dev)
 {
-        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun,
+        printf(NAME ": root_add_device, device handle=%" PRIun "\n",
             dev->handle);
-
+        
         /*
          * Register virtual devices root.
@@ -202 +156 @@
          * vital for the system.
          */
-        add_virtual_root_fun(dev);
+        add_virtual_root_child(dev);
 
         /* Register root device's children. */
-        int res = add_platform_fun(dev);
+        int res = add_platform_child(dev);
         if (EOK != res)
-                ddf_msg(LVL_ERROR, "Failed adding child device for platform.");
-
+                printf(NAME ": failed to add child device for platform.\n");
+        
         return res;
 }
@@ -215 +169 @@
 {
         printf(NAME ": HelenOS root device driver\n");
-
-        ddf_log_init(NAME, LVL_ERROR);
-        return ddf_driver_main(&root_driver);
+        return driver_main(&root_driver);
 }