diff options
author | Harald Welte <laforge@gnumonks.org> | 2010-03-07 13:44:52 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2010-03-07 13:44:52 +0100 |
commit | a4bb938b397cb176ce70bf3db5c53c52598b78d1 (patch) | |
tree | e1e1116142147cfaaf1f8baeb467bc19ef474241 /src/target/firmware | |
parent | a24d658e26affafd531fcf9a049182903d0bbd1b (diff) |
fix even more compiler warnings
Diffstat (limited to 'src/target/firmware')
-rw-r--r-- | src/target/firmware/calypso/irq.c | 6 | ||||
-rw-r--r-- | src/target/firmware/calypso/keypad.c | 3 | ||||
-rw-r--r-- | src/target/firmware/calypso/rtc.c | 3 | ||||
-rw-r--r-- | src/target/firmware/calypso/timer.c | 4 | ||||
-rw-r--r-- | src/target/firmware/calypso/uart.c | 4 | ||||
-rw-r--r-- | src/target/firmware/include/layer1/async.h | 2 | ||||
-rw-r--r-- | src/target/firmware/layer1/mframe_sched.c | 4 | ||||
-rw-r--r-- | src/target/firmware/layer1/sync.c | 2 | ||||
-rw-r--r-- | src/target/firmware/layer1/tdma_sched.c | 3 |
9 files changed, 21 insertions, 10 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; diff --git a/src/target/firmware/include/layer1/async.h b/src/target/firmware/include/layer1/async.h index 9e057c3c..898a4179 100644 --- a/src/target/firmware/include/layer1/async.h +++ b/src/target/firmware/include/layer1/async.h @@ -1,6 +1,8 @@ #ifndef _L1_ASYNC_H #define _L1_ASYNC_H +#include <comm/msgb.h> + #include <layer1/mframe_sched.h> /* safely enable a message into the L1S TX queue */ diff --git a/src/target/firmware/layer1/mframe_sched.c b/src/target/firmware/layer1/mframe_sched.c index 61fbe48b..9a521e1b 100644 --- a/src/target/firmware/layer1/mframe_sched.c +++ b/src/target/firmware/layer1/mframe_sched.c @@ -275,6 +275,10 @@ uint8_t mframe_task2chan_nr(enum mframe_task mft, uint8_t ts) case MF_TASK_SDCCH8_7: cbits = 0x08 + 7; break; + case MF_TASK_UL_ALL_NB: + /* ERROR: cannot express as channel number */ + cbits = 0; + break; } return (cbits << 3) | (ts & 0x7); diff --git a/src/target/firmware/layer1/sync.c b/src/target/firmware/layer1/sync.c index da444aa7..486133ae 100644 --- a/src/target/firmware/layer1/sync.c +++ b/src/target/firmware/layer1/sync.c @@ -1110,7 +1110,7 @@ const struct tdma_sched_item nb_sched_set_ul[] = { /* Interrupt handler */ -static void frame_irq(enum irq_nr nr) +static void frame_irq(__unused enum irq_nr nr) { l1_sync(); } diff --git a/src/target/firmware/layer1/tdma_sched.c b/src/target/firmware/layer1/tdma_sched.c index 2097bb04..7d7692f0 100644 --- a/src/target/firmware/layer1/tdma_sched.c +++ b/src/target/firmware/layer1/tdma_sched.c @@ -33,7 +33,8 @@ #include <calypso/dsp.h> /* dummy function to mark end of set */ -int tdma_end_set(uint8_t p1, uint8_t p2, uint16_t p3) +int tdma_end_set(__unused uint8_t p1, __unused uint8_t p2, + __unused uint16_t p3) { return 0; } |