LIB_DEPENDS=    libpthread.so.1:${PORTSDIR}/emulators/linux_base-c6

--- src/SerialImp.c.orig	2009-02-04 22:06:16.000000000 +0000

+++ src/SerialImp.c	2015-05-11 16:52:36.000000000 +0100

@@ -1,60 +1,79 @@

 /*-------------------------------------------------------------------------

-|   RXTX License v 2.1 - LGPL v 2.1 + Linking Over Controlled Interface.

-|   RXTX is a native interface to serial ports in java.

-|   Copyright 1997-2009 by Trent Jarvi tjarvi@qbang.org and others who

-|   actually wrote it.  See individual source files for more information.

+|	RXTX License v 2.1 - LGPL v 2.1 + Linking Over Controlled Interface.

+|	RXTX is a native interface to serial ports in java.

+|	Copyright 1997-2009 by Trent Jarvi tjarvi@qbang.org and others who

+|	actually wrote it.  See individual source files for more information.

 |

-|   A copy of the LGPL v 2.1 may be found at

-|   http://www.gnu.org/licenses/lgpl.txt on March 4th 2007.  A copy is

-|   here for your convenience.

+|	A copy of the LGPL v 2.1 may be found at

+|	http://www.gnu.org/licenses/lgpl.txt on March 4th 2007.  A copy is

+|	here for your convenience.

 |

-|   This library is free software; you can redistribute it and/or

-|   modify it under the terms of the GNU Lesser General Public

-|   License as published by the Free Software Foundation; either

-|   version 2.1 of the License, or (at your option) any later version.

+|	This library is free software; you can redistribute it and/or

+|	modify it under the terms of the GNU Lesser General Public

+|	License as published by the Free Software Foundation; either

+|	version 2.1 of the License, or (at your option) any later version.

 |

-|   This library is distributed in the hope that it will be useful,

-|   but WITHOUT ANY WARRANTY; without even the implied warranty of

-|   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-|   Lesser General Public License for more details.

+|	This library is distributed in the hope that it will be useful,

+|	but WITHOUT ANY WARRANTY; without even the implied warranty of

+|	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+|	Lesser General Public License for more details.

 |

-|   An executable that contains no derivative of any portion of RXTX, but

-|   is designed to work with RXTX by being dynamically linked with it,

-|   is considered a "work that uses the Library" subject to the terms and

-|   conditions of the GNU Lesser General Public License.

+|	An executable that contains no derivative of any portion of RXTX, but

+|	is designed to work with RXTX by being dynamically linked with it,

+|	is considered a "work that uses the Library" subject to the terms and

+|	conditions of the GNU Lesser General Public License.

 |

-|   The following has been added to the RXTX License to remove

-|   any confusion about linking to RXTX.   We want to allow in part what

-|   section 5, paragraph 2 of the LGPL does not permit in the special

-|   case of linking over a controlled interface.  The intent is to add a

-|   Java Specification Request or standards body defined interface in the

-|   future as another exception but one is not currently available.

+|	The following has been added to the RXTX License to remove

+|	any confusion about linking to RXTX.	We want to allow in part what

+|	section 5, paragraph 2 of the LGPL does not permit in the special

+|	case of linking over a controlled interface.  The intent is to add a

+|	Java Specification Request or standards body defined interface in the

+|	future as another exception but one is not currently available.

 |

-|   http://www.fsf.org/licenses/gpl-faq.html#LinkingOverControlledInterface

+|	http://www.fsf.org/licenses/gpl-faq.html#LinkingOverControlledInterface

 |

-|   As a special exception, the copyright holders of RXTX give you

-|   permission to link RXTX with independent modules that communicate with

-|   RXTX solely through the Sun Microsytems CommAPI interface version 2,

-|   regardless of the license terms of these independent modules, and to copy

-|   and distribute the resulting combined work under terms of your choice,

-|   provided that every copy of the combined work is accompanied by a complete

-|   copy of the source code of RXTX (the version of RXTX used to produce the

-|   combined work), being distributed under the terms of the GNU Lesser General

-|   Public License plus this exception.  An independent module is a

-|   module which is not derived from or based on RXTX.

+|	As a special exception, the copyright holders of RXTX give you

+|	permission to link RXTX with independent modules that communicate with

+|	RXTX solely through the Sun Microsytems CommAPI interface version 2,

+|	regardless of the license terms of these independent modules, and to copy

+|	and distribute the resulting combined work under terms of your choice,

+|	provided that every copy of the combined work is accompanied by a complete

+|	copy of the source code of RXTX (the version of RXTX used to produce the

+|	combined work), being distributed under the terms of the GNU Lesser General

+|	Public License plus this exception.  An independent module is a

+|	module which is not derived from or based on RXTX.

 |

-|   Note that people who make modified versions of RXTX are not obligated

-|   to grant this special exception for their modified versions; it is

-|   their choice whether to do so.  The GNU Lesser General Public License

-|   gives permission to release a modified version without this exception; this

-|   exception also makes it possible to release a modified version which

-|   carries forward this exception.

+|	Note that people who make modified versions of RXTX are not obligated

+|	to grant this special exception for their modified versions; it is

+|	their choice whether to do so.  The GNU Lesser General Public License

+|	gives permission to release a modified version without this exception; this

+|	exception also makes it possible to release a modified version which

+|	carries forward this exception.

 |

-|   You should have received a copy of the GNU Lesser General Public

-|   License along with this library; if not, write to the Free

-|   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-|   All trademarks belong to their respective owners.

+|	You should have received a copy of the GNU Lesser General Public

+|	License along with this library; if not, write to the Free

+|	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+|	All trademarks belong to their respective owners.

 --------------------------------------------------------------------------*/

+/**

+ *	9th May 2015 - james.c.elstone (at) ntlworld.com:

+ *		

+ *		Added STDOUT debug stream, so can see when used with OpenJDK in

+ *		console terminal.  Useful for seeing events interleaved, with OS

+ *		activity.  Just put '#define DEBUG_STDOUT' just below...

+ *		

+ *		Altered behaviour of SIGABRT in RXTXPort(interruptEventLoop)

+ *		to prevent Core Dump from being performed on POSIX compliant OS.

+ * 

+ * 		Sorted out null termination on all debug strings!

+ * 		

+ *		Clearing of char array for sprintfs, driver enumerated multilpe

+ *		times, leaving the content behind in places.

+ *		

+ **/

+

+//#define DEBUG_STDOUT

+

 #if defined(__MWERKS__) /* dima */

 #include "RXTXPort.h" /* dima */

 #else  /* dima */

@@ -64,7 +83,7 @@

 #include "gnu_io_RXTXPort.h"

 #endif /* dima */

 #ifdef __LCC__ /* windows lcc compiler for fd_set. probably wrong */

-#   include<winsock.h>

+#	include<winsock.h>

 #endif /* __LCC__ */

 #include <time.h>

 #include <stdio.h>

@@ -91,23 +110,23 @@

 #ifdef HAVE_TERMIOS_H

 #	include <termios.h>

 #endif /* HAVE_TERMIOS_H */

-#   include <signal.h>

+#	include <signal.h>

 #ifdef HAVE_SIGNAL_H

-#   include <signal.h>

+#	include <signal.h>

 #endif /* HAVE_SIGNAL_H */

 #ifdef HAVE_SYS_SIGNAL_H

-#   include <sys/signal.h>

+#	include <sys/signal.h>

 #endif /* HAVE_SYS_SIGNAL_H */

 #include <sys/types.h>

 #ifdef HAVE_SYS_TIME_H

-#   include <sys/time.h>

+#	include <sys/time.h>

 #endif /* HAVE_SYS_TIME_H */

-#   include <fcntl.h>

+#	include <fcntl.h>

 #ifdef HAVE_SYS_FCNTL_H

-#   include <sys/fcntl.h>

+#	include <sys/fcntl.h>

 #endif /* HAVE_SYS_FCNTL_H */

 #ifdef HAVE_SYS_FILE_H

-#   include <sys/file.h>

+#	include <sys/file.h>

 #endif /* HAVE_SYS_FILE_H */

 #ifdef LFS  /* File Lock Server */

 #	include <sys/socket.h>

@@ -167,59 +186,59 @@

 /*----------------------------------------------------------

 cfmakeraw

-   accept:      termios to be set to raw

-   perform:     initializes the termios structure.

-   return:      int 0 on success

-   exceptions:  none

-   comments:    this is how linux cfmakeraw works.

-		termios(3) manpage

+	accept:		termios to be set to raw

+	perform:	initializes the termios structure.

+	return:		int 0 on success

+	exceptions: none

+	comments:	this is how linux cfmakeraw works.

+				termios(3) manpage

 ----------------------------------------------------------*/

 int cfmakeraw ( struct termios *term )

 {

-	ENTER( "cfmakeraw" );

+	report( "Entering - cfmakeraw\n" );

 	term->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);

 	term->c_oflag &= ~OPOST;

 	term->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);

 	term->c_cflag &= ~(CSIZE|PARENB);

 	term->c_cflag |= CS8;

-	LEAVE( "cfmakeraw" );

+	report( "Leaving - cfmakeraw\n" );

 	return( 0 );

 }

 #endif /* __sun__  || __hpux__ */

 #ifdef DEBUG_TIMING

-struct timeval snow, enow, seloop, eeloop;

-#define report_time_eventLoop( ) { \

-	if ( seloop.tv_sec == eeloop.tv_sec && seloop.tv_usec == eeloop.tv_usec ) \

+	struct timeval snow, enow, seloop, eeloop;

+	#define report_time_eventLoop( ) { \

+		if ( seloop.tv_sec == eeloop.tv_sec && seloop.tv_usec == eeloop.tv_usec ) \

+		{ \

+			gettimeofday(&eeloop, NULL); \

+			seloop.tv_sec = eeloop.tv_sec; \

+			seloop.tv_usec = eeloop.tv_usec; \

+			printf("%8i sec : %8i usec\n", eeloop.tv_sec - seloop.tv_sec, eeloop.tv_usec - seloop.tv_usec); \

+		} \

+	}

+	#define report_time( ) \

 	{ \

-		gettimeofday(&eeloop, NULL); \

-		seloop.tv_sec = eeloop.tv_sec; \

-		seloop.tv_usec = eeloop.tv_usec; \

-		printf("%8i sec : %8i usec\n", eeloop.tv_sec - seloop.tv_sec, eeloop.tv_usec - seloop.tv_usec); \

-	} \

-}

-#define report_time( ) \

-{ \

-	struct timeval now; \

-	gettimeofday(&now, NULL); \

-	mexPrintf("%8s : %5i : %8i sec : %8i usec\n", __TIME__, __LINE__, now.tv_sec, now.tv_usec); \

-}

-#define report_time_start( ) \

-{ \

-	gettimeofday(&snow, NULL); \

-	mexPrintf("%8s : %5i : %8i sec : %8i usec", __TIME__, __LINE__, snow.tv_sec, snow.tv_usec); \

-}

-#define report_time_end( ) \

-{ \

-	gettimeofday(&enow, NULL); \

-	mexPrintf("%8i sec : %8i usec\n", enow.tv_sec - snow.tv_sec, enow.tv_sec - snow.tv_sec?snow.tv_usec-enow.tv_usec:enow.tv_usec - snow.tv_usec); \

-}

+		struct timeval now; \

+		gettimeofday(&now, NULL); \

+		mexPrintf("%8s : %5i : %8i sec : %8i usec\n", __TIME__, __LINE__, now.tv_sec, now.tv_usec); \

+	}

+	#define report_time_start( ) \

+	{ \

+		gettimeofday(&snow, NULL); \

+		mexPrintf("%8s : %5i : %8i sec : %8i usec", __TIME__, __LINE__, snow.tv_sec, snow.tv_usec); \

+	}

+	#define report_time_end( ) \

+	{ \

+		gettimeofday(&enow, NULL); \

+		mexPrintf("%8i sec : %8i usec\n", enow.tv_sec - snow.tv_sec, enow.tv_sec - snow.tv_sec?snow.tv_usec-enow.tv_usec:enow.tv_usec - snow.tv_usec); \

+	}

 #else

-#define report_time_eventLoop( ){};

-#define report_time( ) {}

-#define report_time_start( ) {}

-#define report_time_end( ) {}

+	#define report_time_eventLoop( ){};

+	#define report_time( ) {}

+	#define report_time_start( ) {}

+	#define report_time_end( ) {}

 #endif /* DEBUG_TIMING */

@@ -229,16 +248,16 @@

 /*----------------------------------------------------------

 RXTXPort.Initialize

-   accept:      The JNIEnv and jobj of the thread, the original eis.

-   perform:     fill in the needed variables with this threads values

-   return:      none

-   exceptions:  none

-   comments:    java variables (especially JNIEnv) should not be shared

-		between threads.  Right now we build a local struct with

-		the thread's info before using the variabls.  This is

-		especially true for send_event.

-

-		See also JNI_OnLoad() if the thread does not have the values

+	accept:		The JNIEnv and jobj of the thread, the original eis.

+	perform:	fill in the needed variables with this threads values

+	return:		none

+	exceptions: none

+	comments:	java variables (especially JNIEnv) should not be shared

+				between threads.  Right now we build a local struct with

+				the thread's info before using the variabls.  This is

+				especially true for send_event.

+				

+	See also JNI_OnLoad() if the thread does not have the values

 ----------------------------------------------------------*/

 struct event_info_struct build_threadsafe_eis(

 	JNIEnv *env,

@@ -264,13 +283,13 @@

 /*----------------------------------------------------------

 RXTXPort.Initialize

-   accept:      none

-   perform:     Initialize the native library

-   return:      none

-   exceptions:  none

-   comments:    Basically this just causes rxtx to ignore signals.  signal

-		handlers where tried but the VM (circa 1.1) did not like it.

-

+	accept:		none

+	perform:	Initialize the native library

+	return:		none

+	exceptions:	none

+	comments:	Basically this just causes rxtx to ignore signals.  signal

+				handlers where tried but the VM (circa 1.1) did not like it.

+				

 		It also allows for some sanity checks on linux boxes if DEBUG

 		is enabled.

 ----------------------------------------------------------*/

@@ -284,9 +303,9 @@

 	char message[80];

 #endif /* DEBUG && __linux__ */

 	/* This bit of code checks to see if there is a signal handler installed

-	   for SIGIO, and installs SIG_IGN if there is not.  This is necessary

-	   for the native threads jdk, but we don't want to do it with green

-	   threads, because it slows things down.  Go figure. */

+		for SIGIO, and installs SIG_IGN if there is not.  This is necessary

+		for the native threads jdk, but we don't want to do it with green

+		threads, because it slows things down.  Go figure. */

 	/* POSIX signal handling functions */

 #if !defined(WIN32)

@@ -306,7 +325,7 @@

 		sigaction(SIGIO, &new_action, NULL);

 	}

 #endif /* !WIN32 */

-	ENTER( "RXTXPort:Initialize" );

+	report( "Entering - RXTXPort:Initialize\n" );

 #ifdef PRERELEASE

 	/*  this is just for avoiding confusion while testing new libraries */

 #ifdef DEBUG_MW

@@ -322,32 +341,33 @@

 	/* Lets let people who upgraded kernels know they may have problems */

 	if (uname (&name) == -1)

 	{

-		report( "RXTX WARNING:  cannot get system name\n" );

-		LEAVE( "RXTXPort:Initialize" );

+		report( "RXTX WARNING:	cannot get system name\n" );

+		report( "Leaving - RXTXPort:Initialize\n" );

 		return;

 	}

 	if(strcmp(name.release,UTS_RELEASE)!=0)

 	{

-		sprintf( message, LINUX_KERNEL_VERSION_ERROR, UTS_RELEASE,

+		memset(&message[0], 0, sizeof(message));

+		sprintf( message, "%s%s%s\n", LINUX_KERNEL_VERSION_ERROR, UTS_RELEASE,

 			name.release );

 		report( message );

 		getchar();

 	}

-	LEAVE( "RXTXPort:Initialize" );

+	report( "Leaving - RXTXPort:Initialize\n" );

 #endif /* DEBUG && __linux__ */

 }

 /*----------------------------------------------------------

 RXTXPort.find_preopened_ports

-   accept:      The device to find if preopened.  ie "/dev/ttyS0"

-   perform:     find the filedescriptor if preopened

-   return:      fd

-   exceptions:  none

-   comments:    see

-			RXTXPort.nativeStaticSetDSR

-			RXTXPort.nativeStaticSetDTR

-			RXTXPort.nativeStaticSetRTS

-			RXTXPort.nativeStaticSetSerialPortParams

+	accept:		The device to find if preopened.  ie "/dev/ttyS0"

+	perform:	find the filedescriptor if preopened

+	return:		fd

+	exceptions:	none

+	comments:	see

+				RXTXPort.nativeStaticSetDSR

+				RXTXPort.nativeStaticSetDTR

+				RXTXPort.nativeStaticSetRTS

+				RXTXPort.nativeStaticSetSerialPortParams

 		This is used so people can setDTR low before calling the

 		Java open().

 ----------------------------------------------------------*/

@@ -401,13 +421,13 @@

 /*----------------------------------------------------------

 configure_port

-   accept:      env, file descriptor

-   perform:     set the termios struct to sane settings and

-   return:      0 on success

-   exceptions:  IOExcepiton

-   comments:    Very often people complain about not being able to get past

-                this function and it turns out to be permissions on the

-                device file or bios has the device disabled.

+	accept:		Env, file descriptor

+	perform:	set the termios struct to sane settings and

+	return:		0 on success

+	exceptions:	IOExcepiton

+	comments:	Very often people complain about not being able to get past

+				this function and it turns out to be permissions on the

+				device file or bios has the device disabled.

 ----------------------------------------------------------*/

 int configure_port( int fd )

 {

@@ -446,31 +466,31 @@

 /*----------------------------------------------------------

 get_java_baudrate

-   accept:      the native speed setting

-   perform:     translate the native speed to a Java speed

-   return:      the Java speed

-   exceptions:  none

-   comments:    This is used by open() (indirectly) and

-		nativeStaticGetBaudRate()

+	accept:		the native speed setting

+	perform:	translate the native speed to a Java speed

+	return:		the Java speed

+	exceptions:	none

+	comments:	This is used by open() (indirectly) and

+				nativeStaticGetBaudRate()

 ----------------------------------------------------------*/

 int get_java_baudrate( int native_speed )

 {

 	switch( native_speed )

 	{

-		case B0:     return 0;

-		case B50:    return 50;

-		case B75:    return 75;

-		case B110:   return 110;

-		case B134:   return 134;

-		case B150:   return 150;

-		case B200:   return 200;

-		case B300:   return 300;

-		case B600:   return 600;

-		case B1200:  return 1200;

-		case B1800:  return 1800;

-		case B2400:  return 2400;

-		case B4800:  return 4800;

-		case B9600:  return 9600;

+		case B0:	return 0;

+		case B50:	return 50;

+		case B75:	return 75;

+		case B110:	return 110;

+		case B134:	return 134;

+		case B150:	return 150;

+		case B200:	return 200;

+		case B300:	return 300;

+		case B600:	return 600;

+		case B1200:	return 1200;

+		case B1800:	return 1800;

+		case B2400:	return 2400;

+		case B4800:	return 4800;

+		case B9600:	return 9600;

 #ifdef B14400

 		case B14400: return 14400;

 #endif /* B14400 */

@@ -536,13 +556,13 @@

 /*----------------------------------------------------------

 set_java_vars

-   accept:      fd of the preopened device

-   perform:     Now that the object is instatiated, set the Java variables

-		to the preopened states.

-   return:      none

-   exceptions:  none

-   comments:    preopened refers to the fact that the serial port has

-		been configured before the Java open() has been called.

+	accept:		fd of the preopened device

+	perform:	Now that the object is instatiated, set the Java variables

+				to the preopened states.

+	return:		none

+	exceptions:	none

+	comments:	preopened refers to the fact that the serial port has

+				been configured before the Java open() has been called.

 ----------------------------------------------------------*/

 void set_java_vars( JNIEnv *env, jobject jobj, int fd )

@@ -570,10 +590,10 @@

 	switch( ttyset.c_cflag&CSIZE ) {

-		case CS5:  databits = JDATABITS_5; break;

-		case CS6:  databits = JDATABITS_6; break;

-		case CS7:  databits = JDATABITS_7; break;

-		case CS8:  databits = JDATABITS_8; break;

+		case CS5:	databits = JDATABITS_5; break;

+		case CS6:	databits = JDATABITS_6; break;

+		case CS7:	databits = JDATABITS_7; break;

+		case CS8:	databits = JDATABITS_8; break;

 	}

 #ifdef CMSPAR

 	switch( ttyset.c_cflag&(PARENB|PARODD|CMSPAR ) ) {

@@ -588,9 +608,9 @@

 		case PARENB | CMSPAR: jparity = JPARITY_SPACE; break;

 #endif /* CMSPAR */

 	}

-        switch( ttyset.c_cflag&(CSTOPB) ) {

-                case 0: stop_bits = STOPBITS_1; break;

-                case CSTOPB:

+	 switch( ttyset.c_cflag&(CSTOPB) ) {

+			case 0: stop_bits = STOPBITS_1; break;

+			case CSTOPB:

 			if ( (ttyset.c_cflag & CSIZE) ==  CS5 ) {

 				stop_bits = STOPBITS_1_5;

 			}

@@ -598,7 +618,7 @@

 				stop_bits = STOPBITS_2;

 			}

 			break;

-        }

+	 }

 /*

 dima writes:

@@ -616,9 +636,9 @@

 */

 #if defined(CBAUD)/* dima */

-    	baudrate = ttyset.c_cflag&CBAUD;

+		baudrate = ttyset.c_cflag&CBAUD;

 #else

-    	baudrate = cfgetispeed(&ttyset);

+		baudrate = cfgetispeed(&ttyset);

 #endif

 	(*env)->SetIntField(env, jobj, jfspeed,

 		( jint ) get_java_baudrate(baudrate) );

@@ -629,14 +649,14 @@

 /*----------------------------------------------------------

 RXTXPort.open

-   accept:      The device to open.  ie "/dev/ttyS0"

-   perform:     open the device, set the termios struct to sane settings and

-                return the filedescriptor

-   return:      fd

-   exceptions:  IOExcepiton

-   comments:    Very often people complain about not being able to get past

-                this function and it turns out to be permissions on the

-                device file or bios has the device disabled.

+	accept:		The device to open.  ie "/dev/ttyS0"

+	perform:	open the device, set the termios struct to sane settings and

+				return the filedescriptor

+	return:		fd

+	exceptions:	IOExcepiton

+	comments:	Very often people complain about not being able to get past

+				this function and it turns out to be permissions on the

+				device file or bios has the device disabled.

 ----------------------------------------------------------*/

 JNIEXPORT jint JNICALL RXTXPort(open)(

 	JNIEnv *env,

@@ -676,9 +696,10 @@

 			system_does_not_lock	Win32

 	*/

-	ENTER( "RXTXPort:open" );

+	report( "Entering - RXTXPort:open\n" );

 	if ( LOCK( filename, pid ) )

 	{

+		memset(&message[0], 0, sizeof(message));

 		sprintf( message, "open: locking has failed for %s\n",

 			filename );

 		report( message );

@@ -686,6 +707,7 @@

 	}

 	else

 	{

+		memset(&message[0], 0, sizeof(message));

 		sprintf( message, "open: locking worked for %s\n", filename );

 		report( message );

 	}

@@ -703,36 +725,36 @@

 	}  while (fd < 0 && errno==EINTR);

 #ifdef OPEN_EXCL

-       /*

-       Note that open() follows POSIX semantics: multiple open() calls to

-       the same file will succeed unless the TIOCEXCL ioctl is issued.

-       This will prevent additional opens except by root-owned processes.

-       See tty(4) ("man 4 tty") and ioctl(2) ("man 2 ioctl") for details.

-       */

-

-       if (fd >= 0 && (ioctl(fd, TIOCEXCL) == -1))

-       {

-               sprintf( message, "open: exclusive access denied for %s\n",

-                       filename );

-               report( message );

-               report_error( message );

-

-               close(fd);

-               goto fail;

-       }

+	/*

+	Note that open() follows POSIX semantics: multiple open() calls to

+	the same file will succeed unless the TIOCEXCL ioctl is issued.

+	This will prevent additional opens except by root-owned processes.

+	See tty(4) ("man 4 tty") and ioctl(2) ("man 2 ioctl") for details.

+	*/

+

+	if (fd >= 0 && (ioctl(fd, TIOCEXCL) == -1))

+	{

+			memset(&message[0], 0, sizeof(message));

+			sprintf( message, "open: exclusive access denied for %s\n", filename );

+			report( message );

+			report_error( message );

+			close(fd);

+			goto fail;

+	}

 #endif /* OPEN_EXCL */

 	if( configure_port( fd ) ) goto fail;

 	(*env)->ReleaseStringUTFChars( env, jstr, filename );

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "open: fd returned is %i\n", fd );

 	report( message );

-	LEAVE( "RXTXPort:open" );

+	report( "Leaving - RXTXPort:open\n" );

 	report_time_end( );

 	return (jint)fd;

 fail:

 	(*env)->ReleaseStringUTFChars( env, jstr, filename );

-	LEAVE( "RXTXPort:open" );

+	report( "Leaving - RXTXPort:open\n" );

 	throw_java_exception( env, PORT_IN_USE_EXCEPTION, "open",

 		strerror( errno ) );

 	return -1;

@@ -741,10 +763,10 @@

 /*----------------------------------------------------------

 RXTXPort.nativeClose

-   accept:      none

-   perform:     get the fd from the java end and close it

-   return:      none

-   exceptions:  none

+	accept:		none

+	perform:	get the fd from the java end and close it

+	return:		none

+	exceptions:	none

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(nativeClose)( JNIEnv *env,

 	jobject jobj,jstring jstr )

@@ -764,7 +786,7 @@

 		(*env)->ExceptionDescribe( env );

 		(*env)->ExceptionClear( env );

 		(*env)->DeleteLocalRef( env, jclazz );

-		report("nativeClose: Close not detecting thread pid");

+		report("nativeClose: Close not detecting thread pid\n");

 		return;

 	}

 	report("<nativeClose: pid\n");

@@ -777,14 +799,14 @@

 			system_does_not_unlock	Win32

 	*/

-	ENTER( "RXTXPort:nativeClose" );

+	report( "Entering - RXTXPort:nativeClose\n" );

 	if (fd > 0)

 	{

 		report("nativeClose: discarding remaining data (tcflush)\n");

 		/* discard any incoming+outgoing data not yet read/sent */

 		tcflush(fd, TCIOFLUSH);

  		do {

-			report("nativeClose:  calling close\n");

+			report("nativeClose:	calling close\n");

 			result=CLOSE (fd);

 		}  while ( result < 0 && errno == EINTR );

 		UNLOCK( filename, pid );

@@ -793,7 +815,7 @@

 	(*env)->DeleteLocalRef( env, jclazz );

 	report("nativeClose: release filename\n");

 	(*env)->ReleaseStringUTFChars( env, jstr, filename );

-	LEAVE( "RXTXPort:nativeClose" );

+	report( "Leaving - RXTXPort:nativeClose\n" );

 	report_time_end( );

 	return;

 }

@@ -801,15 +823,15 @@

 /*----------------------------------------------------------

  RXTXPort.set_port_params

-   accept:     env, fd, speed, data bits, stop bits, parity

-   perform:    set the serial port parameters

-   return:     1 on error

-   exceptions: UnsupportedCommOperationException

-   comments:   There is a static method and an instance method that use this

-		function.  The static method gets a fd first.  The instance

-		method can get the fd from the object.

+	accept:		env, fd, speed, data bits, stop bits, parity

+	perform:	set the serial port parameters

+	return:		1 on error

+	exceptions: UnsupportedCommOperationException

+	comments:	There is a static method and an instance method that use this

+				function.  The static method gets a fd first.  The instance

+				method can get the fd from the object.

-		see:  nativeSetSerialPortParams & nativeStaticSerialPortParams

+	see:		nativeSetSerialPortParams & nativeStaticSerialPortParams

 ----------------------------------------------------------*/

 int set_port_params( JNIEnv *env, int fd, int cspeed, int dataBits,

 			int stopBits, int parity )

@@ -864,36 +886,36 @@

 		ioctl( fd, TIOCMSET, &result );

 	}

 	/*

-	   B38400 is a special case in Linux for custom baud rates.

+		B38400 is a special case in Linux for custom baud rates.

-	   We just treat this as a custom speed for now.  If you take this ifdef

-	   out and select baud rates 38400 then 28800 then 38400, you will get

-	   a final baud rate of 28800 because you did not update the divisor.

+		We just treat this as a custom speed for now.  If you take this ifdef

+		out and select baud rates 38400 then 28800 then 38400, you will get

+		a final baud rate of 28800 because you did not update the divisor.

-	   See the next ifdef below for the divisor.

+		See the next ifdef below for the divisor.

 	*/

 #if defined(TIOCGSERIAL)

 	if ( cspeed == B38400 )

 		cspeed = 38400;

 #endif /* TIOCGSERIAL */

-	if(     cfsetispeed( &ttyset, cspeed ) < 0 ||

+	if(	cfsetispeed( &ttyset, cspeed ) < 0 ||

 		cfsetospeed( &ttyset, cspeed ) < 0 )

 	{

 		/*

-		    Some people need to set the baud rate to ones not defined

-		    in termios.h

+			Some people need to set the baud rate to ones not defined

+			in termios.h

-		    This includes some baud rates which are supported by CommAPI

-		    in Unix ( 14400, 28800, 128000, 256000 )

+			This includes some baud rates which are supported by CommAPI

+			in Unix ( 14400, 28800, 128000, 256000 )

-		    If the above fails, we assume this is not a defined

-		    baud rate on Unix.  With Win32, It is assumed the kernel

-		    will do this for us.

+			If the above fails, we assume this is not a defined

+			baud rate on Unix.  With Win32, It is assumed the kernel

+			will do this for us.

-		    The baud_base and desired speed are used to

-		    calculate a custom divisor.

+			The baud_base and desired speed are used to

+			calculate a custom divisor.

-		    On linux the setserial man page covers this.

+			On linux the setserial man page covers this.

 		*/

 #if defined(TIOCGSERIAL)

@@ -905,7 +927,7 @@

 		sstruct.custom_divisor = ( sstruct.baud_base/cspeed );

 		cspeed = B38400;

 #endif /* TIOCGSERIAL */

-		if(     cfsetispeed( &ttyset, cspeed ) < 0 ||

+		if(	cfsetispeed( &ttyset, cspeed ) < 0 ||

 			cfsetospeed( &ttyset, cspeed ) < 0 )

 		{

 			/* OK, we tried everything */

@@ -933,10 +955,10 @@

 /*----------------------------------------------------------

  RXTXPort.nativeSetSerialPortParams

-   accept:     speed, data bits, stop bits, parity

-   perform:    set the serial port parameters

-   return:     jboolean 1 on error

-   exceptions: UnsupportedCommOperationException

+	accept:		speed, data bits, stop bits, parity

+	perform:	set the serial port parameters

+	return:		jboolean 1 on error

+	exceptions: UnsupportedCommOperationException

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(nativeSetSerialPortParams)(

 	JNIEnv *env, jobject jobj, jint speed, jint dataBits, jint stopBits,

@@ -945,15 +967,15 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	int cspeed = translate_speed( env, speed );

-	ENTER( "RXTXPort:nativeSetSerialPortParams" );

+	report( "Entering - RXTXPort:nativeSetSerialPortParams\n" );

 	report_time_start( );

 	if (cspeed < 0 )

 	{

 		report(" invalid cspeed\n");

 /*

-    For some reason the native exceptions are not being caught.  Moving this

-    to the Java side fixed the issue.  taj.

+	For some reason the native exceptions are not being caught.  Moving this

+	to the Java side fixed the issue.  taj.

 		throw_java_exception( env, UNSUPPORTED_COMM_OPERATION,

 			"", "BaudRate could not be set to the specified value" );

 */

@@ -964,17 +986,17 @@

 	if( set_port_params( env, fd, cspeed, dataBits, stopBits, parity ) )

 	{

 		report("set_port_params failed\n");

-		LEAVE( "RXTXPort:nativeSetSerialPortParams" );

+		report( "Leaving - RXTXPort:nativeSetSerialPortParams\n" );

 /*

-    For some reason the native exceptions are not being caught.  Moving this

-    to the Java side fixed the issue.  taj.

+	For some reason the native exceptions are not being caught.  Moving this

+	to the Java side fixed the issue.  taj.

 		throw_java_exception( env, UNSUPPORTED_COMM_OPERATION,

 			"nativeSetSerialPortParams", strerror( errno ) );

 */

 		return(1);

 	}

-	LEAVE( "RXTXPort:nativeSetSerialPortParams" );

+	report( "Leaving - RXTXPort:nativeSetSerialPortParams\n" );

 	report_time_end( );

 	return(0);

 }

@@ -982,17 +1004,17 @@

 /*----------------------------------------------------------

  translate_speed

-   accept:     speed in bits-per-second

-   perform:    convert bits-per-second to a speed_t constant

-   return:     speed_t constant

-   exceptions: returns -1 and the calling method throws the exception so

-	       it may be caught in java.

-   comments:   Only the lowest level code should know about

-               the magic constants.

+	accept:		speed in bits-per-second

+	perform:	convert bits-per-second to a speed_t constant

+	return:		speed_t constant

+	exceptions: returns -1 and the calling method throws the exception so

+				it may be caught in java.

+	comments:	Only the lowest level code should know about

+				the magic constants.

 ----------------------------------------------------------*/

 int translate_speed( JNIEnv *env, jint speed )

 {

-	LEAVE( "RXTXPort:translate_speed" );

+	report( "Leaving - RXTXPort:translate_speed\n" );

 	switch( speed ) {

 		case 0:		return B0;

 		case 50:	return B50;

@@ -1072,7 +1094,7 @@

 	if( speed >= 0 ) return speed;

 	else

 	{

-		LEAVE( "RXTXPort:translate_speed: Error condition" );

+		report( "Leaving - RXTXPort:translate_speed: Error condition\n" );

 		return -1;

 	}

 }

@@ -1080,16 +1102,16 @@

 /*----------------------------------------------------------

  translate_data_bits

-   accept:     gnu.io.SerialPort.DATABITS_* constant

-   perform:    set proper termios c_cflag bits

-   return:     1 on error

-   exceptions: UnsupportedCommOperationException

+	accept:		gnu.io.SerialPort.DATABITS_* constant

+	perform:	set proper termios c_cflag bits

+	return:		1 on error

+	exceptions: UnsupportedCommOperationException

 ----------------------------------------------------------*/

 int translate_data_bits( JNIEnv *env, tcflag_t *cflag, jint dataBits )

 {

 	int temp = (*cflag) & ~CSIZE;

-	ENTER( "translate_date_bits" );

+	report( "Entering - translate_date_bits\n" );

 	switch( dataBits ) {

 		case JDATABITS_5:

 			(*cflag) = temp | CS5;

@@ -1105,10 +1127,10 @@

 			return 0;

 	}

-	LEAVE( "RXTXPort:translate_date_bits" );

+	report( "Leaving - RXTXPort:translate_date_bits\n" );

 /*

-    For some reason the native exceptions are not being caught.  Moving this

-    to the Java side fixed the issue.  taj.

+	For some reason the native exceptions are not being caught.  Moving this

+	to the Java side fixed the issue.  taj.

 	throw_java_exception( env, UNSUPPORTED_COMM_OPERATION,

 		"", "databit value not supported" );

 */

@@ -1118,20 +1140,20 @@

 /*----------------------------------------------------------

  translate_stop_bits

-   accept:     gnu.io.SerialPort.STOPBITS_* constant

-   perform:    set proper termios c_cflag bits

-   return:     1 on error

-   exceptions: UnsupportedCommOperationException

-   comments:   If you specify 5 data bits and 2 stop bits, the port will

-               allegedly use 1.5 stop bits.  Does anyone care?

+	accept:		gnu.io.SerialPort.STOPBITS_* constant

+	perform:	set proper termios c_cflag bits

+	return:		1 on error

+	exceptions: UnsupportedCommOperationException

+	comments:	If you specify 5 data bits and 2 stop bits, the port will

+				allegedly use 1.5 stop bits.  Does anyone care?

 ----------------------------------------------------------*/

 int translate_stop_bits( JNIEnv *env, tcflag_t *cflag, jint stopBits )

 {

-	ENTER( "translate_stop_bits" );

+	report( "Entering - translate_stop_bits\n" );

 	switch( stopBits ) {

 		case STOPBITS_1:

 			(*cflag) &= ~CSTOPB;

-			LEAVE( "RXTXPort:translate_stop_bits" );

+			report( "Leaving - RXTXPort:translate_stop_bits\n" );

 			return 0;

 		/*  ok.. lets try putting it in and see if anyone notices */

 		case STOPBITS_1_5:

@@ -1141,14 +1163,14 @@

 			return 0;

 		case STOPBITS_2:

 			(*cflag) |= CSTOPB;

-			LEAVE( "RXTXPort:translate_stop_bits" );

+			report( "Leaving - RXTXPort:translate_stop_bits\n" );

 			return 0;

 	}

-	LEAVE( "RXTXPort:translate_stop_bits" );

+	report( "Leaving - RXTXPort:translate_stop_bits\n" );

 /*

-    For some reason the native exceptions are not being caught.  Moving this

-    to the Java side fixed the issue.  taj.

+	For some reason the native exceptions are not being caught.  Moving this

+	to the Java side fixed the issue.  taj.

 	throw_java_exception( env, UNSUPPORTED_COMM_OPERATION,

 		"", "stopbit value not supported" );

 */

@@ -1181,7 +1203,7 @@

 	if( tcgetattr( fd, &ttyset ) < 0 )

 	{

-		report("nativeGetParity:  tcgetattr failed\n");

+		report("nativeGetParity:	tcgetattr failed\n");

 		return( -1 );

 	}

 #ifdef  CMSPAR

@@ -1215,49 +1237,49 @@

 /*----------------------------------------------------------

  translate_parity

-   accept:     javax.comm.SerialPort.PARITY_* constant

-   perform:    set proper termios c_cflag bits

-   return:     1 on error

-   exceptions: UnsupportedCommOperationException

-   comments:   The CMSPAR bit should be used for 'mark' and 'space' parity,

-               but it's not in glibc's includes.  Oh well, rarely used anyway.

+	accept:		javax.comm.SerialPort.PARITY_* constant

+	perform:	set proper termios c_cflag bits

+	return:		1 on error

+	exceptions:	UnsupportedCommOperationException

+	comments:	The CMSPAR bit should be used for 'mark' and 'space' parity,

+				but it's not in glibc's includes.  Oh well, rarely used anyway.

 ----------------------------------------------------------*/

 int translate_parity( JNIEnv *env, tcflag_t *cflag, jint parity )

 {

-	ENTER( "translate_parity" );

+	report( "Entering - translate_parity\n" );

 #ifdef CMSPAR

 	(*cflag) &= ~(PARENB | PARODD | CMSPAR );

 #endif /* CMSPAR */

 	switch( parity ) {

 		case JPARITY_NONE:

-			LEAVE( "translate_parity" );

+			report( "Leaving - translate_parity\n" );

 			return 0;

 		case JPARITY_EVEN:

 			(*cflag) |= PARENB;

-			LEAVE( "translate_parity" );

+			report( "Leaving - translate_parity\n" );

 			return 0;

 		case JPARITY_ODD:

 			(*cflag) |= PARENB | PARODD;

-			LEAVE( "translate_parity" );

+			report( "Leaving - translate_parity\n" );

 			return 0;

 #ifdef CMSPAR

 		case JPARITY_MARK:

 			(*cflag) |= PARENB | PARODD | CMSPAR;

-			LEAVE( "translate_parity" );

+			report( "Leaving - translate_parity\n" );

 			return 0;

 		case JPARITY_SPACE:

 			(*cflag) |= PARENB | CMSPAR;

-			LEAVE( "translate_parity" );

+			report( "Leaving - translate_parity\n" );

 			return 0;

 #endif /* CMSPAR */

 		default:

 			printf("Parity missed %i\n", (int) parity );

 	}

-	LEAVE( "translate_parity" );

+	report( "Leaving - translate_parity\n" );

 /*

-    For some reason the native exceptions are not being caught.  Moving this

-    to the Java side fixed the issue.  taj.

+	For some reason the native exceptions are not being caught.  Moving this

+	to the Java side fixed the issue.  taj.

 	throw_java_exception( env, UNSUPPORTED_COMM_OPERATION,

 		"", "parity value not supported" );

 */

@@ -1267,48 +1289,63 @@

 /*----------------------------------------------------------

 drain_loop()

-   accept:

-   perform:	call tcdrain() and report an event when it succeds

-   return:      none

-   exceptions:

-   comments:

+	accept:

+	perform:	call tcdrain() and report an event when it succeds

+	return:		none

+	exceptions:

+	comments:

 ----------------------------------------------------------*/

 void *drain_loop( void *arg )

 {

+	report("Entering - drain_loop\n");	

 	struct event_info_struct *eis = ( struct event_info_struct * ) arg;

 	/* char msg[80]; */

 	int i;

+	

+	report_verbose("drain_loop: pthread detaching\n");

 	pthread_detach( pthread_self() );

-

+	

+	report_verbose("drain_loop: begining for loop\n");

 	for(i=0;;i++)

 	{

-		report_verbose("drain_loop:  looping\n");

+		report_verbose("drain_loop: looping\n");

 		if( eis->eventloop_interrupted )

 		{

+			report_verbose("drain_loop: EventLoop Interrupted\n");

 			goto end;

 		}

-#if defined(__sun__)

-	/* FIXME: No time to test on all OS's for production */

-		if (usleep(5000)) {

-			report("drain_loop:  received EINTR");

-		}

-#else

-		if (usleep(1000000)) {

-			report("drain_loop:  received EINTR");

-		}

-#endif /* __sun__ */

+		

+		#if defined(__sun__)

+			/* FIXME: No time to test on all OS's for production */

+			report_verbose("drain_loop: SUN: Sleeping now\n");

+			if (usleep(5000)) {

+				report("***drain_loop: received EINTR\n");

+			}

+		#else

+			report_verbose("drain_loop: Sleeping now\n");

+			if (usleep(1000000)) {

+				report("***drain_loop: received EINTR\n");

+			}

+		#endif /* __sun__ */

+		

+		report_verbose("***drain_loop: Out of sleep loop\n");

 		/*

 		system_wait();

 		*/

+		

 		if( eis->eventloop_interrupted )

 		{

+			report_verbose("*** drain_loop: Interupted\n");

+			eis->closing = 1;

 			goto end;

 		}

+		

 		if( tcdrain( eis->fd ) == 0 )

 		{

 			if( eis && eis->writing )

 			{

 				/*

+				memset(&msg[0], 0, sizeof(msg));

 				sprintf(msg, "drain_loop: setting OUTPUT_BUFFER_EMPTY\n" );

 				report( msg );

 				*/

@@ -1321,17 +1358,17 @@

 				{

 					goto end;

 				}

-				report_verbose("drain_loop:  writing not set\n");

+				report_verbose("drain_loop: writing not set\n");

 			}

 		}

 		else if (errno != EINTR)

 		{

-			report("drain_loop:  tcdrain bad fd\n");

+			report("drain_loop:	tcdrain bad fd\n");

 			goto end;

 		}

 		else

 		{

-			report("drain_loop:  received EINTR in tcdrain\n");

+			report("drain_loop:	received EINTR in tcdrain\n");

 		}

 	}

 end:

@@ -1344,12 +1381,12 @@

 /*----------------------------------------------------------

 finalize_threads( )

-   accept:      event_info_struct used to access java and communicate with

-	        eventLoop().

-   perform:     see comments

-   return:      none

-   exceptions:  none

-   comments:

+	accept:		event_info_struct used to access java and communicate with

+				eventLoop().

+	perform:	see comments

+	return:		none

+	exceptions:	none

+	comments:

 	The is the pthread spawned on systems that can't access the

 	LSR (Line Status Register).  Without access to the LSR rxtx

 	cannot detect when the output buffer is empty in the Monitor

@@ -1361,14 +1398,14 @@

 ----------------------------------------------------------*/

 void finalize_threads( struct event_info_struct *eis )

 {

-#if     !defined(TIOCSERGETLSR) && !defined( WIN32 )

+#if	!defined(TIOCSERGETLSR) && !defined( WIN32 )

 	/* used to shut down any remaining write threads */

 	eis->output_buffer_empty_flag = 0;

-	ENTER("finalize_threads\n");

+	report("Entering - finalize_threads\n");

 	/* need to clean up again after working events */

-	LEAVE("---------------- finalize_threads ---------------");

+	report("Leaving - ---------------- finalize_threads ---------------\n");

 #endif /* TIOCSERGETLSR & !WIN32 */

 }

@@ -1377,6 +1414,8 @@

 {

 	/*

 	char msg[80];

+	

+	memset(&msg[0], 0, sizeof(msg));

 	sprintf( msg, "RXTX Recieved Signal %i\n", signo );

 	report_error( msg );

 	*/

@@ -1386,17 +1425,19 @@

 /*----------------------------------------------------------

 init_threads( )

-   accept:      none

-   perform:

-   return:      none

-   exceptions:  none

-   comments:

-   this function is called from the event_loop or in other words

-   from the monitor thread. On systems !WIN32 and without TIOCSERGETLSR

-   it will create a new thread looping a call to tcdrain.

+	accept:		none

+	perform:

+	return:		none

+	exceptions:	none

+	comments:

+				this function is called from the event_loop or in other

+				words from the monitor thread. On systems !WIN32 and 

+				without TIOCSERGETLSR it will create a new thread

+				looping a call to tcdrain.

 ----------------------------------------------------------*/

 int init_threads( struct event_info_struct *eis )

 {

+	report("Entering - init_threads\n");

 	jfieldID jeis;

 #if !defined(TIOCSERGETLSR) & !defined(WIN32)

 	sigset_t newmask, oldmask;

@@ -1404,7 +1445,7 @@

 	pthread_t tid;

 	report_time_start( );

-	report("init_threads:  start\n");

+	report("init_threads:	start\n");

 	/* ignore child thread status changes */

 	sigemptyset(&newmask);

 	sigaddset(&newmask, SIGCHLD);

@@ -1412,14 +1453,17 @@

 	/* install our own signal hander */

 	newaction.sa_handler = warn_sig_abort;

 	sigemptyset( &newaction.sa_mask );

-#ifdef SA_INTERRUPT

-	newaction.sa_flags = SA_INTERRUPT;

-#endif /* SA_INTERRUPT */

-#ifdef SA_RESTART

-	/* JOE: do not demand restart! we are handling EINTR */

-/*	newaction.sa_flags = SA_RESTART;*/

-#endif /* SA_RESTART */

-

+	#ifdef SA_INTERRUPT

+		newaction.sa_flags = SA_INTERRUPT;

+	#endif /* SA_INTERRUPT */

+	#ifdef SA_RESTART

+		/* JOE: do not demand restart! we are handling EINTR */

+		/*	newaction.sa_flags = SA_RESTART;*/

+	#endif /* SA_RESTART */

+

+	/**

+	*	POSIX SIGABRT behaviour not changed in original code!!

+	**/

 	sigaction(SIGABRT, &newaction, &oldaction);

 	sigaction(SIGCHLD, &newaction, &oldaction);

 	sigaction(SIGALRM, &newaction, &oldaction);

@@ -1443,23 +1487,25 @@

 	pthread_detach( tid );

 	eis->drain_tid = tid;

 #endif /* TIOCSERGETLSR */

+

 	report("init_threads: get eis\n");

 	jeis  = (*eis->env)->GetFieldID( eis->env, eis->jclazz, "eis", "J" );

 	report("init_threads: set eis\n");

 	(*eis->env)->SetLongField(eis->env, *eis->jobj, jeis, ( size_t ) eis );

-	report("init_threads:  stop\n");

+	report("init_threads:	stop\n");

 	report_time_end( );

+	report("Leaving - init_threads\n");

 	return( 1 );

 }

 /*----------------------------------------------------------

 RXTXPort.writeByte

-   accept:      byte to write (passed as int)

-                jboolean interrupted (no events if true)

-   perform:     write a single byte to the port

-   return:      none

-   exceptions:  IOException

+	accept:		byte to write (passed as int)

+				jboolean interrupted (no events if true)

+	perform:	write a single byte to the port

+	return:		none

+	exceptions:	IOException

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(writeByte)( JNIEnv *env,

 	jobject jobj, jint ji, jboolean interrupted )

@@ -1476,8 +1522,9 @@

 #endif /* __sun__ */

 	report_time_start();

-	ENTER( "RXTXPort:writeByte" );

+	report( "Entering - RXTXPort:writeByte\n" );

 	do {

+		memset(&msg[0], 0, sizeof(msg));

 		sprintf( msg, "writeByte %c>>\n", byte );

 		report( msg );

 		result=WRITE (fd, (void * ) &byte, sizeof(unsigned char));

@@ -1506,12 +1553,14 @@

 				index->next ) index = index->next;

 		}

 		index->writing = 1;

-		report( "writeByte:  index->writing = 1" );

+		report( "writeByte:	index->writing = 1\n" );

 	}

 #endif

+	

+	memset(&msg[0], 0, sizeof(msg));

 	sprintf( msg, "RXTXPort:writeByte %i\n", result );

 	report( msg );

-	LEAVE( "RXTXPort:writeByte" );

+	report( "Leaving - RXTXPort:writeByte\n" );

 	if(result >= 0)

 	{

 		report_time_end();

@@ -1525,13 +1574,13 @@

 /*----------------------------------------------------------

 RXTXPort.writeArray

-   accept:      jbarray: bytes used for writing

-                offset: offset in array to start writing

-                count: Number of bytes to write

-                jboolean interrupted (no events if true)

-   perform:     write length bytes of jbarray

-   return:      none

-   exceptions:  IOException

+	accept:		jbarray: bytes used for writing

+	offset:		offset in array to start writing

+	count:		Number of bytes to write

+				jboolean interrupted (no events if true)

+	perform:	write length bytes of jbarray

+	return:		none

+	exceptions:	IOException

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(writeArray)( JNIEnv *env,

 	jobject jobj, jbyteArray jbarray, jint offset, jint count,

@@ -1562,9 +1611,10 @@

 /* return; OH CRAP */

 	report_time_start();

-	ENTER( "writeArray" );

+	report( "Entering - writeArray\n" );

 	/* warning Roy Rogers */

 	/*

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "::::RXTXPort:writeArray(%s);\n", (char *) body );

 	report_verbose( message );

 	*/

@@ -1600,7 +1650,7 @@

 				index->next ) index = index->next;

 		}

 		index->writing = 1;

-		report( "writeArray:  index->writing = 1" );

+		report( "writeArray:	index->writing = 1\n" );

 	}

 #endif /* TIOCSERGETLSR */

 	/*

@@ -1615,7 +1665,7 @@

 		Things just start spinning out of control after that.

 	*/

-	LEAVE( "RXTXPort:writeArray" );

+	report( "Leaving - RXTXPort:writeArray\n" );

 	report_time_end();

 fail:

 	if( result < 0 ) throw_java_exception( env, IO_EXCEPTION,

@@ -1625,15 +1675,14 @@

 /*----------------------------------------------------------

 RXTXPort.nativeDrain

-   accept:      jboolean interrupted (no events if true)

-   perform:     wait until all data is transmitted

-   return:      none

-   exceptions:  IOException

-   comments:    java.io.OutputStream.flush() is equivalent to tcdrain,

-                not tcflush, which throws away unsent bytes

-

-                count logic added to avoid infinite loops when EINTR is

-                true...  Thread.yeild() was suggested.

+	accept:		jboolean interrupted (no events if true)

+	perform:	wait until all data is transmitted

+	return:		none

+	exceptions:	IOException

+	comments:	java.io.OutputStream.flush() is equivalent to tcdrain,

+				not tcflush, which throws away unsent bytes

+				count logic added to avoid infinite loops when EINTR is

+				true...  Thread.yeild() was suggested.

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(nativeDrain)( JNIEnv *env,

 	jobject jobj, jboolean interrupted )

@@ -1644,7 +1693,7 @@

 	char message[80];

-	ENTER( "SerialImp.c:drain()" );

+	report( "Entering - SerialImp.c:drain()\n" );

 	report_time_start( );

 	do {

 		report_verbose( "nativeDrain: trying tcdrain\n" );

@@ -1652,13 +1701,15 @@

 		count++;

 	}  while (result && errno==EINTR && count <3);

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "RXTXPort:drain() returns: %i\n", result );

 	report_verbose( message );

+	

 #if defined(__sun__)

 	/* FIXME: No time to test on all OS's for production */

 	return( JNI_TRUE );

 #endif /* __sun__ */

-	LEAVE( "RXTXPort:drain()" );

+	report( "Leaving - RXTXPort:drain()\n" );

 	if( result ) throw_java_exception( env, IO_EXCEPTION, "nativeDrain",

 		strerror( errno ) );

 	if( interrupted ) return( JNI_FALSE );

@@ -1669,10 +1720,12 @@

 		eis->output_buffer_empty_flag = 0;

 	}

 #endif /* !TIOCSERGETLSR !WIN32 */

+

 	if( eis && eis->eventflags[SPE_OUTPUT_BUFFER_EMPTY] )

 	{

-                struct event_info_struct myeis =

+		struct event_info_struct myeis =

 			build_threadsafe_eis( env, &jobj, eis );

+			

 		send_event( &myeis, SPE_OUTPUT_BUFFER_EMPTY, 1 );

 	}

 	report_time_end( );

@@ -1682,29 +1735,29 @@

 /*----------------------------------------------------------

 RXTXPort.sendBreak

-   accept:     duration in milliseconds.

-   perform:    send break for actual time.  not less than 0.25 seconds.

-   exceptions: none

-   comments:   not very precise

+	accept:		duration in milliseconds.

+	perform:	send break for actual time.  not less than 0.25 seconds.

+	exceptions: none

+	comments:	not very precise

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(sendBreak)( JNIEnv *env,

 	jobject jobj, jint duration )

 {

 	int fd = get_java_var( env, jobj,"fd","I" );

 	report_time_start( );

-	ENTER( "RXTXPort:sendBreak()" );

+	report( "Entering - RXTXPort:sendBreak()\n" );

 	tcsendbreak( fd, (int)( duration / 250 ) );

 	report_time_end( );

-	LEAVE( "RXTXPort:sendBreak()" );

+	report( "Leaving - RXTXPort:sendBreak()\n" );

 }

 /*----------------------------------------------------------

 RXTXPort.NativegetReceiveTimeout

-   accept:     none

-   perform:    get termios.c_cc[VTIME]

-   return:     VTIME

-   comments:   see  NativeEnableReceiveTimeoutThreshold

+	accept:		none

+	perform:	get termios.c_cc[VTIME]

+	return:	VTIME

+	comments:	see  NativeEnableReceiveTimeoutThreshold

 ----------------------------------------------------------*/

 JNIEXPORT jint JNICALL RXTXPort(NativegetReceiveTimeout)(

 	JNIEnv *env,

@@ -1714,12 +1767,12 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	struct termios ttyset;

-	ENTER( "RXTXPort:nativegetRecieveTimeout()" );

+	report( "Entering - RXTXPort:nativegetRecieveTimeout()\n" );

 	if( tcgetattr( fd, &ttyset ) < 0 ) goto fail;

-	LEAVE( "RXTXPort:nativegetRecieveTimeout()" );

+	report( "Leaving - RXTXPort:nativegetRecieveTimeout()\n" );

 	return(ttyset.c_cc[ VTIME ] * 100);

 fail:

-	LEAVE( "RXTXPort:nativegetRecieveTimeout()" );

+	report( "Leaving - RXTXPort:nativegetRecieveTimeout()\n" );

 	throw_java_exception( env, IO_EXCEPTION, "getReceiveTimeout",

 		strerror( errno ) );

 	return -1;

@@ -1728,10 +1781,10 @@

 /*----------------------------------------------------------

 RXTXPort.NativeisReceiveTimeoutEnabled

-   accept:     none

-   perform:    determine if VTIME is none 0

-   return:     JNI_TRUE if VTIME > 0 else JNI_FALSE

-   comments:   see  NativeEnableReceiveTimeoutThreshold

+	accept:		none

+	perform:	determine if VTIME is none 0

+	return:		JNI_TRUE if VTIME > 0 else JNI_FALSE

+	comments:	see  NativeEnableReceiveTimeoutThreshold

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(NativeisReceiveTimeoutEnabled)(

 	JNIEnv *env,

@@ -1740,12 +1793,12 @@

 {

 	int fd = get_java_var( env, jobj,"fd","I" );

 	struct termios ttyset;

-	ENTER( "RXTXPort:NativeisRecieveTimeoutEnabled()" );

+	report( "Entering - RXTXPort:NativeisRecieveTimeoutEnabled()\n" );

 	if( tcgetattr( fd, &ttyset ) < 0 ) goto fail;

-	LEAVE( "RXTXPort:NativeisRecieveTimeoutEnabled()" );

+	report( "Leaving - RXTXPort:NativeisRecieveTimeoutEnabled()\n" );

 	return(ttyset.c_cc[ VTIME ] > 0 ? JNI_TRUE:JNI_FALSE);

 fail:

-	LEAVE( "RXTXPort:NativeisRecieveTimeoutEnabled()" );

+	report( "Leaving - RXTXPort:NativeisRecieveTimeoutEnabled()\n" );

 	throw_java_exception( env, IO_EXCEPTION, "isReceiveTimeoutEnabled",

 		strerror( errno ) );

 	return JNI_FALSE;

@@ -1754,12 +1807,12 @@

 /*----------------------------------------------------------

 RXTXPort.isDSR

-   accept:      none

-   perform:     check status of DSR

-   return:      true if TIOCM_DSR is set

-                false if TIOCM_DSR is not set

-   exceptions:  none

-   comments:    DSR stands for Data Set Ready

+	accept:		none

+	perform:	check status of DSR

+	return:		true if TIOCM_DSR is set

+				false if TIOCM_DSR is not set

+	exceptions:	none

+	comments:	DSR stands for Data Set Ready

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(isDSR)( JNIEnv *env,

 	jobject jobj )

@@ -1768,11 +1821,13 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:isDSR" );

+	report( "Entering - RXTXPort:isDSR\n" );

 	ioctl( fd, TIOCMGET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "RXTXPort:isDSR returns %i\n", result & TIOCM_DSR );

 	report( message );

-	LEAVE( "RXTXPort:isDSR" );

+	report( "Leaving - RXTXPort:isDSR\n" );

 	if( result & TIOCM_DSR ) return JNI_TRUE;

 	else return JNI_FALSE;

 }

@@ -1780,15 +1835,15 @@

 /*----------------------------------------------------------

 RXTXPort.isCD

-   accept:      none

-   perform:     check status of CD

-   return:      true if TIOCM_CD is set

-                false if TIOCM_CD is not set

-   exceptions:  none

-   comments:    CD stands for Carrier Detect

-                The following comment has been made...

-                "well, it works, there might ofcourse be a bug, but making DCD

-                permanently on fixed it for me so I don't care"

+	accept:		none

+	perform:	check status of CD

+	return:		true if TIOCM_CD is set

+				false if TIOCM_CD is not set

+	exceptions:	none

+	comments:	CD stands for Carrier Detect

+				The following comment has been made...

+				"well, it works, there might ofcourse be a bug, but making DCD

+				permanently on fixed it for me so I don't care"

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(isCD)( JNIEnv *env,

@@ -1798,10 +1853,12 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:isCD" );

+	report( "Entering - RXTXPort:isCD\n" );

 	ioctl( fd, TIOCMGET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "RXTXPort:isCD returns %i\n", result & TIOCM_CD );

-	LEAVE( "RXTXPort:isCD" );

+	report( "Leaving - RXTXPort:isCD\n" );

 	if( result & TIOCM_CD ) return JNI_TRUE;

 	else return JNI_FALSE;

 }

@@ -1809,12 +1866,12 @@

 /*----------------------------------------------------------

 RXTXPort.isCTS

-   accept:      none

-   perform:     check status of CTS

-   return:      true if TIOCM_CTS is set

-                false if TIOCM_CTS is not set

-   exceptions:  none

-   comments:    CTS stands for Clear To Send.

+	accept:		none

+	perform:	check status of CTS

+	return:		true if TIOCM_CTS is set

+				false if TIOCM_CTS is not set

+	exceptions:	none

+	comments:	CTS stands for Clear To Send.

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(isCTS)( JNIEnv *env,

 	jobject jobj )

@@ -1823,11 +1880,13 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:isCTS" );

+	report( "Entering - RXTXPort:isCTS\n" );

 	ioctl( fd, TIOCMGET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "RXTXPort:isCTS returns %i\n", result & TIOCM_CTS );

 	report( message );

-	LEAVE( "RXTXPort:isCTS" );

+	report( "Leaving - RXTXPort:isCTS\n" );

 	if( result & TIOCM_CTS ) return JNI_TRUE;

 	else return JNI_FALSE;

 }

@@ -1835,12 +1894,12 @@

 /*----------------------------------------------------------

 RXTXPort.isRI

-   accept:      none

-   perform:     check status of RI

-   return:      true if TIOCM_RI is set

-                false if TIOCM_RI is not set

-   exceptions:  none

-   comments:    RI stands for Ring Indicator

+	accept:		none

+	perform:	check status of RI

+	return:		true if TIOCM_RI is set

+				false if TIOCM_RI is not set

+	exceptions:	none

+	comments:	RI stands for Ring Indicator

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(isRI)( JNIEnv *env,

 	jobject jobj )

@@ -1849,11 +1908,13 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:isRI" );

+	report( "Entering - RXTXPort:isRI\n" );

 	ioctl( fd, TIOCMGET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "RXTXPort:isRI returns %i\n", result & TIOCM_RI );

 	report( message );

-	LEAVE( "RXTXPort:isRI" );

+	report( "Leaving - RXTXPort:isRI\n" );

 	if( result & TIOCM_RI ) return JNI_TRUE;

 	else return JNI_FALSE;

 }

@@ -1861,12 +1922,12 @@

 /*----------------------------------------------------------

 RXTXPort.isRTS

-   accept:      none

-   perform:     check status of RTS

-   return:      true if TIOCM_RTS is set

-                false if TIOCM_RTS is not set

-   exceptions:  none

-   comments:    tcgetattr with c_cflag CRTS_IFLOW

+	accept:		none

+	perform:	check status of RTS

+	return:		true if TIOCM_RTS is set

+				false if TIOCM_RTS is not set

+	exceptions:	none

+	comments:	tcgetattr with c_cflag CRTS_IFLOW

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(isRTS)( JNIEnv *env,

 	jobject jobj )

@@ -1875,11 +1936,13 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:isRTS" );

+	report( "Entering - RXTXPort:isRTS\n" );

 	ioctl( fd, TIOCMGET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "RXTXPort:isRTS returns %i\n", result & TIOCM_RTS );

 	report( message );

-	LEAVE( "RXTXPort:isRTS" );

+	report( "Leaving - RXTXPort:isRTS\n" );

 	if( result & TIOCM_RTS ) return JNI_TRUE;

 	else return JNI_FALSE;

 }

@@ -1887,13 +1950,13 @@

 /*----------------------------------------------------------

 RXTXPort.setRTS

-   accept:      state  flag to set/unset.

-   perform:     depends on the state flag

-                if true TIOCM_RTS is set

-                if false TIOCM_RTS is unset

-   return:      none

-   exceptions:  none

-   comments:    tcsetattr with c_cflag CRTS_IFLOW

+	accept:		state  flag to set/unset.

+	perform:	depends on the state flag

+				if true TIOCM_RTS is set

+				if false TIOCM_RTS is unset

+	return:		none

+	exceptions:	none

+	comments:	tcsetattr with c_cflag CRTS_IFLOW

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(setRTS)( JNIEnv *env,

 	jobject jobj, jboolean state )

@@ -1902,27 +1965,29 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:setRTS" );

+	report( "Entering - RXTXPort:setRTS\n" );

 	ioctl( fd, TIOCMGET, &result );

 	if( state == JNI_TRUE ) result |= TIOCM_RTS;

 	else result &= ~TIOCM_RTS;

 	ioctl( fd, TIOCMSET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "setRTS( %i )\n", state );

 	report( message );

-	LEAVE( "RXTXPort:setRTS" );

+	report( "Leaving - RXTXPort:setRTS\n" );

 	return;

 }

 /*----------------------------------------------------------

 RXTXPort.setDSR

-   accept:      state  flag to set/unset.

-   perform:     depends on the state flag

-                if true TIOCM_DSR is set

-                if false TIOCM_DSR is unset

-   return:      none

-   exceptions:  none

-   comments:    tcsetattr with c_cflag CRTS_IFLOW

+	accept:		state  flag to set/unset.

+	perform:	depends on the state flag

+				if true TIOCM_DSR is set

+				if false TIOCM_DSR is unset

+	return:		none

+	exceptions:	none

+	comments:	tcsetattr with c_cflag CRTS_IFLOW

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(setDSR)( JNIEnv *env,

 	jobject jobj, jboolean state )

@@ -1931,28 +1996,31 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:setDSR()" );

+	report( "Entering - RXTXPort:setDSR()\n" );

 	ioctl( fd, TIOCMGET, &result );

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "setDSR( %i )\n", state );

 	if( state == JNI_TRUE ) result |= TIOCM_DSR;

 	else result &= ~TIOCM_DSR;

 	ioctl( fd, TIOCMSET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "setDSR( %i )\n", state );

 	report( message );

-	LEAVE( "RXTXPort:setDSR()" );

+	report( "Leaving - RXTXPort:setDSR()\n" );

 	return;

 }

 /*----------------------------------------------------------

 RXTXPort.isDTR

-   accept:      none

-   perform:     check status of DTR

-   return:      true if TIOCM_DTR is set

-                false if TIOCM_DTR is not set

-   exceptions:  none

-   comments:    DTR stands for Data Terminal Ready

+	accept:		none

+	perform:	check status of DTR

+	return:		true if TIOCM_DTR is set

+				false if TIOCM_DTR is not set

+	exceptions:	none

+	comments:	DTR stands for Data Terminal Ready

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(isDTR)( JNIEnv *env,

 	jobject jobj )

@@ -1961,11 +2029,13 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:isDTR" );

+	report( "Entering - RXTXPort:isDTR\n" );

 	ioctl( fd, TIOCMGET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "isDTR( ) returns %i\n", result& TIOCM_DTR );

 	report( message );

-	LEAVE( "RXTXPort:isDTR" );

+	report( "Leaving - RXTXPort:isDTR\n" );

 	if( result & TIOCM_DTR ) return JNI_TRUE;

 	else return JNI_FALSE;

 }

@@ -1973,12 +2043,12 @@

 /*----------------------------------------------------------

 RXTXPort.setDTR

-   accept:      new DTR state

-   perform:     if state is true, TIOCM_DTR is set

-                if state is false, TIOCM_DTR is unset

-   return:      none

-   exceptions:  none

-   comments:    DTR stands for Data Terminal Ready

+	accept:		new DTR state

+	perform:	if state is true, TIOCM_DTR is set

+				if state is false, TIOCM_DTR is unset

+	return:		none

+	exceptions:	none

+	comments:	DTR stands for Data Terminal Ready

 ----------------------------------------------------------*/

 JNIEXPORT void JNICALL RXTXPort(setDTR)( JNIEnv *env,

 	jobject jobj, jboolean state )

@@ -1987,32 +2057,35 @@

 	int fd = get_java_var( env, jobj,"fd","I" );

 	char message[80];

-	ENTER( "RXTXPort:setDTR" );

+	report( "Entering - RXTXPort:setDTR\n" );

 	ioctl( fd, TIOCMGET, &result );

 	if( state == JNI_TRUE ) result |= TIOCM_DTR;

 	else result &= ~TIOCM_DTR;

 	ioctl( fd, TIOCMSET, &result );

+	

+	memset(&message[0], 0, sizeof(message));

 	sprintf( message, "setDTR( %i )\n", state );

 	report( message );

-	LEAVE( "RXTXPort:setDTR" );

+	report( "Leaving - RXTXPort:setDTR\n" );

 	return;

 }

 /*----------------------------------------------------------

 RXTXPort.static_add_filename

-   accept:      filename and fd to save

-   perform:     add a struct holding the info to a linked list

-   return:      none

-   exceptions:  none

-   comments:    the info is checked on open() if its in the list no

-		changes are performed on the file on open()

-

-   comments:    see

-			RXTXPort.nativeStaticSetDSR

-			RXTXPort.nativeStaticSetDTR

-			RXTXPort.nativeStaticSetRTS

-			RXTXPort.nativeStaticSetSerialPortParams

-		This is used so people can setDTR low before calling the

+	accept:		filename and fd to save

+	perform:	add a struct holding the info to a linked list

+	return:		none

+	exceptions:	none

+	comments:	the info is checked on open() if its in the list no

+				changes are performed on the file on open()

+

+	comments:	see

+				RXTXPort.nativeStaticSetDSR

+				RXTXPort.nativeStaticSetDTR

+				RXTXPort.nativeStaticSetRTS

+				RXTXPort.nativeStaticSetSerialPortParams

+				

+	This is used so people can setDTR low before calling the

 -----------------------------------------------------------*/

 void static_add_filename( const char *filename, int fd)

@@ -2055,14 +2128,14 @@

 /*----------------------------------------------------------

 RXTXPort.nativeSetBaudBase

-   accept:      The Baud Base for custom speeds

-   perform:     set the Baud Base

-   return:      0 on success

-   exceptions:  Unsupported Comm Operation on systems not supporting

-                TIOCGSERIAL

-   comments:

-		Set baud rate to 38400 before using this

-		First introduced in rxtx-2.1-3

+	accept:		The Baud Base for custom speeds

+	perform:	set the Baud Base

+	return:		0 on success

+	exceptions:	Unsupported Comm Operation on systems not supporting

+				TIOCGSERIAL

+	comments:

+				Set baud rate to 38400 before using this

+				First introduced in rxtx-2.1-3

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(nativeSetBaudBase)(

 	JNIEnv *env,

@@ -2103,13 +2176,13 @@

 /*----------------------------------------------------------

 RXTXPort.nativeGetBaudBase

-   accept:      the Baud Base used for custom speeds

-   perform:

-   return:      Baud Base

-   exceptions:  Unsupported Comm Operation on systems not supporting

-                TIOCGSERIAL

-   comments:

-		First introduced in rxtx-2.1-3

+	accept:		the Baud Base used for custom speeds

+	perform:

+	return:		Baud Base

+	exceptions:	Unsupported Comm Operation on systems not supporting

+				TIOCGSERIAL

+	comments:

+				First introduced in rxtx-2.1-3

 ----------------------------------------------------------*/

 JNIEXPORT jint JNICALL RXTXPort(nativeGetBaudBase)(

 	JNIEnv *env,

@@ -2141,14 +2214,14 @@

 /*----------------------------------------------------------

 RXTXPort.nativeSetDivisor

-   accept:      Divisor for custom speeds

-   perform:     set the Divisor for custom speeds

-   return:      0 on success

-   exceptions:  Unsupported Comm Operation on systems not supporting

-                TIOCGSERIAL

-   comments:

-		Set baud rate to 38400 before using this

-		First introduced in rxtx-2.1-3

+	accept:		Divisor for custom speeds

+	perform:	set the Divisor for custom speeds

+	return:		0 on success

+	exceptions:	Unsupported Comm Operation on systems not supporting

+				TIOCGSERIAL

+	comments:

+				Set baud rate to 38400 before using this

+				First introduced in rxtx-2.1-3

 ----------------------------------------------------------*/

 JNIEXPORT jboolean JNICALL RXTXPort(nativeSetDivisor)(

 	JNIEnv *env,

@@ -2187,13 +2260,13 @@

 /*----------------------------------------------------------

 RXTXPort.nativeGetDivisor

-   accept:      none

-   perform:     Find the Divisor used for custom speeds

-   return:      Divisor negative value on error.

-   exceptions:  Unsupported Comm Operation on systems not supporting

-	        TIOCGSERIAL

-   comments:

-		First introduced in rxtx-2.1-3

+	accept:		none

+	perform:	Find the Divisor used for custom speeds

+	return:		Divisor negative value on error.

+	exceptions:	Unsupported Comm Operation on systems not supporting

+				TIOCGSERIAL

+	comments:

+				First introduced in rxtx-2.1-3

 ----------------------------------------------------------*/

 JNIEXPORT jint JNICALL RXTXPort(nativeGetDivisor)(

 	JNIEnv *env,

@@ -2226,18 +2299,18 @@

 /*----------------------------------------------------------

 RXTXPort.nativeStaticSetDSR

-   accept:      new RTS state

-   perform:     if flag is true, TIOCM_DSR is set

-                if flag is false, TIOCM_DSR is unset

-   return:      none