From 20171d97f7d7b7a24907ea7a44c3e05956784161 Mon Sep 17 00:00:00 2001 From: scream3r Date: Sat, 1 Jun 2013 12:53:38 +0400 Subject: [PATCH] Added const-s for properties: PROPERTY_JSSC_NO_TIOCEXCL, PROPERTY_JSSC_IGNPAR, PROPERTY_JSSC_PARMRK --- src/java/jssc/SerialNativeInterface.java | 13 +++++++++++++ src/java/jssc/SerialPort.java | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/java/jssc/SerialNativeInterface.java b/src/java/jssc/SerialNativeInterface.java index 4f1d840..b515486 100644 --- a/src/java/jssc/SerialNativeInterface.java +++ b/src/java/jssc/SerialNativeInterface.java @@ -63,6 +63,19 @@ public class SerialNativeInterface { */ public static final long ERR_INCORRECT_SERIAL_PORT = -4; + /** + * @since 2.6.0 + */ + public static final String PROPERTY_JSSC_NO_TIOCEXCL = "JSSC_NO_TIOCEXCL"; + /** + * @since 2.6.0 + */ + public static final String PROPERTY_JSSC_IGNPAR = "JSSC_IGNPAR"; + /** + * @since 2.6.0 + */ + public static final String PROPERTY_JSSC_PARMRK = "JSSC_PARMRK"; + static { String libFolderPath; String libName; diff --git a/src/java/jssc/SerialPort.java b/src/java/jssc/SerialPort.java index 440b427..10f9787 100644 --- a/src/java/jssc/SerialPort.java +++ b/src/java/jssc/SerialPort.java @@ -151,7 +151,9 @@ public class SerialPort { throw new SerialPortException(portName, "openPort()", SerialPortException.TYPE_PORT_ALREADY_OPENED); } if(portName != null){ - portHandle = serialInterface.openPort(portName, (System.getProperty("JSSC_NO_TIOCEXCL") == null && System.getProperty("jssc_no_tiocexcl") == null));//since 2.3.0 -> (if JSSC_NO_TIOCEXCL defined, exclusive lock for serial port will be disabled) + boolean useTIOCEXCL = (System.getProperty(SerialNativeInterface.PROPERTY_JSSC_NO_TIOCEXCL) == null && + System.getProperty(SerialNativeInterface.PROPERTY_JSSC_NO_TIOCEXCL.toLowerCase()) == null); + portHandle = serialInterface.openPort(portName, useTIOCEXCL);//since 2.3.0 -> (if JSSC_NO_TIOCEXCL defined, exclusive lock for serial port will be disabled) } else { throw new SerialPortException(portName, "openPort()", SerialPortException.TYPE_NULL_NOT_PERMITTED);//since 2.1.0 -> NULL port name fix @@ -213,10 +215,10 @@ public class SerialPort { stopBits = 1; } int flags = 0; - if(System.getProperty("JSSC_IGNPAR") != null || System.getProperty("jssc_ignpar") != null){ + if(System.getProperty(SerialNativeInterface.PROPERTY_JSSC_IGNPAR) != null || System.getProperty(SerialNativeInterface.PROPERTY_JSSC_IGNPAR.toLowerCase()) != null){ flags |= PARAMS_FLAG_IGNPAR; } - if(System.getProperty("JSSC_PARMRK") != null || System.getProperty("jssc_parmrk") != null){ + if(System.getProperty(SerialNativeInterface.PROPERTY_JSSC_PARMRK) != null || System.getProperty(SerialNativeInterface.PROPERTY_JSSC_PARMRK.toLowerCase()) != null){ flags |= PARAMS_FLAG_PARMRK; } return serialInterface.setParams(portHandle, baudRate, dataBits, stopBits, parity, setRTS, setDTR, flags);