Added support of "int flags" for "setParams()" method, and also added flags PARAMS_FLAG_IGNPAR, PARAMS_FLAG_PARMRK for changing state of INGPAR, PARMRK in _nix based version of jSSC.

Author: scream3r

src/cpp/_nix_based/jssc.cpp

@@ -220,12 +220,19 @@ int getDataBitsByNum(jint byteSize) {
     }
 }
 
+//since 2.6.0 ->
+const jint PARAMS_FLAG_IGNPAR = 1;
+const jint PARAMS_FLAG_PARMRK = 2;
+//<- since 2.6.0
+
 /* OK */
 /*
  * Set serial port settings
+ *
+ * In 2.6.0 added flags parameter
  */
 JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setParams
-  (JNIEnv *env, jobject object, jlong portHandle, jint baudRate, jint byteSize, jint stopBits, jint parity, jboolean setRTS, jboolean setDTR){
+  (JNIEnv *env, jobject object, jlong portHandle, jint baudRate, jint byteSize, jint stopBits, jint parity, jboolean setRTS, jboolean setDTR, jint flags){
     jboolean returnValue = JNI_FALSE;
 
     speed_t baudRateValue = getBaudRateByNum(baudRate);
@@ -299,12 +306,21 @@ JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setParams
     settings->c_cflag &= ~CRTSCTS;
     settings->c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHONL | ECHOCTL | ECHOPRT | ECHOKE | ISIG | IEXTEN);
 
-    settings->c_iflag &= ~(IXON | IXOFF | IXANY | INPCK | PARMRK | ISTRIP | IGNBRK | BRKINT | INLCR | IGNCR| ICRNL);
+    settings->c_iflag &= ~(IXON | IXOFF | IXANY | INPCK | IGNPAR | PARMRK | ISTRIP | IGNBRK | BRKINT | INLCR | IGNCR| ICRNL);
 #ifdef IUCLC
     settings->c_iflag &= ~IUCLC;
 #endif
     settings->c_oflag &= ~OPOST;
 
+    //since 2.6.0 ->
+    if((flags & PARAMS_FLAG_IGNPAR) == PARAMS_FLAG_IGNPAR){
+        settings->c_iflag |= IGNPAR;
+    }
+    if((flags & PARAMS_FLAG_PARMRK) == PARAMS_FLAG_PARMRK){
+        settings->c_iflag |= PARMRK;
+    }
+    //<- since 2.6.0
+
     //since 0.9 ->
     settings->c_cc[VMIN] = 0;
     settings->c_cc[VTIME] = 0;

src/cpp/jssc_SerialNativeInterface.h

@@ -58,10 +58,10 @@ JNIEXPORT jlong JNICALL Java_jssc_SerialNativeInterface_openPort
 /*
  * Class:     jssc_SerialNativeInterface
  * Method:    setParams
- * Signature: (JIIIIZZ)Z
+ * Signature: (JIIIIZZI)Z
  */
 JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setParams
-  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jboolean, jboolean);
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jboolean, jboolean, jint);
 
 /*
  * Class:     jssc_SerialNativeInterface

src/java/jssc/SerialNativeInterface.java

@@ -36,7 +36,7 @@
  */
 public class SerialNativeInterface {
 
-    private static final String libVersion = "2.5"; //jSSC-2.5.0 Release from 27.04.2013
+    private static final String libVersion = "2.6"; //jSSC-2.5.0 Release from 27.04.2013
     private static final String libMinorSuffix = "0"; //since 0.9.0
 
     public static final int OS_LINUX = 0;
@@ -280,7 +280,7 @@ public static String getLibraryMinorSuffix() {
      * Open port
      *
      * @param portName name of port for opening
-     * @param useTIOCEXCL enable/disable using of <b>TIOCEXCL</b>. Take effect only on *nix based systems.
+     * @param useTIOCEXCL enable/disable using of <b>TIOCEXCL</b>. Take effect only on *nix based systems
      * 
      * @return handle of opened port or -1 if opening of the port was unsuccessful
      */
@@ -296,10 +296,11 @@ public static String getLibraryMinorSuffix() {
      * @param parity parity
      * @param setRTS initial state of RTS line (ON/OFF)
      * @param setDTR initial state of DTR line (ON/OFF)
+     * @param flags additional Native settings. Take effect only on *nix based systems
      * 
      * @return If the operation is successfully completed, the method returns true, otherwise false
      */
-    public native boolean setParams(long handle, int baudRate, int dataBits, int stopBits, int parity, boolean setRTS, boolean setDTR);
+    public native boolean setParams(long handle, int baudRate, int dataBits, int stopBits, int parity, boolean setRTS, boolean setDTR, int flags);
 
     /**
      * Purge of input and output buffer

src/java/jssc/SerialPort.java

@@ -108,6 +108,11 @@ public class SerialPort {
     public static final int ERROR_PARITY = 0x0004;
     //<- since 0.8
 
+    //since 2.6.0 ->
+    private static final int PARAMS_FLAG_IGNPAR = 1;
+    private static final int PARAMS_FLAG_PARMRK = 2;
+    //<- since 2.6.0
+
     public SerialPort(String portName) {
         this.portName = portName;
         serialInterface = new SerialNativeInterface();
@@ -180,14 +185,7 @@ else if(portHandle == SerialNativeInterface.ERR_INCORRECT_SERIAL_PORT){
      * @throws SerialPortException
      */
     public boolean setParams(int baudRate, int dataBits, int stopBits, int parity) throws SerialPortException {
-        checkPortOpened("setParams()");
-        if(stopBits == 1){
-            stopBits = 0;
-        }
-        else if(stopBits == 3){
-            stopBits = 1;
-        }
-        return serialInterface.setParams(portHandle, baudRate, dataBits, stopBits, parity, true, true);
+        return setParams(baudRate, dataBits, stopBits, parity, true, true);
     }
 
     /**
@@ -214,7 +212,14 @@ public boolean setParams(int baudRate, int dataBits, int stopBits, int parity, b
         else if(stopBits == 3){
             stopBits = 1;
         }
-        return serialInterface.setParams(portHandle, baudRate, dataBits, stopBits, parity, setRTS, setDTR);
+        int flags = 0;
+        if(System.getProperty("JSSC_IGNPAR") != null || System.getProperty("jssc_ignpar") != null){
+            flags |= PARAMS_FLAG_IGNPAR;
+        }
+        if(System.getProperty("JSSC_PARMRK") != null || System.getProperty("jssc_parmrk") != null){
+            flags |= PARAMS_FLAG_PARMRK;
+        }
+        return serialInterface.setParams(portHandle, baudRate, dataBits, stopBits, parity, setRTS, setDTR, flags);
     }
 
     /**