Changeset eb522e8 in mainline for uspace/drv/root/root.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

uspace/drv/root/root.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +45 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <ctype.h>
 #include <macros.h>
-
-#include <driver.h>
+#include <inttypes.h>
+#include <sysinfo.h>
+
+#include <ddf/driver.h>
+#include <ddf/log.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -52 +58 @@
 #define NAME "root"
 
-static int root_add_device(device_t *dev);
+#define PLATFORM_FUN_NAME "hw"
+#define PLATFORM_FUN_MATCH_ID_FMT "platform/%s"
+#define PLATFORM_FUN_MATCH_SCORE 100
+
+#define VIRTUAL_FUN_NAME "virt"
+#define VIRTUAL_FUN_MATCH_ID "rootvirt"
+#define VIRTUAL_FUN_MATCH_SCORE 100
+
+static int root_add_device(ddf_dev_t *dev);
 
 /** The root device driver's standard operations. */
@@ -65 +79 @@
 };
 
-/** Create the device which represents the root of HW device tree.
- *
- * @param parent        Parent of the newly created device.
- * @return 0 on success, negative error number otherwise.
- */
-static int add_platform_child(device_t *parent)
-{
-        printf(NAME ": adding new child for platform device.\n");
-        
-        int res = EOK;
-        device_t *platform = NULL;
-        match_id_t *match_id = NULL;
-        
-        /* Create new device. */
-        platform = create_device();
-        if (NULL == platform) {
-                res = ENOMEM;
-                goto failure;
-        }       
-        
-        platform->name = "hw";
-        printf(NAME ": the new device's name is %s.\n", platform->name);
-        
-        /* Initialize match id list. */
-        match_id = create_match_id();
-        if (NULL == match_id) {
-                res = ENOMEM;
-                goto failure;
-        }
-        
-        /* TODO - replace this with some better solution (sysinfo ?) */
-        match_id->id = STRING(UARCH);
-        match_id->score = 100;
-        add_match_id(&platform->match_ids, match_id);
-        
-        /* Register child device. */
-        res = child_device_register(platform, parent);
-        if (EOK != res)
-                goto failure;
-        
-        return res;
-        
-failure:
-        if (NULL != match_id)
-                match_id->id = NULL;
-        
-        if (NULL != platform) {
-                platform->name = NULL;
-                delete_device(platform);
-        }
-        
-        return res;
+/** Create the function which represents the root of virtual device tree.
+ *
+ * @param dev   Device
+ * @return      EOK on success or negative error code
+ */
+static int add_virtual_root_fun(ddf_dev_t *dev)
+{
+        const char *name = VIRTUAL_FUN_NAME;
+        ddf_fun_t *fun;
+        int rc;
+
+        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);
+
+        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;
+}
+
+/** Create the function which represents the root of HW device tree.
+ *
+ * @param dev   Device
+ * @return      EOK on success or negative error code
+ */
+static int add_platform_fun(ddf_dev_t *dev)
+{
+        char *match_id;
+        char *platform;
+        size_t platform_size;
+
+        const char *name = PLATFORM_FUN_NAME;
+        ddf_fun_t *fun;
+        int rc;
+
+        /* Get platform name from sysinfo. */
+        platform = sysinfo_get_data("platform", &platform_size);
+        if (platform == NULL) {
+                ddf_msg(LVL_ERROR, "Failed to obtain platform name.");
+                return ENOENT;
+        }
+
+        /* Null-terminate string. */
+        platform = realloc(platform, platform_size + 1);
+        if (platform == NULL) {
+                ddf_msg(LVL_ERROR, "Memory allocation failed.");
+                return ENOMEM;
+        }
+
+        platform[platform_size] = '\0';
+
+        /* Construct match ID. */
+        if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
+                ddf_msg(LVL_ERROR, "Memory allocation failed.");
+                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);
+
+        fun = ddf_fun_create(dev, fun_inner, name);
+        if (fun == NULL) {
+                ddf_msg(LVL_ERROR, "Error creating function %s", name);
+                return ENOMEM;
+        }
+
+        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;
+        }
+
+        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;
 }
 
@@ -124 +192 @@
  *                      of HW and pseudo devices).
  */
-static int root_add_device(device_t *dev)
-{
-        printf(NAME ": root_add_device, device handle = %d\n", dev->handle);
-        
+static int root_add_device(ddf_dev_t *dev)
+{
+        ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun,
+            dev->handle);
+
+        /*
+         * Register virtual devices root.
+         * We ignore error occurrence because virtual devices shall not be
+         * vital for the system.
+         */
+        add_virtual_root_fun(dev);
+
         /* Register root device's children. */
-        int res = add_platform_child(dev);
+        int res = add_platform_fun(dev);
         if (EOK != res)
-                printf(NAME ": failed to add child device for platform.\n");
-        
+                ddf_msg(LVL_ERROR, "Failed adding child device for platform.");
+
         return res;
 }
@@ -139 +215 @@
 {
         printf(NAME ": HelenOS root device driver\n");
-        return driver_main(&root_driver);
+
+        ddf_log_init(NAME, LVL_ERROR);
+        return ddf_driver_main(&root_driver);
 }