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

Timestamp:

2010-12-09T00:28:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cdc1aa1

Parents:

818dc00 (diff), 0a5a950 (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 + minor changes

The marge with mainline includes the hands-off configure and merge with
our DDF fixes.

The virtual USB host controller is now under the virtual devices hierarchy
(the path is /virt/usbhc now).

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.
  *
@@ -53 +54 @@
 #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);
 
@@ -66 +75 @@
 };
 
+/** 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.
  *
@@ -74 +100 @@
 {
         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 = 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;
-        
+        int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
+            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE);
+
         return res;
-        
-failure:
-        if (NULL != match_id)
-                match_id->id = NULL;
-        
-        if (NULL != platform) {
-                platform->name = NULL;
-                delete_device(platform);
-        }
-        
-        return res;
-}
-
-/** Create virtual USB host controller device.
- * Note that the virtual HC is actually device and driver in one
- * task.
- *
- * @param parent Parent device.
- * @return Error code.
- */
-static int add_virtual_usb_host_controller(device_t *parent)
-{
-        printf(NAME ": adding virtual host contoller.\n");
-
-        int rc;
-        device_t *vhc = NULL;
-        match_id_t *match_id = NULL;
-
-        vhc = create_device();
-        if (vhc == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        vhc->name = "vhc";
-        printf(NAME ": the new device's name is %s.\n", vhc->name);
-
-        /* Initialize match id list. */
-        match_id = create_match_id();
-        if (match_id == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        match_id->id = "usb&hc=vhc";
-        match_id->score = 100;
-        add_match_id(&vhc->match_ids, match_id);
-
-        /* Register child device. */
-        rc = child_device_register(vhc, parent);
-        if (rc != EOK)
-                goto failure;
-
-        return EOK;
-
-failure:
-        if (match_id != NULL)
-                match_id->id = NULL;
-
-        if (vhc != NULL) {
-                vhc->name = NULL;
-                delete_device(vhc);
-        }
-
-        return rc;
 }
 
@@ -184 +119 @@
             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);
@@ -189 +131 @@
                 printf(NAME ": failed to add child device for platform.\n");
         
-        /* Register virtual USB host controller. */
-        int rc = add_virtual_usb_host_controller(dev);
-        if (EOK != rc) {
-                printf(NAME ": failed to add child device - virtual USB HC.\n");
-        }
-
         return res;
 }