Changeset 0e3e1f6 in mainline

Timestamp:

2017-10-12T19:57:34Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

0a5833d7

Parents:

a8435eb5

Message:

Corrected to assume endpoint_t is actually xhci_endpoint_t.

File:

• uspace/drv/bus/usb/xhci/bus.c (modified) (5 diffs)

uspace/drv/bus/usb/xhci/bus.c

@@ -51 +51 @@
 
         /** Endpoint */
-        endpoint_t *endpoint;
+        xhci_endpoint_t *endpoint;
 } hashed_endpoint_t;
 
@@ -105 +105 @@
                 return ENOMEM;
 
-        hashed_ep->endpoint = ep;
+        hashed_ep->endpoint = (xhci_endpoint_t *) ep;
         hash_table_insert(&bus->endpoints, &hashed_ep->link);
 
@@ -137 +137 @@
                 return NULL;
 
-        return hashed_ep->endpoint;
+        return (endpoint_t *) hashed_ep->endpoint;
 }
 
@@ -204 +204 @@
 {
         hashed_endpoint_t *ep = hash_table_get_inst(item, hashed_endpoint_t, link);
-        return (size_t) ep->endpoint->target.packed;
+        return (size_t) hash_mix32(ep->endpoint->base.target.packed);
 }
 
@@ -215 +215 @@
 {
         hashed_endpoint_t *ep = hash_table_get_inst(item, hashed_endpoint_t, link);
-        return ep->endpoint->target.packed == *(uint32_t *) key;
+        return ep->endpoint->base.target.packed == *(uint32_t *) key;
 }