summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2011-11-09 23:24:16 +0100
committerHarald Welte <laforge@gnumonks.org>2011-11-10 07:33:56 +0100
commitebc2088382df3148a3b61f7108aa6ffccd7396be (patch)
treed9564d0ca2bd11d4f0b9dbfa6816029fbdf4f151
parent7db9f66c8b902f7c6417f06145d286bdd4ea83fe (diff)
dfu: Remove unused variable, mark method as not retuning
-rw-r--r--firmware/include/asm/compiler.h1
-rw-r--r--firmware/src/dfu/dfu.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/firmware/include/asm/compiler.h b/firmware/include/asm/compiler.h
index 08b6bae..d2b53f0 100644
--- a/firmware/include/asm/compiler.h
+++ b/firmware/include/asm/compiler.h
@@ -5,5 +5,6 @@
#define unlikely(x) __builtin_expect(!!(x), 0)
#define __unused __attribute__((unused))
+#define __noreturn __attribute__((noreturn))
#endif
diff --git a/firmware/src/dfu/dfu.c b/firmware/src/dfu/dfu.c
index f31b9f8..5d6865c 100644
--- a/firmware/src/dfu/dfu.c
+++ b/firmware/src/dfu/dfu.c
@@ -993,10 +993,8 @@ static __dfufunc void dfu_udp_irq(void)
}
/* this is only called once before DFU mode, no __dfufunc required */
-static void dfu_switch(void)
+static __noreturn void dfu_switch(void)
{
- AT91PS_AIC pAic = AT91C_BASE_AIC;
-
DEBUGE("\r\nsam7dfu: switching to DFU mode\r\n");
dfu_state = DFU_STATE_appDETACH;
personal git repositories of Harald Welte. Your mileage may vary