Changeset 00aece0 in mainline for uspace/drv/bus/usb/vhc/main.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 changes.

File:

• uspace/drv/bus/usb/vhc/main.c (modified) (4 diffs)

uspace/drv/bus/usb/vhc/main.c

@@ -58 +58 @@
 };
 
-static int vhc_add_device(ddf_dev_t *dev)
+static int vhc_dev_add(ddf_dev_t *dev)
 {
         static int vhc_count = 0;
@@ -73 +73 @@
         }
         data->magic = 0xDEADBEEF;
-        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1);
+        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1,
+            bandwidth_count_usb11);
         if (rc != EOK) {
                 usb_log_fatal("Failed to initialize endpoint manager.\n");
@@ -79 +80 @@
                 return rc;
         }
-        usb_device_keeper_init(&data->dev_keeper);
+        usb_device_manager_init(&data->dev_manager, USB_SPEED_MAX);
 
         ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");
@@ -130 +131 @@
 
 static driver_ops_t vhc_driver_ops = {
-        .add_device = vhc_add_device,
+        .dev_add = vhc_dev_add,
 };