From dc7e33558e04c9cd0a04085fe20d64d6403123ee Mon Sep 17 00:00:00 2001
From: Petre Eftime <petre.p.eftime@intel.com>
Date: Tue, 1 Sep 2015 18:55:06 +0300
Subject: [PATCH] java: fix Java arrays for m24lr64e

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

diff --git a/src/m24lr64e/javaupm_m24lr64e.i b/src/m24lr64e/javaupm_m24lr64e.i
index 14d14a9e..ae61d31d 100644
--- a/src/m24lr64e/javaupm_m24lr64e.i
+++ b/src/m24lr64e/javaupm_m24lr64e.i
@@ -3,10 +3,23 @@
 %include "stdint.i"
 %include "arrays_java.i";
 
-%apply signed char[] {uint8_t *};
-
 %{
     #include "m24lr64e.h"
 %}
 
+%typemap(jni) (uint8_t *buf, unsigned int len) "jbyteArray";
+%typemap(jtype) (uint8_t *buf, unsigned int len) "byte[]";
+%typemap(jstype) (uint8_t *buf, unsigned int len) "byte[]";
+
+%typemap(javain) (uint8_t *buf, unsigned int len) "$javainput";
+
+%typemap(in) (uint8_t *buf, unsigned int len) {
+        $1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL);
+        $2 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(freearg) (uint8_t *buf, unsigned int len) {
+        JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
+}
+
 %include "m24lr64e.h"