Merge lp:~abogani/ubuntu/lucid/rxtx/rxtx-fix-361635 into lp:ubuntu/lucid/rxtx

[Alessio Igor Bogani]

[Alessio Igor Bogani (abogani)]

Backport from development tree of fix for 64 bit systems

[Daniel Holbach (dholbach)]

 - Can you please add some documentation in debian/changelog about where exactly the patch is from and which files you changed?
 - Can you run update-maintainer (from ubuntu-dev-tools) to adhere to https://wiki.ubuntu.com/DebianMaintainerField

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

Marking "merged." This has already been uploaded to the archive, and the package importer has added it to lp:ubuntu/rxtx

See this revision:

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/rxtx/lucid/revision/5

Thanks!

review: Approve

[Andrew Starr-Bochicchio (andrewsomething)]

Hmmm... Not sure how to actually close this out. I can "claim the review" for Ubuntu Sponsors for universe and mark it approved, but I can't seem to change the status from "Needs review" to "Merged."

[James Westby (james-w)]

On Fri, 29 Jan 2010 01:19:33 -0000, Andrew Starr-Bochicchio <email address hidden> wrote:
> Hmmm... Not sure how to actually close this out. I can "claim the review" for Ubuntu Sponsors for universe and mark it approved, but I can't seem to change the status from "Needs review" to "Merged."

That would seem to be a bug in Launchpad, I'll investigate.

Thanks,

James

[James Westby (james-w)]

Ah, it's bug 504025.

Thanks,

James

=== modified file 'debian/changelog'
--- debian/changelog	2008-07-21 18:20:31 +0000
+++ debian/changelog	2009-12-09 23:12:14 +0000
@@ -1,3 +1,15 @@
+rxtx (2.1.7r2-4ubuntu1) lucid; urgency=low
+
+ * Backport of fix for 64 bit systems
+   Source code changes have been backported from development
+   snapshot tarball (rxtx-2.2pre2.zip) downloaded from 
+   http://rxtx.qbang.org/wiki/index.php/Download
+   These changes are related to int/long handling into src/SerialImp.c 
+   and src/SerialImp.h
+   - LP: #361635
+
+ -- Alessio Igor Bogani <[e-mail]>  Tue, 09 Dec 2009 20:46:12 +0100
+
 rxtx (2.1.7r2-4) unstable; urgency=low
 
   * Changed Java build dependency to default-jdk-builddep.
 
=== modified file 'debian/control'
--- debian/control	2008-07-21 18:20:31 +0000
+++ debian/control	2009-12-09 23:12:14 +0000
@@ -1,7 +1,8 @@
 Source: rxtx
 Section: libs
 Priority: optional
-Maintainer: Mario Joussen <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Mario Joussen <[e-mail]>
 Build-Depends: debhelper (>> 5.0.0), libtool, default-jdk-builddep
 Standards-Version: 3.8.0
 Homepage: http://www.rxtx.org
 
=== modified file 'src/SerialImp.c'
--- src/SerialImp.c	2007-07-28 16:13:55 +0000
+++ src/SerialImp.c	2009-12-09 23:12:14 +0000
@@ -1339,7 +1339,7 @@
 	report("init_threads: get eis\n");
 	jeis  = (*eis->env)->GetFieldID( eis->env, eis->jclazz, "eis", "J" );
 	report("init_threads: set eis\n");
-	(*eis->env)->SetIntField(eis->env, *eis->jobj, jeis, ( size_t ) eis );
+	(*eis->env)->SetLongField(eis->env, *eis->jobj, jeis, ( size_t ) eis );
 	report("init_threads:  stop\n");
 	report_time_end( );
 	return( 1 );
@@ -1532,7 +1532,7 @@
 	jobject jobj, jboolean interrupted )
 {
 	int fd = get_java_var( env, jobj,"fd","I" );
-	struct event_info_struct *eis = ( struct event_info_struct * ) get_java_var( env, jobj, "eis", "J" );
+	struct event_info_struct *eis = ( struct event_info_struct * ) get_java_var_long( env, jobj, "eis", "J" );
 	int result, count=0;
 
 	char message[80];
@@ -2941,7 +2941,7 @@
 	/* TRENT */
 	int flag, count = 0;
 	struct event_info_struct *eis = ( struct event_info_struct * )
-		get_java_var( env, *jobj,"eis","J" );
+		get_java_var_long( env, *jobj,"eis","J" );
 	
 	report_time_start();
 	flag = eis->eventflags[SPE_DATA_AVAILABLE];
@@ -4875,9 +4875,9 @@
    exceptions:  none
    comments:
 ----------------------------------------------------------*/
-size_t get_java_var( JNIEnv *env, jobject jobj, char *id, char *type )
+long get_java_var_long( JNIEnv *env, jobject jobj, char *id, char *type )
 {
-	int result = 0;
+	long result = 0;
 	jclass jclazz = (*env)->GetObjectClass( env, jobj );
 	jfieldID jfd = (*env)->GetFieldID( env, jclazz, id, type );
 
@@ -4891,7 +4891,11 @@
 		LEAVE( "get_java_var" );
 		return result;
 	}
-	result = (int)( (*env)->GetIntField( env, jobj, jfd ) );
+	if ( !strcmp( type, "J" ) ) {
+		result = (long)( (*env)->GetLongField( env, jobj, jfd ) );
+	} else {
+		result = (int) ( (*env)->GetIntField( env, jobj, jfd ) );
+	}
 /* ct7 & gel * Added DeleteLocalRef */
 	(*env)->DeleteLocalRef( env, jclazz );
 	if(!strncmp( "fd",id,2) && result == 0)
@@ -4902,6 +4906,10 @@
 	return result;
 }
 
+int get_java_var( JNIEnv *env, jobject jobj, char *id, char *type ) {
+	return (int) get_java_var_long( env, jobj, id, type );
+}
+
 /*----------------------------------------------------------
 throw_java_exception
 
 
=== modified file 'src/SerialImp.h'
--- src/SerialImp.h	2006-03-01 18:56:52 +0000
+++ src/SerialImp.h	2009-12-09 23:12:14 +0000
@@ -413,7 +413,8 @@
 void system_wait();
 void finalize_event_info_struct( struct event_info_struct * );
 int read_byte_array( JNIEnv *, jobject *, int, unsigned char *, int, int );
-size_t get_java_var( JNIEnv *, jobject, char *, char * );
+int get_java_var( JNIEnv *, jobject, char *, char * );
+long get_java_var_long( JNIEnv *, jobject, char *, char * );
 jboolean is_interrupted( struct event_info_struct * );
 int send_event(struct event_info_struct *, jint, int );
 void dump_termios(char *,struct termios *);