From f6c56be5e4743e6fb68374dc715b6b368470d5d6 Mon Sep 17 00:00:00 2001
From: Petre Eftime <petre.p.eftime@intel.com>
Date: Mon, 31 Aug 2015 18:51:49 +0300
Subject: [PATCH] java: convert (uint8_t *buffer, size_t len) to byte[] for
 grovescam

Signed-off-by: Petre Eftime <petre.p.eftime@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/grovescam/javaupm_grovescam.i | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/grovescam/javaupm_grovescam.i b/src/grovescam/javaupm_grovescam.i
index 94e5cb8c..5f8a789d 100644
--- a/src/grovescam/javaupm_grovescam.i
+++ b/src/grovescam/javaupm_grovescam.i
@@ -1,10 +1,23 @@
 %module javaupm_grovescam
 %include "../upm.i"
-%include "arrays_java.i";
-%apply unsigned char[] {uint8_t *};
 
 %{
     #include "grovescam.h"
 %}
 
+%typemap(jni) (uint8_t *buffer, size_t len) "jbyteArray";
+%typemap(jtype) (uint8_t *buffer, size_t len) "byte[]";
+%typemap(jstype) (uint8_t *buffer, size_t len) "byte[]";
+
+%typemap(javain) (uint8_t *buffer, size_t len) "$javainput";
+
+%typemap(in) (uint8_t *buffer, size_t len) {
+        $1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL);
+        $2 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (uint8_t *buffer, size_t len) {
+        JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
+}
+
 %include "grovescam.h"