From 52b4370e7de4ab9205770fe1319d37476fd35f47 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 15 Aug 2013 23:06:48 +0200 Subject: [PATCH 1/6] fix register_interrupt callback parameter --- cpu/native/include/cpu.h | 2 +- cpu/native/irq_cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/native/include/cpu.h b/cpu/native/include/cpu.h index 484bafef40..0efb9c1d04 100644 --- a/cpu/native/include/cpu.h +++ b/cpu/native/include/cpu.h @@ -52,7 +52,7 @@ void eINT(void); /** * register interrupt handler handler for interrupt sig */ -int register_interrupt(int sig, void *handler); +int register_interrupt(int sig, void (*handler)(void)); /** * unregister interrupt handler for interrupt sig diff --git a/cpu/native/irq_cpu.c b/cpu/native/irq_cpu.c index 053d8eb5b7..43736f0630 100644 --- a/cpu/native/irq_cpu.c +++ b/cpu/native/irq_cpu.c @@ -358,7 +358,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context) * TODO: use appropriate data structure for signal * handlers. */ -int register_interrupt(int sig, void *handler) +int register_interrupt(int sig, void (*handler)(void)) { struct sigaction sa; DEBUG("XXX: register_interrupt()\n"); From c1a5a3b5aff8e962dd980162b6d5174382148752 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 15 Aug 2013 23:09:16 +0200 Subject: [PATCH 2/6] fix hwtimer_arch_set_absolute return value --- cpu/native/hwtimer_cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpu/native/hwtimer_cpu.c b/cpu/native/hwtimer_cpu.c index b63e0e42e3..c9419522a8 100644 --- a/cpu/native/hwtimer_cpu.c +++ b/cpu/native/hwtimer_cpu.c @@ -210,7 +210,10 @@ void hwtimer_arch_set_absolute(unsigned long value, short timer) { DEBUG("hwtimer_arch_set_absolute(%lu, %i)\n", value, timer); value -= native_hwtimer_now; - return(hwtimer_arch_set(value, timer)); + + hwtimer_arch_set(value, timer); + + return; } unsigned long hwtimer_arch_now(void) From 747d33e6668221ba4716e19e394ab325dd0bdd6e Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 15 Aug 2013 23:13:57 +0200 Subject: [PATCH 3/6] fix warning for sa.sa_sigaction assignments --- cpu/native/irq_cpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cpu/native/irq_cpu.c b/cpu/native/irq_cpu.c index 43736f0630..6b6f2bf1d9 100644 --- a/cpu/native/irq_cpu.c +++ b/cpu/native/irq_cpu.c @@ -369,8 +369,7 @@ int register_interrupt(int sig, void (*handler)(void)) native_irq_handlers[sig].func = handler; - sa.sa_sigaction = (void *) native_isr_entry; - /* sa.sa_handler = (void*) native_isr_entry; */ + sa.sa_sigaction = native_isr_entry; if (sigemptyset(&sa.sa_mask) == -1) { err(1, "register_interrupt: sigemptyset"); @@ -402,7 +401,6 @@ int unregister_interrupt(int sig) native_irq_handlers[sig].func = NULL; - /* sa.sa_sigaction = SIG_IGN; */ sa.sa_handler = SIG_IGN; if (sigemptyset(&sa.sa_mask) == -1) { @@ -437,7 +435,7 @@ void native_interrupt_init(void) native_irq_handlers[i].func = NULL; } - sa.sa_sigaction = (void *) native_isr_entry; + sa.sa_sigaction = native_isr_entry; if (sigemptyset(&sa.sa_mask) == -1) { err(1, "native_interrupt_init: sigemptyset"); From 6fba4d7ced110d5ff8405bcc41991b1a6f7d0d6b Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 15 Aug 2013 23:20:30 +0200 Subject: [PATCH 4/6] fix unused startup parameter warnings --- cpu/native/startup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cpu/native/startup.c b/cpu/native/startup.c index 74f28f8b65..befc8a8e89 100644 --- a/cpu/native/startup.c +++ b/cpu/native/startup.c @@ -35,6 +35,9 @@ __attribute__((constructor)) static void startup(int argc, char **argv) printf("usage: %s \n", argv[0]); exit(EXIT_FAILURE); } +#else /* args unused here */ + (void) argc; + (void) argv; #endif native_cpu_init(); From 395a033de69e84dfaae0708f779014515f093140 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Wed, 21 Aug 2013 15:09:35 +0200 Subject: [PATCH 5/6] fix unused parameter warning in posix-rtc.c --- cpu/native/rtc/posix-rtc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpu/native/rtc/posix-rtc.c b/cpu/native/rtc/posix-rtc.c index 965de49186..88eaf7b9f5 100644 --- a/cpu/native/rtc/posix-rtc.c +++ b/cpu/native/rtc/posix-rtc.c @@ -48,6 +48,8 @@ void rtc_disable(void) void rtc_set_localtime(struct tm *localt) { DEBUG("rtc_set_localtime()\n"); + + (void)localt; /* not implemented atm */ printf("setting time not supported."); } From 846bcc01a891c5f364760cef3e6dc189e6f9d041 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Wed, 21 Aug 2013 15:10:24 +0200 Subject: [PATCH 6/6] Change interface cb parameter to function pointer --- cpu/native/net/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpu/native/net/interface.c b/cpu/native/net/interface.c index 9da1413cd0..aab38196fe 100644 --- a/cpu/native/net/interface.c +++ b/cpu/native/net/interface.c @@ -106,7 +106,7 @@ void nativenet_switch_to_rx() /* nativenet_internal.h *************************************************/ /************************************************************************/ -int _nativenet_register_cb(int event, void *func) +int _nativenet_register_cb(int event, void (*func)(void)) { if (event > NNEV_MAXEV) { DEBUG("_nativenet_register_cb: event > NNEV_MAXEV");