Changeset 9262571 in mainline

Timestamp:

2011-04-06T16:06:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9783496

Parents:

f0891ce

Message:

Make op structures static to avoid conflict
remove one bandwidth_count_usb11 implementation

Location:

uspace/lib/usb/src/host

Files:

• bandwidth.c (modified) (1 diff)
• usb_endpoint_manager.c (modified) (1 diff)

uspace/lib/usb/src/host/bandwidth.c

@@ -78 +78 @@
 }
 /*----------------------------------------------------------------------------*/
-hash_table_operations_t op = {
+static hash_table_operations_t op = {
         .hash = transfer_hash,
         .compare = transfer_compare,
         .remove_callback = transfer_remove,
 };
-/*----------------------------------------------------------------------------*/
-size_t bandwidth_count_usb11(usb_speed_t speed, usb_transfer_type_t type,
-    size_t size, size_t max_packet_size)
-{
-        const unsigned packet_count =
-            (size + max_packet_size - 1) / max_packet_size;
-        /* TODO: It may be that ISO and INT transfers use only one data packet
-         * per transaction, but I did not find text in UB spec that confirms
-         * this */
-        /* NOTE: All data packets will be considered to be max_packet_size */
-        switch (speed)
-        {
-        case USB_SPEED_LOW:
-                assert(type == USB_TRANSFER_INTERRUPT);
-                /* Protocol overhead 13B
-                 * (3 SYNC bytes, 3 PID bytes, 2 Endpoint + CRC bytes, 2
-                 * CRC bytes, and a 3-byte interpacket delay)
-                 * see USB spec page 45-46. */
-                /* Speed penalty 8: low speed is 8-times slower*/
-                return packet_count * (13 + max_packet_size) * 8;
-        case USB_SPEED_FULL:
-                /* Interrupt transfer overhead see above
-                 * or page 45 of USB spec */
-                if (type == USB_TRANSFER_INTERRUPT)
-                        return packet_count * (13 + max_packet_size);
-
-                assert(type == USB_TRANSFER_ISOCHRONOUS);
-                /* Protocol overhead 9B
-                 * (2 SYNC bytes, 2 PID bytes, 2 Endpoint + CRC bytes, 2 CRC
-                 * bytes, and a 1-byte interpacket delay)
-                 * see USB spec page 42 */
-                return packet_count * (9 + max_packet_size);
-        default:
-                return 0;
-        }
-}
 /*----------------------------------------------------------------------------*/
 int bandwidth_init(bandwidth_t *instance, size_t bandwidth,

uspace/lib/usb/src/host/usb_endpoint_manager.c

@@ -86 +86 @@
 }
 /*----------------------------------------------------------------------------*/
-hash_table_operations_t op = {
+static hash_table_operations_t op = {
         .hash = ep_hash,
         .compare = ep_compare,