Changeset 423c749 in mainline for uspace/lib/usbhost/include/usb

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.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• hcd.h (modified) (2 diffs)
• usb_device_manager.h (deleted)
• usb_endpoint_manager.h (modified) (5 diffs)

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

@@ -41 +41 @@
 #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>
@@ -53 +52 @@
 /** Generic host controller driver structure. */
 struct hcd {
-        /** Device manager storing handles and addresses. */
-        usb_device_manager_t dev_manager;
         /** Endpoint manager. */
         usb_endpoint_manager_t ep_manager;

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

@@ -50 +50 @@
 /** 90% of total bandwidth is available for periodic transfers */
 #define BANDWIDTH_AVAILABLE_USB11 ((BANDWIDTH_TOTAL_USB11 / 10) * 9)
-/** 16 addresses per list */
-#define ENDPOINT_LIST_COUNT 8
 
 typedef size_t (*bw_count_func_t)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
@@ -59 +57 @@
 /** Endpoint management structure */
 typedef struct usb_endpoint_manager {
-        /** Store endpoint_t instances */
-        list_t endpoint_lists[ENDPOINT_LIST_COUNT];
+        struct {
+                usb_speed_t speed;      /**< Device speed */
+                bool occupied;          /**< The address is in use. */
+                list_t endpoint_list;   /**< Store endpoint_t instances */
+        } devices[USB_ADDRESS_COUNT];
         /** Prevents races accessing lists */
         fibril_mutex_t guard;
@@ -67 +68 @@
         /** Use this function to count bw required by EP */
         bw_count_func_t bw_count;
+        /** Maximum speed allowed. */
+        usb_speed_t max_speed;
+        /** The last reserved address */
+        usb_address_t last_address;
 } usb_endpoint_manager_t;
 
@@ -74 +79 @@
 
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth, bw_count_func_t bw_count);
+    size_t available_bandwidth, bw_count_func_t bw_count, usb_speed_t max_speed);
 
 int usb_endpoint_manager_register_ep(
@@ -98 +103 @@
 void usb_endpoint_manager_remove_address(usb_endpoint_manager_t *instance,
     usb_address_t address, ep_remove_callback_t callback, void *arg);
+
+int usb_endpoint_manager_request_address(usb_endpoint_manager_t *instance,
+    usb_address_t *address, bool strict, usb_speed_t speed);
+
+int usb_endpoint_manager_release_address(usb_endpoint_manager_t *instance,
+    usb_address_t address);
+
+int usb_endpoint_manager_get_info_by_address(usb_endpoint_manager_t *instance,
+    usb_address_t address, usb_speed_t *speed);
 #endif
 /**