mirror of
https://github.com/eclipse/upm.git
synced 2025-12-15 13:26:07 +03:00
SWIGJAVA: Remove the last JAVA ifdefs from src
Removed all references to #ifdef SWIGJAVA and JAVACALLBACK from the
library source. All java-specific source code has been moved to the
corresponding library's .i file for java.
* Update library source
* Update examples where necessary
* The function pointer methodology has been remove from libraries
which provided callbacks as both a class and a function pointer
implementation. Examples were updated to use the class version
of callbacks.
* Updated documentation for SWIGJAVA
Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@@ -134,20 +134,12 @@ NRF24L01::setPayload (uint8_t payload) {
|
||||
m_payload = payload;
|
||||
}
|
||||
|
||||
#ifdef JAVACALLBACK
|
||||
void
|
||||
NRF24L01::setDataReceivedHandler (Callback *call_obj)
|
||||
{
|
||||
callback_obj = call_obj;
|
||||
dataReceivedHandler = &generic_callback;
|
||||
}
|
||||
#else
|
||||
void
|
||||
NRF24L01::setDataReceivedHandler (funcPtrVoidVoid handler)
|
||||
{
|
||||
dataReceivedHandler = handler;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool
|
||||
NRF24L01::dataReady () {
|
||||
@@ -316,11 +308,8 @@ void
|
||||
NRF24L01::pollListener() {
|
||||
if (dataReady()) {
|
||||
getData (m_rxBuffer);
|
||||
#ifdef JAVACALLBACK
|
||||
|
||||
dataReceivedHandler (callback_obj); /* let know that data arrived */
|
||||
#else
|
||||
dataReceivedHandler (); /* let know that data arrived */
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user