Changeset 4cf5b8e0 in mainline for uspace/lib/usbhost/src/hcd.c

Timestamp:

2013-09-21T01:10:47Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ce33c10

Parents:

9348862

Message:

libusbhost: Rename usb_endpoint_manager → usb_bus

It's shorter and more accurate.

File:

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

uspace/lib/usbhost/src/hcd.c

@@ -95 +95 @@
 {
         assert(hcd);
-        usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count, max_speed);
+        usb_bus_init(&hcd->bus, bandwidth, bw_count, max_speed);
 
         hcd->driver.data = NULL;
@@ -107 +107 @@
         assert(hcd);
         usb_address_t address = 0;
-        const int ret = usb_endpoint_manager_request_address(
-            &hcd->ep_manager, &address, false, speed);
+        const int ret = usb_bus_request_address(
+            &hcd->bus, &address, false, speed);
         if (ret != EOK)
                 return ret;
@@ -117 +117 @@
 {
         assert(hcd);
-        return usb_endpoint_manager_remove_address(&hcd->ep_manager, address,
+        return usb_bus_remove_address(&hcd->bus, address,
             unregister_helper_warn, hcd);
 }
@@ -125 +125 @@
         assert(hcd);
         usb_address_t address = 0;
-        return usb_endpoint_manager_request_address(
-            &hcd->ep_manager, &address, true, speed);
+        return usb_bus_request_address(
+            &hcd->bus, &address, true, speed);
 }
 
@@ -134 +134 @@
 {
         assert(hcd);
-        return usb_endpoint_manager_add_ep(&hcd->ep_manager, target.address,
+        return usb_bus_add_ep(&hcd->bus, target.address,
             target.endpoint, dir, type, max_packet_size, size, register_helper,
             hcd, tt_address, tt_port);
@@ -142 +142 @@
 {
         assert(hcd);
-        return usb_endpoint_manager_remove_ep(&hcd->ep_manager, target.address,
+        return usb_bus_remove_ep(&hcd->bus, target.address,
             target.endpoint, dir, unregister_helper, hcd);
 }
@@ -161 +161 @@
                 usb_log_debug2("Reseting toggle on %d:%d.\n",
                     toggle->target.address, toggle->target.endpoint);
-                usb_endpoint_manager_reset_toggle(&toggle->hcd->ep_manager,
+                usb_bus_reset_toggle(&toggle->hcd->bus,
                     toggle->target, toggle->target.endpoint == 0);
         }
@@ -187 +187 @@
         assert(hcd);
 
-        endpoint_t *ep = usb_endpoint_manager_find_ep(&hcd->ep_manager,
+        endpoint_t *ep = usb_bus_find_ep(&hcd->bus,
             target.address, target.endpoint, direction);
         if (ep == NULL) {