alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

java: Use Runnables instead of IsrCallbacks in Java

Browse Source 
Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Petre Eftime
2015-12-23 17:47:26 +02:00
committed by Mihai Tudor Panu
parent e1c66c351a
commit 2cd043c2a1
35 changed files with 96 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rpr220/javaupm_rpr220.i
View File

@ -1,12 +1,7 @@
%module(directors="1") javaupm_rpr220
%module javaupm_rpr220
%include "../upm.i"
%feature("director") IsrCallback;
SWIG_DIRECTOR_OWNED(IsrCallback)
%ignore generic_callback_isr;
%include "../IsrCallback.h"
%{
#include "rpr220.h"
%}
@ -21,4 +16,4 @@ SWIG_DIRECTOR_OWNED(IsrCallback)
System.exit(1);
}
}
%}
%}

4
src/rpr220/rpr220.cxx
View File

@ -59,9 +59,9 @@ bool RPR220::blackDetected()
}
#ifdef JAVACALLBACK
void RPR220::installISR(IsrCallback *cb)
void RPR220::installISR(jobject runnable)
{
installISR(generic_callback_isr, cb);
installISR(mraa_java_isr_callback, runnable);
}
#endif

8
src/rpr220/rpr220.h
View File

@ -26,10 +26,6 @@
#include <string>
#include <mraa/gpio.h>
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
#include "../IsrCallback.h"
#endif
namespace upm {
/**
@ -88,7 +84,7 @@ namespace upm {
bool blackDetected();
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(IsrCallback *cb);
void installISR(jobject runnable);
#else
/**
* Installs an ISR to be called when
@ -110,7 +106,7 @@ namespace upm {
private:
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(void (*isr)(void *), void *arg);
#endif
#endif
bool m_isrInstalled;
mraa_gpio_context m_gpio;
};