Changeset 3f03199 in mainline for uspace/srv/fs/fat/fat_idx.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/fs/fat/fat_idx.c (modified) (1 diff)

uspace/srv/fs/fat/fat_idx.c

@@ -88 +88 @@
 static unused_t *unused_find(service_id_t service_id, bool lock)
 {
-        unused_t *u;
-
         if (lock)
                 fibril_mutex_lock(&unused_lock);
 
-        list_foreach(unused_list, l) {
-                u = list_get_instance(l, unused_t, link);
+        list_foreach(unused_list, link, unused_t, u) {
                 if (u->service_id == service_id) 
                         return u;