Changeset 6cd9aa6 in mainline for kernel/arch/mips32/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/arch/mips32/src

Files:

• drivers/msim.c (modified) (2 diffs)
• drivers/serial.c (modified) (2 diffs)
• exception.c (modified) (3 diffs)
• interrupt.c (modified) (1 diff)

kernel/arch/mips32/src/drivers/msim.c

@@ -95 +95 @@
 
 /** Process keyboard interrupt. */
-static void msim_irq_handler(irq_t *irq, void *arg, ...)
+static void msim_irq_handler(irq_t *irq)
 {
         if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
@@ -111 +111 @@
 }
 
-static irq_ownership_t msim_claim(void)
+static irq_ownership_t msim_claim(void *instance)
 {
         return IRQ_ACCEPT;

kernel/arch/mips32/src/drivers/serial.c

@@ -113 +113 @@
 
 /** Process keyboard interrupt. Does not work in simics? */
-static void serial_irq_handler(irq_t *irq, void *arg, ...)
+static void serial_irq_handler(irq_t *irq)
 {
         if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
@@ -121 +121 @@
 }
 
-static irq_ownership_t serial_claim(void)
+static irq_ownership_t serial_claim(void *instance)
 {
         return IRQ_ACCEPT;

kernel/arch/mips32/src/exception.c

@@ -145 +145 @@
         
         /* decode interrupt number and process the interrupt */
-        cause = (cp0_cause_read() >> 8) &0xff;
+        cause = (cp0_cause_read() >> 8) & 0xff;
         
         for (i = 0; i < 8; i++) {
@@ -154 +154 @@
                                  * The IRQ handler was found.
                                  */
-                                irq->handler(irq, irq->arg);
+                                irq->handler(irq);
                                 spinlock_unlock(&irq->lock);
                         } else {
@@ -161 +161 @@
                                  */
 #ifdef CONFIG_DEBUG
-                                printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, i);
+                                printf("cpu%u: spurious interrupt (inum=%d)\n",
+                                    CPU->id, i);
 #endif
                         }

kernel/arch/mips32/src/interrupt.c

@@ -101 +101 @@
 }
 
-static irq_ownership_t timer_claim(void)
+static irq_ownership_t timer_claim(void *instance)
 {
         return IRQ_ACCEPT;
 }
 
-static void timer_irq_handler(irq_t *irq, void *arg, ...)
+static void timer_irq_handler(irq_t *irq)
 {
         unsigned long drift;