? build
? diff.patch
? i386-apple-darwin10.4.0
? MACOSX_IDE/XCode/LibSerialUniversal.xcodeproj/michu.mode1v3
? MACOSX_IDE/Xcode3/build.xxx
cvs diff: Diffing .
cvs diff: Diffing CNI
cvs diff: Diffing MACOSX_IDE
cvs diff: Diffing MACOSX_IDE/XCode
cvs diff: Diffing MACOSX_IDE/XCode/LibSerialUniversal.xcodeproj
Index: MACOSX_IDE/XCode/LibSerialUniversal.xcodeproj/project.pbxproj
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/MACOSX_IDE/XCode/LibSerialUniversal.xcodeproj/project.pbxproj,v
retrieving revision 1.1.2.3
diff -r1.1.2.3 project.pbxproj
295a296
> 			compatibilityVersion = "Xcode 2.4";
299a301
> 			projectRoot = "";
cvs diff: Diffing MACOSX_IDE/Xcode3
cvs diff: Diffing MACOSX_IDE/Xcode3/RXTX.xcodeproj
Index: MACOSX_IDE/Xcode3/RXTX.xcodeproj/project.pbxproj
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/MACOSX_IDE/Xcode3/RXTX.xcodeproj/Attic/project.pbxproj,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 project.pbxproj
123c123
< 		19C28FACFE9D520D11CA2CBB /* Products */ = {
---
> 		19C28FACFE9D520D11CA2CBB /* Xcode3 */ = {
129c129
< 			name = Products;
---
> 			name = Xcode3;
139c139
< 				19C28FACFE9D520D11CA2CBB /* Products */,
---
> 				19C28FACFE9D520D11CA2CBB /* Xcode3 */,
307a308
> 			developmentRegion = English;
308a310,315
> 			knownRegions = (
> 				English,
> 				Japanese,
> 				French,
> 				German,
> 			);
cvs diff: Diffing MACOSX_IDE/Xcode3/ant
cvs diff: Diffing MACOSX_IDE/Xcode3/resources
cvs diff: Diffing MACOSX_IDE/Xcode3/src
Index: MACOSX_IDE/Xcode3/src/config.h
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/MACOSX_IDE/Xcode3/src/Attic/config.h,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 config.h
80c80
< #define VERSION "2.2pre1"
---
> #define VERSION "2.2pre3"
cvs diff: Diffing WinCE
cvs diff: Diffing contrib
cvs diff: Diffing contrib/MAcOSX
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer/macosx
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer/resources
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer/resources/macosx
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer/resources/macosx/jar
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer/resources/macosx/lib
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/Sources/gnu/io/installer/util
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/build
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/build/Debug
cvs diff: Diffing contrib/MAcOSX/RXTXInstaller/jnlp
cvs diff: Diffing debian
cvs diff: Diffing src
Index: src/SerialImp.c
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/src/SerialImp.c,v
retrieving revision 1.46.2.209
diff -r1.46.2.209 SerialImp.c
149a150,151
> #define 	B460800   0010004
> 
446c448
< #ifdef B115200
---
> //#ifdef B115200
448c450
< #endif /*  B115200 */
---
> //#endif /*  B115200 */
1253c1255,1256
< 		if (usleep(5000)) {
---
> //		if (usleep(5000)) {
> 		if (usleep(2000)) {
1520c1523,1527
< 	body = (*env)->GetByteArrayElements( env, jbarray, 0 );
---
> 	
> 	//some JNI changed I made... cant remember why...
> 	//body = (*env)->GetByteArrayElements( env, jbarray, 0 );
> 	body = (*env)->GetPrimitiveArrayCritical( env, jbarray, 0 );
> 
1525,1526c1532,1533
< 	report_time_start();
< 	ENTER( "writeArray" );
---
> //	report_time_start();
> //	ENTER( "writeArray" );
1538c1545
< 		report("writeArray()\n");
---
> //		report("writeArray()\n");
1553c1560,1562
< 	(*env)->ReleaseByteArrayElements( env, jbarray, body, 0 );
---
> //	(*env)->ReleaseByteArrayElements( env, jbarray, body, 0 );
> 	(*env)->ReleasePrimitiveArrayCritical( env, jbarray, body, 0 );
> 	
1563c1572
< 		report( "writeArray:  index->writing = 1" );
---
> //		report( "writeArray:  index->writing = 1" );
1578,1579c1587,1588
< 	LEAVE( "RXTXPort:writeArray" );
< 	report_time_end();
---
> //	LEAVE( "RXTXPort:writeArray" );
> //	report_time_end();
3021c3030
< 	report_time_start();
---
> //	report_time_start();
3096,3097c3105,3106
< 				/* usleep(10); */
< 				usleep(1000);
---
> 				usleep(10); 
> 				/*usleep(1000);*/
3118,3240d3126
< #ifdef asdf
< int read_byte_array(	JNIEnv *env,
< 			jobject *jobj,
< 			int fd,
< 			unsigned char *buffer,
< 			int length,
< 			int timeout )
< {
< 	int ret, left, bytes = 0;
< 	long now, start = 0;
< 	char msg[80];
< 
< 	report_time_start();
< 	ENTER( "read_byte_array" );
< 	sprintf(msg, "read_byte_array requests %i\n", length);
< 	report( msg );
< 	left = length;
< 	if (timeout >= 0)
< 		start = GetTickCount();
< 	while( bytes < length )
< 	{
< 		if (timeout >= 0) {
< 			now = GetTickCount();
< 			if (now-start >= timeout)
< 				return bytes;
< 		}
< RETRY:	if ((ret = READ( fd, buffer + bytes, left )) < 0 )
< 		{
< 			if (errno == EINTR)
< 				goto RETRY;
< 			report( "read_byte_array: read returned -1\n" );
< 			LEAVE( "read_byte_array" );
< 			return -1;
< 		}
< 		bytes += ret;
< 		left -= ret;
< 	}
< 	sprintf(msg, "read_byte_array returns %i\n", bytes);
< 	report( msg );
< 	LEAVE( "read_byte_array" );
< 	report_time_end();
< 	return bytes;
< }
< 
< 
< int read_byte_array(	JNIEnv *env,
< 			jobject *jobj,
< 			int fd,
< 			unsigned char *buffer,
< 			int length,
< 			int timeout )
< {
< 	int ret, left, bytes = 0;
< 	/* int count = 0; */
< 	fd_set rfds;
< 	struct timeval sleep;
< 	struct event_info_struct *eis = find_eis( fd );
< 
< #ifndef WIN32
< 	struct timeval *psleep=&sleep;
< #endif /* WIN32 */
< 
< 	ENTER( "read_byte_array" );
< 	left = length;
< 	FD_ZERO( &rfds );
< 	FD_SET( fd, &rfds );
< 	if( timeout != 0 )
< 	{
< 		sleep.tv_sec = timeout / 1000;
< 		sleep.tv_usec = 1000 * ( timeout % 1000 );
< 	}
< 	while( bytes < length )
< 	{
<          /* FIXME: In Linux, select updates the timeout automatically, so
<             other OSes will need to update it manually if they want to have
<             the same behavior.  For those OSes, timeouts will occur after no
<             data AT ALL is received for the timeout duration.  No big deal. */
< #ifndef WIN32
< 		do {
< 			if( timeout == 0 ) psleep = NULL;
< 			ret=SELECT( fd + 1, &rfds, NULL, NULL, psleep );
< 		}  while (ret < 0 && errno==EINTR);
< #else
< 		/*
< 		    the select() needs some work before the above will
< 		    work on win32.  The select code cannot be accessed
< 		    from both the Monitor Thread and the Reading Thread.
< 
< 		*/
< 		ret = RXTXPort(nativeavailable)( env, *jobj );
< #endif /* WIN32 */
< 		if( ret == 0 )
< 		{
< 			report( "read_byte_array: select returned 0\n" );
< 			LEAVE( "read_byte_array" );
< 			break;
< 		}
< 		if( ret < 0 )
< 		{
< 			report( "read_byte_array: select returned -1\n" );
< 			LEAVE( "read_byte_array" );
< 			return -1;
< 		}
< 		ret = READ( fd, buffer + bytes, left );
< 		if( ret == 0 )
< 		{
< 			report( "read_byte_array: read returned 0 bytes\n" );
< 			LEAVE( "read_byte_array" );
< 			break;
< 		}
< 		else if( ret < 0 )
< 		{
< 			report( "read_byte_array: read returned -1\n" );
< 			LEAVE( "read_byte_array" );
< 			return -1;
< 		}
< 		bytes += ret;
< 		left -= ret;
< 	}
< 	LEAVE( "read_byte_array" );
< 	return bytes;
< }
< #endif /* asdf */
3482c3368,3370
< 	body = (*env)->GetByteArrayElements( env, jbarray, 0 );
---
> //	body = (*env)->GetByteArrayElements( env, jbarray, 0 );
> 	body = (*env)->GetPrimitiveArrayCritical( env, jbarray, 0 );
> 		
3484c3372,3373
< 	(*env)->ReleaseByteArrayElements( env, jbarray, body, 0 );
---
> 	(*env)->ReleasePrimitiveArrayCritical( env, jbarray, body, 0 );
> 	//(*env)->ReleaseByteArrayElements( env, jbarray, body, 0 );
4025c3914
< 			usleep(20000);
---
> 			usleep(2000);
4028c3917
< 			usleep(20000);
---
> 			usleep(2000);
4041c3930
< 		usleep(20000);
---
> 		usleep(2000);
4241c4130
< 	return (*env)->NewStringUTF( env, "RXTX-2.2pre2" );
---
> 	return (*env)->NewStringUTF( env, "RXTX-2.2pre4" );
5294,5295c5183,5186
< 	char lockinfo[12], message[80];
< 	char file[80], *p;
---
> 	
> 	//fix http://bugzilla.qbang.org/show_bug.cgi?id=160
> 	char lockinfo[12], message[256];
> 	char file[256], *p;
6018c5909
< 		JNI_VERSION_1_2
---
> 		JNI_VERSION_1_6
6049c5940
< 	return JNI_VERSION_1_2;  /* JNI API used */
---
> 	return JNI_VERSION_1_6;  /* JNI API used */
Index: src/termios.c
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/src/termios.c,v
retrieving revision 1.9.2.65
diff -r1.9.2.65 termios.c
1239c1239,1247
< 	tcsetattr( index->fd, 0, index->ttyset );
---
> 	//http://bugzilla.qbang.org/show_bug.cgi?id=153
> 	if ( tcsetattr( index->fd, 0, index->ttyset ) )
> 	{
> 		sprintf( message, "serial_open():  Could not set port attributes for %s\n",
> 			filename );
> 		report( message );
> 		serial_close( index->fd );
> 		return -1;
> 	}
3210c3218
< 	usleep(1000);
---
> //	usleep(1000);
cvs diff: Diffing src/gnu
cvs diff: Diffing src/gnu/io
Index: src/gnu/io/CommPortIdentifier.java
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/src/gnu/io/Attic/CommPortIdentifier.java,v
retrieving revision 1.7.2.30
diff -r1.7.2.30 CommPortIdentifier.java
123c123,125
< 		System.loadLibrary( "rxtxSerial" );
---
> 		//fix http://bugzilla.qbang.org/show_bug.cgi?id=151
> 		//System.loadLibrary( "rxtxSerial" );
> 		RXTXVersion.loadLibrary("rxtxSerial");
Index: src/gnu/io/RXTXPort.java
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/src/gnu/io/RXTXPort.java,v
retrieving revision 1.27.2.77
diff -r1.27.2.77 RXTXPort.java
894c894
< 				Thread.sleep(5);
---
> 				Thread.sleep(1);
Index: src/gnu/io/RXTXVersion.java
===================================================================
RCS file: /var/cvs/cvsroot/rxtx-devel/src/gnu/io/RXTXVersion.java,v
retrieving revision 1.2.2.38
diff -r1.2.2.38 RXTXVersion.java
79c79
< 		Version = "RXTX-2.2";
---
> 		Version = "RXTX-2.2pre5";
cvs diff: Diffing src/lfd
cvs diff: Diffing src/psmisc
cvs diff: Diffing tests
cvs diff: Diffing tests/gnu
cvs diff: Diffing tests/gnu/io
cvs diff: Diffing tests/gnu/io/rxtx
cvs diff: Diffing tests/gnu/io/rxtx/tests
