Changeset 7265558 in mainline for uspace/lib/usbhost/include/usb

Timestamp:

2011-10-28T20:53:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

48ae3ef

Parents:

83c3123

Message:

libusbhost: Drop hash_table and use multiple lists instead.

This has several advantages:
Knowing that all endpoints on one address are in one list makes toggle resets more efficient.
Endpoint search is done only once for inserts and deletes.
Lists are part of the structure and not allocated separately, removing one more failure point from init path.

Location:

uspace/lib/usbhost/include/usb/host

Files:

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

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

@@ -77 +77 @@
 int endpoint_toggle_get(endpoint_t *instance);
 void endpoint_toggle_set(endpoint_t *instance, int toggle);
-void endpoint_toggle_reset_filtered(endpoint_t *instance, usb_target_t target);
+
+static inline endpoint_t * endpoint_get_instance(link_t *item)
+{
+        return list_get_instance(item, endpoint_t, link);
+}
 #endif
 /**

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

@@ -37 +37 @@
 
 #include <assert.h>
+#include <usbhc_iface.h>
 #include <usb/host/usb_device_manager.h>
 #include <usb/host/usb_endpoint_manager.h>
 #include <usb/host/usb_transfer_batch.h>
-#include <usbhc_iface.h>
 
 typedef struct hcd hcd_t;
@@ -53 +53 @@
 };
 /*----------------------------------------------------------------------------*/
-static inline int hcd_init(hcd_t *hcd, size_t bandwidth,
+static inline void hcd_init(hcd_t *hcd, 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);
-        return usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
-}
-/*----------------------------------------------------------------------------*/
-static inline void hcd_destroy(hcd_t *hcd)
-{
-        usb_endpoint_manager_destroy(&hcd->ep_manager);
+        usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count);
 }
 /*----------------------------------------------------------------------------*/

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

@@ -40 +40 @@
 #define LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
 
-#include <stdlib.h>
-#include <adt/hash_table.h>
+#include <adt/list.h>
 #include <fibril_synch.h>
 #include <usb/usb.h>
+
 #include <usb/host/endpoint.h>
 
 #define BANDWIDTH_TOTAL_USB11 12000000
 #define BANDWIDTH_AVAILABLE_USB11 ((BANDWIDTH_TOTAL_USB11 / 10) * 9)
+#define ENDPOINT_LIST_COUNT 8
 
 typedef struct usb_endpoint_manager {
-        hash_table_t ep_table;
+        list_t endpoint_lists[ENDPOINT_LIST_COUNT];
         fibril_mutex_t guard;
         size_t free_bw;