rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for Windows on ARM

This commit is contained in:
Will Hedgecock 2021-12-06 16:53:53 -06:00
parent 1ba0e69376
commit 6a236af9f9
28 changed files with 168 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/main/c/Windows/Makefile
View File

@ -1,84 +1,96 @@
## Windows specific library variables # Compiler tools, commands, and flags
COMPILE = cl COMPILE_X86 := i686-w64-mingw32-gcc
LINK = link COMPILE_X64 := x86_64-w64-mingw32-gcc
CFLAGS = /c /O2 /GF /GL /MT /EHsc /fp:precise /J /nologo /TP COMPILE_ARM := armv7-w64-mingw32-gcc
LDFLAGS = /DLL /LTCG /NOASSEMBLY /NOLOGO COMPILE_ARM64 := aarch64-w64-mingw32-gcc
INCLUDES = /I"$(JDK_HOME)\include" /I"$(JDK_HOME)\include\win32" CFLAGS := -Os -flto -static-libgcc -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
LIBRARIES = Advapi32.lib SetupAPI.lib LDFLAGS := -Os -flto -static-libgcc -shared -fuse-linker-plugin -s
DELETE = @del /q /f INCLUDES := -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/win32" -I"$(JDK_HOME)/include/linux" -I"$(JDK_HOME)/include/darwin" -I"$(JDK_HOME)/include/solaris"
RMDIR = @rd /q /s LIBRARIES := -ladvapi32 -lsetupapi
MKDIR = @md DELETE := @rm
COPY = @copy /y MKDIR := @mkdir
MOVE = @move /y COPY := @cp
PRINT = @echo MOVE := @mv
FULL_CLASS = com.fazecast.jSerialComm.SerialPort PRINT := @echo
JAVAC = "$(JDK_HOME)\bin\javac"
JFLAGS = -source 1.6 -target 1.6 -Xlint:-options # Java and resource definitions
LIBRARY_NAME = jSerialComm.dll LIBRARY_NAME := jSerialComm.dll
SOURCES = SerialPort_Windows.c WindowsHelperFunctions.c BUILD_DIR := ../../../../build
JAVA_SOURCE_DIR = ..\..\..\..\src\main\java\com\fazecast\jSerialComm RESOURCE_DIR := ../../../../src/main/resources/Windows
RESOURCE_DIR = ..\..\..\..\src\main\resources\Windows JAVA_SOURCE_DIR := ../../../../src/main/java/com/fazecast/jSerialComm
BUILD_DIR = ..\..\..\..\bin\Windows FULL_CLASS := com.fazecast.jSerialComm.SerialPort
JAVA_CLASS_DIR = $(BUILD_DIR)\..\com\fazecast\jSerialComm JAVA_CLASS_DIR := $(BUILD_DIR)/com/fazecast/jSerialComm
OBJECTSx86 = $(BUILD_DIR)\x86\SerialPort_Windows.obj $(BUILD_DIR)\x86\WindowsHelperFunctions.obj JNI_HEADER_FILE := com_fazecast_jSerialComm_SerialPort.h
OBJECTSx86_64 = $(BUILD_DIR)\x86_64\SerialPort_Windows.obj $(BUILD_DIR)\x86_64\WindowsHelperFunctions.obj JNI_HEADER := ../$(JNI_HEADER_FILE)
JNI_HEADER = ..\com_fazecast_jSerialComm_SerialPort.h JAVA_CLASS := $(JAVA_CLASS_DIR)/SerialPort.class
JAVA_CLASS = $(JAVA_CLASS_DIR)\SerialPort.class JFLAGS := -source 1.6 -target 1.6 -Xlint:-options
JAVAC := "$(JDK_HOME)/bin/javac"
# Architecture-dependent library variables
OBJECTSx86 := $(BUILD_DIR)/x86/SerialPort_Windows.o $(BUILD_DIR)/x86/WindowsHelperFunctions.o
OBJECTSx64 := $(BUILD_DIR)/x86_64/SerialPort_Windows.o $(BUILD_DIR)/x86_64/WindowsHelperFunctions.o
OBJECTSarm := $(BUILD_DIR)/armv7/SerialPort_Windows.o $(BUILD_DIR)/armv7/WindowsHelperFunctions.o
OBJECTSarm64 := $(BUILD_DIR)/aarch64/SerialPort_Windows.o $(BUILD_DIR)/aarch64/WindowsHelperFunctions.o
# Define phony and suffix rules # Define phony and suffix rules
.PHONY: all win32 win64 checkdirs clean .PHONY: all win32 win64 winarm winarm64 checkdirs clean
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .obj .class .java .h .SUFFIXES: .cpp .c .o .class .java .h
# Default build target not possible due to different architecture compilers # Default build target not possible due to different architecture compilers
all : all : win32 win64 winarm winarm64
$(PRINT). $(DELETE) -rf "$(BUILD_DIR)"
$(PRINT) Must specify a target (either win32 or win64), but not both at the same time since different versions of the Microsoft Compiler are required for difference architectures. $(DELETE) -rf ../*.h $(JNI_HEADER_FILE)
$(PRINT).
$(PRINT) NOTE: Before attempting to use this Makefile, make sure that you have called 'vcvarsall.bat' for your intended architecture. This file can normally be found in "C:\Program Files (x86)\Microsoft Visual Studio [version]\VC\".
$(PRINT).
$(PRINT) Example: To build 64-bit Windows libraries, you would call:
$(PRINT) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat x64
$(PRINT) nmake win64
$(PRINT).
clean : clean :
$(RMDIR) $(BUILD_DIR)\.. $(DELETE) -rf "$(BUILD_DIR)"
$(DELETE) -rf ../*.h $(JNI_HEADER_FILE)
# Builds 32-bit Windows libraries # Build architecture-specific Windows libraries
win32 : $(BUILD_DIR)\x86 $(BUILD_DIR)\x86\$(LIBRARY_NAME) win32 : $(JAVA_CLASS_DIR) $(BUILD_DIR)/x86 $(BUILD_DIR)/x86/$(LIBRARY_NAME)
$(COPY) $(BUILD_DIR)\x86\*.dll $(RESOURCE_DIR)\x86 $(COPY) $(BUILD_DIR)/x86/*.dll $(RESOURCE_DIR)/x86/
$(DELETE) ..\*.h win64 : $(JAVA_CLASS_DIR) $(BUILD_DIR)/x86_64 $(BUILD_DIR)/x86_64/$(LIBRARY_NAME)
$(RMDIR) $(BUILD_DIR)\.. $(COPY) $(BUILD_DIR)/x86_64/*.dll $(RESOURCE_DIR)/x86_64
winarm : $(JAVA_CLASS_DIR) $(BUILD_DIR)/armv7 $(BUILD_DIR)/armv7/$(LIBRARY_NAME)
# Builds 64-bit Windows libraries $(COPY) $(BUILD_DIR)/armv7/*.dll $(RESOURCE_DIR)/armv7/
win64 : $(BUILD_DIR)\x86_64 $(BUILD_DIR)\x86_64\$(LIBRARY_NAME) winarm64 : $(JAVA_CLASS_DIR) $(BUILD_DIR)/aarch64 $(BUILD_DIR)/aarch64/$(LIBRARY_NAME)
$(COPY) $(BUILD_DIR)\x86_64\*.dll $(RESOURCE_DIR)\x86_64 $(COPY) $(BUILD_DIR)/aarch64/*.dll $(RESOURCE_DIR)/aarch64/
$(DELETE) ..\*.h
$(RMDIR) $(BUILD_DIR)\..
# Rule to create build directories # Rule to create build directories
$(BUILD_DIR)\x86 : $(BUILD_DIR)/x86 :
$(MKDIR) "$@" $(MKDIR) -p $@
$(BUILD_DIR)\x86_64 : $(BUILD_DIR)/x86_64 :
$(MKDIR) "$@" $(MKDIR) -p $@
$(BUILD_DIR)/armv7 :
$(MKDIR) -p $@
$(BUILD_DIR)/aarch64 :
$(MKDIR) -p $@
$(JAVA_CLASS_DIR) :
$(MKDIR) -p $@
# Rule to build 32-bit library # Build rules for all libraries
$(BUILD_DIR)\x86\$(LIBRARY_NAME) : $(JNI_HEADER) $(OBJECTSx86) $(BUILD_DIR)/x86/$(LIBRARY_NAME) : $(JNI_HEADER) $(OBJECTSx86)
$(LINK) $(LDFLAGS) /MACHINE:X86 /OUT:$@ $(OBJECTSx86) $(LIBRARIES) $(COMPILE_X86) $(LDFLAGS) -o $@ $(OBJECTSx86) $(LIBRARIES)
$(BUILD_DIR)/x86_64/$(LIBRARY_NAME) : $(JNI_HEADER) $(OBJECTSx64)
$(COMPILE_X64) $(LDFLAGS) -o $@ $(OBJECTSx64) $(LIBRARIES)
$(BUILD_DIR)/armv7/$(LIBRARY_NAME) : $(JNI_HEADER) $(OBJECTSarm)
$(COMPILE_ARM) $(LDFLAGS) -o $@ $(OBJECTSarm) $(LIBRARIES)
$(BUILD_DIR)/aarch64/$(LIBRARY_NAME) : $(JNI_HEADER) $(OBJECTSarm64)
$(COMPILE_ARM64) $(LDFLAGS) -o $@ $(OBJECTSarm64) $(LIBRARIES)
# Rule to build 64-bit library # Suffix rules to get from *.c -> *.o
$(BUILD_DIR)\x86_64\$(LIBRARY_NAME) : $(JNI_HEADER) $(OBJECTSx86_64) $(BUILD_DIR)/x86/%.o : %.c
$(LINK) $(LDFLAGS) /MACHINE:X64 /OUT:$@ $(OBJECTSx86_64) $(LIBRARIES) $(COMPILE_X86) $(INCLUDES) $(CFLAGS) -c $< -o $@
$(BUILD_DIR)/x86_64/%.o : %.c
# Suffix rules to get from *.c -> *.obj $(COMPILE_X64) $(INCLUDES) $(CFLAGS) -c $< -o $@
$(OBJECTSx86_64) : $(BUILD_DIR)/armv7/%.o : %.c
$(COMPILE) $(CFLAGS) $(INCLUDES) $(*B).c -Fo$@ $(COMPILE_ARM) $(INCLUDES) $(CFLAGS) -c $< -o $@
$(OBJECTSx86) : $(BUILD_DIR)/aarch64/%.o : %.c
$(COMPILE) $(CFLAGS) $(INCLUDES) $(*B).c -Fo$@ $(COMPILE_ARM64) $(INCLUDES) $(CFLAGS) -c $< -o $@
# Rule to build JNI header file # Rule to build JNI header file
$(JNI_HEADER) : $(JAVA_CLASS) $(JNI_HEADER) : $(JAVA_CLASS)
$(COPY) $@ ./
# Suffix rule to get from *.java -> *.class # Suffix rule to get from *.java -> *.class
$(JAVA_CLASS) : $(JAVA_CLASS) :
$(JAVAC) $(JFLAGS) -d $(JAVA_CLASS_DIR)\..\..\.. -cp $(JAVA_SOURCE_DIR)\..\..\.. $(JAVA_SOURCE_DIR)\$(*B).java -h .. $(JAVAC) $(JFLAGS) -d $(JAVA_CLASS_DIR)/../../.. -cp $(JAVA_SOURCE_DIR)/../../.. $(JAVA_SOURCE_DIR)/$(basename $(notdir $@)).java -h ..

162
src/main/c/Windows/SerialPort_Windows.c
View File

@ -2,7 +2,7 @@
* SerialPort_Windows.c * SerialPort_Windows.c
* *
* Created on: Feb 25, 2012 * Created on: Feb 25, 2012
* Last Updated on: Dec 01, 2021 * Last Updated on: Dec 06, 2021
* Author: Will Hedgecock * Author: Will Hedgecock
* *
* Copyright (C) 2012-2021 Fazecast, Inc. * Copyright (C) 2012-2021 Fazecast, Inc.
@ -334,19 +334,19 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
// Get relevant SerialComm methods and fill in com port array // Get relevant SerialComm methods and fill in com port array
wchar_t systemPortName[128]; wchar_t systemPortName[128];
jobjectArray arrayObject = env->NewObjectArray(serialPorts.length, serialCommClass, 0); jobjectArray arrayObject = (*env)->NewObjectArray(env, serialPorts.length, serialCommClass, 0);
for (int i = 0; i < serialPorts.length; ++i) for (int i = 0; i < serialPorts.length; ++i)
{ {
// Create new SerialComm object containing the enumerated values // Create new SerialComm object containing the enumerated values
jobject serialCommObject = env->NewObject(serialCommClass, serialCommConstructor); jobject serialCommObject = (*env)->NewObject(env, serialCommClass, serialCommConstructor);
wcscpy(systemPortName, L"\\\\.\\"); wcscpy(systemPortName, L"\\\\.\\");
wcscat(systemPortName, serialPorts.ports[i]->portPath); wcscat(systemPortName, serialPorts.ports[i]->portPath);
env->SetObjectField(serialCommObject, comPortField, env->NewString((jchar*)systemPortName, wcslen(systemPortName))); (*env)->SetObjectField(env, serialCommObject, comPortField, (*env)->NewString(env, (jchar*)systemPortName, wcslen(systemPortName)));
env->SetObjectField(serialCommObject, friendlyNameField, env->NewString((jchar*)serialPorts.ports[i]->friendlyName, wcslen(serialPorts.ports[i]->friendlyName))); (*env)->SetObjectField(env, serialCommObject, friendlyNameField, (*env)->NewString(env, (jchar*)serialPorts.ports[i]->friendlyName, wcslen(serialPorts.ports[i]->friendlyName)));
env->SetObjectField(serialCommObject, portDescriptionField, env->NewString((jchar*)serialPorts.ports[i]->portDescription, wcslen(serialPorts.ports[i]->portDescription))); (*env)->SetObjectField(env, serialCommObject, portDescriptionField, (*env)->NewString(env, (jchar*)serialPorts.ports[i]->portDescription, wcslen(serialPorts.ports[i]->portDescription)));
// Add new SerialComm object to array // Add new SerialComm object to array
env->SetObjectArrayElement(arrayObject, i, serialCommObject); (*env)->SetObjectArrayElement(env, arrayObject, i, serialCommObject);
} }
return arrayObject; return arrayObject;
} }
@ -354,48 +354,48 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_initializeLibrary(JNIEnv *env, jclass serialComm) JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_initializeLibrary(JNIEnv *env, jclass serialComm)
{ {
// Cache class and method ID as global references // Cache class and method ID as global references
serialCommClass = (jclass)env->NewGlobalRef(serialComm); serialCommClass = (jclass)(*env)->NewGlobalRef(env, serialComm);
serialCommConstructor = env->GetMethodID(serialCommClass, "<init>", "()V"); serialCommConstructor = (*env)->GetMethodID(env, serialCommClass, "<init>", "()V");
// Cache Java fields as global references // Cache Java fields as global references
serialPortHandleField = env->GetFieldID(serialCommClass, "portHandle", "J"); serialPortHandleField = (*env)->GetFieldID(env, serialCommClass, "portHandle", "J");
comPortField = env->GetFieldID(serialCommClass, "comPort", "Ljava/lang/String;"); comPortField = (*env)->GetFieldID(env, serialCommClass, "comPort", "Ljava/lang/String;");
friendlyNameField = env->GetFieldID(serialCommClass, "friendlyName", "Ljava/lang/String;"); friendlyNameField = (*env)->GetFieldID(env, serialCommClass, "friendlyName", "Ljava/lang/String;");
portDescriptionField = env->GetFieldID(serialCommClass, "portDescription", "Ljava/lang/String;"); portDescriptionField = (*env)->GetFieldID(env, serialCommClass, "portDescription", "Ljava/lang/String;");
eventListenerRunningField = env->GetFieldID(serialCommClass, "eventListenerRunning", "Z"); eventListenerRunningField = (*env)->GetFieldID(env, serialCommClass, "eventListenerRunning", "Z");
disableConfigField = env->GetFieldID(serialCommClass, "disableConfig", "Z"); disableConfigField = (*env)->GetFieldID(env, serialCommClass, "disableConfig", "Z");
isDtrEnabledField = env->GetFieldID(serialCommClass, "isDtrEnabled", "Z"); isDtrEnabledField = (*env)->GetFieldID(env, serialCommClass, "isDtrEnabled", "Z");
isRtsEnabledField = env->GetFieldID(serialCommClass, "isRtsEnabled", "Z"); isRtsEnabledField = (*env)->GetFieldID(env, serialCommClass, "isRtsEnabled", "Z");
baudRateField = env->GetFieldID(serialCommClass, "baudRate", "I"); baudRateField = (*env)->GetFieldID(env, serialCommClass, "baudRate", "I");
dataBitsField = env->GetFieldID(serialCommClass, "dataBits", "I"); dataBitsField = (*env)->GetFieldID(env, serialCommClass, "dataBits", "I");
stopBitsField = env->GetFieldID(serialCommClass, "stopBits", "I"); stopBitsField = (*env)->GetFieldID(env, serialCommClass, "stopBits", "I");
parityField = env->GetFieldID(serialCommClass, "parity", "I"); parityField = (*env)->GetFieldID(env, serialCommClass, "parity", "I");
flowControlField = env->GetFieldID(serialCommClass, "flowControl", "I"); flowControlField = (*env)->GetFieldID(env, serialCommClass, "flowControl", "I");
sendDeviceQueueSizeField = env->GetFieldID(serialCommClass, "sendDeviceQueueSize", "I"); sendDeviceQueueSizeField = (*env)->GetFieldID(env, serialCommClass, "sendDeviceQueueSize", "I");
receiveDeviceQueueSizeField = env->GetFieldID(serialCommClass, "receiveDeviceQueueSize", "I"); receiveDeviceQueueSizeField = (*env)->GetFieldID(env, serialCommClass, "receiveDeviceQueueSize", "I");
rs485ModeField = env->GetFieldID(serialCommClass, "rs485Mode", "Z"); rs485ModeField = (*env)->GetFieldID(env, serialCommClass, "rs485Mode", "Z");
rs485DelayBeforeField = env->GetFieldID(serialCommClass, "rs485DelayBefore", "I"); rs485DelayBeforeField = (*env)->GetFieldID(env, serialCommClass, "rs485DelayBefore", "I");
rs485DelayAfterField = env->GetFieldID(serialCommClass, "rs485DelayAfter", "I"); rs485DelayAfterField = (*env)->GetFieldID(env, serialCommClass, "rs485DelayAfter", "I");
xonStartCharField = env->GetFieldID(serialCommClass, "xonStartChar", "B"); xonStartCharField = (*env)->GetFieldID(env, serialCommClass, "xonStartChar", "B");
xoffStopCharField = env->GetFieldID(serialCommClass, "xoffStopChar", "B"); xoffStopCharField = (*env)->GetFieldID(env, serialCommClass, "xoffStopChar", "B");
timeoutModeField = env->GetFieldID(serialCommClass, "timeoutMode", "I"); timeoutModeField = (*env)->GetFieldID(env, serialCommClass, "timeoutMode", "I");
readTimeoutField = env->GetFieldID(serialCommClass, "readTimeout", "I"); readTimeoutField = (*env)->GetFieldID(env, serialCommClass, "readTimeout", "I");
writeTimeoutField = env->GetFieldID(serialCommClass, "writeTimeout", "I"); writeTimeoutField = (*env)->GetFieldID(env, serialCommClass, "writeTimeout", "I");
eventFlagsField = env->GetFieldID(serialCommClass, "eventFlags", "I"); eventFlagsField = (*env)->GetFieldID(env, serialCommClass, "eventFlags", "I");
} }
JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_uninitializeLibrary(JNIEnv *env, jclass serialComm) JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_uninitializeLibrary(JNIEnv *env, jclass serialComm)
{ {
// Delete the cache global reference // Delete the cache global reference
env->DeleteGlobalRef(serialCommClass); (*env)->DeleteGlobalRef(env, serialCommClass);
} }
JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_openPortNative(JNIEnv *env, jobject obj) JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_openPortNative(JNIEnv *env, jobject obj)
{ {
// Retrieve the serial port parameter fields // Retrieve the serial port parameter fields
jstring portNameJString = (jstring)env->GetObjectField(obj, comPortField); jstring portNameJString = (jstring)(*env)->GetObjectField(env, obj, comPortField);
const wchar_t *portName = (wchar_t*)env->GetStringChars(portNameJString, NULL); const wchar_t *portName = (wchar_t*)(*env)->GetStringChars(env, portNameJString, NULL);
unsigned char disableAutoConfig = env->GetBooleanField(obj, disableConfigField); unsigned char disableAutoConfig = (*env)->GetBooleanField(env, obj, disableConfigField);
// Ensure that the serial port still exists and is not already open // Ensure that the serial port still exists and is not already open
serialPort *port = fetchPort(&serialPorts, portName); serialPort *port = fetchPort(&serialPorts, portName);
@ -406,7 +406,7 @@ JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_openPortNative(
} }
if (!port || (port->handle != INVALID_HANDLE_VALUE)) if (!port || (port->handle != INVALID_HANDLE_VALUE))
{ {
env->ReleaseStringChars(portNameJString, (const jchar*)portName); (*env)->ReleaseStringChars(env, portNameJString, (const jchar*)portName);
return 0; return 0;
} }
@ -431,7 +431,7 @@ JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_openPortNative(
} }
// Return a pointer to the serial port data structure // Return a pointer to the serial port data structure
env->ReleaseStringChars(portNameJString, (const jchar*)portName); (*env)->ReleaseStringChars(env, portNameJString, (const jchar*)portName);
return (port->handle != INVALID_HANDLE_VALUE) ? (jlong)(intptr_t)port : 0; return (port->handle != INVALID_HANDLE_VALUE) ? (jlong)(intptr_t)port : 0;
} }
@ -439,22 +439,22 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J
{ {
// Retrieve port parameters from the Java class // Retrieve port parameters from the Java class
serialPort *port = (serialPort*)(intptr_t)serialPortPointer; serialPort *port = (serialPort*)(intptr_t)serialPortPointer;
DWORD baudRate = (DWORD)env->GetIntField(obj, baudRateField); DWORD baudRate = (DWORD)(*env)->GetIntField(env, obj, baudRateField);
BYTE byteSize = (BYTE)env->GetIntField(obj, dataBitsField); BYTE byteSize = (BYTE)(*env)->GetIntField(env, obj, dataBitsField);
int stopBitsInt = env->GetIntField(obj, stopBitsField); int stopBitsInt = (*env)->GetIntField(env, obj, stopBitsField);
int parityInt = env->GetIntField(obj, parityField); int parityInt = (*env)->GetIntField(env, obj, parityField);
int flowControl = env->GetIntField(obj, flowControlField); int flowControl = (*env)->GetIntField(env, obj, flowControlField);
int timeoutMode = env->GetIntField(obj, timeoutModeField); int timeoutMode = (*env)->GetIntField(env, obj, timeoutModeField);
int readTimeout = env->GetIntField(obj, readTimeoutField); int readTimeout = (*env)->GetIntField(env, obj, readTimeoutField);
int writeTimeout = env->GetIntField(obj, writeTimeoutField); int writeTimeout = (*env)->GetIntField(env, obj, writeTimeoutField);
int eventsToMonitor = env->GetIntField(obj, eventFlagsField); int eventsToMonitor = (*env)->GetIntField(env, obj, eventFlagsField);
char xonStartChar = env->GetByteField(obj, xonStartCharField); char xonStartChar = (*env)->GetByteField(env, obj, xonStartCharField);
char xoffStopChar = env->GetByteField(obj, xoffStopCharField); char xoffStopChar = (*env)->GetByteField(env, obj, xoffStopCharField);
DWORD sendDeviceQueueSize = (DWORD)env->GetIntField(obj, sendDeviceQueueSizeField); DWORD sendDeviceQueueSize = (DWORD)(*env)->GetIntField(env, obj, sendDeviceQueueSizeField);
DWORD receiveDeviceQueueSize = (DWORD)env->GetIntField(obj, receiveDeviceQueueSizeField); DWORD receiveDeviceQueueSize = (DWORD)(*env)->GetIntField(env, obj, receiveDeviceQueueSizeField);
BYTE rs485ModeEnabled = (BYTE)env->GetBooleanField(obj, rs485ModeField); BYTE rs485ModeEnabled = (BYTE)(*env)->GetBooleanField(env, obj, rs485ModeField);
BYTE isDtrEnabled = env->GetBooleanField(obj, isDtrEnabledField); BYTE isDtrEnabled = (*env)->GetBooleanField(env, obj, isDtrEnabledField);
BYTE isRtsEnabled = env->GetBooleanField(obj, isRtsEnabledField); BYTE isRtsEnabled = (*env)->GetBooleanField(env, obj, isRtsEnabledField);
BYTE stopBits = (stopBitsInt == com_fazecast_jSerialComm_SerialPort_ONE_STOP_BIT) ? ONESTOPBIT : (stopBitsInt == com_fazecast_jSerialComm_SerialPort_ONE_POINT_FIVE_STOP_BITS) ? ONE5STOPBITS : TWOSTOPBITS; BYTE stopBits = (stopBitsInt == com_fazecast_jSerialComm_SerialPort_ONE_STOP_BIT) ? ONESTOPBIT : (stopBitsInt == com_fazecast_jSerialComm_SerialPort_ONE_POINT_FIVE_STOP_BITS) ? ONE5STOPBITS : TWOSTOPBITS;
BYTE parity = (parityInt == com_fazecast_jSerialComm_SerialPort_NO_PARITY) ? NOPARITY : (parityInt == com_fazecast_jSerialComm_SerialPort_ODD_PARITY) ? ODDPARITY : (parityInt == com_fazecast_jSerialComm_SerialPort_EVEN_PARITY) ? EVENPARITY : (parityInt == com_fazecast_jSerialComm_SerialPort_MARK_PARITY) ? MARKPARITY : SPACEPARITY; BYTE parity = (parityInt == com_fazecast_jSerialComm_SerialPort_NO_PARITY) ? NOPARITY : (parityInt == com_fazecast_jSerialComm_SerialPort_ODD_PARITY) ? ODDPARITY : (parityInt == com_fazecast_jSerialComm_SerialPort_EVEN_PARITY) ? EVENPARITY : (parityInt == com_fazecast_jSerialComm_SerialPort_MARK_PARITY) ? MARKPARITY : SPACEPARITY;
BOOL isParity = (parityInt == com_fazecast_jSerialComm_SerialPort_NO_PARITY) ? FALSE : TRUE; BOOL isParity = (parityInt == com_fazecast_jSerialComm_SerialPort_NO_PARITY) ? FALSE : TRUE;
@ -469,7 +469,8 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configPort(J
BOOL XonXoffOutEnabled = ((flowControl & com_fazecast_jSerialComm_SerialPort_FLOW_CONTROL_XONXOFF_OUT_ENABLED) > 0); BOOL XonXoffOutEnabled = ((flowControl & com_fazecast_jSerialComm_SerialPort_FLOW_CONTROL_XONXOFF_OUT_ENABLED) > 0);
// Retrieve existing port configuration // Retrieve existing port configuration
DCB dcbSerialParams{}; DCB dcbSerialParams;
memset(&dcbSerialParams, 0, sizeof(DCB));
dcbSerialParams.DCBlength = sizeof(DCB); dcbSerialParams.DCBlength = sizeof(DCB);
if (!SetupComm(port->handle, receiveDeviceQueueSize, sendDeviceQueueSize) || !GetCommState(port->handle, &dcbSerialParams)) if (!SetupComm(port->handle, receiveDeviceQueueSize, sendDeviceQueueSize) || !GetCommState(port->handle, &dcbSerialParams))
{ {
@ -522,7 +523,8 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeou
eventFlags |= EV_TXEMPTY; eventFlags |= EV_TXEMPTY;
// Set updated port timeouts // Set updated port timeouts
COMMTIMEOUTS timeouts{}; COMMTIMEOUTS timeouts;
memset(&timeouts, 0, sizeof(COMMTIMEOUTS));
timeouts.WriteTotalTimeoutMultiplier = 0; timeouts.WriteTotalTimeoutMultiplier = 0;
if (eventsToMonitor & com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_DATA_RECEIVED) if (eventsToMonitor & com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_DATA_RECEIVED)
{ {
@ -574,7 +576,8 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeou
JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_waitForEvent(JNIEnv *env, jobject obj, jlong serialPortPointer) JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_waitForEvent(JNIEnv *env, jobject obj, jlong serialPortPointer)
{ {
// Create an asynchronous event structure // Create an asynchronous event structure
OVERLAPPED overlappedStruct{}; OVERLAPPED overlappedStruct;
memset(&overlappedStruct, 0, sizeof(OVERLAPPED));
serialPort *port = (serialPort*)(intptr_t)serialPortPointer; serialPort *port = (serialPort*)(intptr_t)serialPortPointer;
overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
jint event = com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_TIMED_OUT; jint event = com_fazecast_jSerialComm_SerialPort_LISTENING_EVENT_TIMED_OUT;
@ -651,7 +654,8 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_waitForEvent(JNI
JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_closePortNative(JNIEnv *env, jobject obj, jlong serialPortPointer) JNIEXPORT jlong JNICALL Java_com_fazecast_jSerialComm_SerialPort_closePortNative(JNIEnv *env, jobject obj, jlong serialPortPointer)
{ {
// Force the port to enter non-blocking mode to ensure that any current reads return // Force the port to enter non-blocking mode to ensure that any current reads return
COMMTIMEOUTS timeouts{}; COMMTIMEOUTS timeouts;
memset(&timeouts, 0, sizeof(COMMTIMEOUTS));
serialPort *port = (serialPort*)(intptr_t)serialPortPointer; serialPort *port = (serialPort*)(intptr_t)serialPortPointer;
timeouts.WriteTotalTimeoutMultiplier = 0; timeouts.WriteTotalTimeoutMultiplier = 0;
timeouts.ReadIntervalTimeout = MAXDWORD; timeouts.ReadIntervalTimeout = MAXDWORD;
@ -727,7 +731,8 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_readBytes(JNIEnv
} }
// Create an asynchronous result structure // Create an asynchronous result structure
OVERLAPPED overlappedStruct{}; OVERLAPPED overlappedStruct;
memset(&overlappedStruct, 0, sizeof(OVERLAPPED));
overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (overlappedStruct.hEvent == NULL) if (overlappedStruct.hEvent == NULL)
{ {
@ -753,14 +758,15 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_readBytes(JNIEnv
// Return number of bytes read // Return number of bytes read
CloseHandle(overlappedStruct.hEvent); CloseHandle(overlappedStruct.hEvent);
env->SetByteArrayRegion(buffer, offset, numBytesRead, (jbyte*)port->readBuffer); (*env)->SetByteArrayRegion(env, buffer, offset, numBytesRead, (jbyte*)port->readBuffer);
return (result == TRUE) ? numBytesRead : -1; return (result == TRUE) ? numBytesRead : -1;
} }
JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_writeBytes(JNIEnv *env, jobject obj, jlong serialPortPointer, jbyteArray buffer, jlong bytesToWrite, jlong offset, jint timeoutMode) JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_writeBytes(JNIEnv *env, jobject obj, jlong serialPortPointer, jbyteArray buffer, jlong bytesToWrite, jlong offset, jint timeoutMode)
{ {
// Create an asynchronous result structure // Create an asynchronous result structure
OVERLAPPED overlappedStruct{}; OVERLAPPED overlappedStruct;
memset(&overlappedStruct, 0, sizeof(OVERLAPPED));
serialPort *port = (serialPort*)(intptr_t)serialPortPointer; serialPort *port = (serialPort*)(intptr_t)serialPortPointer;
overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); overlappedStruct.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (overlappedStruct.hEvent == NULL) if (overlappedStruct.hEvent == NULL)
@ -774,7 +780,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_writeBytes(JNIEn
// Write to the serial port // Write to the serial port
BOOL result; BOOL result;
DWORD numBytesWritten = 0; DWORD numBytesWritten = 0;
jbyte *writeBuffer = env->GetByteArrayElements(buffer, 0); jbyte *writeBuffer = (*env)->GetByteArrayElements(env, buffer, 0);
if (((result = WriteFile(port->handle, writeBuffer+offset, bytesToWrite, NULL, &overlappedStruct)) == FALSE) && (GetLastError() != ERROR_IO_PENDING)) if (((result = WriteFile(port->handle, writeBuffer+offset, bytesToWrite, NULL, &overlappedStruct)) == FALSE) && (GetLastError() != ERROR_IO_PENDING))
{ {
port->errorLineNumber = __LINE__ - 2; port->errorLineNumber = __LINE__ - 2;
@ -788,7 +794,7 @@ JNIEXPORT jint JNICALL Java_com_fazecast_jSerialComm_SerialPort_writeBytes(JNIEn
// Return number of bytes written // Return number of bytes written
CloseHandle(overlappedStruct.hEvent); CloseHandle(overlappedStruct.hEvent);
env->ReleaseByteArrayElements(buffer, writeBuffer, JNI_ABORT); (*env)->ReleaseByteArrayElements(env, buffer, writeBuffer, JNI_ABORT);
return (result == TRUE) ? numBytesWritten : -1; return (result == TRUE) ? numBytesWritten : -1;
} }
@ -847,8 +853,8 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_clearRTS(JNI
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_presetRTS(JNIEnv *env, jobject obj) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_presetRTS(JNIEnv *env, jobject obj)
{ {
jstring portNameJString = (jstring)env->GetObjectField(obj, comPortField); jstring portNameJString = (jstring)(*env)->GetObjectField(env, obj, comPortField);
const char *portName = env->GetStringUTFChars(portNameJString, NULL); const char *portName = (*env)->GetStringUTFChars(env, portNameJString, NULL);
const char* comPort = strrchr(portName, '\\'); const char* comPort = strrchr(portName, '\\');
// Try to preset the RTS mode of the COM port using a Windows command // Try to preset the RTS mode of the COM port using a Windows command
@ -870,14 +876,14 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_presetRTS(JN
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
} }
env->ReleaseStringUTFChars(portNameJString, portName); (*env)->ReleaseStringUTFChars(env, portNameJString, portName);
return (result != 0); return (result != 0);
} }
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_preclearRTS(JNIEnv *env, jobject obj) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_preclearRTS(JNIEnv *env, jobject obj)
{ {
jstring portNameJString = (jstring)env->GetObjectField(obj, comPortField); jstring portNameJString = (jstring)(*env)->GetObjectField(env, obj, comPortField);
const char *portName = env->GetStringUTFChars(portNameJString, NULL); const char *portName = (*env)->GetStringUTFChars(env, portNameJString, NULL);
const char* comPort = strrchr(portName, '\\'); const char* comPort = strrchr(portName, '\\');
// Try to preset the RTS mode of the COM port using a Windows command // Try to preset the RTS mode of the COM port using a Windows command
@ -899,7 +905,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_preclearRTS(
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
} }
env->ReleaseStringUTFChars(portNameJString, portName); (*env)->ReleaseStringUTFChars(env, portNameJString, portName);
return (result != 0); return (result != 0);
} }
@ -929,8 +935,8 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_clearDTR(JNI
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_presetDTR(JNIEnv *env, jobject obj) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_presetDTR(JNIEnv *env, jobject obj)
{ {
jstring portNameJString = (jstring)env->GetObjectField(obj, comPortField); jstring portNameJString = (jstring)(*env)->GetObjectField(env, obj, comPortField);
const char *portName = env->GetStringUTFChars(portNameJString, NULL); const char *portName = (*env)->GetStringUTFChars(env, portNameJString, NULL);
const char* comPort = strrchr(portName, '\\'); const char* comPort = strrchr(portName, '\\');
// Try to preset the DTR mode of the COM port using a Windows command // Try to preset the DTR mode of the COM port using a Windows command
@ -952,14 +958,14 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_presetDTR(JN
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
} }
env->ReleaseStringUTFChars(portNameJString, portName); (*env)->ReleaseStringUTFChars(env, portNameJString, portName);
return (result != 0); return (result != 0);
} }
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_preclearDTR(JNIEnv *env, jobject obj) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_preclearDTR(JNIEnv *env, jobject obj)
{ {
jstring portNameJString = (jstring)env->GetObjectField(obj, comPortField); jstring portNameJString = (jstring)(*env)->GetObjectField(env, obj, comPortField);
const char *portName = env->GetStringUTFChars(portNameJString, NULL); const char *portName = (*env)->GetStringUTFChars(env, portNameJString, NULL);
const char* comPort = strrchr(portName, '\\'); const char* comPort = strrchr(portName, '\\');
// Try to preset the DTR mode of the COM port using a Windows command // Try to preset the DTR mode of the COM port using a Windows command
@ -981,7 +987,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_preclearDTR(
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
} }
env->ReleaseStringUTFChars(portNameJString, portName); (*env)->ReleaseStringUTFChars(env, portNameJString, portName);
return (result != 0); return (result != 0);
} }
@ -1005,12 +1011,12 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getDCD(JNIEn
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getDTR(JNIEnv *env, jobject obj, jlong serialPortPointer) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getDTR(JNIEnv *env, jobject obj, jlong serialPortPointer)
{ {
return env->GetBooleanField(obj, isDtrEnabledField); return (*env)->GetBooleanField(env, obj, isDtrEnabledField);
} }
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getRTS(JNIEnv *env, jobject obj, jlong serialPortPointer) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getRTS(JNIEnv *env, jobject obj, jlong serialPortPointer)
{ {
return env->GetBooleanField(obj, isRtsEnabledField); return (*env)->GetBooleanField(env, obj, isRtsEnabledField);
} }
JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getRI(JNIEnv *env, jobject obj, jlong serialPortPointer) JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_getRI(JNIEnv *env, jobject obj, jlong serialPortPointer)

6
src/main/java/com/fazecast/jSerialComm/SerialPort.java
View File

@ -101,7 +101,11 @@ public final class SerialPort
} }
else if (OS.indexOf("win") >= 0) else if (OS.indexOf("win") >= 0)
{ {
if (System.getProperty("os.arch").indexOf("64") >= 0) if (System.getProperty("os.arch").equals("aarch64") || System.getProperty("os.arch").equals("arm64"))
libraryPath = "Windows/aarch64";
else if (System.getProperty("os.arch").indexOf("arm") >= 0)
libraryPath = "Windows/armv7";
else if (System.getProperty("os.arch").indexOf("64") >= 0)
libraryPath = "Windows/x86_64"; libraryPath = "Windows/x86_64";
else else
libraryPath = "Windows/x86"; libraryPath = "Windows/x86";

BIN
src/main/resources/Android/arm64-v8a/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Android/armeabi-v7a/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Android/x86/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Android/x86_64/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv5/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv6/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv6hf/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv7/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv7hf/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv8_32/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/armv8_64/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/ppc64le/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/x86/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Linux/x86_64/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/OSX/aarch64/libjSerialComm.jnilib
View File

Binary file not shown.

BIN
src/main/resources/OSX/x86/libjSerialComm.jnilib
View File

Binary file not shown.

BIN
src/main/resources/OSX/x86_64/libjSerialComm.jnilib
View File

Binary file not shown.

BIN
src/main/resources/Solaris/sparcv8plus_32/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Solaris/sparcv9_64/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Solaris/x86/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Solaris/x86_64/libjSerialComm.so
View File

Binary file not shown.

BIN
src/main/resources/Windows/aarch64/jSerialComm.dll Normal file
View File

Binary file not shown.

BIN
src/main/resources/Windows/armv7/jSerialComm.dll Normal file
View File

Binary file not shown.

BIN
src/main/resources/Windows/x86/jSerialComm.dll
View File

Binary file not shown.

BIN
src/main/resources/Windows/x86_64/jSerialComm.dll
View File

Binary file not shown.