From be2e8d7c76559019acb1734edf11e5d044c9b020 Mon Sep 17 00:00:00 2001 From: Petre Eftime Date: Mon, 31 Aug 2015 18:45:02 +0300 Subject: [PATCH] java: convert (uint8_t* buf, int len) to byte[] in Java for lsm9ds0, free resources Signed-off-by: Petre Eftime Signed-off-by: Mihai Tudor Panu --- src/lsm9ds0/javaupm_lsm9ds0.i | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/lsm9ds0/javaupm_lsm9ds0.i b/src/lsm9ds0/javaupm_lsm9ds0.i index 67b65526..ca63616d 100644 --- a/src/lsm9ds0/javaupm_lsm9ds0.i +++ b/src/lsm9ds0/javaupm_lsm9ds0.i @@ -11,7 +11,6 @@ %apply int {mraa::Edge}; %apply float *INOUT { float *x, float *y, float *z }; -%apply unsigned char[] {uint8_t *buf}; %{ #include "lsm9ds0.h" @@ -28,20 +27,38 @@ %typemap(out) float *getAccelerometer { $result = JCALL1(NewFloatArray, jenv, 3); JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); + delete [] $1; } %typemap(out) float *getGyroscope { $result = JCALL1(NewFloatArray, jenv, 3); JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); + delete [] $1; } %typemap(out) float *getMagnetometer { $result = JCALL1(NewFloatArray, jenv, 3); JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); + delete [] $1; } %ignore getAccelerometer(float *, float *, float *); %ignore getGyroscope(float *, float *, float *); %ignore getMagnetometer(float *, float *, float *); +%typemap(jni) (uint8_t *buf, int len) "jbyteArray"; +%typemap(jtype) (uint8_t *buf, int len) "byte[]"; +%typemap(jstype) (uint8_t *buf, int len) "byte[]"; + +%typemap(javain) (uint8_t *buf, int len) "$javainput"; + +%typemap(in) (uint8_t *buf, int len) { + $1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL); + $2 = JCALL1(GetArrayLength, jenv, $input); +} + +%typemap(freearg) (uint8_t *buf, int len) { + JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0); +} + %include "lsm9ds0.h"