From aa77bbbc9ee73685dccb56cc2ea2246f3d32b3ab Mon Sep 17 00:00:00 2001 From: Kyle Johannes Date: Wed, 29 Nov 2023 17:05:08 -0500 Subject: [PATCH] first iteration cleanup --- CMakeLists.txt | 18 +- api/icsneoc/icsneoc.cpp | 14 +- examples/java/java_wrap.c | 1454 +++++++++++++++---------------- platform/android/androidusb.cpp | 57 +- 4 files changed, 742 insertions(+), 801 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ef5838..57bf259 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,10 +5,10 @@ cmake_policy(SET CMP0074 NEW) option(LIBICSNEO_BUILD_TESTS "Build all tests." OFF) option(LIBICSNEO_BUILD_DOCS "Build documentation. Don't use in Visual Studio." OFF) -option(LIBICSNEO_BUILD_EXAMPLES "Build examples." OFF) +option(LIBICSNEO_BUILD_EXAMPLES "Build examples." ON) option(LIBICSNEO_BUILD_ICSNEOC "Build dynamic C library" ON) option(LIBICSNEO_BUILD_ICSNEOC_STATIC "Build static C library" ON) -option(LIBICSNEO_BUILD_ICSNEOLEGACY "Build icsnVC40 compatibility library" OFF) +option(LIBICSNEO_BUILD_ICSNEOLEGACY "Build icsnVC40 compatibility library" ON) set(LIBICSNEO_NPCAP_INCLUDE_DIR "" CACHE STRING "Npcap include directory; set to build with Npcap") # Device Drivers @@ -16,12 +16,12 @@ set(LIBICSNEO_NPCAP_INCLUDE_DIR "" CACHE STRING "Npcap include directory; set to # it is only relevant for communication between Linux and # CoreMini from the onboard processor of the device. option(LIBICSNEO_ENABLE_FIRMIO "Enable communication between Linux and CoreMini within the same device" OFF) -option(LIBICSNEO_ENABLE_RAW_ETHERNET "Enable devices which communicate over raw ethernet" OFF) -option(LIBICSNEO_ENABLE_CDCACM "Enable devices which communicate over USB CDC ACM" OFF) +option(LIBICSNEO_ENABLE_RAW_ETHERNET "Enable devices which communicate over raw ethernet" ON) +option(LIBICSNEO_ENABLE_CDCACM "Enable devices which communicate over USB CDC ACM" ON) option(LIBICSNEO_ENABLE_ANDROIDUSB "Enable devices which communicate over USB CDC ACM on Android" ON) -option(LIBICSNEO_ENABLE_FTDI "Enable devices which communicate over USB FTDI2XX" OFF) +option(LIBICSNEO_ENABLE_FTDI "Enable devices which communicate over USB FTDI2XX" ON) option(LIBICSNEO_ENABLE_TCP "Enable devices which communicate over TCP" OFF) -option(LIBICSNEO_ENABLE_FTD3XX "Enable devices which communicate over USB FTD3XX" OFF) +option(LIBICSNEO_ENABLE_FTD3XX "Enable devices which communicate over USB FTD3XX" ON) if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) @@ -166,12 +166,6 @@ else() # Darwin or Linux endif() endif() endif() - - if(LIBICSNEO_ENABLE_ANDROIDUSB) - list(APPEND PLATFORM_SRC - platform/posix/android/androidusb.cpp - ) - endif() endif() diff --git a/api/icsneoc/icsneoc.cpp b/api/icsneoc/icsneoc.cpp index 2583eeb..51a3a7e 100644 --- a/api/icsneoc/icsneoc.cpp +++ b/api/icsneoc/icsneoc.cpp @@ -4,13 +4,6 @@ #define ICSNEOC_MAKEDLL -#ifdef ICSNEO_ENABLE_ANDROIDUSB -#include "icsneo/platform/android/androidusb.h" -#include -#define LOG_TAG "libicsneoc" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) -#endif - #include "icsneo/icsneoc.h" #include "icsneo/icsneocpp.h" #include "icsneo/platform/dynamiclib.h" @@ -101,7 +94,6 @@ bool icsneo_isValidNeoDevice(const neodevice_t* device) { // return false on nullptr if(!device) { EventManager::GetInstance().add(APIEvent::Type::RequiredParameterNull, APIEvent::Severity::Error); - LOGD("nullparameter neodevice error\n"); return false; } // If this neodevice_t was returned by a previous search, it will no longer be valid (as the underlying icsneo::Device is freed) @@ -115,18 +107,17 @@ bool icsneo_isValidNeoDevice(const neodevice_t* device) { } EventManager::GetInstance().add(APIEvent::Type::InvalidNeoDevice, APIEvent::Severity::Error); - LOGD("Invalid neodevice error\n"); return false; } bool icsneo_openDevice(const neodevice_t* device) { if(!icsneo_isValidNeoDevice(device)) { - LOGD("Invalid neodevice error\n"); + //todo error return false; } if(!device->device->open()) { - LOGD("Device failed to open...\n"); + //todo error return false; } @@ -233,7 +224,6 @@ bool icsneo_getMessages(const neodevice_t* device, neomessage_t* messages, size_ return false; *items = storage.size(); - for(size_t i = 0; i < *items; i++) { // For each message, copy into neomessage_t buffer given messages[i] = CreateNeoMessage(storage[i]); diff --git a/examples/java/java_wrap.c b/examples/java/java_wrap.c index c9c0a65..a6c18d8 100644 --- a/examples/java/java_wrap.c +++ b/examples/java/java_wrap.c @@ -178,26 +178,26 @@ typedef struct { static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) { jclass excep; static const SWIG_JavaExceptions_t java_exceptions[] = { - { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, - { SWIG_JavaIOException, "java/io/IOException" }, - { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, - { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, - { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, - { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, - { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, - { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" }, - { SWIG_JavaUnknownError, "java/lang/UnknownError" }, - { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } + { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, + { SWIG_JavaIOException, "java/io/IOException" }, + { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, + { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, + { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, + { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, + { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, + { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" }, + { SWIG_JavaUnknownError, "java/lang/UnknownError" }, + { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } }; const SWIG_JavaExceptions_t *except_ptr = java_exceptions; while (except_ptr->code != code && except_ptr->code) - except_ptr++; + except_ptr++; (*jenv)->ExceptionClear(jenv); excep = (*jenv)->FindClass(jenv, except_ptr->java_exception); if (excep) - (*jenv)->ThrowNew(jenv, excep, msg); + (*jenv)->ThrowNew(jenv, excep, msg); } @@ -275,20 +275,20 @@ static int SWIG_JavaArrayInSchar (JNIEnv *jenv, jbyte **jarr, signed char **carr int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetByteArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (signed char*) malloc(sz * sizeof(signed char)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseByteArrayElements(jenv, input, jarr, 0); } @@ -305,12 +305,12 @@ static jbyteArray SWIG_JavaArrayOutSchar (JNIEnv *jenv, signed char *result, jsi int i; jbyteArray jresult = (*jenv)->NewByteArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetByteArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseByteArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -321,20 +321,20 @@ static int SWIG_JavaArrayInUchar (JNIEnv *jenv, jshort **jarr, unsigned char **c int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetShortArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (unsigned char*) malloc(sz * sizeof(unsigned char)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseShortArrayElements(jenv, input, jarr, 0); } @@ -351,12 +351,12 @@ static jshortArray SWIG_JavaArrayOutUchar (JNIEnv *jenv, unsigned char *result, int i; jshortArray jresult = (*jenv)->NewShortArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetShortArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseShortArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -367,20 +367,20 @@ static int SWIG_JavaArrayInShort (JNIEnv *jenv, jshort **jarr, short **carr, jsh int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetShortArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (short*) malloc(sz * sizeof(short)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseShortArrayElements(jenv, input, jarr, 0); } @@ -397,12 +397,12 @@ static jshortArray SWIG_JavaArrayOutShort (JNIEnv *jenv, short *result, jsize sz int i; jshortArray jresult = (*jenv)->NewShortArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetShortArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseShortArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -413,20 +413,20 @@ static int SWIG_JavaArrayInUshort (JNIEnv *jenv, jint **jarr, unsigned short **c int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetIntArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (unsigned short*) malloc(sz * sizeof(unsigned short)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseIntArrayElements(jenv, input, jarr, 0); } @@ -443,12 +443,12 @@ static jintArray SWIG_JavaArrayOutUshort (JNIEnv *jenv, unsigned short *result, int i; jintArray jresult = (*jenv)->NewIntArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetIntArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseIntArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -459,20 +459,20 @@ static int SWIG_JavaArrayInInt (JNIEnv *jenv, jint **jarr, int **carr, jintArray int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetIntArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (int*) malloc(sz * sizeof(int)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseIntArrayElements(jenv, input, jarr, 0); } @@ -489,12 +489,12 @@ static jintArray SWIG_JavaArrayOutInt (JNIEnv *jenv, int *result, jsize sz) { int i; jintArray jresult = (*jenv)->NewIntArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetIntArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseIntArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -505,20 +505,20 @@ static int SWIG_JavaArrayInUint (JNIEnv *jenv, jlong **jarr, unsigned int **carr int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetLongArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (unsigned int*) malloc(sz * sizeof(unsigned int)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseLongArrayElements(jenv, input, jarr, 0); } @@ -535,12 +535,12 @@ static jlongArray SWIG_JavaArrayOutUint (JNIEnv *jenv, unsigned int *result, jsi int i; jlongArray jresult = (*jenv)->NewLongArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetLongArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseLongArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -551,20 +551,20 @@ static int SWIG_JavaArrayInLong (JNIEnv *jenv, jint **jarr, long **carr, jintArr int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetIntArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (long*) malloc(sz * sizeof(long)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseIntArrayElements(jenv, input, jarr, 0); } @@ -581,12 +581,12 @@ static jintArray SWIG_JavaArrayOutLong (JNIEnv *jenv, long *result, jsize sz) { int i; jintArray jresult = (*jenv)->NewIntArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetIntArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseIntArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -597,20 +597,20 @@ static int SWIG_JavaArrayInUlong (JNIEnv *jenv, jlong **jarr, unsigned long **ca int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetLongArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (unsigned long*) malloc(sz * sizeof(unsigned long)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseLongArrayElements(jenv, input, jarr, 0); } @@ -627,12 +627,12 @@ static jlongArray SWIG_JavaArrayOutUlong (JNIEnv *jenv, unsigned long *result, j int i; jlongArray jresult = (*jenv)->NewLongArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetLongArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseLongArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -643,20 +643,20 @@ static int SWIG_JavaArrayInLonglong (JNIEnv *jenv, jlong **jarr, jlong **carr, j int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetLongArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (jlong*) malloc(sz * sizeof(jlong)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseLongArrayElements(jenv, input, jarr, 0); } @@ -673,12 +673,12 @@ static jlongArray SWIG_JavaArrayOutLonglong (JNIEnv *jenv, jlong *result, jsize int i; jlongArray jresult = (*jenv)->NewLongArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetLongArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseLongArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -689,20 +689,20 @@ static int SWIG_JavaArrayInFloat (JNIEnv *jenv, jfloat **jarr, float **carr, jfl int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetFloatArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (float*) malloc(sz * sizeof(float)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseFloatArrayElements(jenv, input, jarr, 0); } @@ -719,12 +719,12 @@ static jfloatArray SWIG_JavaArrayOutFloat (JNIEnv *jenv, float *result, jsize sz int i; jfloatArray jresult = (*jenv)->NewFloatArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetFloatArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseFloatArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -735,20 +735,20 @@ static int SWIG_JavaArrayInDouble (JNIEnv *jenv, jdouble **jarr, double **carr, int i; jsize sz; if (!input) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null array"); + return 0; } sz = (*jenv)->GetArrayLength(jenv, input); *jarr = (*jenv)->GetDoubleArrayElements(jenv, input, 0); if (!*jarr) - return 0; + return 0; *carr = (double*) malloc(sz * sizeof(double)); if (!*carr) { - SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); - return 0; + SWIG_JavaThrowException(jenv, SWIG_JavaOutOfMemoryError, "array memory allocation failed"); + return 0; } for (i=0; iGetArrayLength(jenv, input); for (i=0; iReleaseDoubleArrayElements(jenv, input, jarr, 0); } @@ -765,12 +765,12 @@ static jdoubleArray SWIG_JavaArrayOutDouble (JNIEnv *jenv, double *result, jsize int i; jdoubleArray jresult = (*jenv)->NewDoubleArray(jenv, sz); if (!jresult) - return NULL; + return NULL; arr = (*jenv)->GetDoubleArrayElements(jenv, jresult, 0); if (!arr) - return NULL; + return NULL; for (i=0; iReleaseDoubleArrayElements(jenv, jresult, arr, 0); return jresult; } @@ -808,10 +808,10 @@ static void delete_neodevice_t_array(neodevice_t *ary) { } static neodevice_t neodevice_t_array_getitem(neodevice_t *ary, int index) { - return ary[index]; + return ary[index]; } static void neodevice_t_array_setitem(neodevice_t *ary, int index, neodevice_t value) { - ary[index] = value; + ary[index] = value; } @@ -824,10 +824,10 @@ static void delete_neoevent_t_array(neoevent_t *ary) { } static neoevent_t neoevent_t_array_getitem(neoevent_t *ary, int index) { - return ary[index]; + return ary[index]; } static void neoevent_t_array_setitem(neoevent_t *ary, int index, neoevent_t value) { - ary[index] = value; + ary[index] = value; } @@ -840,10 +840,10 @@ static void delete_neomessage_t_array(neomessage_t *ary) { } static neomessage_t neomessage_t_array_getitem(neomessage_t *ary, int index) { - return ary[index]; + return ary[index]; } static void neomessage_t_array_setitem(neomessage_t *ary, int index, neomessage_t value) { - ary[index] = value; + ary[index] = value; } @@ -860,19 +860,19 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_icsneo_1findAllDevices(JNIEnv *jenv, (void)jarg1_; arg1 = *(neodevice_t **)&jarg1; { - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return ; - } - if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return ; - } - arg2 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg2, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return ; + } + if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return ; + } + arg2 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg2, 0); } icsneo_findAllDevices(arg1,arg2); { - (*jenv)->ReleaseIntArrayElements(jenv, jarg2, (jint *)arg2, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg2, (jint *)arg2, 0); } } @@ -896,59 +896,59 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1serialNumToString(JNIEnv (void)jcls; arg1 = (uint32_t)jarg1; { - arg2 = NULL; - if(jarg2 != NULL) { - /* Get the String from the StringBuffer */ - jmethodID setLengthID; - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); - jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); + arg2 = NULL; + if(jarg2 != NULL) { + /* Get the String from the StringBuffer */ + jmethodID setLengthID; + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); + jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); - /* Convert the String to a C string */ - const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); + /* Convert the String to a C string */ + const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); - /* Take a copy of the C string as the typemap is for a non const C string */ - jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); - jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); - arg2 = (char *) malloc(capacity+1); - strcpy(arg2, pCharStr); + /* Take a copy of the C string as the typemap is for a non const C string */ + jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); + jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); + arg2 = (char *) malloc(capacity+1); + strcpy(arg2, pCharStr); - /* Release the UTF string we obtained with GetStringUTFChars */ - (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); + /* Release the UTF string we obtained with GetStringUTFChars */ + (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); - /* Zero the original StringBuffer, so we can replace it with the result */ - setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); - (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); - } + /* Zero the original StringBuffer, so we can replace it with the result */ + setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); + (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); + } } { - if (!jarg3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); + if (!jarg3) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); } result = (bool)icsneo_serialNumToString(arg1,arg2,arg3); jresult = (jboolean)result; { - if(arg2 != NULL) { - /* Append the result to the empty StringBuffer */ - jstring newString = (*jenv)->NewStringUTF(jenv, arg2); - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); - (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); + if(arg2 != NULL) { + /* Append the result to the empty StringBuffer */ + jstring newString = (*jenv)->NewStringUTF(jenv, arg2); + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); + (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); - /* Clean up the string object, no longer needed */ - free(arg2); - arg2 = NULL; - } + /* Clean up the string object, no longer needed */ + free(arg2); + arg2 = NULL; + } } { - (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); } @@ -964,45 +964,45 @@ SWIGEXPORT jlong JNICALL Java_icsneojavaJNI_icsneo_1serialStringToNum(JNIEnv *je (void)jenv; (void)jcls; { - arg1 = NULL; - if(jarg1 != NULL) { - /* Get the String from the StringBuffer */ - jmethodID setLengthID; - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg1); - jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); - jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg1, toStringID); + arg1 = NULL; + if(jarg1 != NULL) { + /* Get the String from the StringBuffer */ + jmethodID setLengthID; + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg1); + jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); + jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg1, toStringID); - /* Convert the String to a C string */ - const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); + /* Convert the String to a C string */ + const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); - /* Take a copy of the C string as the typemap is for a non const C string */ - jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); - jint capacity = (*jenv)->CallIntMethod(jenv, jarg1, capacityID); - arg1 = (char *) malloc(capacity+1); - strcpy(arg1, pCharStr); + /* Take a copy of the C string as the typemap is for a non const C string */ + jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); + jint capacity = (*jenv)->CallIntMethod(jenv, jarg1, capacityID); + arg1 = (char *) malloc(capacity+1); + strcpy(arg1, pCharStr); - /* Release the UTF string we obtained with GetStringUTFChars */ - (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); + /* Release the UTF string we obtained with GetStringUTFChars */ + (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); - /* Zero the original StringBuffer, so we can replace it with the result */ - setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); - (*jenv)->CallVoidMethod(jenv, jarg1, setLengthID, (jint) 0); - } + /* Zero the original StringBuffer, so we can replace it with the result */ + setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); + (*jenv)->CallVoidMethod(jenv, jarg1, setLengthID, (jint) 0); + } } result = (uint32_t)icsneo_serialStringToNum((char const *)arg1); jresult = (jlong)result; { - if(arg1 != NULL) { - /* Append the result to the empty StringBuffer */ - jstring newString = (*jenv)->NewStringUTF(jenv, arg1); - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg1); - jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); - (*jenv)->CallObjectMethod(jenv, jarg1, appendStringID, newString); + if(arg1 != NULL) { + /* Append the result to the empty StringBuffer */ + jstring newString = (*jenv)->NewStringUTF(jenv, arg1); + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg1); + jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); + (*jenv)->CallObjectMethod(jenv, jarg1, appendStringID, newString); - /* Clean up the string object, no longer needed */ - free(arg1); - arg1 = NULL; - } + /* Clean up the string object, no longer needed */ + free(arg1); + arg1 = NULL; + } } return jresult; @@ -1174,46 +1174,46 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1getMessages(JNIEnv *jenv, arg1 = *(neodevice_t **)&jarg1; arg2 = *(neomessage_t **)&jarg2; { - if (!jarg3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); + if (!jarg3) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); } { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg4) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return 0; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg4); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg4, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg4 = 0; - if (sz > 0) { - arg4 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg4) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return 0; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg4); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg4, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg4 = 0; + if (sz > 0) { + arg4 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } result = (bool)icsneo_getMessages((neodevice_t const *)arg1,arg2,arg3,arg4); jresult = (jboolean)result; { - (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); } return jresult; @@ -1264,59 +1264,59 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1getProductName(JNIEnv *je (void)jarg1_; arg1 = *(neodevice_t **)&jarg1; { - arg2 = NULL; - if(jarg2 != NULL) { - /* Get the String from the StringBuffer */ - jmethodID setLengthID; - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); - jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); + arg2 = NULL; + if(jarg2 != NULL) { + /* Get the String from the StringBuffer */ + jmethodID setLengthID; + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); + jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); - /* Convert the String to a C string */ - const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); + /* Convert the String to a C string */ + const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); - /* Take a copy of the C string as the typemap is for a non const C string */ - jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); - jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); - arg2 = (char *) malloc(capacity+1); - strcpy(arg2, pCharStr); + /* Take a copy of the C string as the typemap is for a non const C string */ + jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); + jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); + arg2 = (char *) malloc(capacity+1); + strcpy(arg2, pCharStr); - /* Release the UTF string we obtained with GetStringUTFChars */ - (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); + /* Release the UTF string we obtained with GetStringUTFChars */ + (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); - /* Zero the original StringBuffer, so we can replace it with the result */ - setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); - (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); - } + /* Zero the original StringBuffer, so we can replace it with the result */ + setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); + (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); + } } { - if (!jarg3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); + if (!jarg3) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); } result = (bool)icsneo_getProductName((neodevice_t const *)arg1,arg2,arg3); jresult = (jboolean)result; { - if(arg2 != NULL) { - /* Append the result to the empty StringBuffer */ - jstring newString = (*jenv)->NewStringUTF(jenv, arg2); - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); - (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); + if(arg2 != NULL) { + /* Append the result to the empty StringBuffer */ + jstring newString = (*jenv)->NewStringUTF(jenv, arg2); + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); + (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); - /* Clean up the string object, no longer needed */ - free(arg2); - arg2 = NULL; - } + /* Clean up the string object, no longer needed */ + free(arg2); + arg2 = NULL; + } } { - (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); } @@ -1335,59 +1335,59 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1getProductNameForType(JNI (void)jcls; arg1 = (devicetype_t)jarg1; { - arg2 = NULL; - if(jarg2 != NULL) { - /* Get the String from the StringBuffer */ - jmethodID setLengthID; - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); - jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); + arg2 = NULL; + if(jarg2 != NULL) { + /* Get the String from the StringBuffer */ + jmethodID setLengthID; + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); + jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); - /* Convert the String to a C string */ - const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); + /* Convert the String to a C string */ + const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); - /* Take a copy of the C string as the typemap is for a non const C string */ - jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); - jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); - arg2 = (char *) malloc(capacity+1); - strcpy(arg2, pCharStr); + /* Take a copy of the C string as the typemap is for a non const C string */ + jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); + jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); + arg2 = (char *) malloc(capacity+1); + strcpy(arg2, pCharStr); - /* Release the UTF string we obtained with GetStringUTFChars */ - (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); + /* Release the UTF string we obtained with GetStringUTFChars */ + (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); - /* Zero the original StringBuffer, so we can replace it with the result */ - setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); - (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); - } + /* Zero the original StringBuffer, so we can replace it with the result */ + setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); + (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); + } } { - if (!jarg3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); + if (!jarg3) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); } result = (bool)icsneo_getProductNameForType(arg1,arg2,arg3); jresult = (jboolean)result; { - if(arg2 != NULL) { - /* Append the result to the empty StringBuffer */ - jstring newString = (*jenv)->NewStringUTF(jenv, arg2); - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); - (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); + if(arg2 != NULL) { + /* Append the result to the empty StringBuffer */ + jstring newString = (*jenv)->NewStringUTF(jenv, arg2); + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); + (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); - /* Clean up the string object, no longer needed */ - free(arg2); - arg2 = NULL; - } + /* Clean up the string object, no longer needed */ + free(arg2); + arg2 = NULL; + } } { - (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); } @@ -1662,59 +1662,59 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1describeDevice(JNIEnv *je (void)jarg1_; arg1 = *(neodevice_t **)&jarg1; { - arg2 = NULL; - if(jarg2 != NULL) { - /* Get the String from the StringBuffer */ - jmethodID setLengthID; - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); - jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); + arg2 = NULL; + if(jarg2 != NULL) { + /* Get the String from the StringBuffer */ + jmethodID setLengthID; + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID toStringID = (*jenv)->GetMethodID(jenv, strClass, "toString", "()Ljava/lang/String;"); + jstring js = (jstring) (*jenv)->CallObjectMethod(jenv, jarg2, toStringID); - /* Convert the String to a C string */ - const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); + /* Convert the String to a C string */ + const char *pCharStr = (*jenv)->GetStringUTFChars(jenv, js, 0); - /* Take a copy of the C string as the typemap is for a non const C string */ - jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); - jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); - arg2 = (char *) malloc(capacity+1); - strcpy(arg2, pCharStr); + /* Take a copy of the C string as the typemap is for a non const C string */ + jmethodID capacityID = (*jenv)->GetMethodID(jenv, strClass, "capacity", "()I"); + jint capacity = (*jenv)->CallIntMethod(jenv, jarg2, capacityID); + arg2 = (char *) malloc(capacity+1); + strcpy(arg2, pCharStr); - /* Release the UTF string we obtained with GetStringUTFChars */ - (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); + /* Release the UTF string we obtained with GetStringUTFChars */ + (*jenv)->ReleaseStringUTFChars(jenv, js, pCharStr); - /* Zero the original StringBuffer, so we can replace it with the result */ - setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); - (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); - } + /* Zero the original StringBuffer, so we can replace it with the result */ + setLengthID = (*jenv)->GetMethodID(jenv, strClass, "setLength", "(I)V"); + (*jenv)->CallVoidMethod(jenv, jarg2, setLengthID, (jint) 0); + } } { - if (!jarg3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); + if (!jarg3) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); } result = (bool)icsneo_describeDevice((neodevice_t const *)arg1,arg2,arg3); jresult = (jboolean)result; { - if(arg2 != NULL) { - /* Append the result to the empty StringBuffer */ - jstring newString = (*jenv)->NewStringUTF(jenv, arg2); - jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); - jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); - (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); + if(arg2 != NULL) { + /* Append the result to the empty StringBuffer */ + jstring newString = (*jenv)->NewStringUTF(jenv, arg2); + jclass strClass = (*jenv)->GetObjectClass(jenv, jarg2); + jmethodID appendStringID = (*jenv)->GetMethodID(jenv, strClass, "append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;"); + (*jenv)->CallObjectMethod(jenv, jarg2, appendStringID, newString); - /* Clean up the string object, no longer needed */ - free(arg2); - arg2 = NULL; - } + /* Clean up the string object, no longer needed */ + free(arg2); + arg2 = NULL; + } } { - (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); } @@ -1730,9 +1730,9 @@ SWIGEXPORT jlong JNICALL Java_icsneojavaJNI_icsneo_1getVersion(JNIEnv *jenv, jcl (void)jcls; result = icsneo_getVersion(); { - neoversion_t * resultptr = (neoversion_t *) malloc(sizeof(neoversion_t)); - memmove(resultptr, &result, sizeof(neoversion_t)); - *(neoversion_t **)&jresult = resultptr; + neoversion_t * resultptr = (neoversion_t *) malloc(sizeof(neoversion_t)); + memmove(resultptr, &result, sizeof(neoversion_t)); + *(neoversion_t **)&jresult = resultptr; } return jresult; } @@ -1749,20 +1749,20 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1getEvents(JNIEnv *jenv, j (void)jarg1_; arg1 = *(neoevent_t **)&jarg1; { - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg2 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg2, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg2 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg2, 0); } result = (bool)icsneo_getEvents(arg1,arg2); jresult = (jboolean)result; { - (*jenv)->ReleaseIntArrayElements(jenv, jarg2, (jint *)arg2, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg2, (jint *)arg2, 0); } return jresult; @@ -1783,20 +1783,20 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1getDeviceEvents(JNIEnv *j arg1 = *(neodevice_t **)&jarg1; arg2 = *(neoevent_t **)&jarg2; { - if (!jarg3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); + if (!jarg3) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg3) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg3 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg3, 0); } result = (bool)icsneo_getDeviceEvents((neodevice_t const *)arg1,arg2,arg3); jresult = (jboolean)result; { - (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg3, (jint *)arg3, 0); } return jresult; @@ -1868,20 +1868,20 @@ SWIGEXPORT jboolean JNICALL Java_icsneojavaJNI_icsneo_1getSupportedDevices(JNIEn (void)jcls; arg1 = *(devicetype_t **)&jarg1; { - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); - return 0; - } - if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); - return 0; - } - arg2 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg2, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return 0; + } + if ((*jenv)->GetArrayLength(jenv, jarg2) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return 0; + } + arg2 = (size_t *) (*jenv)->GetIntArrayElements(jenv, jarg2, 0); } result = (bool)icsneo_getSupportedDevices(arg1,arg2); jresult = (jboolean)result; { - (*jenv)->ReleaseIntArrayElements(jenv, jarg2, (jint *)arg2, 0); + (*jenv)->ReleaseIntArrayElements(jenv, jarg2, (jint *)arg2, 0); } return jresult; @@ -1999,16 +1999,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neodevice_1t_1serial_1set(JNIEnv *jen arg1 = *(neodevice_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if(arg2) { - strncpy((char*)arg1->serial, (const char *)arg2, 7-1); - arg1->serial[7-1] = 0; - } else { - arg1->serial[0] = 0; - } + if(arg2) { + strncpy((char*)arg1->serial, (const char *)arg2, 7-1); + arg1->serial[7-1] = 0; + } else { + arg1->serial[0] = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); @@ -3602,14 +3602,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1statusbitfield_1t_1status (void)jarg1_; arg1 = *(neomessage_statusbitfield_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 4) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUint(jenv, &jarr2, (unsigned int **)&arg2, jarg2)) return ; { - size_t ii; - uint32_t *b = (uint32_t *) arg1->statusBitfield; - for (ii = 0; ii < (size_t)4; ii++) b[ii] = *((uint32_t *) arg2 + ii); + size_t ii; + uint32_t *b = (uint32_t *) arg1->statusBitfield; + for (ii = 0; ii < (size_t)4; ii++) b[ii] = *((uint32_t *) arg2 + ii); } SWIG_JavaArrayArgoutUint(jenv, jarr2, (unsigned int *)arg2, jarg2); free(arg2); @@ -3691,30 +3691,30 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1t_1timestamp_1set(JNIEnv (void)jarg1_; arg1 = *(neomessage_t **)&jarg1; { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return ; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg2); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg2 = 0; - if (sz > 0) { - arg2 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return ; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg2); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg2 = 0; + if (sz > 0) { + arg2 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } if (arg1) (arg1)->timestamp = arg2; } @@ -3731,22 +3731,22 @@ SWIGEXPORT jobject JNICALL Java_icsneojavaJNI_neomessage_1t_1timestamp_1get(JNIE arg1 = *(neomessage_t **)&jarg1; result = (uint64_t) ((arg1)->timestamp); { - jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); - jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); - jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); - jobject bigint; - int i; + jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); + jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); + jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); + jobject bigint; + int i; - bae[0] = 0; - for(i=1; i<9; i++ ) { - bae[i] = (jbyte)(result>>8*(8-i)); - } + bae[0] = 0; + for(i=1; i<9; i++ ) { + bae[i] = (jbyte)(result>>8*(8-i)); + } - (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); - bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); - (*jenv)->DeleteLocalRef(jenv, ba); - jresult = bigint; + (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); + bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); + (*jenv)->DeleteLocalRef(jenv, ba); + jresult = bigint; } return jresult; } @@ -3761,30 +3761,30 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1t_1timestampReserved_1set (void)jarg1_; arg1 = *(neomessage_t **)&jarg1; { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return ; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg2); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg2 = 0; - if (sz > 0) { - arg2 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return ; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg2); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg2 = 0; + if (sz > 0) { + arg2 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } if (arg1) (arg1)->timestampReserved = arg2; } @@ -3801,22 +3801,22 @@ SWIGEXPORT jobject JNICALL Java_icsneojavaJNI_neomessage_1t_1timestampReserved_1 arg1 = *(neomessage_t **)&jarg1; result = (uint64_t) ((arg1)->timestampReserved); { - jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); - jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); - jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); - jobject bigint; - int i; + jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); + jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); + jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); + jobject bigint; + int i; - bae[0] = 0; - for(i=1; i<9; i++ ) { - bae[i] = (jbyte)(result>>8*(8-i)); - } + bae[0] = 0; + for(i=1; i<9; i++ ) { + bae[i] = (jbyte)(result>>8*(8-i)); + } - (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); - bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); - (*jenv)->DeleteLocalRef(jenv, ba); - jresult = bigint; + (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); + bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); + (*jenv)->DeleteLocalRef(jenv, ba); + jresult = bigint; } return jresult; } @@ -3894,14 +3894,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1t_1header_1set(JNIEnv *je (void)jarg1_; arg1 = *(neomessage_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 4) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUchar(jenv, &jarr2, (unsigned char **)&arg2, jarg2)) return ; { - size_t ii; - uint8_t *b = (uint8_t *) arg1->header; - for (ii = 0; ii < (size_t)4; ii++) b[ii] = *((uint8_t *) arg2 + ii); + size_t ii; + uint8_t *b = (uint8_t *) arg1->header; + for (ii = 0; ii < (size_t)4; ii++) b[ii] = *((uint8_t *) arg2 + ii); } SWIG_JavaArrayArgoutUchar(jenv, jarr2, (unsigned char *)arg2, jarg2); free(arg2); @@ -3989,14 +3989,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1t_1reserved_1set(JNIEnv * (void)jarg1_; arg1 = *(neomessage_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 17) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUchar(jenv, &jarr2, (unsigned char **)&arg2, jarg2)) return ; { - size_t ii; - uint8_t *b = (uint8_t *) arg1->reserved; - for (ii = 0; ii < (size_t)17; ii++) b[ii] = *((uint8_t *) arg2 + ii); + size_t ii; + uint8_t *b = (uint8_t *) arg1->reserved; + for (ii = 0; ii < (size_t)17; ii++) b[ii] = *((uint8_t *) arg2 + ii); } SWIG_JavaArrayArgoutUchar(jenv, jarr2, (unsigned char *)arg2, jarg2); free(arg2); @@ -4078,30 +4078,30 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1can_1t_1timestamp_1set(JN (void)jarg1_; arg1 = *(neomessage_can_t **)&jarg1; { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return ; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg2); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg2 = 0; - if (sz > 0) { - arg2 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return ; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg2); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg2 = 0; + if (sz > 0) { + arg2 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } if (arg1) (arg1)->timestamp = arg2; } @@ -4118,22 +4118,22 @@ SWIGEXPORT jobject JNICALL Java_icsneojavaJNI_neomessage_1can_1t_1timestamp_1get arg1 = *(neomessage_can_t **)&jarg1; result = (uint64_t) ((arg1)->timestamp); { - jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); - jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); - jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); - jobject bigint; - int i; + jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); + jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); + jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); + jobject bigint; + int i; - bae[0] = 0; - for(i=1; i<9; i++ ) { - bae[i] = (jbyte)(result>>8*(8-i)); - } + bae[0] = 0; + for(i=1; i<9; i++ ) { + bae[i] = (jbyte)(result>>8*(8-i)); + } - (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); - bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); - (*jenv)->DeleteLocalRef(jenv, ba); - jresult = bigint; + (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); + bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); + (*jenv)->DeleteLocalRef(jenv, ba); + jresult = bigint; } return jresult; } @@ -4148,30 +4148,30 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1can_1t_1timestampReserved (void)jarg1_; arg1 = *(neomessage_can_t **)&jarg1; { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return ; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg2); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg2 = 0; - if (sz > 0) { - arg2 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return ; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg2); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg2 = 0; + if (sz > 0) { + arg2 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } if (arg1) (arg1)->timestampReserved = arg2; } @@ -4188,22 +4188,22 @@ SWIGEXPORT jobject JNICALL Java_icsneojavaJNI_neomessage_1can_1t_1timestampReser arg1 = *(neomessage_can_t **)&jarg1; result = (uint64_t) ((arg1)->timestampReserved); { - jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); - jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); - jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); - jobject bigint; - int i; + jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); + jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); + jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); + jobject bigint; + int i; - bae[0] = 0; - for(i=1; i<9; i++ ) { - bae[i] = (jbyte)(result>>8*(8-i)); - } + bae[0] = 0; + for(i=1; i<9; i++ ) { + bae[i] = (jbyte)(result>>8*(8-i)); + } - (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); - bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); - (*jenv)->DeleteLocalRef(jenv, ba); - jresult = bigint; + (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); + bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); + (*jenv)->DeleteLocalRef(jenv, ba); + jresult = bigint; } return jresult; } @@ -4393,14 +4393,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1can_1t_1reserved_1set(JNI (void)jarg1_; arg1 = *(neomessage_can_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 16) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUchar(jenv, &jarr2, (unsigned char **)&arg2, jarg2)) return ; { - size_t ii; - uint8_t *b = (uint8_t *) arg1->reserved; - for (ii = 0; ii < (size_t)16; ii++) b[ii] = *((uint8_t *) arg2 + ii); + size_t ii; + uint8_t *b = (uint8_t *) arg1->reserved; + for (ii = 0; ii < (size_t)16; ii++) b[ii] = *((uint8_t *) arg2 + ii); } SWIG_JavaArrayArgoutUchar(jenv, jarr2, (unsigned char *)arg2, jarg2); free(arg2); @@ -4482,30 +4482,30 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1eth_1t_1timestamp_1set(JN (void)jarg1_; arg1 = *(neomessage_eth_t **)&jarg1; { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return ; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg2); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg2 = 0; - if (sz > 0) { - arg2 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return ; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg2); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg2 = 0; + if (sz > 0) { + arg2 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } if (arg1) (arg1)->timestamp = arg2; } @@ -4522,22 +4522,22 @@ SWIGEXPORT jobject JNICALL Java_icsneojavaJNI_neomessage_1eth_1t_1timestamp_1get arg1 = *(neomessage_eth_t **)&jarg1; result = (uint64_t) ((arg1)->timestamp); { - jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); - jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); - jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); - jobject bigint; - int i; + jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); + jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); + jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); + jobject bigint; + int i; - bae[0] = 0; - for(i=1; i<9; i++ ) { - bae[i] = (jbyte)(result>>8*(8-i)); - } + bae[0] = 0; + for(i=1; i<9; i++ ) { + bae[i] = (jbyte)(result>>8*(8-i)); + } - (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); - bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); - (*jenv)->DeleteLocalRef(jenv, ba); - jresult = bigint; + (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); + bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); + (*jenv)->DeleteLocalRef(jenv, ba); + jresult = bigint; } return jresult; } @@ -4552,30 +4552,30 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1eth_1t_1timestampReserved (void)jarg1_; arg1 = *(neomessage_eth_t **)&jarg1; { - jclass clazz; - jmethodID mid; - jbyteArray ba; - jbyte* bae; - jsize sz; - int i; + jclass clazz; + jmethodID mid; + jbyteArray ba; + jbyte* bae; + jsize sz; + int i; - if (!jarg2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); - return ; - } - clazz = (*jenv)->GetObjectClass(jenv, jarg2); - mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); - ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); - bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - sz = (*jenv)->GetArrayLength(jenv, ba); - arg2 = 0; - if (sz > 0) { - arg2 = (uint64_t)(signed char)bae[0]; - for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); + if (!jarg2) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "BigInteger null"); + return ; + } + clazz = (*jenv)->GetObjectClass(jenv, jarg2); + mid = (*jenv)->GetMethodID(jenv, clazz, "toByteArray", "()[B"); + ba = (jbyteArray)(*jenv)->CallObjectMethod(jenv, jarg2, mid); + bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + sz = (*jenv)->GetArrayLength(jenv, ba); + arg2 = 0; + if (sz > 0) { + arg2 = (uint64_t)(signed char)bae[0]; + for(i=1; iReleaseByteArrayElements(jenv, ba, bae, 0); } if (arg1) (arg1)->timestampReserved = arg2; } @@ -4592,22 +4592,22 @@ SWIGEXPORT jobject JNICALL Java_icsneojavaJNI_neomessage_1eth_1t_1timestampReser arg1 = *(neomessage_eth_t **)&jarg1; result = (uint64_t) ((arg1)->timestampReserved); { - jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); - jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); - jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); - jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); - jobject bigint; - int i; + jbyteArray ba = (*jenv)->NewByteArray(jenv, 9); + jbyte* bae = (*jenv)->GetByteArrayElements(jenv, ba, 0); + jclass clazz = (*jenv)->FindClass(jenv, "java/math/BigInteger"); + jmethodID mid = (*jenv)->GetMethodID(jenv, clazz, "", "([B)V"); + jobject bigint; + int i; - bae[0] = 0; - for(i=1; i<9; i++ ) { - bae[i] = (jbyte)(result>>8*(8-i)); - } + bae[0] = 0; + for(i=1; i<9; i++ ) { + bae[i] = (jbyte)(result>>8*(8-i)); + } - (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); - bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); - (*jenv)->DeleteLocalRef(jenv, ba); - jresult = bigint; + (*jenv)->ReleaseByteArrayElements(jenv, ba, bae, 0); + bigint = (*jenv)->NewObject(jenv, clazz, mid, ba); + (*jenv)->DeleteLocalRef(jenv, ba); + jresult = bigint; } return jresult; } @@ -4713,14 +4713,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1eth_1t_1reservedHeader_1s (void)jarg1_; arg1 = *(neomessage_eth_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 3) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUchar(jenv, &jarr2, (unsigned char **)&arg2, jarg2)) return ; { - size_t ii; - uint8_t *b = (uint8_t *) arg1->reservedHeader; - for (ii = 0; ii < (size_t)3; ii++) b[ii] = *((uint8_t *) arg2 + ii); + size_t ii; + uint8_t *b = (uint8_t *) arg1->reservedHeader; + for (ii = 0; ii < (size_t)3; ii++) b[ii] = *((uint8_t *) arg2 + ii); } SWIG_JavaArrayArgoutUchar(jenv, jarr2, (unsigned char *)arg2, jarg2); free(arg2); @@ -4808,14 +4808,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1eth_1t_1reserved_1set(JNI (void)jarg1_; arg1 = *(neomessage_eth_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 17) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUchar(jenv, &jarr2, (unsigned char **)&arg2, jarg2)) return ; { - size_t ii; - uint8_t *b = (uint8_t *) arg1->reserved; - for (ii = 0; ii < (size_t)17; ii++) b[ii] = *((uint8_t *) arg2 + ii); + size_t ii; + uint8_t *b = (uint8_t *) arg1->reserved; + for (ii = 0; ii < (size_t)17; ii++) b[ii] = *((uint8_t *) arg2 + ii); } SWIG_JavaArrayArgoutUchar(jenv, jarr2, (unsigned char *)arg2, jarg2); free(arg2); @@ -4977,16 +4977,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoversion_1t_1metadata_1set(JNIEnv * arg1 = *(neoversion_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if (arg2) { - arg1->metadata = (char const *) malloc(strlen((const char *)arg2)+1); - strcpy((char *)arg1->metadata, (const char *)arg2); - } else { - arg1->metadata = 0; - } + if (arg2) { + arg1->metadata = (char const *) malloc(strlen((const char *)arg2)+1); + strcpy((char *)arg1->metadata, (const char *)arg2); + } else { + arg1->metadata = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); } @@ -5017,16 +5017,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoversion_1t_1buildBranch_1set(JNIEn arg1 = *(neoversion_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if (arg2) { - arg1->buildBranch = (char const *) malloc(strlen((const char *)arg2)+1); - strcpy((char *)arg1->buildBranch, (const char *)arg2); - } else { - arg1->buildBranch = 0; - } + if (arg2) { + arg1->buildBranch = (char const *) malloc(strlen((const char *)arg2)+1); + strcpy((char *)arg1->buildBranch, (const char *)arg2); + } else { + arg1->buildBranch = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); } @@ -5057,16 +5057,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoversion_1t_1buildTag_1set(JNIEnv * arg1 = *(neoversion_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if (arg2) { - arg1->buildTag = (char const *) malloc(strlen((const char *)arg2)+1); - strcpy((char *)arg1->buildTag, (const char *)arg2); - } else { - arg1->buildTag = 0; - } + if (arg2) { + arg1->buildTag = (char const *) malloc(strlen((const char *)arg2)+1); + strcpy((char *)arg1->buildTag, (const char *)arg2); + } else { + arg1->buildTag = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); } @@ -5097,16 +5097,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoversion_1t_1reserved_1set(JNIEnv * arg1 = *(neoversion_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if(arg2) { - strncpy((char*)arg1->reserved, (const char *)arg2, 32-1); - arg1->reserved[32-1] = 0; - } else { - arg1->reserved[0] = 0; - } + if(arg2) { + strncpy((char*)arg1->reserved, (const char *)arg2, 32-1); + arg1->reserved[32-1] = 0; + } else { + arg1->reserved[0] = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); @@ -5160,16 +5160,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoevent_1t_1description_1set(JNIEnv arg1 = *(neoevent_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if (arg2) { - arg1->description = (char const *) malloc(strlen((const char *)arg2)+1); - strcpy((char *)arg1->description, (const char *)arg2); - } else { - arg1->description = 0; - } + if (arg2) { + arg1->description = (char const *) malloc(strlen((const char *)arg2)+1); + strcpy((char *)arg1->description, (const char *)arg2); + } else { + arg1->description = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); } @@ -5201,8 +5201,8 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoevent_1t_1timestamp_1set(JNIEnv *j arg1 = *(neoevent_t **)&jarg1; argp2 = *(time_t **)&jarg2; if (!argp2) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null time_t"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null time_t"); + return ; } arg2 = *argp2; if (arg1) (arg1)->timestamp = arg2; @@ -5220,9 +5220,9 @@ SWIGEXPORT jlong JNICALL Java_icsneojavaJNI_neoevent_1t_1timestamp_1get(JNIEnv * arg1 = *(neoevent_t **)&jarg1; result = ((arg1)->timestamp); { - time_t * resultptr = (time_t *) malloc(sizeof(time_t)); - memmove(resultptr, &result, sizeof(time_t)); - *(time_t **)&jresult = resultptr; + time_t * resultptr = (time_t *) malloc(sizeof(time_t)); + memmove(resultptr, &result, sizeof(time_t)); + *(time_t **)&jresult = resultptr; } return jresult; } @@ -5294,16 +5294,16 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoevent_1t_1serial_1set(JNIEnv *jenv arg1 = *(neoevent_t **)&jarg1; arg2 = 0; if (jarg2) { - arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); - if (!arg2) return ; + arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0); + if (!arg2) return ; } { - if(arg2) { - strncpy((char*)arg1->serial, (const char *)arg2, 7-1); - arg1->serial[7-1] = 0; - } else { - arg1->serial[0] = 0; - } + if(arg2) { + strncpy((char*)arg1->serial, (const char *)arg2, 7-1); + arg1->serial[7-1] = 0; + } else { + arg1->serial[0] = 0; + } } if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2); @@ -5335,14 +5335,14 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoevent_1t_1reserved_1set(JNIEnv *je (void)jarg1_; arg1 = *(neoevent_t **)&jarg1; if (jarg2 && (*jenv)->GetArrayLength(jenv, jarg2) != 16) { - SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "incorrect array size"); + return ; } if (!SWIG_JavaArrayInUchar(jenv, &jarr2, (unsigned char **)&arg2, jarg2)) return ; { - size_t ii; - uint8_t *b = (uint8_t *) arg1->reserved; - for (ii = 0; ii < (size_t)16; ii++) b[ii] = *((uint8_t *) arg2 + ii); + size_t ii; + uint8_t *b = (uint8_t *) arg1->reserved; + for (ii = 0; ii < (size_t)16; ii++) b[ii] = *((uint8_t *) arg2 + ii); } SWIG_JavaArrayArgoutUchar(jenv, jarr2, (unsigned char *)arg2, jarg2); free(arg2); @@ -6768,9 +6768,9 @@ SWIGEXPORT jlong JNICALL Java_icsneojavaJNI_neodevice_1t_1array_1getitem(JNIEnv arg2 = (int)jarg2; result = neodevice_t_array_getitem(arg1,arg2); { - neodevice_t * resultptr = (neodevice_t *) malloc(sizeof(neodevice_t)); - memmove(resultptr, &result, sizeof(neodevice_t)); - *(neodevice_t **)&jresult = resultptr; + neodevice_t * resultptr = (neodevice_t *) malloc(sizeof(neodevice_t)); + memmove(resultptr, &result, sizeof(neodevice_t)); + *(neodevice_t **)&jresult = resultptr; } return jresult; } @@ -6790,8 +6790,8 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neodevice_1t_1array_1setitem(JNIEnv * arg2 = (int)jarg2; argp3 = *(neodevice_t **)&jarg3; if (!argp3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null neodevice_t"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null neodevice_t"); + return ; } arg3 = *argp3; neodevice_t_array_setitem(arg1,arg2,arg3); @@ -6836,9 +6836,9 @@ SWIGEXPORT jlong JNICALL Java_icsneojavaJNI_neoevent_1t_1array_1getitem(JNIEnv * arg2 = (int)jarg2; result = neoevent_t_array_getitem(arg1,arg2); { - neoevent_t * resultptr = (neoevent_t *) malloc(sizeof(neoevent_t)); - memmove(resultptr, &result, sizeof(neoevent_t)); - *(neoevent_t **)&jresult = resultptr; + neoevent_t * resultptr = (neoevent_t *) malloc(sizeof(neoevent_t)); + memmove(resultptr, &result, sizeof(neoevent_t)); + *(neoevent_t **)&jresult = resultptr; } return jresult; } @@ -6858,8 +6858,8 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neoevent_1t_1array_1setitem(JNIEnv *j arg2 = (int)jarg2; argp3 = *(neoevent_t **)&jarg3; if (!argp3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null neoevent_t"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null neoevent_t"); + return ; } arg3 = *argp3; neoevent_t_array_setitem(arg1,arg2,arg3); @@ -6904,9 +6904,9 @@ SWIGEXPORT jlong JNICALL Java_icsneojavaJNI_neomessage_1t_1array_1getitem(JNIEnv arg2 = (int)jarg2; result = neomessage_t_array_getitem(arg1,arg2); { - neomessage_t * resultptr = (neomessage_t *) malloc(sizeof(neomessage_t)); - memmove(resultptr, &result, sizeof(neomessage_t)); - *(neomessage_t **)&jresult = resultptr; + neomessage_t * resultptr = (neomessage_t *) malloc(sizeof(neomessage_t)); + memmove(resultptr, &result, sizeof(neomessage_t)); + *(neomessage_t **)&jresult = resultptr; } return jresult; } @@ -6926,8 +6926,8 @@ SWIGEXPORT void JNICALL Java_icsneojavaJNI_neomessage_1t_1array_1setitem(JNIEnv arg2 = (int)jarg2; argp3 = *(neomessage_t **)&jarg3; if (!argp3) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null neomessage_t"); - return ; + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null neomessage_t"); + return ; } arg3 = *argp3; neomessage_t_array_setitem(arg1,arg2,arg3); diff --git a/platform/android/androidusb.cpp b/platform/android/androidusb.cpp index 40a6334..386fe0e 100644 --- a/platform/android/androidusb.cpp +++ b/platform/android/androidusb.cpp @@ -45,57 +45,14 @@ bool ANDROIDUSB::open() { LOGD("Failed isOpen check in open(): %ul\n", device.handle); return false; } - - /* - struct termios tty = {}; - struct termios compare = {}; - - if(tcgetattr(fd, &tty) != 0) { - close(); - report(APIEvent::Type::DriverFailedToOpen, APIEvent::Severity::Error); - report(APIEvent::Type::DriverTCGetAddrFail, APIEvent::Severity::Error); - return false; - } - - tty.c_cflag |= (CLOCAL | CREAD); // Ignore modem controls - tty.c_cflag &= ~CSIZE; - tty.c_cflag |= CS8; // 8-bit characters - tty.c_cflag &= ~PARENB; // No parity bit - tty.c_cflag &= ~CSTOPB; // One stop bit - tty.c_cflag &= ~CRTSCTS; // No hardware flow control - - // Non-canonical mode - tty.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON); - tty.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN); - tty.c_oflag &= ~OPOST; - - // Fetch bytes as they become available - // See http://man7.org/linux/man-pages/man3/termios.3.html - tty.c_cc[VMIN] = 0; - tty.c_cc[VTIME] = 1; // 100ms timeout (1 decisecond, what?) - - if(tcsetattr(fd, TCSAFLUSH, &tty) != 0) { // Flushes input and output buffers as well as setting settings - close(); - report(APIEvent::Type::DriverFailedToOpen, APIEvent::Severity::Error); - report(APIEvent::Type::DriverTCSetAddrFail, APIEvent::Severity::Error); - return false; - } - - if(tcgetattr(fd, &compare) != 0 || memcmp(&tty, &compare, sizeof(struct termios)) != 0) { - close(); - return false; - } - */ - // Create threads readThread = std::thread(&ANDROIDUSB::readTask, this); writeThread = std::thread(&ANDROIDUSB::writeTask, this); - return true; } bool ANDROIDUSB::isOpen() { - LOGD("isOpen handle: %i, openStatus: %s\n", device.handle, openStatus?"true":"false"); + //LOGD("isOpen handle: %i, openStatus: %s\n", device.handle, openStatus?"true":"false"); return ((device.handle >= 0) && (openStatus)); // Negative fd indicates error or not opened yet } @@ -117,6 +74,7 @@ bool ANDROIDUSB::close() { disconnected = false; systemFDs[device.handle] = nullptr; + openStatus = false; device.handle = -1; uint8_t flush; @@ -137,7 +95,7 @@ void ANDROIDUSB::readTask() { devh = mapItr->second; } while(!closing && !isDisconnected()) { - int bytesRead = 0; // ::read(fd, readbuf, READ_BUFFER_SIZE); + int bytesRead = 0; auto ret = libusb_bulk_transfer(devh, ep_in_addr, readbuf, READ_BUFFER_SIZE, &bytesRead, 50); if (ret == LIBUSB_ERROR_TIMEOUT) { continue; @@ -239,11 +197,11 @@ void ANDROIDUSB::Find(std::vector& found) { LOGD("libusb_init failed: %d\n", ret); return; } - LOGD("libusb_init completed: %d\n", ret); - LOGD("SYSTEM FDs size: %d\n", systemFDs.size()); + //LOGD("libusb_init completed: %d\n", ret); + //LOGD("SYSTEM FDs size: %d\n", systemFDs.size()); for (auto & [fd, libUsbHandle]: systemFDs) { ret = libusb_wrap_sys_device(ctx, (intptr_t) fd, &libusbDeviceHandle); - LOGD("Wrapping system FD: %d, return: %s\n", fd, libusb_strerror(ret)); + //LOGD("Wrapping system FD: %d, return: %s\n", fd, libusb_strerror(ret)); if (ret == 0) { FoundDevice device = {}; struct libusb_device_descriptor desc; @@ -252,14 +210,13 @@ void ANDROIDUSB::Find(std::vector& found) { ret = libusb_get_device_descriptor(libusb_get_device(libusbDeviceHandle), &desc); if (ret == 0) { device.productId = desc.idProduct; - LOGD("ProductID: %x\n", device.productId); + //LOGD("ProductID: %x\n", device.productId); ret = libusb_get_string_descriptor_ascii(libusbDeviceHandle, desc.iSerialNumber, outString, sizeof(outString)); if (ret > 0) { std::strncpy(device.serial, reinterpret_cast(outString), sizeof(device.serial)); - LOGD("Serial Number: %s\n", device.serial); } else { LOGD("Serial number fetch failed!\n"); }