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

uspace/lib/drv/generic/interrupt.c

@@ -138 +138 @@
     interrupt_context_list_t *list, int id)
 {
-        interrupt_context_t *ctx;
-        
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
+        fibril_mutex_lock(&list->mutex);
+        
+        list_foreach(list->contexts, link, interrupt_context_t, ctx) {
                 if (ctx->id == id) {
                         fibril_mutex_unlock(&list->mutex);
@@ -157 +154 @@
     interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
-        interrupt_context_t *ctx;
-        
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
+        fibril_mutex_lock(&list->mutex);
+        
+        list_foreach(list->contexts, link, interrupt_context_t, ctx) {
                 if (ctx->irq == irq && ctx->dev == dev) {
                         fibril_mutex_unlock(&list->mutex);