Changeset 6cd9aa6 in mainline for kernel/generic/src

Timestamp:

2009-02-15T23:13:55Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

17f168e

Parents:

fa09449

Message:

IRQ handlers are using one superfluous argument and an unused elipsis.
On the other hand, IRQ claim functions would need to be passed the instance
argument.

Location:

kernel/generic/src

Files:

• console/console.c (modified) (1 diff)
• console/kconsole.c (modified) (1 diff)
• ddi/irq.c (modified) (4 diffs)

kernel/generic/src/console/console.c

@@ -102 +102 @@
  * @return Always returns IRQ_DECLINE.
  */
-static irq_ownership_t klog_claim(void)
+static irq_ownership_t klog_claim(void *instance)
 {
         return IRQ_DECLINE;

kernel/generic/src/console/kconsole.c

@@ -104 +104 @@
  *
  */
-static irq_ownership_t kconsole_claim(void)
+static irq_ownership_t kconsole_claim(void *instance)
 {
         return IRQ_DECLINE;

kernel/generic/src/ddi/irq.c

@@ -40 +40 @@
  * This code is designed to support:
  * - multiple devices sharing single IRQ
- * - multiple IRQs per signle device
+ * - multiple IRQs per single device
+ * - multiple instances of the same device
  *
  *
@@ -145 +146 @@
         irq->claim = NULL;
         irq->handler = NULL;
-        irq->arg = NULL;
+        irq->instance = NULL;
         irq->cir = NULL;
         irq->cir_arg = NULL;
@@ -307 +308 @@
         if (devno == -1) {
                 /* Invoked by irq_dispatch_and_lock(). */
-                rv = ((irq->inr == inr) && (irq->claim() == IRQ_ACCEPT));
+                rv = ((irq->inr == inr) &&
+                    (irq->claim(irq->instance) == IRQ_ACCEPT));
         } else {
                 /* Invoked by irq_find_and_lock(). */
@@ -366 +368 @@
         if (devno == -1) {
                 /* Invoked by irq_dispatch_and_lock() */
-                rv = (irq->claim() == IRQ_ACCEPT);
+                rv = (irq->claim(irq->instance) == IRQ_ACCEPT);
         } else {
                 /* Invoked by irq_find_and_lock() */