Changeset 92d6868 in mainline

Timestamp:

2011-04-07T07:56:03Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

506d330

Parents:

0aae4a6a

Message:

Use sane key management in usb_endpoint_manager

Location:

uspace

Files:

• drv/ohci/iface.c (modified) (1 diff)
• drv/uhci-hcd/iface.c (modified) (1 diff)
• lib/usb/include/usb/host/usb_endpoint_manager.h (modified) (1 diff)
• lib/usb/src/host/usb_endpoint_manager.c (modified) (8 diffs)

uspace/drv/ohci/iface.c

@@ -163 +163 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
         // TODO use real endpoint here!
-        return usb_endpoint_manager_register_ep(&hc->ep_manager,
-            address, endpoint, direction, NULL, 0);
+        return usb_endpoint_manager_register_ep(&hc->ep_manager,NULL, 0);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/iface.c

@@ -179 +179 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
-            address, endpoint, direction, ep, size);
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
         if (ret != EOK) {
                 endpoint_destroy(ep);

uspace/lib/usb/include/usb/host/usb_endpoint_manager.h

@@ -64 +64 @@
 
 int usb_endpoint_manager_register_ep(usb_endpoint_manager_t *instance,
-    usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     endpoint_t *ep, size_t data_size);
 

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

@@ -35 +35 @@
 #define BUCKET_COUNT 7
 
-typedef struct {
-        usb_address_t address;
-        usb_endpoint_t endpoint;
-        usb_direction_t direction;
-} __attribute__((aligned (sizeof(unsigned long)))) id_t;
-#define MAX_KEYS (sizeof(id_t) / sizeof(unsigned long))
+#define MAX_KEYS (3)
 typedef struct {
-        union {
-                id_t id;
-                unsigned long key[MAX_KEYS];
-        };
         link_t link;
         size_t bw;
@@ -66 +57 @@
         assert(item);
         node_t *node = hash_table_get_instance(item, node_t, link);
-        hash_count_t i = 0;
-        for (; i < keys; ++i) {
-                if (key[i] != node->key[i])
-                        return false;
-        }
-        return true;
+        assert(node);
+        assert(node->ep);
+        bool match = true;
+        switch (keys) {
+        case 3:
+                match = match && (key[2] == node->ep->direction);
+        case 2:
+                match = match && (key[1] == (unsigned long)node->ep->endpoint);
+        case 1:
+                match = match && (key[0] == (unsigned long)node->ep->address);
+                break;
+        default:
+                match = false;
+        }
+        return match;
 }
 /*----------------------------------------------------------------------------*/
@@ -142 +142 @@
 /*----------------------------------------------------------------------------*/
 int usb_endpoint_manager_register_ep(usb_endpoint_manager_t *instance,
-    usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
     endpoint_t *ep, size_t data_size)
 {
@@ -150 +149 @@
         assert(instance);
 
-        id_t id = {
-                .address = address,
-                .endpoint = endpoint,
-                .direction = direction,
-        };
+        unsigned long key[MAX_KEYS] =
+            {ep->address, ep->endpoint, ep->direction};
         fibril_mutex_lock(&instance->guard);
 
         link_t *item =
-            hash_table_find(&instance->ep_table, (unsigned long*)&id);
+            hash_table_find(&instance->ep_table, key);
         if (item != NULL) {
                 fibril_mutex_unlock(&instance->guard);
@@ -175 +171 @@
         }
 
-        node->id = id;
         node->bw = bw;
         node->ep = ep;
         link_initialize(&node->link);
 
-        hash_table_insert(&instance->ep_table,
-            (unsigned long*)&id, &node->link);
+        hash_table_insert(&instance->ep_table, key, &node->link);
         instance->free_bw -= bw;
         fibril_mutex_unlock(&instance->guard);
@@ -192 +186 @@
 {
         assert(instance);
-        id_t id = {
-                .address = address,
-                .endpoint = endpoint,
-                .direction = direction,
-        };
+        unsigned long key[MAX_KEYS] = {address, endpoint, direction};
+
         fibril_mutex_lock(&instance->guard);
-        link_t *item =
-            hash_table_find(&instance->ep_table, (unsigned long*)&id);
+        link_t *item = hash_table_find(&instance->ep_table, key);
         if (item == NULL) {
                 fibril_mutex_unlock(&instance->guard);
@@ -207 +197 @@
         node_t *node = hash_table_get_instance(item, node_t, link);
         instance->free_bw += node->bw;
-        hash_table_remove(&instance->ep_table, (unsigned long*)&id, MAX_KEYS);
+        hash_table_remove(&instance->ep_table, key, MAX_KEYS);
 
         fibril_mutex_unlock(&instance->guard);
@@ -219 +209 @@
 {
         assert(instance);
-        id_t id = {
-                .address = address,
-                .endpoint = endpoint,
-                .direction = direction,
-        };
+        unsigned long key[MAX_KEYS] = {address, endpoint, direction};
+
         fibril_mutex_lock(&instance->guard);
-        link_t *item =
-            hash_table_find(&instance->ep_table, (unsigned long*)&id);
+        link_t *item = hash_table_find(&instance->ep_table, key);
         if (item == NULL) {
                 fibril_mutex_unlock(&instance->guard);