Changeset 3f03199 in mainline for uspace/lib/block/block.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/lib/block/block.c (modified) (2 diffs)

uspace/lib/block/block.c

@@ -93 +93 @@
         fibril_mutex_lock(&dcl_lock);
         
-        list_foreach(dcl, cur) {
-                devcon_t *devcon = list_get_instance(cur, devcon_t, link);
+        list_foreach(dcl, link, devcon_t, devcon) {
                 if (devcon->service_id == service_id) {
                         fibril_mutex_unlock(&dcl_lock);
@@ -124 +123 @@
         
         fibril_mutex_lock(&dcl_lock);
-        list_foreach(dcl, cur) {
-                devcon_t *d = list_get_instance(cur, devcon_t, link);
+        list_foreach(dcl, link, devcon_t, d) {
                 if (d->service_id == service_id) {
                         fibril_mutex_unlock(&dcl_lock);