Changes in uspace/drv/root/root.c [6f9e7fea:7e752b2] in mainline

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
  * All rights reserved.
  *
@@ -46 +45 @@
 #include <ctype.h>
 #include <macros.h>
+#include <inttypes.h>
 
 #include <driver.h>
@@ -52 +52 @@
 
 #define NAME "root"
-
-#define PLATFORM_DEVICE_NAME "hw"
-#define PLATFORM_DEVICE_MATCH_ID STRING(UARCH)
-#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);
@@ -74 +66 @@
 };
 
-/** 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.
  *
@@ -99 +74 @@
 {
         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, PLATFORM_DEVICE_MATCH_ID);
         
-        int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
-            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
-
+        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;
 }
@@ -115 +127 @@
 static int root_add_device(device_t *dev)
 {
-        printf(NAME ": root_add_device, device handle = %d\n", dev->handle);
+        printf(NAME ": root_add_device, device handle=%" PRIun "\n",
+            dev->handle);
         
-        /*
-         * Register virtual devices root.
-         * We ignore error occurrence because virtual devices shall not be
-         * vital for the system.
-         */
-        add_virtual_root_child(dev);
-
         /* Register root device's children. */
         int res = add_platform_child(dev);