Skip to content

Cleanup Linestatus Handling #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 1 commit into from
May 14, 2025
Merged

Cleanup Linestatus Handling #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 11 additions & 48 deletions src/main/cpp/_nix_based/jssc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,30 +910,10 @@ JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_waitEvents
/*Lines status*/
int statusLines = getLinesStatus(portHandle);

jint statusCTS = 0;
jint statusDSR = 0;
jint statusRING = 0;
jint statusRLSD = 0;

/*CTS status*/
if(statusLines & TIOCM_CTS){
statusCTS = 1;
}

/*DSR status*/
if(statusLines & TIOCM_DSR){
statusDSR = 1;
}

/*RING status*/
if(statusLines & TIOCM_RNG){
statusRING = 1;
}

/*RLSD(DCD) status*/
if(statusLines & TIOCM_CAR){
statusRLSD = 1;
}
jint statusCTS = !!(statusLines & TIOCM_CTS);
jint statusDSR = !!(statusLines & TIOCM_DSR);
jint statusRING = !!(statusLines & TIOCM_RNG);
jint statusRLSD = !!(statusLines & TIOCM_CAR);

/*Interrupts*/
int interrupts[] = {-1, -1, -1, -1, -1};
Expand Down Expand Up @@ -1022,34 +1002,17 @@ JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_getSerialPortName
JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getLinesStatus
(JNIEnv *env, jobject, jlong portHandle){
jint returnValues[4];
for(jint i = 0; i < 4; i++){
returnValues[i] = 0;
}
jintArray returnArray = env->NewIntArray(4);

/*Lines status*/
int statusLines = getLinesStatus(portHandle);
returnValues[0] = !!(statusLines & TIOCM_CTS);
returnValues[1] = !!(statusLines & TIOCM_DSR);
returnValues[2] = !!(statusLines & TIOCM_RNG);
returnValues[3] = !!(statusLines & TIOCM_CAR);

/*CTS status*/
if(statusLines & TIOCM_CTS){
returnValues[0] = 1;
}

/*DSR status*/
if(statusLines & TIOCM_DSR){
returnValues[1] = 1;
}

/*RING status*/
if(statusLines & TIOCM_RNG){
returnValues[2] = 1;
}

/*RLSD(DCD) status*/
if(statusLines & TIOCM_CAR){
returnValues[3] = 1;
}

jintArray returnArray = env->NewIntArray(4);
if( returnArray == NULL ) return NULL;
env->SetIntArrayRegion(returnArray, 0, 4, returnValues);
return returnArray;
}