Changeset fd07e526 in mainline for uspace/lib/usbhost/include

Timestamp:

2011-09-16T14:50:20Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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 USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• batch.h (deleted)
• endpoint.h (modified) (2 diffs)
• hcd.h (added)
• usb_device_manager.h (moved) (moved from uspace/lib/usbhost/include/usb/host/device_keeper.h ) (4 diffs)
• usb_endpoint_manager.h (modified) (4 diffs)
• usb_transfer_batch.h (added)

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

@@ -54 +54 @@
         fibril_condvar_t avail;
         volatile bool active;
+        void (*destroy_hook)(struct endpoint *);
         struct {
                 void *data;
@@ -68 +69 @@
 
 void endpoint_set_hc_data(endpoint_t *instance,
-    void *data, int (*toggle_get)(void *), void (*toggle_set)(void *, int));
+    void *data, void (*destroy_hook)(endpoint_t *),
+    int (*toggle_get)(void *), void (*toggle_set)(void *, int));
 
 void endpoint_clear_hc_data(endpoint_t *instance);

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup libusbhost
  * @{
  */
 /** @file
- * Device keeper structure and functions.
+ * Device manager structure and functions.
  *
  * Typical USB host controller needs to keep track of various settings for
@@ -38 +37 @@
  * This structure shall simplify the management.
  */
-#ifndef LIBUSBHOST_HOST_DEVICE_KEEPER_H
-#define LIBUSBHOST_HOST_DEVICE_KEEPER_H
+#ifndef LIBUSBHOST_HOST_USB_DEVICE_MANAGER_H
+#define LIBUSBHOST_HOST_USB_DEVICE_MANAGER_H
 
 #include <adt/list.h>
@@ -57 +56 @@
 };
 
-/** Host controller device keeper.
+/** Host controller device manager.
  * You shall not access members directly but only using functions below.
  */
@@ -64 +63 @@
         fibril_mutex_t guard;
         usb_address_t last_address;
-} usb_device_keeper_t;
+} usb_device_manager_t;
 
-void usb_device_keeper_init(usb_device_keeper_t *instance);
+void usb_device_manager_init(usb_device_manager_t *instance);
 
-usb_address_t device_keeper_get_free_address(usb_device_keeper_t *instance,
-    usb_speed_t speed);
+usb_address_t usb_device_manager_get_free_address(
+    usb_device_manager_t *instance, usb_speed_t speed);
 
-void usb_device_keeper_bind(usb_device_keeper_t *instance,
+void usb_device_manager_bind(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t handle);
 
-void usb_device_keeper_release(usb_device_keeper_t *instance,
+void usb_device_manager_release(usb_device_manager_t *instance,
     usb_address_t address);
 
-usb_address_t usb_device_keeper_find(usb_device_keeper_t *instance,
+usb_address_t usb_device_manager_find(usb_device_manager_t *instance,
     devman_handle_t handle);
 
-bool usb_device_keeper_find_by_address(usb_device_keeper_t *instance,
+bool usb_device_manager_find_by_address(usb_device_manager_t *instance,
     usb_address_t address, devman_handle_t *handle);
 
-usb_speed_t usb_device_keeper_get_speed(usb_device_keeper_t *instance,
+usb_speed_t usb_device_manager_get_speed(usb_device_manager_t *instance,
     usb_address_t address);
 #endif

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

@@ -38 +38 @@
  */
 #ifndef LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
-#define LIBUSBHOST_HOST_YSB_ENDPOINT_MANAGER_H
+#define LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
 
 #include <stdlib.h>
@@ -52 +52 @@
         hash_table_t ep_table;
         fibril_mutex_t guard;
-        fibril_condvar_t change;
         size_t free_bw;
+        size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
 } usb_endpoint_manager_t;
 
@@ -60 +60 @@
 
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth);
+    size_t available_bandwidth,
+    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t));
 
 void usb_endpoint_manager_destroy(usb_endpoint_manager_t *instance);
@@ -77 +78 @@
     usb_endpoint_manager_t *instance, usb_target_t target, const uint8_t *data);
 
+/** Wrapper combining allocation and insertion */
 static inline int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,