rusefi
/
java-simple-serial-connector
mirror of https://github.com/rusefi/java-simple-serial-connector.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated _nix_based jssc.cpp, added keys for disabling TIOCEXCL and prevent flags rewriting for serial port while port listing

This commit is contained in:
scream3r 2013-04-17 17:23:07 +04:00
parent 223740af44
commit ebcb3d8c4c
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cpp/_nix_based/jssc.cpp
View File

@ -43,12 +43,15 @@
#include <jni.h> #include <jni.h>
#include "../jssc_SerialNativeInterface.h" #include "../jssc_SerialNativeInterface.h"
#include <iostream> //-lCstd use for Solaris linker //#include <iostream> //-lCstd use for Solaris linker
/* OK */ /* OK */
/* Port opening */ /*
JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, jobject object, jstring portName){ * Port opening
* In 2.2.0 added useTIOCEXCL and invokedByPortList
*/
JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, jobject object, jstring portName, jboolean useTIOCEXCL, jboolean invokedByPortList){
const char* port = env->GetStringUTFChars(portName, JNI_FALSE); const char* port = env->GetStringUTFChars(portName, JNI_FALSE);
jint hComm; jint hComm;
hComm = open(port, O_RDWR | O_NOCTTY | O_NDELAY); hComm = open(port, O_RDWR | O_NOCTTY | O_NDELAY);
@ -58,11 +61,15 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, job
if(tcgetattr(hComm, settings) == 0){ if(tcgetattr(hComm, settings) == 0){
//<- since 2.2.0 //<- since 2.2.0
#if defined TIOCEXCL && !defined __SunOS #if defined TIOCEXCL && !defined __SunOS
ioctl(hComm, TIOCEXCL);//since 0.9 if(useTIOCEXCL == JNI_TRUE){//since 2.2.0
ioctl(hComm, TIOCEXCL);//since 0.9
}
#endif #endif
int flags = fcntl(hComm, F_GETFL, 0); if(invokedByPortList == JNI_FALSE){//since 2.2.0 (should not change any flags while using port list, because port can be opened by another application)
flags &= ~O_NDELAY; int flags = fcntl(hComm, F_GETFL, 0);
fcntl(hComm, F_SETFL, flags); flags &= ~O_NDELAY;
fcntl(hComm, F_SETFL, flags);
}
} }
else { else {
hComm = -2; hComm = -2;
@ -75,13 +82,13 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, job
} }
else if(errno == ENOENT){//Port not found else if(errno == ENOENT){//Port not found
hComm = -2; hComm = -2;
} }//-> since 2.2.0
else if(errno == EACCES){//Permission denied else if(errno == EACCES){//Permission denied
hComm = -3; hComm = -3;
} }
else { else {
hComm = -2; hComm = -2;
} }//<- since 2.2.0
}//<- since 0.9 }//<- since 0.9
env->ReleaseStringUTFChars(portName, port); env->ReleaseStringUTFChars(portName, port);
return hComm; return hComm;