Changes in uspace/drv/vhc/hcd.c [70a9092:357a302] in mainline

File:

• uspace/drv/vhc/hcd.c (modified) (6 diffs)

uspace/drv/vhc/hcd.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */ 
@@ -35 +35 @@
 
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>
@@ -46 +45 @@
 
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
 #include <usb_iface.h>
 #include "vhcd.h"
@@ -53 +53 @@
 #include "conn.h"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
-{
-        /* This shall be called only for VHC device. */
-        assert(dev->parent == NULL);
-
-        *handle = dev->handle;
-        return EOK;
-}
-
-static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
-};
-
 static device_ops_t vhc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USB_DEV_IFACE] = &vhc_usb_iface,
+        .close = on_client_close,
         .default_handler = default_connection_handler
 };
@@ -93 +81 @@
         virtual_hub_device_init(dev);
 
-        printf("%s: virtual USB host controller ready.\n", NAME);
+        usb_log_info("Virtual USB host controller ready (id = %zu).\n",
+            (size_t) dev->handle);
 
         return EOK;
@@ -116 +105 @@
         sleep(5);
 
-        usb_dprintf_enable(NAME, 0);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         printf(NAME ": virtual USB host controller driver.\n");