Changeset 423c749 in mainline for uspace/lib/usbhost/src/hcd.c

Timestamp:

2013-07-27T07:49:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3aac088

Parents:

2838486

Message:

libusbhost: Remove usb_device_manager.

Functions merged to usb_endpoint_manager.

File:

• uspace/lib/usbhost/src/hcd.c (modified) (5 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -95 +95 @@
 {
         assert(hcd);
-        usb_device_manager_init(&hcd->dev_manager, max_speed);
-        usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
+        usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count, max_speed);
 
         hcd->private_data = NULL;
@@ -108 +107 @@
         assert(hcd);
         usb_address_t address = 0;
-        const int ret = usb_device_manager_request_address(
-            &hcd->dev_manager, &address, false, speed);
+        const int ret = usb_endpoint_manager_request_address(
+            &hcd->ep_manager, &address, false, speed);
         if (ret != EOK)
                 return ret;
@@ -120 +119 @@
         usb_endpoint_manager_remove_address(&hcd->ep_manager, address,
             unregister_helper_warn, hcd);
-        usb_device_manager_release_address(&hcd->dev_manager, address);
+        usb_endpoint_manager_release_address(&hcd->ep_manager, address);
         return EOK;
 }
@@ -128 +127 @@
         assert(hcd);
         usb_address_t address = 0;
-        return usb_device_manager_request_address(
-            &hcd->dev_manager, &address, true, speed);
+        return usb_endpoint_manager_request_address(
+            &hcd->ep_manager, &address, true, speed);
 }
 
@@ -137 +136 @@
         assert(hcd);
         usb_speed_t speed = USB_SPEED_MAX;
-        const int ret = usb_device_manager_get_info_by_address(
-            &hcd->dev_manager, target.address, &speed);
+        const int ret = usb_endpoint_manager_get_info_by_address(
+            &hcd->ep_manager, target.address, &speed);
         if (ret != EOK) {
                 return ret;