diff --git a/src/main/c/Android/jni/SerialPort_Android.c b/src/main/c/Android/jni/SerialPort_Android.c index 4488c13..f61d3dc 100644 --- a/src/main/c/Android/jni/SerialPort_Android.c +++ b/src/main/c/Android/jni/SerialPort_Android.c @@ -2,7 +2,7 @@ * SerialPort_Android.c * * Created on: Mar 13, 2015 - * Last Updated on: Nov 07, 2019 + * Last Updated on: Nov 12, 2019 * Author: Will Hedgecock * * Copyright (C) 2012-2019 Fazecast, Inc. @@ -154,7 +154,7 @@ JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_openPortNative( // Clear any serial port flags and set up raw, non-canonical port parameters if (isatty(serialPortFD)) { - struct termios options = { 0 }; + struct termios options = {0}; fcntl(serialPortFD, F_SETFL, 0); ioctl(serialPortFD, TCGETS, &options); options.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON); @@ -188,8 +188,8 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J { if (serialPortFD <= 0) return JNI_FALSE; - struct serial_struct serInfo; - struct termios options = { 0 }; + struct serial_struct serInfo = {0}; + struct termios options = {0}; // Get port parameters from Java class int baudRate = (*env)->GetIntField(env, obj, baudRateField); @@ -267,13 +267,13 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J setBaudRate(serialPortFD, baudRate); // Attempt to set the requested RS-485 mode - struct serial_rs485 rs485Conf; + struct serial_rs485 rs485Conf = {0}; if (ioctl(serialPortFD, TIOCGRS485, &rs485Conf) == 0) { if (rs485ModeEnabled) - rs485Conf.flags |= SER_RS485_ENABLED; + rs485Conf.flags |= SER_RS485_ENABLED; // Set these too? SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND else - rs485Conf.flags &= ~SER_RS485_ENABLED; + rs485Conf.flags &= ~SER_RS485_ENABLED; // Clear these too? &= ~(SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND); rs485Conf.delay_rts_before_send = rs485DelayBefore; rs485Conf.delay_rts_after_send = rs485DelayAfter; ioctl(serialPortFD, TIOCSRS485, &rs485Conf); @@ -292,7 +292,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeou int readTimeout = (*env)->GetIntField(env, obj, readTimeoutField); // Retrieve existing port configuration - struct termios options = { 0 }; + struct termios options = {0}; if (isatty(serialPortFD)) ioctl(serialPortFD, TCGETS, &options); else @@ -383,7 +383,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configEventF jboolean retVal; if ((eventsToMonitor & com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_DATA_RECEIVED) > 0) { - struct termios options = { 0 }; + struct termios options = {0}; ioctl(serialPortFD, TCGETS, &options); int flags = fcntl(serialPortFD, F_GETFL); if (flags == -1) @@ -424,7 +424,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_closePortNat (*env)->SetBooleanField(env, obj, isOpenedField, JNI_FALSE); // Force the port to enter non-blocking mode to ensure that any current reads return - struct termios options; + struct termios options = {0}; ioctl(serialPortFD, TCGETS, &options); int flags = fcntl(serialPortFD, F_GETFL); flags |= O_NONBLOCK; @@ -500,7 +500,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_readBytes(JNIEnv else if ((timeoutMode & com_fazecast_jSerialComm_SerialPort_TIMEOUT_READ_BLOCKING) > 0) // Blocking mode, but not indefinitely { // Get current system time - struct timeval expireTime = { 0 }, currTime = { 0 }; + struct timeval expireTime = {0}, currTime = {0}; gettimeofday(&expireTime, NULL); expireTime.tv_usec += (readTimeout * 1000); if (expireTime.tv_usec > 1000000) diff --git a/src/main/c/Posix/SerialPort_Posix.c b/src/main/c/Posix/SerialPort_Posix.c index 1a1a20e..52c63c3 100644 --- a/src/main/c/Posix/SerialPort_Posix.c +++ b/src/main/c/Posix/SerialPort_Posix.c @@ -2,7 +2,7 @@ * SerialPort_Posix.c * * Created on: Feb 25, 2012 - * Last Updated on: Nov 08, 2019 + * Last Updated on: Nov 12, 2019 * Author: Will Hedgecock * * Copyright (C) 2012-2019 Fazecast, Inc. @@ -263,7 +263,7 @@ JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_openPortNative( else { // Clear any serial port flags and set up raw, non-canonical port parameters - struct termios options = { 0 }; + struct termios options = {0}; fcntl(serialPortFD, F_SETFL, 0); tcgetattr(serialPortFD, &options); #if defined(__sun__) @@ -303,7 +303,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J { if (serialPortFD <= 0) return JNI_FALSE; - struct termios options = { 0 }; + struct termios options = {0}; // Get port parameters from Java class baud_rate baudRate = (*env)->GetIntField(env, obj, baudRateField); @@ -355,7 +355,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J // Attempt to set the transmit buffer size and any necessary custom baud rates #if defined(__linux__) - struct serial_struct serInfo; + struct serial_struct serInfo = {0}; if (ioctl(serialPortFD, TIOCGSERIAL, &serInfo) == 0) { serInfo.xmit_fifo_size = sendDeviceQueueSize; @@ -370,13 +370,13 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J // Attempt to set the requested RS-485 mode #if defined(__linux__) - struct serial_rs485 rs485Conf; + struct serial_rs485 rs485Conf = {0}; if (ioctl(serialPortFD, TIOCGRS485, &rs485Conf) == 0) { if (rs485ModeEnabled) - rs485Conf.flags |= SER_RS485_ENABLED; + rs485Conf.flags |= SER_RS485_ENABLED; // Set these too? SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND else - rs485Conf.flags &= ~SER_RS485_ENABLED; + rs485Conf.flags &= ~SER_RS485_ENABLED; // Clear these too? &= ~(SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND); rs485Conf.delay_rts_before_send = rs485DelayBefore; rs485Conf.delay_rts_after_send = rs485DelayAfter; ioctl(serialPortFD, TIOCSRS485, &rs485Conf); @@ -396,7 +396,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeou int readTimeout = (*env)->GetIntField(env, obj, readTimeoutField); // Retrieve existing port configuration - struct termios options = { 0 }; + struct termios options = {0}; tcgetattr(serialPortFD, &options); int flags = fcntl(serialPortFD, F_GETFL); if (flags == -1) @@ -463,7 +463,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configEventF jboolean retVal; if ((eventsToMonitor & com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_DATA_RECEIVED) > 0) { - struct termios options = { 0 }; + struct termios options = {0}; tcgetattr(serialPortFD, &options); int flags = fcntl(serialPortFD, F_GETFL); if (flags == -1) @@ -507,7 +507,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_closePortNat (*env)->SetBooleanField(env, obj, isOpenedField, JNI_FALSE); // Force the port to enter non-blocking mode to ensure that any current reads return - struct termios options = { 0 }; + struct termios options = {0}; tcgetattr(serialPortFD, &options); int flags = fcntl(serialPortFD, F_GETFL); flags |= O_NONBLOCK; @@ -586,7 +586,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_readBytes(JNIEnv else if ((timeoutMode & com_fazecast_jSerialComm_SerialPort_TIMEOUT_READ_BLOCKING) > 0) // Blocking mode, but not indefinitely { // Get current system time - struct timeval expireTime = { 0 }, currTime = { 0 }; + struct timeval expireTime = {0}, currTime = {0}; gettimeofday(&expireTime, NULL); expireTime.tv_usec += (readTimeout * 1000); if (expireTime.tv_usec > 1000000) diff --git a/src/main/c/Windows/SerialPort_Windows.c b/src/main/c/Windows/SerialPort_Windows.c index 2f5fdd5..12ac58d 100644 --- a/src/main/c/Windows/SerialPort_Windows.c +++ b/src/main/c/Windows/SerialPort_Windows.c @@ -2,7 +2,7 @@ * SerialPort_Windows.c * * Created on: Feb 25, 2012 - * Last Updated on: Nov 07, 2019 + * Last Updated on: Nov 12, 2019 * Author: Will Hedgecock * * Copyright (C) 2012-2019 Fazecast, Inc. @@ -408,7 +408,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J HANDLE serialPortHandle = (HANDLE)serialPortFD; if (serialPortHandle == INVALID_HANDLE_VALUE) return JNI_FALSE; - DCB dcbSerialParams = {0}; + DCB dcbSerialParams{}; dcbSerialParams.DCBlength = sizeof(DCB); // Get port parameters from Java class @@ -476,7 +476,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeou HANDLE serialPortHandle = (HANDLE)serialPortFD; if (serialPortHandle == INVALID_HANDLE_VALUE) return JNI_FALSE; - COMMTIMEOUTS timeouts = {0}; + COMMTIMEOUTS timeouts{}; int timeoutMode = env->GetIntField(obj, timeoutModeField); DWORD readTimeout = (DWORD)env->GetIntField(obj, readTimeoutField); DWORD writeTimeout = (DWORD)env->GetIntField(obj, writeTimeoutField); @@ -537,7 +537,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configEventF // Change read timeouts if we are monitoring data received if ((eventsToMonitor & com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_DATA_RECEIVED) > 0) { - COMMTIMEOUTS timeouts = {0}; + COMMTIMEOUTS timeouts{}; timeouts.ReadIntervalTimeout = MAXDWORD; timeouts.ReadTotalTimeoutMultiplier = MAXDWORD; timeouts.ReadTotalTimeoutConstant = 1000; @@ -557,7 +557,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_waitForEvent(JNI HANDLE serialPortHandle = (HANDLE)serialPortFD; if (serialPortHandle == INVALID_HANDLE_VALUE) return 0; - OVERLAPPED overlappedStruct = {0}; + OVERLAPPED overlappedStruct{}; overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (overlappedStruct.hEvent == NULL) { @@ -607,7 +607,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_closePortNat PurgeComm(serialPortHandle, PURGE_RXABORT | PURGE_RXCLEAR | PURGE_TXABORT | PURGE_TXCLEAR); // Force the port to enter non-blocking mode to ensure that any current reads return - COMMTIMEOUTS timeouts = {0}; + COMMTIMEOUTS timeouts{}; timeouts.WriteTotalTimeoutMultiplier = 0; timeouts.ReadIntervalTimeout = MAXDWORD; timeouts.ReadTotalTimeoutMultiplier = 0; @@ -689,7 +689,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_readBytes(JNIEnv } // Create an asynchronous result structure - OVERLAPPED overlappedStruct = {0}; + OVERLAPPED overlappedStruct{}; overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (overlappedStruct.hEvent == NULL) { @@ -751,7 +751,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_writeBytes(JNIEn } // Create an asynchronous result structure - OVERLAPPED overlappedStruct = {0}; + OVERLAPPED overlappedStruct{}; overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (overlappedStruct.hEvent == NULL) { diff --git a/src/main/resources/Android/arm64-v8a/libjSerialComm.so b/src/main/resources/Android/arm64-v8a/libjSerialComm.so index 4cd1d9b..c224c55 100644 Binary files a/src/main/resources/Android/arm64-v8a/libjSerialComm.so and b/src/main/resources/Android/arm64-v8a/libjSerialComm.so differ diff --git a/src/main/resources/Android/armeabi-v7a/libjSerialComm.so b/src/main/resources/Android/armeabi-v7a/libjSerialComm.so index 0c358a5..aacdd98 100644 Binary files a/src/main/resources/Android/armeabi-v7a/libjSerialComm.so and b/src/main/resources/Android/armeabi-v7a/libjSerialComm.so differ diff --git a/src/main/resources/Android/armeabi/libjSerialComm.so b/src/main/resources/Android/armeabi/libjSerialComm.so index 1fd538f..15098f8 100644 Binary files a/src/main/resources/Android/armeabi/libjSerialComm.so and b/src/main/resources/Android/armeabi/libjSerialComm.so differ diff --git a/src/main/resources/Android/mips/libjSerialComm.so b/src/main/resources/Android/mips/libjSerialComm.so index 5cf1baf..ba4fcf2 100644 Binary files a/src/main/resources/Android/mips/libjSerialComm.so and b/src/main/resources/Android/mips/libjSerialComm.so differ diff --git a/src/main/resources/Android/mips64/libjSerialComm.so b/src/main/resources/Android/mips64/libjSerialComm.so index d6e8be2..15186a9 100644 Binary files a/src/main/resources/Android/mips64/libjSerialComm.so and b/src/main/resources/Android/mips64/libjSerialComm.so differ diff --git a/src/main/resources/Android/x86/libjSerialComm.so b/src/main/resources/Android/x86/libjSerialComm.so index 102e7f0..fa90a68 100644 Binary files a/src/main/resources/Android/x86/libjSerialComm.so and b/src/main/resources/Android/x86/libjSerialComm.so differ diff --git a/src/main/resources/Android/x86_64/libjSerialComm.so b/src/main/resources/Android/x86_64/libjSerialComm.so index fc00192..962b838 100644 Binary files a/src/main/resources/Android/x86_64/libjSerialComm.so and b/src/main/resources/Android/x86_64/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv5/libjSerialComm.so b/src/main/resources/Linux/armv5/libjSerialComm.so index 7fb2dcf..7baa70a 100644 Binary files a/src/main/resources/Linux/armv5/libjSerialComm.so and b/src/main/resources/Linux/armv5/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv6-hf/libjSerialComm.so b/src/main/resources/Linux/armv6-hf/libjSerialComm.so index b4ecbdc..f8fe6ae 100644 Binary files a/src/main/resources/Linux/armv6-hf/libjSerialComm.so and b/src/main/resources/Linux/armv6-hf/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv6/libjSerialComm.so b/src/main/resources/Linux/armv6/libjSerialComm.so index 9ac44ce..1919287 100644 Binary files a/src/main/resources/Linux/armv6/libjSerialComm.so and b/src/main/resources/Linux/armv6/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv7-hf/libjSerialComm.so b/src/main/resources/Linux/armv7-hf/libjSerialComm.so index b4ecbdc..f8fe6ae 100644 Binary files a/src/main/resources/Linux/armv7-hf/libjSerialComm.so and b/src/main/resources/Linux/armv7-hf/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv7/libjSerialComm.so b/src/main/resources/Linux/armv7/libjSerialComm.so index f5025a4..aec6a7e 100644 Binary files a/src/main/resources/Linux/armv7/libjSerialComm.so and b/src/main/resources/Linux/armv7/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv8_32/libjSerialComm.so b/src/main/resources/Linux/armv8_32/libjSerialComm.so index dfaca3a..5f8823e 100644 Binary files a/src/main/resources/Linux/armv8_32/libjSerialComm.so and b/src/main/resources/Linux/armv8_32/libjSerialComm.so differ diff --git a/src/main/resources/Linux/armv8_64/libjSerialComm.so b/src/main/resources/Linux/armv8_64/libjSerialComm.so index f7bad01..25f305b 100644 Binary files a/src/main/resources/Linux/armv8_64/libjSerialComm.so and b/src/main/resources/Linux/armv8_64/libjSerialComm.so differ diff --git a/src/main/resources/Linux/x86/libjSerialComm.so b/src/main/resources/Linux/x86/libjSerialComm.so index 48be7eb..5820421 100644 Binary files a/src/main/resources/Linux/x86/libjSerialComm.so and b/src/main/resources/Linux/x86/libjSerialComm.so differ diff --git a/src/main/resources/Linux/x86_64/libjSerialComm.so b/src/main/resources/Linux/x86_64/libjSerialComm.so index 79757f4..61234b8 100644 Binary files a/src/main/resources/Linux/x86_64/libjSerialComm.so and b/src/main/resources/Linux/x86_64/libjSerialComm.so differ diff --git a/src/main/resources/OSX/x86_64/libjSerialComm.jnilib b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib index 2fd5fbe..cb8570c 100755 Binary files a/src/main/resources/OSX/x86_64/libjSerialComm.jnilib and b/src/main/resources/OSX/x86_64/libjSerialComm.jnilib differ diff --git a/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so b/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so index 192c232..a7ef75a 100644 Binary files a/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so and b/src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so differ diff --git a/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so b/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so index e99f698..18f5d03 100644 Binary files a/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so and b/src/main/resources/Solaris/sparcv9_64/libjSerialComm.so differ diff --git a/src/main/resources/Solaris/x86/libjSerialComm.so b/src/main/resources/Solaris/x86/libjSerialComm.so index 64e29b8..0554ef0 100644 Binary files a/src/main/resources/Solaris/x86/libjSerialComm.so and b/src/main/resources/Solaris/x86/libjSerialComm.so differ diff --git a/src/main/resources/Solaris/x86_64/libjSerialComm.so b/src/main/resources/Solaris/x86_64/libjSerialComm.so index 98903ff..92f4929 100644 Binary files a/src/main/resources/Solaris/x86_64/libjSerialComm.so and b/src/main/resources/Solaris/x86_64/libjSerialComm.so differ diff --git a/src/main/resources/Windows/x86/jSerialComm.dll b/src/main/resources/Windows/x86/jSerialComm.dll index e97cf47..3e6b333 100644 Binary files a/src/main/resources/Windows/x86/jSerialComm.dll and b/src/main/resources/Windows/x86/jSerialComm.dll differ diff --git a/src/main/resources/Windows/x86_64/jSerialComm.dll b/src/main/resources/Windows/x86_64/jSerialComm.dll index bbc1074..2c714c7 100644 Binary files a/src/main/resources/Windows/x86_64/jSerialComm.dll and b/src/main/resources/Windows/x86_64/jSerialComm.dll differ