Changeset 26e7d6d in mainline for uspace/drv/bus/usb/vhc/main.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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 (moved) (moved from uspace/drv/vhc/main.c ) (4 diffs)

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

@@ -34 +34 @@
  */
 
-#include <devmap.h>
+#include <loc.h>
 #include <async.h>
 #include <unistd.h>
@@ -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);
 
         ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");
@@ -104 +105 @@
         }
 
-        rc = ddf_fun_add_to_class(hc, USB_HC_DDF_CLASS_NAME);
+        rc = ddf_fun_add_to_category(hc, USB_HC_CATEGORY);
         if (rc != EOK) {
                 usb_log_fatal("Failed to add function to HC class: %s.\n",