fix even more compiler warnings

5 files changed, 12 insertions, 8 deletions

diff --git a/src/target/firmware/calypso/irq.c b/src/target/firmware/calypso/irq.c
index d019918d..a3d57fbe 100644
--- a/src/target/firmware/calypso/irq.c
+++ b/src/target/firmware/calypso/irq.c
@@ -234,15 +234,15 @@ static void set_default_priorities(void)
 
 static uint32_t irq_nest_mask;
 /* mask off all interrupts that have a lower priority than irq_nr */
-static void mask_all_lower_prio_irqs(enum irq_nr irq)
+static void mask_all_lower_prio_irqs(enum irq_nr irqnr)
 {
-	uint8_t our_prio = readb(IRQ_REG(ILR_IRQ(irq))) >> 2;
+	uint8_t our_prio = readb(IRQ_REG(ILR_IRQ(irqnr))) >> 2;
 	int i;
 
 	for (i = 0; i < _NR_IRQ; i++) {
 		uint8_t prio;
 
-		if (i == irq)
+		if (i == irqnr)
 			continue;
 
 		prio = readb(IRQ_REG(ILR_IRQ(i))) >> 2;
diff --git a/src/target/firmware/calypso/keypad.c b/src/target/firmware/calypso/keypad.c
index 4afd51b8..8d9c9251 100644
--- a/src/target/firmware/calypso/keypad.c
+++ b/src/target/firmware/calypso/keypad.c
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <defines.h>
 #include <debug.h>
 #include <delay.h>
 #include <memory.h>
@@ -111,7 +112,7 @@ void dispatch_buttons(uint32_t buttons)
 	lastbuttons = buttons;
 }
 
-static void keypad_irq(enum irq_nr nr)
+static void keypad_irq(__unused enum irq_nr nr)
 {
 	keypad_poll();
 }
diff --git a/src/target/firmware/calypso/rtc.c b/src/target/firmware/calypso/rtc.c
index afa3824b..20497008 100644
--- a/src/target/firmware/calypso/rtc.c
+++ b/src/target/firmware/calypso/rtc.c
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <defines.h>
 #include <debug.h>
 #include <memory.h>
 #include <calypso/irq.h>
@@ -58,7 +59,7 @@ enum rtc_reg {
 
 static int tick_ctr;
 
-static void rtc_irq_tick(enum irq_nr nr)
+static void rtc_irq_tick(__unused enum irq_nr nr)
 {
 	if (tick_ctr & 1)
 		st7558_set_attr(DISP_ATTR_INVERT);
diff --git a/src/target/firmware/calypso/timer.c b/src/target/firmware/calypso/timer.c
index 050c7c93..916839dd 100644
--- a/src/target/firmware/calypso/timer.c
+++ b/src/target/firmware/calypso/timer.c
@@ -24,6 +24,8 @@
 #include <memory.h>
 #include <stdint.h>
 
+#include <defines.h>
+
 #include <calypso/timer.h>
 #include <calypso/irq.h>
 
@@ -107,7 +109,7 @@ enum wdog_reg {
 	WD_MODE		= 0x04,
 };
 
-static void wdog_irq(enum irq_nr nr)
+static void wdog_irq(__unused enum irq_nr nr)
 {
 	puts("=> WATCHDOG\n");
 }
diff --git a/src/target/firmware/calypso/uart.c b/src/target/firmware/calypso/uart.c
index 70e50c15..d7fa3921 100644
--- a/src/target/firmware/calypso/uart.c
+++ b/src/target/firmware/calypso/uart.c
@@ -190,7 +190,7 @@ static uint8_t uart_reg_read(int uart, enum uart_reg reg)
 	return ret;
 }
 
-static void uart_irq_handler_cons(enum irq_nr irq)
+static void uart_irq_handler_cons(__unused enum irq_nr irqnr)
 {
 	const uint8_t uart = CONS_UART_NR;
 	uint8_t iir;
@@ -223,7 +223,7 @@ static void uart_irq_handler_cons(enum irq_nr irq)
 	}
 }
 
-static void uart_irq_handler_sercomm(enum irq_nr irq)
+static void uart_irq_handler_sercomm(__unused enum irq_nr irqnr)
 {
 	const uint8_t uart = SERCOMM_UART_NR;
 	uint8_t iir, ch;