Changeset 6843a9c in mainline for uspace/drv/bus/usb/vhc/main.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/drv/bus/usb/vhc/main.c (modified) (3 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;
@@ -80 +80 @@
                 return rc;
         }
-        usb_device_manager_init(&data->dev_manager);
+        usb_device_manager_init(&data->dev_manager, USB_SPEED_MAX);
 
         ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");
@@ -131 +131 @@
 
 static driver_ops_t vhc_driver_ops = {
-        .add_device = vhc_add_device,
+        .dev_add = vhc_dev_add,
 };