Changeset b4b534ac in mainline for uspace/lib/usbhost/include/usb/host/usb_bus.h

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbhost/include/usb/host/usb_bus.h (moved) (moved from uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h ) (3 diffs)

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

@@ -40 +40 @@
 #define LIBUSBHOST_HOST_USB_ENDPOINT_MANAGER_H
 
+#include <usb/host/endpoint.h>
+#include <usb/usb.h>
+
 #include <adt/list.h>
 #include <fibril_synch.h>
-#include <usb/usb.h>
+#include <stdbool.h>
 
-#include <usb/host/endpoint.h>
 
 /** Bytes per second in FULL SPEED */
@@ -50 +52 @@
 /** 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
+
+//TODO: Implement
+#define BANDWIDTH_AVAILABLE_USB20  1
+
+typedef size_t (*bw_count_func_t)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
+typedef void (*ep_remove_callback_t)(endpoint_t *, void *);
+typedef int (*ep_add_callback_t)(endpoint_t *, void *);
 
 /** Endpoint management structure */
-typedef struct usb_endpoint_manager {
-        /** Store endpoint_t instances */
-        list_t endpoint_lists[ENDPOINT_LIST_COUNT];
+typedef struct usb_bus {
+        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;
@@ -62 +72 @@
         size_t free_bw;
         /** Use this function to count bw required by EP */
-        size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t);
-} usb_endpoint_manager_t;
+        bw_count_func_t bw_count;
+        /** Maximum speed allowed. */
+        usb_speed_t max_speed;
+        /** The last reserved address */
+        usb_address_t last_address;
+} usb_bus_t;
+
 
 size_t bandwidth_count_usb11(usb_speed_t speed, usb_transfer_type_t type,
     size_t size, size_t max_packet_size);
+size_t bandwidth_count_usb20(usb_speed_t speed, usb_transfer_type_t type,
+    size_t size, size_t max_packet_size);
 
-int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth,
-    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t));
+int usb_bus_init(usb_bus_t *instance,
+    size_t available_bandwidth, bw_count_func_t bw_count, usb_speed_t max_speed);
 
-void usb_endpoint_manager_reset_eps_if_need(usb_endpoint_manager_t *instance,
-    usb_target_t target, const uint8_t data[8]);
+int usb_bus_register_ep(usb_bus_t *instance, endpoint_t *ep, size_t data_size);
 
-int usb_endpoint_manager_register_ep(
-    usb_endpoint_manager_t *instance, endpoint_t *ep, size_t data_size);
-int usb_endpoint_manager_unregister_ep(
-    usb_endpoint_manager_t *instance, endpoint_t *ep);
-endpoint_t * usb_endpoint_manager_find_ep(usb_endpoint_manager_t *instance,
+int usb_bus_unregister_ep(usb_bus_t *instance, endpoint_t *ep);
+
+endpoint_t * usb_bus_find_ep(usb_bus_t *instance,
     usb_address_t address, usb_endpoint_t ep, usb_direction_t direction);
 
-int usb_endpoint_manager_add_ep(usb_endpoint_manager_t *instance,
+int usb_bus_add_ep(usb_bus_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, usb_speed_t speed, size_t max_packet_size,
-    size_t data_size, int (*callback)(endpoint_t *, void *), void *arg);
+    usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
+    size_t data_size, ep_add_callback_t callback, void *arg,
+    usb_address_t tt_address, unsigned tt_port);
 
-int usb_endpoint_manager_remove_ep(usb_endpoint_manager_t *instance,
+int usb_bus_remove_ep(usb_bus_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    void (*callback)(endpoint_t *, void *), void *arg);
+    ep_remove_callback_t callback, void *arg);
 
-void usb_endpoint_manager_remove_address(usb_endpoint_manager_t *instance,
-    usb_address_t address, void (*callback)(endpoint_t *, void *), void *arg);
+int usb_bus_reset_toggle(usb_bus_t *instance, usb_target_t target, bool all);
+
+int usb_bus_remove_address(usb_bus_t *instance,
+    usb_address_t address, ep_remove_callback_t callback, void *arg);
+
+int usb_bus_request_address(usb_bus_t *instance,
+    usb_address_t *address, bool strict, usb_speed_t speed);
+
+int usb_bus_get_speed(usb_bus_t *instance,
+    usb_address_t address, usb_speed_t *speed);
 #endif
 /**