aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
diff options
context:
space:
mode:
authorAditya Gaddam <adityagaddam@gmail.com>2012-09-02 11:04:01 -0400
committerAditya Gaddam <adityagaddam@gmail.com>2012-09-02 11:04:01 -0400
commit53b224544424f037c29617f066294058aa6572f5 (patch)
tree1536907128420cff6bdfb63e1dd19ced0672f688 /libmaple
parent6b2700e2b1a03b7e0191f3dd9b34f8c51eea3c84 (diff)
downloadlibrambutan-53b224544424f037c29617f066294058aa6572f5.tar.gz
librambutan-53b224544424f037c29617f066294058aa6572f5.zip
"Callback versions of functions now take voidArgumentFuncPtr. We can probably use voidFuncPtr instead, but this way people can see that the function expects something different. Existing functions haven't changed in signature.
Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
Diffstat (limited to 'libmaple')
-rw-r--r--libmaple/exti.c6
-rw-r--r--libmaple/include/libmaple/exti.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/libmaple/exti.c b/libmaple/exti.c
index b620c77..abd618d 100644
--- a/libmaple/exti.c
+++ b/libmaple/exti.c
@@ -92,7 +92,7 @@ void exti_attach_interrupt(exti_num num,
exti_trigger_mode mode) {
// Call callback version with arg being null
- exti_attach_callback(num, port, handler, NULL, mode);
+ exti_attach_callback(num, port, (voidArgumentFuncPtr)handler, NULL, mode);
}
/**
@@ -114,14 +114,14 @@ void exti_attach_interrupt(exti_num num,
*/
void exti_attach_callback(exti_num num,
exti_cfg port,
- voidFuncPtr handler,
+ voidArgumentFuncPtr handler,
void *arg,
exti_trigger_mode mode) {
ASSERT(handler);
/* Register the handler */
- exti_channels[num].handler = (voidArgumentFuncPtr)handler;
+ exti_channels[num].handler = handler;
exti_channels[num].arg = arg;
/* Set trigger mode */
diff --git a/libmaple/include/libmaple/exti.h b/libmaple/include/libmaple/exti.h
index 530b442..1d201ac 100644
--- a/libmaple/include/libmaple/exti.h
+++ b/libmaple/include/libmaple/exti.h
@@ -117,7 +117,7 @@ void exti_attach_interrupt(exti_num num,
exti_trigger_mode mode);
void exti_attach_callback(exti_num num,
exti_cfg port,
- voidFuncPtr handler,
+ voidArgumentFuncPtr handler,
void *arg,
exti_trigger_mode mode);
void exti_detach_interrupt(exti_num num);