Changes in uspace/drv/vhc/hcd.c [f0da4eb2:0995cd6] in mainline

File:

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

uspace/drv/vhc/hcd.c

@@ -52 +52 @@
 #include "conn.h"
 
+static device_ops_t vhc_ops = {
+        .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
+        .default_handler = default_connection_handler
+};
 
 static int vhc_count = 0;
-static int vhc_add_device(usb_hc_device_t *dev)
+static int vhc_add_device(device_t *dev)
 {
         /*
@@ -65 +69 @@
         vhc_count++;
 
-        dev->transfer_ops = &vhc_transfer_ops;
-        dev->generic->ops->default_handler = default_connection_handler;
+        dev->ops = &vhc_ops;
+
+        /*
+         * Initialize address management.
+         */
+        address_init();
 
         /*
          * Initialize our hub and announce its presence.
          */
-        hub_init();
-        usb_hcd_add_root_hub(dev);
+        hub_init(dev);
 
         printf("%s: virtual USB host controller ready.\n", NAME);
@@ -79 +86 @@
 }
 
-static usb_hc_driver_t vhc_driver = {
+static driver_ops_t vhc_driver_ops = {
+        .add_device = vhc_add_device,
+};
+
+static driver_t vhc_driver = {
         .name = NAME,
-        .add_hc = &vhc_add_device
+        .driver_ops = &vhc_driver_ops
 };
 
@@ -99 +110 @@
         printf("%s: virtual USB host controller driver.\n", NAME);
 
-        debug_level = 10;
+        usb_dprintf_enable(NAME, 10);
 
         fid_t fid = fibril_create(hc_manager_fibril, NULL);
@@ -114 +125 @@
         sleep(4);
 
-        return usb_hcd_main(&vhc_driver);
+        return driver_main(&vhc_driver);
 }