Changeset 925a21e in mainline for uspace/lib/usbhost/src/usb_endpoint_manager.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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 mainline changes.

File:

• uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (10 diffs)

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -45 +45 @@
 static hash_index_t node_hash(unsigned long key[])
 {
-        hash_index_t hash = 0;
-        unsigned i = 0;
-        for (;i < MAX_KEYS; ++i) {
-                hash ^= key[i];
-        }
-        hash %= BUCKET_COUNT;
-        return hash;
+        /* USB endpoints use 4 bits, thus ((key[0] << 4) | key[1])
+         * produces unique value for every address.endpoint pair */
+        return ((key[0] << 4) | key[1]) % BUCKET_COUNT;
 }
 /*----------------------------------------------------------------------------*/
@@ -63 +59 @@
         switch (keys) {
         case 3:
-                match = match && (key[2] == node->ep->direction);
+                match = match &&
+                    ((key[2] == node->ep->direction)
+                    || (node->ep->direction == USB_DIRECTION_BOTH));
         case 2:
                 match = match && (key[1] == (unsigned long)node->ep->endpoint);
@@ -140 +138 @@
 /*----------------------------------------------------------------------------*/
 int usb_endpoint_manager_init(usb_endpoint_manager_t *instance,
-    size_t available_bandwidth)
+    size_t available_bandwidth,
+    size_t (*bw_count)(usb_speed_t, usb_transfer_type_t, size_t, size_t))
 {
         assert(instance);
         fibril_mutex_initialize(&instance->guard);
-        fibril_condvar_initialize(&instance->change);
         instance->free_bw = available_bandwidth;
-        bool ht =
+        instance->bw_count = bw_count;
+        const bool ht =
             hash_table_create(&instance->ep_table, BUCKET_COUNT, MAX_KEYS, &op);
         return ht ? EOK : ENOMEM;
@@ -159 +158 @@
     endpoint_t *ep, size_t data_size)
 {
+        assert(instance);
+        assert(instance->bw_count);
         assert(ep);
-        size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
+        const size_t bw = instance->bw_count(ep->speed, ep->transfer_type,
             data_size, ep->max_packet_size);
-        assert(instance);
+
+        fibril_mutex_lock(&instance->guard);
+
+        if (bw > instance->free_bw) {
+                fibril_mutex_unlock(&instance->guard);
+                return ENOSPC;
+        }
 
         unsigned long key[MAX_KEYS] =
             {ep->address, ep->endpoint, ep->direction};
-        fibril_mutex_lock(&instance->guard);
-
-        link_t *item =
+
+        const link_t *item =
             hash_table_find(&instance->ep_table, key);
         if (item != NULL) {
                 fibril_mutex_unlock(&instance->guard);
                 return EEXISTS;
-        }
-
-        if (bw > instance->free_bw) {
-                fibril_mutex_unlock(&instance->guard);
-                return ENOSPC;
         }
 
@@ -193 +194 @@
         instance->free_bw -= bw;
         fibril_mutex_unlock(&instance->guard);
-        fibril_condvar_broadcast(&instance->change);
         return EOK;
 }
@@ -211 +211 @@
 
         node_t *node = hash_table_get_instance(item, node_t, link);
-        if (node->ep->active)
+        if (node->ep->active) {
+                fibril_mutex_unlock(&instance->guard);
                 return EBUSY;
+        }
 
         instance->free_bw += node->bw;
@@ -218 +220 @@
 
         fibril_mutex_unlock(&instance->guard);
-        fibril_condvar_broadcast(&instance->change);
         return EOK;
 }
@@ -230 +231 @@
 
         fibril_mutex_lock(&instance->guard);
-        link_t *item = hash_table_find(&instance->ep_table, key);
+        const link_t *item = hash_table_find(&instance->ep_table, key);
         if (item == NULL) {
                 fibril_mutex_unlock(&instance->guard);
                 return NULL;
         }
-        node_t *node = hash_table_get_instance(item, node_t, link);
+        const node_t *node = hash_table_get_instance(item, node_t, link);
         if (bw)
                 *bw = node->bw;
@@ -255 +256 @@
 {
         assert(instance);
-        if (target.endpoint > 15 || target.endpoint < 0
-            || target.address >= USB11_ADDRESS_MAX || target.address < 0) {
+        if (!usb_target_is_valid(target)) {
                 usb_log_error("Invalid data when checking for toggle reset.\n");
                 return;
         }
 
+        assert(data);
         switch (data[1])
         {
-        case 0x01: /*clear feature*/
-                /* recipient is endpoint, value is zero (ENDPOINT_STALL) */
+        case 0x01: /* Clear Feature -- resets only cleared ep */
+                /* Recipient is endpoint, value is zero (ENDPOINT_STALL) */
                 if (((data[0] & 0xf) == 1) && ((data[2] | data[3]) == 0)) {
                         /* endpoint number is < 16, thus first byte is enough */
@@ -276 +277 @@
         break;
 
-        case 0x9: /* set configuration */
-        case 0x11: /* set interface */
-                /* target must be device */
+        case 0x9: /* Set Configuration */
+        case 0x11: /* Set Interface */
+                /* Recipient must be device */
                 if ((data[0] & 0xf) == 0) {
                         usb_target_t reset_target =