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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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) (5 diffs)

uspace/lib/usbhost/src/usb_endpoint_manager.c

@@ -90 +90 @@
         if (address < 0)
                 return NULL;
-        list_foreach(*get_list(instance, address), iterator) {
-                endpoint_t *ep = endpoint_get_instance(iterator);
+        list_foreach(*get_list(instance, address), link, endpoint_t, ep) {
                 if (ep_match(ep, address, endpoint, direction))
                         return ep;
@@ -196 +195 @@
                         fibril_mutex_lock(&instance->guard);
                         /* endpoint number is < 16, thus first byte is enough */
-                        list_foreach(*get_list(instance, target.address), it) {
-                                endpoint_t *ep = endpoint_get_instance(it);
+                        list_foreach(*get_list(instance, target.address),
+                            link, endpoint_t, ep) {
                                 if ((ep->address == target.address)
                                     && (ep->endpoint = data[4])) {
@@ -216 +215 @@
                 if ((data[0] & 0xf) == 0) {
                         fibril_mutex_lock(&instance->guard);
-                        list_foreach(*get_list(instance, target.address), it) {
-                                endpoint_t *ep = endpoint_get_instance(it);
+                        list_foreach(*get_list(instance, target.address),
+                            link, endpoint_t, ep) {
                                 if (ep->address == target.address) {
                                         endpoint_toggle_set(ep,0);
@@ -408 +407 @@
     usb_address_t address, void (*callback)(endpoint_t *, void *), void *arg)
 {
+        list_t *list;
+        link_t *link;
+        link_t *next;
+
         assert(address >= 0);
         assert(instance);
         fibril_mutex_lock(&instance->guard);
-        list_foreach(*get_list(instance, address), iterator) {
-                endpoint_t *ep = endpoint_get_instance(iterator);
+
+        list = get_list(instance, address);
+        link = list_first(list);
+        while (link != NULL) {
+                endpoint_t *ep = list_get_instance(link, endpoint_t, link);
+                next = list_next(link, list);
+
                 if (ep->address == address) {
-                        iterator = iterator->next;
                         list_remove(&ep->link);
                         if (callback)
@@ -420 +427 @@
                         endpoint_destroy(ep);
                 }
+                link = next;
         }
         fibril_mutex_unlock(&instance->guard);