From f0c717c1a3c3e7dd6dd61ca10418476c0277eeba Mon Sep 17 00:00:00 2001 From: hedgecrw85 Date: Thu, 2 Jul 2015 11:28:28 -0500 Subject: [PATCH] Mac OS Makefile updates. --- src/main/c/OSX/Makefile | 5 ++--- src/main/c/OSX/OSXHelperFunctions.c | 11 ----------- src/main/c/OSX/OSXHelperFunctions.h | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/c/OSX/Makefile b/src/main/c/OSX/Makefile index d11b1e5..6754e16 100644 --- a/src/main/c/OSX/Makefile +++ b/src/main/c/OSX/Makefile @@ -16,13 +16,12 @@ JAVAC := javac JAVAH := javah -jni JFLAGS := -source 1.6 -target 1.6 -Xlint:-options LIBRARY_NAME := libjSerialComm.jnilib -SOURCES := SerialPort_OSX.c OSXHelperFunctions.c JAVA_SOURCE_DIR = ../../../../src/main/java/com/fazecast/jSerialComm RESOURCE_DIR = ../../../../src/main/resources/OSX BUILD_DIR = ../../../../bin/OSX JAVA_CLASS_DIR = $(BUILD_DIR)/../com/fazecast/jSerialComm -OBJECTSx86 = $(BUILD_DIR)/x86/$(SOURCES:.c=.o) -OBJECTSx86_64 = $(BUILD_DIR)/x86_64/$(SOURCES:.c=.o) +OBJECTSx86 = $(BUILD_DIR)/x86/SerialPort_OSX.o $(BUILD_DIR)/x86/OSXHelperFunctions.o +OBJECTSx86_64 = $(BUILD_DIR)/x86_64/SerialPort_OSX.o $(BUILD_DIR)/x86_64/OSXHelperFunctions.o JNI_HEADER = ../com_fazecast_jSerialComm_SerialPort.h JAVA_CLASS = $(JAVA_CLASS_DIR)/SerialPort.class diff --git a/src/main/c/OSX/OSXHelperFunctions.c b/src/main/c/OSX/OSXHelperFunctions.c index b15cefd..1bf7740 100644 --- a/src/main/c/OSX/OSXHelperFunctions.c +++ b/src/main/c/OSX/OSXHelperFunctions.c @@ -71,15 +71,4 @@ speed_t getBaudRateCode(speed_t baudRate) return 0; } -void setBaudRate(int portFD, speed_t baudRate) -{ - struct termios2 options = { 0 }; - ioctl(portFD, TCGETS2, &options); - options.c_cflag &= ~CBAUD; - options.c_cflag |= BOTHER; - options.c_ispeed = baudRate; - options.c_ospeed = baudRate; - ioctl(portFD, TCSETS2, &options); -} - #endif diff --git a/src/main/c/OSX/OSXHelperFunctions.h b/src/main/c/OSX/OSXHelperFunctions.h index 15482bb..f5fbb15 100644 --- a/src/main/c/OSX/OSXHelperFunctions.h +++ b/src/main/c/OSX/OSXHelperFunctions.h @@ -29,6 +29,5 @@ #include speed_t getBaudRateCode(speed_t baudRate); -void setBaudRate(int portFD, speed_t baudRate); #endif // #ifndef __OSX_HELPER_FUNCTIONS_HEADER_H__