Changeset 54464f6a in mainline for uspace/lib/usbhost/include

Timestamp:

2011-11-11T19:48:33Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

50a01a9

Parents:

c2e50d7 (diff), 747ef72 (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

Location:

uspace/lib/usbhost/include/usb/host

Files:

• hcd.h (modified) (1 diff)
• usb_device_manager.h (modified) (2 diffs)
• usb_endpoint_manager.h (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -68 +68 @@
  * @param bw_count Bandwidth compute function, passed to endpoint manager.
  */
-static inline void hcd_init(hcd_t *hcd, size_t bandwidth,
+static inline void hcd_init(hcd_t *hcd, usb_speed_t max_speed, size_t bandwidth,
     size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t))
 {
         assert(hcd);
-        usb_device_manager_init(&hcd->dev_manager);
+        usb_device_manager_init(&hcd->dev_manager, max_speed);
         usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
         hcd->private_data = NULL;

uspace/lib/usbhost/include/usb/host/usb_device_manager.h

@@ -59 +59 @@
                 devman_handle_t handle; /**< Devman handle of the device. */
         } devices[USB_ADDRESS_COUNT];
+        usb_speed_t max_speed;
         fibril_mutex_t guard;
         /** The last reserved address */
@@ -64 +65 @@
 } usb_device_manager_t;
 
-void usb_device_manager_init(usb_device_manager_t *instance);
+void usb_device_manager_init(
+    usb_device_manager_t *instance, usb_speed_t max_speed);
 
-usb_address_t usb_device_manager_get_free_address(
-    usb_device_manager_t *instance, usb_speed_t speed);
+int usb_device_manager_request_address(usb_device_manager_t *instance,
+    usb_address_t *address, bool strict, usb_speed_t speed);
 
-int usb_device_manager_bind(usb_device_manager_t *instance,
+int usb_device_manager_bind_address(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle);
 
-int usb_device_manager_release(usb_device_manager_t *instance,
+int usb_device_manager_release_address(usb_device_manager_t *instance,
     usb_address_t address);
 

uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h

@@ -90 +90 @@
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     void (*callback)(endpoint_t *, void *), void *arg);
+
+void usb_endpoint_manager_remove_address(usb_endpoint_manager_t *instance,
+    usb_address_t address, void (*callback)(endpoint_t *, void *), void *arg);
 #endif
 /**