Private
Public Access
2
0

gpio.hpp: remove unused args parameter from Java isr method

Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Petre Eftime
2015-09-08 14:52:37 +03:00
committed by Brendan Le Foll
parent 3934897864
commit a0791f8277

View File

@@ -73,6 +73,7 @@ typedef enum {
class IsrCallback class IsrCallback
{ {
friend class Gpio;
public: public:
virtual ~IsrCallback() virtual ~IsrCallback()
{ {
@@ -82,15 +83,14 @@ class IsrCallback
{ /* empty, overloaded in Java*/ { /* empty, overloaded in Java*/
} }
private: protected:
}; static void
void
generic_isr_callback(void* data) generic_isr_callback(void* data)
{ {
IsrCallback* callback = (IsrCallback*) data; IsrCallback* callback = (IsrCallback*) data;
callback->run(); callback->run();
} }
};
#endif #endif
/** /**
@@ -198,9 +198,9 @@ class Gpio
} }
#elif defined(SWIGJAVA) #elif defined(SWIGJAVA)
Result Result
isr(Edge mode, IsrCallback* cb, void* args) isr(Edge mode, IsrCallback* cb)
{ {
return (Result) mraa_gpio_isr(m_gpio, (mraa_gpio_edge_t) mode, generic_isr_callback, cb); return (Result) mraa_gpio_isr(m_gpio, (mraa_gpio_edge_t) mode, &IsrCallback::generic_isr_callback, cb);
} }
#else #else
/** /**