Changeset 563d9d0a in mainline

Timestamp:

2011-09-07T10:17:00Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7099861

Parents:

52eead3e

Message:

libusbhost: minor cleanup and fixes

Location:

uspace/lib

Files:

• usb/include/usb/usb.h (modified) (2 diffs)
• usbhost/src/endpoint.c (modified) (1 diff)
• usbhost/src/usb_endpoint_manager.c (modified) (6 diffs)

uspace/lib/usb/include/usb/usb.h

@@ -36 +36 @@
 #define LIBUSB_USB_H_
 
+#include <bool.h>
 #include <sys/types.h>
 #include <byteorder.h>
@@ -130 +131 @@
 } usb_target_t;
 
+/** Check USB target for allowed values (address and endpoint).
+ *
+ * @param target.
+ * @return True, if values are wihtin limits, false otherwise.
+ */
+static inline bool usb_target_is_valid(usb_target_t target)
+{
+        return !(target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB11_ADDRESS_MAX || target.address < 0);
+}
+
 /** Compare USB targets (addresses and endpoints).
  *

uspace/lib/usbhost/src/endpoint.c

@@ -89 +89 @@
 {
         assert(instance);
+        instance->destroy_hook = NULL;
         instance->hc_data.data = NULL;
         instance->hc_data.toggle_get = NULL;

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -146 +146 @@
         fibril_condvar_initialize(&instance->change);
         instance->free_bw = available_bandwidth;
-        bool ht =
+        const bool ht =
             hash_table_create(&instance->ep_table, BUCKET_COUNT, MAX_KEYS, &op);
         return ht ? EOK : ENOMEM;
@@ -160 +160 @@
 {
         assert(ep);
-        size_t bw = bandwidth_count_usb11(ep->speed, ep->transfer_type,
+        const size_t bw = bandwidth_count_usb11(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;
         }
 
@@ -211 +212 @@
 
         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;
@@ -230 +233 @@
 
         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 +258 @@
 {
         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 +279 @@
         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 =