From 2fa9b7b6c9f6f4a27a4370f6c589cc33bf046c35 Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Fri, 20 Jun 2014 15:22:55 +0000 Subject: [PATCH 1/1] hcsr04: fix compilation issue with maa_gpio_isr args Signed-off-by: Kiveisha Yevgeniy --- examples/hcsr04.cxx | 2 +- src/hcsr04/hcsr04.cxx | 4 ++-- src/hcsr04/hcsr04.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/hcsr04.cxx b/examples/hcsr04.cxx index 63b3ab1..52a470c 100644 --- a/examples/hcsr04.cxx +++ b/examples/hcsr04.cxx @@ -43,7 +43,7 @@ sig_handler(int signo) //! [Interesting] void -interrupt (void) { +interrupt (void * args) { sonar->ackEdgeDetected (); } diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx index 1eb1054..d2af4be 100644 --- a/src/hcsr04/hcsr04.cxx +++ b/src/hcsr04/hcsr04.cxx @@ -31,7 +31,7 @@ using namespace upm; -HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void)) { +HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *)) { maa_result_t error = MAA_SUCCESS; m_name = "HCSR04"; @@ -50,7 +50,7 @@ HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void)) { maa_gpio_dir(m_echoPinCtx, MAA_GPIO_IN); gpio_edge_t edge = MAA_GPIO_EDGE_BOTH; - maa_gpio_isr (m_echoPinCtx, edge, fptr); + maa_gpio_isr (m_echoPinCtx, edge, fptr, NULL); } HCSR04::~HCSR04 () { diff --git a/src/hcsr04/hcsr04.h b/src/hcsr04/hcsr04.h index 549ee02..370c58a 100644 --- a/src/hcsr04/hcsr04.h +++ b/src/hcsr04/hcsr04.h @@ -55,7 +55,7 @@ class HCSR04 { * @param fptr function pointer for handling raising and * falling interrupts */ - HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void)); + HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *)); /** * HCSR04 object destructor. -- 2.7.4