Changeset 8b863a62 in mainline for uspace/lib/drv/generic/interrupt.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/drv/generic/interrupt.c (modified) (6 diffs)

uspace/lib/drv/generic/interrupt.c

@@ -39 +39 @@
 #include <errno.h>
 #include <sys/types.h>
+#include <macros.h>
 
 #include "ddf/interrupt.h"
@@ -55 +56 @@
 static interrupt_context_t *find_interrupt_context(
     interrupt_context_list_t *list, ddf_dev_t *dev, int irq);
-int register_interrupt_handler(ddf_dev_t *dev, int irq,
-    interrupt_handler_t *handler, irq_code_t *pseudocode);
-int unregister_interrupt_handler(ddf_dev_t *dev, int irq);
 
 /** Interrupts */
@@ -68 +66 @@
 };
 
-static irq_code_t default_pseudocode = {
+static const irq_code_t default_pseudocode = {
         0,
         NULL,
-        sizeof(default_cmds) / sizeof(irq_cmd_t),
+        ARRAY_SIZE(default_cmds),
         default_cmds
 };
@@ -138 +136 @@
     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 +152 @@
     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);
@@ -175 +167 @@
 
 int register_interrupt_handler(ddf_dev_t *dev, int irq,
-    interrupt_handler_t *handler, irq_code_t *pseudocode)
+    interrupt_handler_t *handler, const irq_code_t *pseudocode)
 {
         interrupt_context_t *ctx = create_interrupt_context();