Changeset 1fe9bf6 in mainline for uspace/drv/root/root.c

Timestamp:

2010-11-21T17:13:32Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

31860b7

Parents:

8b3bff5 (diff), 4087a33 (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:

Merged updates from HelenOS mainline + changes from branch

/vojtechhorky/ddf_proposal/

File:

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

uspace/drv/root/root.c

@@ -72 +72 @@
 static int add_platform_child(device_t *parent)
 {
+        return EOK;
         printf(NAME ": adding new child for platform device.\n");
         
@@ -119 +120 @@
 }
 
+/** 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;
+}
+
 /** Get the root device.
  *
@@ -133 +188 @@
                 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;
 }