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

Timestamp:

2018-01-25T02:05:57Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

d369b3b

Parents:

5f0b366

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 01:23:20)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:05:57)

Message:

usbhost: make bandwidth accounting a usb2_bus-thing

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bandwidth.h (modified) (1 diff)
• bus.h (modified) (1 diff)
• usb2_bus.h (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <stddef.h>
 
-/** Bytes per second in FULL SPEED */
-#define BANDWIDTH_TOTAL_USB11 (12000000 / 8)
-/** 90% of total bandwidth is available for periodic transfers */
-#define BANDWIDTH_AVAILABLE_USB11 ((BANDWIDTH_TOTAL_USB11 * 9) / 10)
-
-/** Number of nanoseconds in one microframe */
-#define BANDWIDTH_TOTAL_USB20 (125000)
-/** 90% of total bandwidth is available for periodic transfers */
-#define BANDWIDTH_AVAILABLE_USB20  ((BANDWIDTH_TOTAL_USB20 * 9) / 10)
-
 typedef struct endpoint endpoint_t;
 
-extern ssize_t bandwidth_count_usb11(endpoint_t *, size_t);
+typedef size_t (*endpoint_count_bw_t)(endpoint_t *);
 
-extern ssize_t bandwidth_count_usb20(endpoint_t *, size_t);
+typedef struct {
+        size_t available_bandwidth;
+        endpoint_count_bw_t count_bw;
+} bandwidth_accounting_t;
+
+extern const bandwidth_accounting_t bandwidth_accounting_usb11;
+extern const bandwidth_accounting_t bandwidth_accounting_usb2;
 
 #endif

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

@@ -120 +120 @@
         void (*endpoint_unregister)(endpoint_t *);
         void (*endpoint_destroy)(endpoint_t *);                 /**< Optional */
-        ssize_t (*endpoint_count_bw) (endpoint_t *, size_t);    /**< Optional */
         usb_transfer_batch_t *(*batch_create)(endpoint_t *);    /**< Optional */
 

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

@@ -42 +42 @@
 
 #include <usb/host/bus.h>
+#include <usb/host/bandwidth.h>
 
 typedef struct usb2_bus usb2_bus_t;
@@ -57 +58 @@
         /** Size of the bandwidth pool */
         size_t free_bw;
+
+        /* Configured bandwidth accounting */
+        const bandwidth_accounting_t *bw_accounting;
 } usb2_bus_t;
 
 extern const bus_ops_t usb2_bus_ops;
 
-extern void usb2_bus_init(usb2_bus_t *, size_t);
+extern void usb2_bus_init(usb2_bus_t *, const bandwidth_accounting_t *);
 
 #endif