Changeset 76b5a95c in mainline for uspace/drv/root/root.c

Timestamp:

2011-03-23T20:53:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

71af5a4

Parents:

5716e9a (diff), ab10b842 (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/root/root.c (modified) (9 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.
  *
@@ -44 +45 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <ctype.h>
 #include <macros.h>
@@ -49 +51 @@
 #include <sysinfo.h>
 
-#include <driver.h>
+#include <ddf/driver.h>
 #include <devman.h>
 #include <ipc/devman.h>
@@ -55 +57 @@
 #define NAME "root"
 
-#define PLATFORM_DEVICE_NAME "hw"
-#define PLATFORM_DEVICE_MATCH_ID_FMT "platform/%s"
-#define PLATFORM_DEVICE_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(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. */
@@ -76 +78 @@
 };
 
-/** Create the device which represents the root of virtual device tree.
- *
- * @param parent Parent of the newly created device.
- * @return Error code.
- */
-static int add_virtual_root_child(device_t *parent)
-{
-        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);
-
-        int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
-            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
-
-        return res;
-}
-
-/** 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)
+/** 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;
+
+        printf(NAME ": adding new function for virtual devices.\n");
+        printf(NAME ":   function node is `%s' (%d %s)\n", name,
+            VIRTUAL_FUN_MATCH_SCORE, VIRTUAL_FUN_MATCH_ID);
+
+        fun = ddf_fun_create(dev, fun_inner, name);
+        if (fun == NULL) {
+                printf(NAME ": error creating function %s\n", name);
+                return ENOMEM;
+        }
+
+        rc = ddf_fun_add_match_id(fun, VIRTUAL_FUN_MATCH_ID,
+            VIRTUAL_FUN_MATCH_SCORE);
+        if (rc != EOK) {
+                printf(NAME ": error adding match IDs to function %s\n", name);
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+
+        rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                printf(NAME ": error binding function %s: %s\n", 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;
-        int res;
+
+        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) {
@@ -123 +150 @@
 
         /* Construct match ID. */
-
-        if (asprintf(&match_id, PLATFORM_DEVICE_MATCH_ID_FMT, platform) == -1) {
+        if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
                 printf(NAME ": Memory allocation failed.\n");
                 return ENOMEM;
         }
 
-        /* Add child. */
-
-        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);
-
-        res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
-            match_id, PLATFORM_DEVICE_MATCH_SCORE);
-
-        return res;
+        /* Add function. */
+        printf(NAME ": adding platform function\n");
+        printf(NAME ":   function node is `%s' (%d %s)\n", PLATFORM_FUN_NAME,
+            PLATFORM_FUN_MATCH_SCORE, match_id);
+
+        fun = ddf_fun_create(dev, fun_inner, name);
+        if (fun == NULL) {
+                printf(NAME ": error creating function %s\n", name);
+                return ENOMEM;
+        }
+
+        rc = ddf_fun_add_match_id(fun, match_id, PLATFORM_FUN_MATCH_SCORE);
+        if (rc != EOK) {
+                printf(NAME ": error adding match IDs to function %s\n", name);
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+
+        rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                printf(NAME ": error binding function %s: %s\n", name,
+                    str_error(rc));
+                ddf_fun_destroy(fun);
+                return rc;
+        }
+
+        return EOK;
 }
 
@@ -146 +189 @@
  *                      of HW and pseudo devices).
  */
-static int root_add_device(device_t *dev)
+static int root_add_device(ddf_dev_t *dev)
 {
         printf(NAME ": root_add_device, device handle=%" PRIun "\n",
             dev->handle);
-        
+
         /*
          * Register virtual devices root.
@@ -156 +199 @@
          * vital for the system.
          */
-        add_virtual_root_child(dev);
+        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");
-        
+
         return res;
 }
@@ -169 +212 @@
 {
         printf(NAME ": HelenOS root device driver\n");
-        return driver_main(&root_driver);
+        return ddf_driver_main(&root_driver);
 }