Changeset 68414f4a in mainline for uspace/drv/root/root.c

Timestamp:

2011-02-13T20:03:45Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bab6388

Parents:

8b1e15ac

Message:

Refactor drivers

• Rename soft-state structures to have the simplest names
• Use soft-state structures as a starting point instead of DDF device or function nodes
• Convert to standard naming scheme

File:

• uspace/drv/root/root.c (modified) (6 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.
  *
@@ -55 +56 @@
 #define NAME "root"
 
-#define PLATFORM_DEVICE_NAME "hw"
-#define PLATFORM_DEVICE_MATCH_ID_FMT "platform/%s"
-#define PLATFORM_DEVICE_MATCH_SCORE 100
+#define PLATFORM_FUN_NAME "hw"
+#define PLATFORM_FUN_MATCH_ID_FMT "platform/%s"
+#define PLATFORM_FUN_MATCH_SCORE 100
 
-#define VIRTUAL_DEVICE_NAME "virt"
-#define VIRTUAL_DEVICE_MATCH_ID "rootvirt"
-#define VIRTUAL_DEVICE_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(device_t *dev);
@@ -76 +77 @@
 };
 
-/** Create the device which represents the root of virtual device tree.
+/** Create the function which represents the root of virtual device tree.
  *
- * @param parent Parent of the newly created device.
- * @return Error code.
+ * @param dev   Device
+ * @return      EOK on success or negative error code
  */
-static int add_virtual_root_child(device_t *parent)
+static int add_virtual_root_fun(device_t *dev)
 {
-        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);
+        printf(NAME ": adding new function for virtual devices.\n");
+        printf(NAME ":   function node is `%s' (%d %s)\n", VIRTUAL_FUN_NAME,
+            VIRTUAL_FUN_MATCH_SCORE, VIRTUAL_FUN_MATCH_ID);
 
-        int res = register_function_wrapper(parent, VIRTUAL_DEVICE_NAME,
-            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
+        int res = register_function_wrapper(dev, VIRTUAL_FUN_NAME,
+            VIRTUAL_FUN_MATCH_ID, VIRTUAL_FUN_MATCH_SCORE);
 
         return res;
 }
 
-/** Create the device which represents the root of HW device tree.
+/** Create the function which represents the root of HW device tree.
  *
- * @param parent        Parent of the newly created device.
- * @return 0 on success, negative error number otherwise.
+ * @param dev   Device
+ * @return      EOK on success or negative error code
  */
-static int add_platform_child(device_t *parent)
+static int add_platform_fun(device_t *dev)
 {
         char *match_id;
@@ -106 +107 @@
 
         /* Get platform name from sysinfo. */
-
         platform = sysinfo_get_data("platform", &platform_size);
         if (platform == NULL) {
@@ -123 +123 @@
 
         /* 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. */
+        /* 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);
 
-        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 = register_function_wrapper(parent, PLATFORM_DEVICE_NAME,
-            match_id, PLATFORM_DEVICE_MATCH_SCORE);
+        res = register_function_wrapper(dev, PLATFORM_FUN_NAME,
+            match_id, PLATFORM_FUN_MATCH_SCORE);
 
         return res;
@@ -156 +154 @@
          * 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");