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

File:

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

uspace/drv/root/root.c

@@ -45 +45 @@
 #include <ctype.h>
 #include <macros.h>
+#include <inttypes.h>
 
 #include <driver.h>
@@ -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.
  *
@@ -180 +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 root device's children. */
@@ -187 +135 @@
                 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;
 }