Changeset 6cd9aa6 in mainline for kernel/genarch

Timestamp:

2009-02-15T23:13:55Z (17 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/genarch

Files:

• include/kbd/ns16550.h (modified) (1 diff)
• include/kbd/z8530.h (modified) (1 diff)
• src/kbd/i8042.c (modified) (1 diff)
• src/kbd/ns16550.c (modified) (1 diff)
• src/kbd/z8530.c (modified) (1 diff)

kernel/genarch/include/kbd/ns16550.h

@@ -47 +47 @@
 extern void ns16550_release(void);
 extern char ns16550_key_read(chardev_t *);
-extern irq_ownership_t ns16550_claim(void);
-extern void ns16550_irq_handler(irq_t *, void *, ...);
+extern irq_ownership_t ns16550_claim(void *);
+extern void ns16550_irq_handler(irq_t *);
 
 #include <arch/types.h>

kernel/genarch/include/kbd/z8530.h

@@ -50 +50 @@
 extern void z8530_interrupt(void);
 extern char z8530_key_read(chardev_t *);
-extern irq_ownership_t z8530_claim(void);
-extern void z8530_irq_handler(irq_t *, void *, ...);
+extern irq_ownership_t z8530_claim(void *);
+extern void z8530_irq_handler(irq_t *);
 
 #endif

kernel/genarch/src/kbd/i8042.c

@@ -124 +124 @@
 }
 
-static irq_ownership_t i8042_claim(void)
+static irq_ownership_t i8042_claim(void *instance)
 {
         return IRQ_ACCEPT;
 }
 
-static void i8042_irq_handler(irq_t *irq, void *arg, ...)
+static void i8042_irq_handler(irq_t *irq)
 {
         if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)

kernel/genarch/src/kbd/ns16550.c

@@ -211 +211 @@
 }
 
-irq_ownership_t ns16550_claim(void)
+irq_ownership_t ns16550_claim(void *instance)
 {
         return (ns16550_lsr_read(&ns16550) & LSR_DATA_READY);
 }
 
-void ns16550_irq_handler(irq_t *irq, void *arg, ...)
+void ns16550_irq_handler(irq_t *irq)
 {
         if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)

kernel/genarch/src/kbd/z8530.c

@@ -195 +195 @@
 }
 
-irq_ownership_t z8530_claim(void)
+irq_ownership_t z8530_claim(void *instance)
 {
         return (z8530_read_a(&z8530, RR0) & RR0_RCA);
 }
 
-void z8530_irq_handler(irq_t *irq, void *arg, ...)
+void z8530_irq_handler(irq_t *irq)
 {
         if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)