javax-usb-cvs Mailing List for javax.usb (Page 3)

Brought to you by: bweisch, ddstreet

javax-usb-cvs — CVS updates

You can subscribe to this list here.

2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov (1)	_Dec (12)
2006	_Jan (9)	_Feb	_Mar	_Apr	_May	_Jun	_Jul (6)	_Aug	_Sep	_Oct	_Nov	_Dec
2007	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (3)	_Aug	_Sep	_Oct	_Nov (1)	_Dec (3)
2008	_Jan	_Feb (6)	_Mar	_Apr	_May	_Jun (7)	_Jul	_Aug (24)	_Sep	_Oct	_Nov	_Dec
2009	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (1)	_Oct	_Nov	_Dec
2011	_Jan (2)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2012	_Jan (6)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 > >> (Page 3 of 4)

[javax-usb-cvs] javax-usb-ri-linux/jni JavaxUsbKernel.c,1.3,1.4

From: Dan S. <dds...@us...> - 2007-07-17 20:03:56

Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4914

Modified Files:
	JavaxUsbKernel.c 
Log Message:
defect 1192482 - 2.4 kernel no loner uses bulk-over-interrupt queueing starting with 2.4.30 kernel


Index: JavaxUsbKernel.c
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JavaxUsbKernel.c	17 Jul 2007 20:01:37 -0000	1.3
--- JavaxUsbKernel.c	17 Jul 2007 20:03:51 -0000	1.4
***************
*** 20,24 ****
  // This is defined only in 2.4 kernels.
  #define QUEUE_BULK 0x10
! #define QUEUE_BULK_LAST_KERNEL_VERSION KERNEL_VERSION(2,4,99)
  
  // 2.4 USB subsystems do not allow queued interrupt transfers but do allow (encourage?) interrupt-using-bulk
--- 20,24 ----
  // This is defined only in 2.4 kernels.
  #define QUEUE_BULK 0x10
! #define QUEUE_BULK_LAST_KERNEL_VERSION KERNEL_VERSION(2,4,29)
  
  // 2.4 USB subsystems do not allow queued interrupt transfers but do allow (encourage?) interrupt-using-bulk

[javax-usb-cvs] javax-usb-ri-linux/jni JavaxUsb.h, 1.17, 1.18 JavaxUsbActive.c, 1.7, 1.8 JavaxUsbKernel.c, 1.2, 1.3 JavaxUsbKernel.h, 1.4, 1.5 JavaxUsbTopologyListener.c, 1.2, 1.3 JavaxUsbTopologyUpdater.c, 1.11, 1.12

From: Dan S. <dds...@us...> - 2007-07-17 20:01:42

Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2565

Modified Files:
	JavaxUsb.h JavaxUsbActive.c JavaxUsbKernel.c JavaxUsbKernel.h 
	JavaxUsbTopologyListener.c JavaxUsbTopologyUpdater.c 
Log Message:
defect 1556311 - /proc/bus/usb/ is deprecated in newer distros and replaced
with /dev/bus/usb/ which is controlled by udev.


Index: JavaxUsbTopologyUpdater.c
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbTopologyUpdater.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JavaxUsbTopologyUpdater.c	9 Jun 2005 15:36:08 -0000	1.11
--- JavaxUsbTopologyUpdater.c	17 Jul 2007 20:01:37 -0000	1.12
***************
*** 50,55 ****
  
  	errno = 0;
! 	if (0 > (busses = scandir(USBDEVFS_PATH, &buslist, select_usbfs, alphasort)) ) {
! 		log( LOG_ERROR, "Could not access %s : %s", USBDEVFS_PATH, strerror(errno) );
  		return -errno;
  	}
--- 50,55 ----
  
  	errno = 0;
! 	if (0 > (busses = scandir(usbdevfs_path(), &buslist, select_usbfs, alphasort)) ) {
! 		log( LOG_ERROR, "Could not access %s : %s", usbdevfs_path(), strerror(errno) );
  		return -errno;
  	}
***************
*** 58,65 ****
  		struct dirent **devlist = NULL;
  		int bus, hcAddress, devs;
! 		int busdir_len = strlen(USBDEVFS_PATH) + strlen(buslist[port]->d_name) + 2;
  		char busdir[busdir_len];
  
! 		sprintf(busdir, "%s/%s", USBDEVFS_PATH, buslist[port]->d_name);
  		bus = atoi( buslist[port]->d_name );
  
--- 58,65 ----
  		struct dirent **devlist = NULL;
  		int bus, hcAddress, devs;
! 		int busdir_len = strlen(usbdevfs_path()) + strlen(buslist[port]->d_name) + 2;
  		char busdir[busdir_len];
  
! 		sprintf(busdir, "%s/%s", usbdevfs_path(), buslist[port]->d_name);
  		bus = atoi( buslist[port]->d_name );
  
***************
*** 98,102 ****
  	struct usbdevfs_connectinfo *connectinfo = NULL;
  	struct jusb_device_descriptor *dev_desc = NULL;
! 	int node_len = strlen(USBDEVFS_PATH) + 1 + 3 + 1 + 3 + 1;
  	char node[node_len];
  
--- 98,102 ----
  	struct usbdevfs_connectinfo *connectinfo = NULL;
  	struct jusb_device_descriptor *dev_desc = NULL;
! 	int node_len = strlen(usbdevfs_path()) + 1 + 3 + 1 + 3 + 1;
  	char node[node_len];
  
***************
*** 111,115 ****
  	CheckedDeleteLocalRef( env, LinuxUsbServices );
  
! 	sprintf(node, "%s/%03d/%03d", USBDEVFS_PATH, (0xff&bus), (0xff&dev));
  
  	keyString = CheckedNewStringUTF( env, node );
--- 111,115 ----
  	CheckedDeleteLocalRef( env, LinuxUsbServices );
  
! 	sprintf(node, "%s/%03d/%03d", usbdevfs_path(), (0xff&bus), (0xff&dev));
  
  	keyString = CheckedNewStringUTF( env, node );

Index: JavaxUsb.h
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsb.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JavaxUsb.h	8 Oct 2004 21:05:00 -0000	1.17
--- JavaxUsb.h	17 Jul 2007 20:01:37 -0000	1.18
***************
*** 35,45 ****
  #include "JavaxUsbKernel.h"
  
- #define USBDEVFS_PATH            "/proc/bus/usb"
- #define USBDEVFS_DEVICES         "/proc/bus/usb/devices"
- #define USBDEVFS_DRIVERS         "/proc/bus/usb/drivers"
- 
- #define USBDEVFS_SPRINTF_NODE    "/proc/bus/usb/%3.03d/%3.03d"
- #define USBDEVFS_SSCANF_NODE     "/proc/bus/usb/%3d/%3d"
- 
  #define MAX_LINE_LENGTH 255
  #define MAX_KEY_LENGTH 255
--- 35,38 ----
***************
*** 223,227 ****
  static inline int bus_node_to_name( int bus, int node, char *name )
  {
! 	sprintf( name, USBDEVFS_SPRINTF_NODE, bus, node );
  	return strlen( name );
  }
--- 216,220 ----
  static inline int bus_node_to_name( int bus, int node, char *name )
  {
! 	sprintf( name, usbdevfs_sprintf_node(), bus, node );
  	return strlen( name );
  }
***************
*** 230,234 ****
  {
  	int bus, node;
! 	if (1 > (sscanf( name, USBDEVFS_SSCANF_NODE, &bus, &node )))
  		return -1;
  	else return bus;
--- 223,227 ----
  {
  	int bus, node;
! 	if (1 > (sscanf( name, usbdevfs_sscanf_node(), &bus, &node )))
  		return -1;
  	else return bus;
***************
*** 246,250 ****
  {
  	int bus, node;
! 	if (2 > (sscanf( name, USBDEVFS_SSCANF_NODE, &bus, &node )))
  		return -1;
  	else return node;
--- 239,243 ----
  {
  	int bus, node;
! 	if (2 > (sscanf( name, usbdevfs_sscanf_node(), &bus, &node )))
  		return -1;
  	else return node;

Index: JavaxUsbKernel.c
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JavaxUsbKernel.c	19 May 2005 22:51:11 -0000	1.2
--- JavaxUsbKernel.c	17 Jul 2007 20:01:37 -0000	1.3
***************
*** 92,93 ****
--- 92,143 ----
  	return (INTERRUPT_USES_BULK_LAST_KERNEL_VERSION >= getKernelVersion() ? getBulkType() : USBDEVFS_URB_TYPE_INTERRUPT);
  }
+ 
+ 
+ // These are probably not the best way to determine where the usbfs is but it's simple.
+ 
+ #define USBDEVFS_PATH_OLD "/proc/bus/usb"
+ #define USBDEVFS_DEVICES_OLD "/proc/bus/usb/devices"
+ #define USBDEVFS_SPRINTF_NODE_OLD "/proc/bus/usb/%3.03d/%3.03d"
+ #define USBDEVFS_SSCANF_NODE_OLD "/proc/bus/usb/%3d/%3d"
+ 
+ #define USBDEVFS_PATH_NEW "/dev/bus/usb"
+ #define USBDEVFS_DEVICES_NEW "/dev/bus/usb/devices"
+ #define USBDEVFS_SPRINTF_NODE_NEW "/dev/bus/usb/%3.03d/%3.03d"
+ #define USBDEVFS_SSCANF_NODE_NEW "/dev/bus/usb/%3d/%3d"
+ 
+ char *usbdevfs_path()
+ {
+ 	struct stat buf;
+ 	if ((0 == stat(USBDEVFS_PATH_NEW, &buf)) && S_ISDIR(buf.st_mode))
+ 		return USBDEVFS_PATH_NEW;
+ 	else
+ 		return USBDEVFS_PATH_OLD;
+ }
+ 
+ char *usbdevfs_devices_filename()
+ {
+ 	struct stat buf;
+ 	if (0 == stat(USBDEVFS_DEVICES_NEW, &buf))
+ 		return USBDEVFS_DEVICES_NEW;
+ 	else
+ 		return USBDEVFS_DEVICES_OLD;
+ }
+ 
+ char *usbdevfs_sscanf_node()
+ {
+ 	struct stat buf;
+ 	if ((0 == stat(USBDEVFS_PATH_NEW, &buf)) && S_ISDIR(buf.st_mode))
+ 		return USBDEVFS_SSCANF_NODE_NEW;
+ 	else
+ 		return USBDEVFS_SSCANF_NODE_OLD;
+ }
+ 
+ char *usbdevfs_sprintf_node()
+ {
+ 	struct stat buf;
+ 	if ((0 == stat(USBDEVFS_PATH_NEW, &buf)) && S_ISDIR(buf.st_mode))
+ 		return USBDEVFS_SPRINTF_NODE_NEW;
+ 	else
+ 		return USBDEVFS_SPRINTF_NODE_OLD;
+ }
+ 

Index: JavaxUsbActive.c
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbActive.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JavaxUsbActive.c	24 Jan 2005 18:56:14 -0000	1.7
--- JavaxUsbActive.c	17 Jul 2007 20:01:37 -0000	1.8
***************
*** 38,48 ****
  
  	errno = 0;
! 	if (!(file = fopen(USBDEVFS_DEVICES, "r"))) {
! 		log( LOG_HOTPLUG_ERROR, "Could not open %s : %s", USBDEVFS_DEVICES, strerror(errno) );
  		ret = -errno
  		goto end;
  	}
  
! 	log( LOG_HOTPLUG_OTHER, "Checking %s", USBDEVFS_DEVICES );
  
  	while (1) {
--- 38,48 ----
  
  	errno = 0;
! 	if (!(file = fopen(usbdevfs_devices_filename(), "r"))) {
! 		log( LOG_HOTPLUG_ERROR, "Could not open %s : %s", usbdevfs_devices_filename(), strerror(errno) );
  		ret = -errno
  		goto end;
  	}
  
! 	log( LOG_HOTPLUG_OTHER, "Checking %s", usbdevfs_devices_filename() );
  
  	while (1) {
***************
*** 51,55 ****
  		errno = 0;
  		if (0 > (len = getline(&line, &linelen, file))) {
! 			log( LOG_HOTPLUG_ERROR, "Could not read from %s : %s", USBDEVFS_DEVICES, strerror(errno) );
  			ret = -errno;
  			break;
--- 51,55 ----
  		errno = 0;
  		if (0 > (len = getline(&line, &linelen, file))) {
! 			log( LOG_HOTPLUG_ERROR, "Could not read from %s : %s", usbdevfs_devices_filename(), strerror(errno) );
  			ret = -errno;
  			break;
***************
*** 115,125 ****
  
  	errno = 0;
! 	if (!(file = fopen(USBDEVFS_DEVICES, "r"))) {
! 		log( LOG_HOTPLUG_ERROR, "Could not open %s : %s", USBDEVFS_DEVICES, strerror(errno) );
  		ret = -errno;
  		goto end;
  	}
  
! 	log( LOG_HOTPLUG_OTHER, "Checking %s", USBDEVFS_DEVICES );
  
  	while (1) {
--- 115,125 ----
  
  	errno = 0;
! 	if (!(file = fopen(usbdevfs_devices_filename(), "r"))) {
! 		log( LOG_HOTPLUG_ERROR, "Could not open %s : %s", usbdevfs_devices_filename(), strerror(errno) );
  		ret = -errno;
  		goto end;
  	}
  
! 	log( LOG_HOTPLUG_OTHER, "Checking %s", usbdevfs_devices_filename() );
  
  	while (1) {
***************
*** 128,132 ****
  		errno = 0;
  		if (0 > (len = getline(&line, &linelen, file))) {
! 			log( LOG_HOTPLUG_ERROR, "Could not read from %s : %s", USBDEVFS_DEVICES, strerror(errno) );
  			ret = -errno;
  			break;
--- 128,132 ----
  		errno = 0;
  		if (0 > (len = getline(&line, &linelen, file))) {
! 			log( LOG_HOTPLUG_ERROR, "Could not read from %s : %s", usbdevfs_devices_filename(), strerror(errno) );
  			ret = -errno;
  			break;
***************
*** 277,283 ****
  #ifdef CONFIG_SETTING_USE_DEVICES_FILE
  	if (0 > ret) {
! 		log( LOG_HOTPLUG_OTHER, "Getting active config using %s.", USBDEVFS_DEVICES );
  		ret = config_use_devices_file( env, bus, dev );
! 		log( LOG_HOTPLUG_OTHER, "%s returned %d%s.", USBDEVFS_DEVICES, ret, 0>ret ? " (failure)" : "" );
  	}
  #endif
--- 277,283 ----
  #ifdef CONFIG_SETTING_USE_DEVICES_FILE
  	if (0 > ret) {
! 		log( LOG_HOTPLUG_OTHER, "Getting active config using %s.", usbdevfs_devices_filename() );
  		ret = config_use_devices_file( env, bus, dev );
! 		log( LOG_HOTPLUG_OTHER, "%s returned %d%s.", usbdevfs_devices_filename(), ret, 0>ret ? " (failure)" : "" );
  	}
  #endif
***************
*** 305,311 ****
  #ifdef INTERFACE_SETTING_USE_DEVICES_FILE
  	if (0 > ret) {
! 		log( LOG_HOTPLUG_OTHER, "Getting active interface %d setting using %s.", interface, USBDEVFS_DEVICES );
  		ret = interface_use_devices_file( env, bus, dev, interface );
! 		log( LOG_HOTPLUG_OTHER, "%s returned %d%s.", USBDEVFS_DEVICES, ret, 0>ret ? " (failure)" : "" );
  	}
  #endif
--- 305,311 ----
  #ifdef INTERFACE_SETTING_USE_DEVICES_FILE
  	if (0 > ret) {
! 		log( LOG_HOTPLUG_OTHER, "Getting active interface %d setting using %s.", interface, usbdevfs_devices_filename() );
  		ret = interface_use_devices_file( env, bus, dev, interface );
! 		log( LOG_HOTPLUG_OTHER, "%s returned %d%s.", usbdevfs_devices_filename(), ret, 0>ret ? " (failure)" : "" );
  	}
  #endif

Index: JavaxUsbTopologyListener.c
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbTopologyListener.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JavaxUsbTopologyListener.c	22 Jan 2003 01:42:04 -0000	1.2
--- JavaxUsbTopologyListener.c	17 Jul 2007 20:01:37 -0000	1.3
***************
*** 28,34 ****
  
  	errno = 0;
! 	descriptor = open( USBDEVFS_DEVICES, O_RDONLY, 0 );
  	if ( 0 >= descriptor ) {
! 		log( LOG_HOTPLUG_CRITICAL, "Could not open %s", USBDEVFS_DEVICES );
  		error = errno;
  		goto TOPOLOGY_LISTENER_CLEANUP;
--- 28,34 ----
  
  	errno = 0;
! 	descriptor = open( usbdevfs_devices_filename(), O_RDONLY, 0 );
  	if ( 0 >= descriptor ) {
! 		log( LOG_HOTPLUG_CRITICAL, "Could not open %s", usbdevfs_devices_filename() );
  		error = errno;
  		goto TOPOLOGY_LISTENER_CLEANUP;

Index: JavaxUsbKernel.h
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JavaxUsbKernel.h	19 May 2005 22:51:11 -0000	1.4
--- JavaxUsbKernel.h	17 Jul 2007 20:01:37 -0000	1.5
***************
*** 48,50 ****
--- 48,55 ----
  int getBulkType(void);
  
+ char *usbdevfs_path();
+ char *usbdevfs_devices_filename();
+ char *usbdevfs_sscanf_node();
+ char *usbdevfs_sprintf_node();
+ 
  #endif /* _JAVAX_USB_KERNEL_H */

[javax-usb-cvs] javax-usb/src/javax/usb/util StandardRequest.java, 1.7, 1.8

From: Dan S. <dds...@us...> - 2007-07-17 18:43:34

Update of /cvsroot/javax-usb/javax-usb/src/javax/usb/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6250

Modified Files:
	StandardRequest.java 
Log Message:
defect 1610873 : getDescriptor does not work with index>127
change
short wValue = (short)((type << 8) | index);
to
short wValue = (short)((type << 8) | ((int)index)&0xff);


Index: StandardRequest.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/util/StandardRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StandardRequest.java	23 Mar 2004 01:03:47 -0000	1.7
--- StandardRequest.java	17 Jul 2007 18:43:22 -0000	1.8
***************
*** 281,285 ****
  		byte bmRequestType = REQUESTTYPE_GET_DESCRIPTOR;
  		byte bRequest = UsbConst.REQUEST_GET_DESCRIPTOR;
! 		short wValue = (short)((type << 8) | index);
  		short wIndex = langid;
  
--- 281,285 ----
  		byte bmRequestType = REQUESTTYPE_GET_DESCRIPTOR;
  		byte bRequest = UsbConst.REQUEST_GET_DESCRIPTOR;
! 		short wValue = (short)((type << 8) | ((int)index)&0xff);
  		short wIndex = langid;

[javax-usb-cvs] javax-usb-ri/src/com/ibm/jusb/util NullUsbTracer.java, 1.1, 1.2 StandardErrorUsbTracer.java, 1.1, 1.2 StandardOutUsbTracer.java, 1.1, 1.2 UsbTracer.java, 1.3, 1.4

From: Dan S. <dds...@us...> - 2006-07-06 20:16:41

Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12899/src/com/ibm/jusb/util

Modified Files:
	NullUsbTracer.java StandardErrorUsbTracer.java 
	StandardOutUsbTracer.java UsbTracer.java 
Log Message:
replace trace() with print() and add println()


Index: StandardErrorUsbTracer.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util/StandardErrorUsbTracer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardErrorUsbTracer.java	5 Jul 2006 20:48:27 -0000	1.1
--- StandardErrorUsbTracer.java	6 Jul 2006 20:16:34 -0000	1.2
***************
*** 46,50 ****
  	 * @param msg The trace message.
  	 */
! 	public void trace(String name, int level, String msg)
  	{
  		if (level <= currentLevel)
--- 46,50 ----
  	 * @param msg The trace message.
  	 */
! 	public void print(String name, int level, String msg)
  	{
  		if (level <= currentLevel)

Index: NullUsbTracer.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util/NullUsbTracer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NullUsbTracer.java	5 Jul 2006 20:48:27 -0000	1.1
--- NullUsbTracer.java	6 Jul 2006 20:16:34 -0000	1.2
***************
*** 33,36 ****
  	 * @param msg The trace message.
  	 */
! 	public void trace(String name, int level, String msg) { }
  }
--- 33,36 ----
  	 * @param msg The trace message.
  	 */
! 	public void print(String name, int level, String msg) { }
  }

Index: StandardOutUsbTracer.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util/StandardOutUsbTracer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardOutUsbTracer.java	5 Jul 2006 20:48:27 -0000	1.1
--- StandardOutUsbTracer.java	6 Jul 2006 20:16:34 -0000	1.2
***************
*** 46,50 ****
  	 * @param msg The trace message.
  	 */
! 	public void trace(String name, int level, String msg)
  	{
  		if (level <= currentLevel)
--- 46,50 ----
  	 * @param msg The trace message.
  	 */
! 	public void print(String name, int level, String msg)
  	{
  		if (level <= currentLevel)

Index: UsbTracer.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util/UsbTracer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UsbTracer.java	6 Jul 2006 19:45:59 -0000	1.3
--- UsbTracer.java	6 Jul 2006 20:16:34 -0000	1.4
***************
*** 25,29 ****
   * {@link #getUsbTracer(String, int) getUsbTracer(name, level)} method and use that
   * object for all your tracing, or use the default/global UsbTracer object via
!  * UsbTracer.{@link #getUsbTracer() getUsbTracer()}.{@link #trace(String,int,String) trace(name, level, msg)}.
   * <p>
   * Each UsbTracer object has a default name and level.  The name should be used by the UsbTracer
--- 25,29 ----
   * {@link #getUsbTracer(String, int) getUsbTracer(name, level)} method and use that
   * object for all your tracing, or use the default/global UsbTracer object via
!  * UsbTracer.{@link #getUsbTracer() getUsbTracer()}.
   * <p>
   * Each UsbTracer object has a default name and level.  The name should be used by the UsbTracer
***************
*** 56,60 ****
  	 * @param msg The trace message.
  	 */
! 	public abstract void trace(String name, int level, String msg);
  
  	/**
--- 56,73 ----
  	 * @param msg The trace message.
  	 */
! 	public abstract void print(String name, int level, String msg);
! 
! 	/**
! 	 * Trace message with the specified name at the specified level.
! 	 * <p>
! 	 * This appends a newline to the message.
! 	 * @param name The name of the trace source.
! 	 * @param level The trace level of the message.
! 	 * @param msg The trace message.
! 	 */
! 	public void println(String name, int level, String msg)
! 	{
! 		print(name, level, msg + "\n");
! 	}
  
  	/**
***************
*** 63,69 ****
  	 * @param msg The trace message.
  	 */
! 	public void trace(String name, String msg)
  	{
! 		trace(name, getDefaultLevel(), msg);
  	}
  
--- 76,94 ----
  	 * @param msg The trace message.
  	 */
! 	public void print(String name, String msg)
  	{
! 		print(name, getDefaultLevel(), msg);
! 	}
! 
! 	/**
! 	 * Trace message with the specified name at this UsbTracer object's default level.
! 	 * <p>
! 	 * This appends a newline to the message.
! 	 * @param name The name of the trace source.
! 	 * @param msg The trace message.
! 	 */
! 	public void println(String name, String msg)
! 	{
! 		println(name, getDefaultLevel(), msg);
  	}
  
***************
*** 73,79 ****
  	 * @param msg The trace message.
  	 */
! 	public void trace(int level, String msg)
  	{
! 		trace(getDefaultName(), level, msg);
  	}
  
--- 98,116 ----
  	 * @param msg The trace message.
  	 */
! 	public void print(int level, String msg)
  	{
! 		print(getDefaultName(), level, msg);
! 	}
! 
! 	/**
! 	 * Trace message with this UsbTracer object's default name at the specified level.
! 	 * <p>
! 	 * This appends a newline to the message.
! 	 * @param level The trace level of the message.
! 	 * @param msg The trace message.
! 	 */
! 	public void println(int level, String msg)
! 	{
! 		println(getDefaultName(), level, msg);
  	}
  
***************
*** 82,88 ****
  	 * @param msg The trace message.
  	 */
! 	public void trace(String msg)
  	{
! 		trace(getDefaultName(), getDefaultLevel(), msg);
  	}
  
--- 119,136 ----
  	 * @param msg The trace message.
  	 */
! 	public void print(String msg)
  	{
! 		print(getDefaultName(), getDefaultLevel(), msg);
! 	}
! 
! 	/**
! 	 * Trace message with this UsbTracer object's default name and default level.
! 	 * <p>
! 	 * This appends a newline to the message.
! 	 * @param msg The trace message.
! 	 */
! 	public void println(String msg)
! 	{
! 		println(getDefaultName(), getDefaultLevel(), msg);
  	}

[javax-usb-cvs] javax-usb-ri/src/com/ibm/jusb/util UsbTracer.java, 1.2, 1.3

From: Dan S. <dds...@us...> - 2006-07-06 19:46:08

Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32557/src/com/ibm/jusb/util

Modified Files:
	UsbTracer.java 
Log Message:
Integer.class to int.class


Index: UsbTracer.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util/UsbTracer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UsbTracer.java	6 Jul 2006 15:00:54 -0000	1.2
--- UsbTracer.java	6 Jul 2006 19:45:59 -0000	1.3
***************
*** 120,124 ****
  	{
  		try {
! 			Class[] constructorClasses = { String.class, Integer.class };
  			String className = UsbHostManager.getProperties().getProperty(TRACE_IMPLEMENTATION_PROPERTY);
  			Constructor classConstructor = Class.forName(className).getConstructor(constructorClasses);
--- 120,124 ----
  	{
  		try {
! 			Class[] constructorClasses = { String.class, int.class };
  			String className = UsbHostManager.getProperties().getProperty(TRACE_IMPLEMENTATION_PROPERTY);
  			Constructor classConstructor = Class.forName(className).getConstructor(constructorClasses);

[javax-usb-cvs] javax-usb-ri/src/com/ibm/jusb/util UsbTracer.java, 1.1, 1.2

From: Dan S. <dds...@us...> - 2006-07-06 15:00:57

Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11935/src/com/ibm/jusb/util

Modified Files:
	UsbTracer.java 
Log Message:
wrap int with new Integer()


Index: UsbTracer.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util/UsbTracer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UsbTracer.java	5 Jul 2006 20:48:27 -0000	1.1
--- UsbTracer.java	6 Jul 2006 15:00:54 -0000	1.2
***************
*** 123,127 ****
  			String className = UsbHostManager.getProperties().getProperty(TRACE_IMPLEMENTATION_PROPERTY);
  			Constructor classConstructor = Class.forName(className).getConstructor(constructorClasses);
! 			Object[] constructorObjects = { name, level };
  			return (UsbTracer)classConstructor.newInstance(constructorObjects);
  		} catch ( Exception e ) {
--- 123,127 ----
  			String className = UsbHostManager.getProperties().getProperty(TRACE_IMPLEMENTATION_PROPERTY);
  			Constructor classConstructor = Class.forName(className).getConstructor(constructorClasses);
! 			Object[] constructorObjects = { name, new Integer(level) };
  			return (UsbTracer)classConstructor.newInstance(constructorObjects);
  		} catch ( Exception e ) {

[javax-usb-cvs] javax-usb-ri-linux/lib javax.usb.properties, 1.12, 1.13

From: Dan S. <dds...@us...> - 2006-07-05 20:51:37

Update of /cvsroot/javax-usb/javax-usb-ri-linux/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2299

Modified Files:
	javax.usb.properties 
Log Message:
update the fields in the javax.usb.properties file to add new fields for a common ri update.


Index: javax.usb.properties
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/lib/javax.usb.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** javax.usb.properties	12 May 2005 19:15:07 -0000	1.12
--- javax.usb.properties	5 Jul 2006 20:51:30 -0000	1.13
***************
*** 36,39 ****
--- 36,75 ----
  com.ibm.jusb.UsbDeviceImp.queueSubmissions = true
  
+ # This property causes the common implementation to enforce short packet error conditions.
+ # If set, it checks each UsbIrp for a short packet condition upon completion, and if
+ # one is detected with no exception (and the accept short packet flag set to false),
+ # it creates a UsbShortPacketException and sets it on the UsbIrp.
+ # This should only be set to true for platform implementations that do not support/create
+ # short packet exceptions.
+ #com.ibm.jusb.UsbIrpImp.createShortPacketException = false
+ 
+ # This property sets the default UsbTracer implementation.  The default is the NullUsbTracer,
+ # which does no tracing at all.  These implementations are provided, or you can create your own:
+ #   com.ibm.jusb.util.NullUsbTracer
+ #   com.ibm.jusb.util.StandardOutUsbTracer
+ #   com.ibm.jusb.util.StandardErrorUsbTracer
+ #com.ibm.jusb.util.UsbTracer=com.ibm.jusb.util.NullUsbTracer
+ 
+ # These set the default name and level of the "global" UsbTracer object.  The level may be specified
+ # as any of these defines:
+ #   TRACE_CRITICAL
+ #   TRACE_ERROR
+ #   TRACE_WARN
+ #   TRACE_NOTICE
+ #   TRACE_INFO
+ #   TRACE_DEBUG
+ #com.ibm.jusb.util.UsbTracer.global.name=Main UsbTracer
+ #com.ibm.jusb.util.UsbTracer.global.level=TRACE_DEBUG
+ 
+ # This sets the level of messages that the StandardOutUsbTracer prints.  Trace messages with
+ # lower priority than this will not be printed.  This may be specified as any of the
+ # level defines listed above.
+ #com.ibm.jusb.util.StandardOutUsbTracer.currentLevel=TRACE_DEBUG
+ 
+ # This sets the level of messages that the StandardErrorUsbTracer prints.  Trace messages with
+ # lower priority than this will not be printed.  This may be specified as any of the
+ # level defines listed above.
+ #com.ibm.jusb.util.StandardErrorUsbTracer.currentLevel=TRACE_DEBUG
+ 
  ################################################################################
  # Properties required/used by javax.usb Linux Implementation

[javax-usb-cvs] javax-usb-ri/src/com/ibm/jusb/util NullUsbTracer.java, NONE, 1.1 StandardErrorUsbTracer.java, NONE, 1.1 StandardOutUsbTracer.java, NONE, 1.1 UsbTracer.java, NONE, 1.1

From: Dan S. <dds...@us...> - 2006-07-05 20:48:34

Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/util
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1336/src/com/ibm/jusb/util

Added Files:
	NullUsbTracer.java StandardErrorUsbTracer.java 
	StandardOutUsbTracer.java UsbTracer.java 
Log Message:
add generic tracing interface to allow tracing from common or platform implementation
to trace package of user's choice.  simple null, stdout, and stderr trace implementations
provided for now.


--- NEW FILE: StandardErrorUsbTracer.java ---
package com.ibm.jusb.util;

/* 
 * Copyright (c) 1999 - 2001, International Business Machines Corporation.
 * All Rights Reserved.
 *
 * This software is provided and licensed under the terms and conditions
 * of the Common Public License:
 * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
 */

import javax.usb.*;

/**
 * This implementation of UsbTracer sends messages to standard error.
 * <p>
 * This will print all messages on standard error, if the message level meets the
 * currently set priority level or is higher priority.
 * @author Dan Streetman
 */
public class StandardErrorUsbTracer extends UsbTracer
{
	/**
	 * Create a new StandardErrorUsbTracer with the specified name and trace level.
	 * @param name The default name of this tracer object.
	 * @param level The default trace level of this tracer object.
	 */
	public StandardErrorUsbTracer(String name, int level)
	{
		super(name, level);

		try {
			currentLevel = getIntTraceLevel(UsbHostManager.getProperties().getProperty(TRACE_MSG_LEVEL));
		} catch ( Exception e ) {
			currentLevel = TRACE_DEBUG;
		}
	}

	/**
	 * This traces to standard error if appropriate.
	 * <p>
	 * If the level meets or exceeds the current level, the message is printed to
	 * standard error.
	 * @param name The name of the trace source.
	 * @param level The trace level of the message.
	 * @param msg The trace message.
	 */
	public void trace(String name, int level, String msg)
	{
		if (level <= currentLevel)
			System.err.print(name + ":" + msg);
	}

	protected int currentLevel;

	public static final String TRACE_MSG_LEVEL = "com.ibm.jusb.util.StandardErrorUsbTracer.currentLevel";
}

--- NEW FILE: NullUsbTracer.java ---
package com.ibm.jusb.util;

/* 
 * Copyright (c) 1999 - 2001, International Business Machines Corporation.
 * All Rights Reserved.
 *
 * This software is provided and licensed under the terms and conditions
 * of the Common Public License:
 * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
 */

import javax.usb.*;

/**
 * This implementation of UsbTracer does nothing with any trace messages.
 * @author Dan Streetman
 */
public class NullUsbTracer extends UsbTracer
{
	/**
	 * Create a new NullUsbTracer with the specified name and trace level.
	 * <p>
	 * Since this class does nothing these parameters don't matter.
	 * @param name The default name of this tracer object.
	 * @param level The default trace level of this tracer object.
	 */
	public NullUsbTracer(String name, int level) { super(name, level); }

	/**
	 * This method does nothing.  The trace message is dropped completely.
	 * @param name The name of the trace source.
	 * @param level The trace level of the message.
	 * @param msg The trace message.
	 */
	public void trace(String name, int level, String msg) { }
}

--- NEW FILE: StandardOutUsbTracer.java ---
package com.ibm.jusb.util;

/* 
 * Copyright (c) 1999 - 2001, International Business Machines Corporation.
 * All Rights Reserved.
 *
 * This software is provided and licensed under the terms and conditions
 * of the Common Public License:
 * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
 */

import javax.usb.*;

/**
 * This implementation of UsbTracer sends messages to standard out.
 * <p>
 * This will print all messages on standard out, if the message level meets the
 * currently set priority level or is higher priority.
 * @author Dan Streetman
 */
public class StandardOutUsbTracer extends UsbTracer
{
	/**
	 * Create a new StandardOutUsbTracer with the specified name and trace level.
	 * @param name The default name of this tracer object.
	 * @param level The default trace level of this tracer object.
	 */
	public StandardOutUsbTracer(String name, int level)
	{
		super(name, level);

		try {
			currentLevel = getIntTraceLevel(UsbHostManager.getProperties().getProperty(TRACE_MSG_LEVEL));
		} catch ( Exception e ) {
			currentLevel = TRACE_DEBUG;
		}
	}

	/**
	 * This traces to standard out if appropriate.
	 * <p>
	 * If the level meets or exceeds the current level, the message is printed to
	 * standard out.
	 * @param name The name of the trace source.
	 * @param level The trace level of the message.
	 * @param msg The trace message.
	 */
	public void trace(String name, int level, String msg)
	{
		if (level <= currentLevel)
			System.out.print(name + ":" + msg);
	}

	protected int currentLevel;

	public static final String TRACE_MSG_LEVEL = "com.ibm.jusb.util.StandardOutUsbTracer.currentLevel";
}

--- NEW FILE: UsbTracer.java ---
package com.ibm.jusb.util;

/* 
 * Copyright (c) 1999 - 2001, International Business Machines Corporation.
 * All Rights Reserved.
 *
 * This software is provided and licensed under the terms and conditions
 * of the Common Public License:
 * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
 */

import java.lang.reflect.*;
import java.util.*;

import javax.usb.*;

/**
 * Class to provide abstracted tracing for javax.usb implementation(s).
 * <p>
 * This allows the javax.usb implementations (common implementation and any
 * platform implementations) to perform tracing in a generic manner, whose output
 * can be controlled by the user and redirected to any desired trace package or function.
 * <p>
 * To use this tracing, either create a UsbTracer object yourself with the
 * {@link #getUsbTracer(String, int) getUsbTracer(name, level)} method and use that
 * object for all your tracing, or use the default/global UsbTracer object via
 * UsbTracer.{@link #getUsbTracer() getUsbTracer()}.{@link #trace(String,int,String) trace(name, level, msg)}.
 * <p>
 * Each UsbTracer object has a default name and level.  The name should be used by the UsbTracer
 * implementation, possibly be prefixing the trace message with it.  The level should be used
 * by the UsbTracer implementation, usually by printing out only messages with a higher priority
 * that the implementation's current priority setting (which is dependent on the implementation).
 * @author Dan Streetman
 */
public abstract class UsbTracer
{
	/**
	 * Create a new UsbTracer with the specified name and trace level.
	 * <p>
	 * This creates a new UsbTracer with the specified default values.
	 * This is only usable by subclasses, and all subclasses must invoke this
	 * constructor.
	 * @param name The default name of this tracer object.
	 * @param level The default trace level of this tracer object.
	 */
	protected UsbTracer(String name, int level)
	{
		setDefaultName(name);
		setDefaultLevel(level);
	}

	/**
	 * Trace message with the specified name at the specified level.
	 * @param name The name of the trace source.
	 * @param level The trace level of the message.
	 * @param msg The trace message.
	 */
	public abstract void trace(String name, int level, String msg);

	/**
	 * Trace message with the specified name at this UsbTracer object's default level.
	 * @param name The name of the trace source.
	 * @param msg The trace message.
	 */
	public void trace(String name, String msg)
	{
		trace(name, getDefaultLevel(), msg);
	}

	/**
	 * Trace message with this UsbTracer object's default name at the specified level.
	 * @param level The trace level of the message.
	 * @param msg The trace message.
	 */
	public void trace(int level, String msg)
	{
		trace(getDefaultName(), level, msg);
	}

	/**
	 * Trace message with this UsbTracer object's default name and default level.
	 * @param msg The trace message.
	 */
	public void trace(String msg)
	{
		trace(getDefaultName(), getDefaultLevel(), msg);
	}

	/**
	 * Set the default name for this UsbTracer object.
	 * @param name The default name.
	 */
	public void setDefaultName(String name) { defaultName = name; }

	/**
	 * Get the default name for this UsbTracer object.
	 * @return The default name.
	 */
	public String getDefaultName() { return defaultName; }

	/**
	 * Set the default level for this UsbTracer object.
	 * @param level The default level.
	 */
	public void setDefaultLevel(int level) { defaultLevel = level; }

	/**
	 * Get the default level for this UsbTracer object.
	 * @return The default level.
	 */
	public int getDefaultLevel() { return defaultLevel; }

	/**
	 * Get a new UsbTracer object with the specified name and level.
	 * @param name The default trace name for the new UsbTracer.
	 * @param level The default trace level for the new UsbTracer.
	 * @return A new UsbTracer object.
	 */
	public static UsbTracer getUsbTracer(String name, int level)
	{
		try {
			Class[] constructorClasses = { String.class, Integer.class };
			String className = UsbHostManager.getProperties().getProperty(TRACE_IMPLEMENTATION_PROPERTY);
			Constructor classConstructor = Class.forName(className).getConstructor(constructorClasses);
			Object[] constructorObjects = { name, level };
			return (UsbTracer)classConstructor.newInstance(constructorObjects);
		} catch ( Exception e ) {
			return new NullUsbTracer(name, level);
		}
	}

	/**
	 * Get the default/global UsbTracer.
	 * <p>
	 * This should be used for easy tracing access.  The default/global UsbTracer object is returned.
	 * Its name defaults to "Main UsbTracer" and level to TRACE_DEBUG.  Both are settable from the
	 * javax.usb.properties file.
	 * @return The global/main UsbTracer.
	 */
	public static UsbTracer getUsbTracer()
	{
		synchronized (globalUsbTracerLock) {
			if (null == globalUsbTracer) {
				String name = GLOBAL_TRACER_DEFAULT_NAME;
				int level = GLOBAL_TRACER_DEFAULT_LEVEL;
				try { name = UsbHostManager.getProperties().getProperty(GLOBAL_TRACER_NAME_PROPERTY); }
				catch ( Exception e ) {	}

				try { level = getIntTraceLevel(UsbHostManager.getProperties().getProperty(GLOBAL_TRACER_LEVEL_PROPERTY)); }
				catch ( Exception e ) { }

				globalUsbTracer = getUsbTracer(name, level);
			}
		}

		return globalUsbTracer;
	}

	/**
	 * This translates the provided String trace level to an int level.
	 * @param level The String trace level.
	 * @return The int trace level.
	 * @exception Exception If the String level did not match a trace int level.
	 */
	protected static int getIntTraceLevel(String level) throws Exception
	{
		if (TRACE_CRITICAL_PROPERTY.equalsIgnoreCase(level.trim()))
			return TRACE_CRITICAL;
		else if (TRACE_ERROR_PROPERTY.equalsIgnoreCase(level.trim()))
			return TRACE_ERROR;
		else if (TRACE_WARN_PROPERTY.equalsIgnoreCase(level.trim()))
			return TRACE_WARN;
		else if (TRACE_NOTICE_PROPERTY.equalsIgnoreCase(level.trim()))
			return TRACE_NOTICE;
		else if (TRACE_INFO_PROPERTY.equalsIgnoreCase(level.trim()))
			return TRACE_INFO;
		else if (TRACE_DEBUG_PROPERTY.equalsIgnoreCase(level.trim()))
			return TRACE_DEBUG;
		else
			throw new Exception("Unknown trace level : " + level);
	}

	private static UsbTracer globalUsbTracer;
	private static Object globalUsbTracerLock = new Object();

	protected String defaultName;
	protected int defaultLevel;

	public static final String TRACE_IMPLEMENTATION_PROPERTY = "com.ibm.jusb.util.UsbTracer";
	public static final String GLOBAL_TRACER_NAME_PROPERTY = "com.ibm.jusb.util.UsbTracer.global.name";
	public static final String GLOBAL_TRACER_LEVEL_PROPERTY = "com.ibm.jusb.util.UsbTracer.global.level";

	public static final String TRACE_CRITICAL_PROPERTY = "TRACE_CRITICAL";
	public static final String TRACE_ERROR_PROPERTY = "TRACE_ERROR";
	public static final String TRACE_WARN_PROPERTY = "TRACE_WARN";
	public static final String TRACE_NOTICE_PROPERTY = "TRACE_NOTICE";
	public static final String TRACE_INFO_PROPERTY = "TRACE_INFO";
	public static final String TRACE_DEBUG_PROPERTY = "TRACE_DEBUG";

	public static final int TRACE_CRITICAL = 100;
	public static final int TRACE_ERROR = 200;
	public static final int TRACE_WARN = 300;
	public static final int TRACE_NOTICE = 400;
	public static final int TRACE_INFO = 500;
	public static final int TRACE_DEBUG = 600;

	private static final String GLOBAL_TRACER_DEFAULT_NAME = "Main UsbTracer";
	private static final int GLOBAL_TRACER_DEFAULT_LEVEL = TRACE_DEBUG;
}

[javax-usb-cvs] javax-usb-ri/docs javax.usb.properties,1.1,1.2

From: Dan S. <dds...@us...> - 2006-07-05 20:48:31

Update of /cvsroot/javax-usb/javax-usb-ri/docs
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1336/docs

Modified Files:
	javax.usb.properties 
Log Message:
add generic tracing interface to allow tracing from common or platform implementation
to trace package of user's choice.  simple null, stdout, and stderr trace implementations
provided for now.


Index: javax.usb.properties
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/docs/javax.usb.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** javax.usb.properties	13 Jan 2005 17:59:18 -0000	1.1
--- javax.usb.properties	5 Jul 2006 20:48:27 -0000	1.2
***************
*** 38,39 ****
--- 38,67 ----
  # short packet exceptions.
  #com.ibm.jusb.UsbIrpImp.createShortPacketException = false
+ 
+ # This property sets the default UsbTracer implementation.  The default is the NullUsbTracer,
+ # which does no tracing at all.  These implementations are provided, or you can create your own:
+ #   com.ibm.jusb.util.NullUsbTracer
+ #   com.ibm.jusb.util.StandardOutUsbTracer
+ #   com.ibm.jusb.util.StandardErrorUsbTracer
+ #com.ibm.jusb.util.UsbTracer=com.ibm.jusb.util.NullUsbTracer
+ 
+ # These set the default name and level of the "global" UsbTracer object.  The level may be specified
+ # as any of these defines:
+ #   TRACE_CRITICAL
+ #   TRACE_ERROR
+ #   TRACE_WARN
+ #   TRACE_NOTICE
+ #   TRACE_INFO
+ #   TRACE_DEBUG
+ #com.ibm.jusb.util.UsbTracer.global.name=Main UsbTracer
+ #com.ibm.jusb.util.UsbTracer.global.level=TRACE_DEBUG
+ 
+ # This sets the level of messages that the StandardOutUsbTracer prints.  Trace messages with
+ # lower priority than this will not be printed.  This may be specified as any of the
+ # level defines listed above.
+ #com.ibm.jusb.util.StandardOutUsbTracer.currentLevel=TRACE_DEBUG
+ 
+ # This sets the level of messages that the StandardErrorUsbTracer prints.  Trace messages with
+ # lower priority than this will not be printed.  This may be specified as any of the
+ # level defines listed above.
+ #com.ibm.jusb.util.StandardErrorUsbTracer.currentLevel=TRACE_DEBUG

[javax-usb-cvs] javax-usb-ri-linux rpm-script,NONE,1.1

From: Dan S. <dds...@us...> - 2006-01-20 19:28:34

Update of /cvsroot/javax-usb/javax-usb-ri-linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13815

Added Files:
	rpm-script 
Log Message:
add script to create rpm for linux


--- NEW FILE: rpm-script ---
#!/bin/bash

echo -n "Please enter the version number: "
read VERSION

cp -vf lib/libJavaxUsb.so rpm-files/usr/lib/libJavaxUsb.so.$VERSION
ln -s libJavaxUsb.so.$VERSION rpm-files/usr/lib/libJavaxUsb.so
cp -vf lib/jsr80_linux.jar rpm-files/opt/javax-usb/lib/jsr80_linux-$VERSION.jar
ln -s jsr80_linux-$VERSION.jar rpm-files/opt/javax-usb/lib/jsr80_linux.jar
cp -vf lib/javax.usb.properties rpm-files/opt/javax-usb/etc

rpmbuild -bb javax-usb-ri-linux.spec \
	--buildroot="`pwd`/rpm-files" \
	--target i386 \
	--define "_rpmdir `pwd`" \
	--define "_rpmfilename %{name}-%{version}-%{release}.%{arch}.rpm"

rm -vf rpm-files/usr/lib/libJavaxUsb.so.$VERSION
rm -vf rpm-files/usr/lib/libJavaxUsb.so
rm -vf rpm-files/opt/javax-usb/lib/jsr80_linux-$VERSION.jar
rm -vf rpm-files/opt/javax-usb/lib/jsr80_linux.jar
rm -vf rpm-files/opt/javax-usb/etc/javax.usb.properties

[javax-usb-cvs] javax-usb-ri rpm-script,NONE,1.1

From: Dan S. <dds...@us...> - 2006-01-20 19:28:04

Update of /cvsroot/javax-usb/javax-usb-ri
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13583

Added Files:
	rpm-script 
Log Message:
add script to make rpm for linux


--- NEW FILE: rpm-script ---
#!/bin/bash

echo -n "Please enter the version number: "
read VERSION

cp -vf lib/jsr80_ri.jar rpm-files/opt/javax-usb/lib/jsr80_ri-$VERSION.jar
ln -s jsr80_ri-$VERSION.jar rpm-files/opt/javax-usb/lib/jsr80_ri.jar

rpmbuild -bb javax-usb-ri.spec \
	--buildroot="`pwd`/rpm-files" \
	--target i386 \
	--define "_rpmdir `pwd`" \
	--define "_rpmfilename %{name}-%{version}-%{release}.%{arch}.rpm"

rm -vf rpm-files/opt/javax-usb/lib/jsr80_ri-$VERSION.jar
rm -vf rpm-files/opt/javax-usb/lib/jsr80_ri.jar

[javax-usb-cvs] javax-usb rpm-script,NONE,1.1

From: Dan S. <dds...@us...> - 2006-01-20 19:27:33

Update of /cvsroot/javax-usb/javax-usb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13466

Added Files:
	rpm-script 
Log Message:
added script to create rpm for linux


--- NEW FILE: rpm-script ---
#!/bin/bash

echo -n "Please enter the version number: "
read VERSION

cp -vf lib/jsr80.jar rpm-files/opt/javax-usb/lib/jsr80-$VERSION.jar
ln -s jsr80-$VERSION.jar rpm-files/opt/javax-usb/lib/jsr80.jar

rpmbuild -bb javax-usb.spec \
	--buildroot="`pwd`/rpm-files" \
	--target i386 \
	--define "_rpmdir `pwd`" \
	--define "_rpmfilename %{name}-%{version}-%{release}.%{arch}.rpm"

rm -vf rpm-files/opt/javax-usb/lib/jsr80-$VERSION.jar
rm -vf rpm-files/opt/javax-usb/lib/jsr80.jar

[javax-usb-cvs] javax-usb/src/javax/usb UsbIrp.java,1.24,1.25

From: Dan S. <dds...@us...> - 2006-01-15 01:53:21

Update of /cvsroot/javax-usb/javax-usb/src/javax/usb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27036

Modified Files:
	UsbIrp.java 
Log Message:
javadoc syntax fix


Index: UsbIrp.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/UsbIrp.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** UsbIrp.java	9 Jun 2004 20:25:40 -0000	1.24
--- UsbIrp.java	15 Jan 2006 01:52:45 -0000	1.25
***************
*** 178,182 ****
  	 * <p>
  	 * This must be false before use.
! 	 * @return If the has completed.
  	 */
  	public boolean isComplete();
--- 178,182 ----
  	 * <p>
  	 * This must be false before use.
! 	 * @return If this UsbIrp has completed.
  	 */
  	public boolean isComplete();

[javax-usb-cvs] javax-usb/docs jsr80.pdf,1.12,1.13

From: Dan S. <dds...@us...> - 2006-01-15 01:51:41

Update of /cvsroot/javax-usb/javax-usb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26822

Modified Files:
	jsr80.pdf 
Log Message:
spelling fix


Index: jsr80.pdf
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/docs/jsr80.pdf,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
Binary files /tmp/cvsq358IV and /tmp/cvs2f29Pt differ

[javax-usb-cvs] javax-usb/docs/src jsr80.tex,1.13,1.14

From: Dan S. <dds...@us...> - 2006-01-15 01:50:59

Update of /cvsroot/javax-usb/javax-usb/docs/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26671

Modified Files:
	jsr80.tex 
Log Message:
spelling fix


Index: jsr80.tex
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/docs/src/jsr80.tex,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** jsr80.tex	7 Jan 2006 16:53:13 -0000	1.13
--- jsr80.tex	15 Jan 2006 01:50:39 -0000	1.14
***************
*** 196,200 ****
  pipe.  The default control pipe requires \myinterface{UsbControlIrp}s, which contain
  meta-information besides the actual data buffer.  The \myinterface{UsbControlIrp}s
! may be submitted synchronously or asyncronously.  The submission methods
  behave the same, except the synchronous submission method blocks until
  the submission is complete, essentially meaning all data has been transferred.
--- 196,200 ----
  pipe.  The default control pipe requires \myinterface{UsbControlIrp}s, which contain
  meta-information besides the actual data buffer.  The \myinterface{UsbControlIrp}s
! may be submitted synchronously or asynchronously.  The submission methods
  behave the same, except the synchronous submission method blocks until
  the submission is complete, essentially meaning all data has been transferred.
***************
*** 323,327 ****
  control pipe.  However, this pipe is not neccesarily a control-type pipe,
  and so other objects may be used for the communication.  There are
! synchronous and asyncronous methods, which behave the same as the
  methods from the \myinterface{UsbDevice} interface; the synchronous methods block
  until complete, while the asynchronous methods return immediately
--- 323,327 ----
  control pipe.  However, this pipe is not neccesarily a control-type pipe,
  and so other objects may be used for the communication.  There are
! synchronous and asynchronous methods, which behave the same as the
  methods from the \myinterface{UsbDevice} interface; the synchronous methods block
  until complete, while the asynchronous methods return immediately

[javax-usb-cvs] javax-usb/docs jsr80.pdf,1.11,1.12

From: Dan S. <dds...@us...> - 2006-01-07 16:54:07

Update of /cvsroot/javax-usb/javax-usb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1967

Modified Files:
	jsr80.pdf 
Log Message:
updated


Index: jsr80.pdf
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/docs/jsr80.pdf,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
Binary files /tmp/cvsINtM1K and /tmp/cvsY1bVqC differ

[javax-usb-cvs] javax-usb/docs/src jsr80.tex,1.12,1.13

From: Dan S. <dds...@us...> - 2006-01-07 16:53:20

Update of /cvsroot/javax-usb/javax-usb/docs/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1854

Modified Files:
	jsr80.tex 
Log Message:
LaTeX control fixes


Index: jsr80.tex
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/docs/src/jsr80.tex,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** jsr80.tex	7 Jan 2006 16:43:58 -0000	1.12
--- jsr80.tex	7 Jan 2006 16:53:13 -0000	1.13
***************
*** 67,71 ****
  \renewcommand{\subsectionmark}[1]{\markright{\emph{\mytitle}}}
  \renewcommand{\subsubsectionmark}[1]{\markright{\emph{\mytitle}}}
! \fancyhead[LE,RO]{\bfseries\thepage}
  \fancyhead[LO]{\rightmark}
  
--- 67,71 ----
  \renewcommand{\subsectionmark}[1]{\markright{\emph{\mytitle}}}
  \renewcommand{\subsubsectionmark}[1]{\markright{\emph{\mytitle}}}
! \fancyhead[L,RO]{\bfseries\thepage}
  \fancyhead[LO]{\rightmark}
  
***************
*** 94,111 ****
  with this JSR.  
  
- \mysubsectionend
- 
- %\subsection{Audience}
- %
- %The reader is expected
- %
- %\mysubsectionend
- %
- %\subsection{Scope}
- %
- %This document is intended to introduce the reader
- %
- %\mysubsectionend
- 
  \mysectionend
  
--- 94,97 ----

[javax-usb-cvs] javax-usb/docs/src jsr80.tex,1.11,1.12

From: Dan S. <dds...@us...> - 2006-01-07 16:44:14

Update of /cvsroot/javax-usb/javax-usb/docs/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496

Modified Files:
	jsr80.tex 
Log Message:
spelling fixes


Index: jsr80.tex
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/docs/src/jsr80.tex,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** jsr80.tex	8 Jun 2004 17:56:30 -0000	1.11
--- jsr80.tex	7 Jan 2006 16:43:58 -0000	1.12
***************
*** 381,385 ****
  First, the data buffer is simply a byte[] but there are additional methods that
  are used to modify the transfer of data.  There are methods to set and get the
! offset, which indicates what offset into the data buffer the imeplementation
  should use when transferring data.  If the offset is zero, data will be transferred
  starting at the beginning of the byte[], if the offset is above zero, data starting
--- 381,385 ----
  First, the data buffer is simply a byte[] but there are additional methods that
  are used to modify the transfer of data.  There are methods to set and get the
! offset, which indicates what offset into the data buffer the implementation
  should use when transferring data.  If the offset is zero, data will be transferred
  starting at the beginning of the byte[], if the offset is above zero, data starting
***************
*** 402,406 ****
  The methods related to short packets are used to set and get the policy that should be
  used when handling short packets.  The policy can be set to either accept or reject
! short packets.  Short packets will happen if the device transferrs less data than the
  host was expecting.  Normally this will happen only if the pipe direction is
  device-to-host, and the data buffer provided is larger than the amount of data that
--- 402,406 ----
  The methods related to short packets are used to set and get the policy that should be
  used when handling short packets.  The policy can be set to either accept or reject
! short packets.  Short packets will happen if the device transfers less data than the
  host was expecting.  Normally this will happen only if the pipe direction is
  device-to-host, and the data buffer provided is larger than the amount of data that

[javax-usb-cvs] javax-usb/src/javax/usb UsbHostManager.java,1.14,1.15

From: Dan S. <dds...@us...> - 2005-12-30 18:09:07

Update of /cvsroot/javax-usb/javax-usb/src/javax/usb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6110

Modified Files:
	UsbHostManager.java 
Log Message:
fix typos in the JavaDOC.


Index: UsbHostManager.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/UsbHostManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** UsbHostManager.java	13 Apr 2004 23:22:01 -0000	1.14
--- UsbHostManager.java	30 Dec 2005 18:08:56 -0000	1.15
***************
*** 26,30 ****
  	 * Get the UsbServices implementation.
  	 * @return The UsbServices implementation instance.
! 	 * @exception UsbException If the is an error creating the UsbSerivces implementation.
  	 * @exception SecurityException If the caller does not have security access.
  	 */
--- 26,30 ----
  	 * Get the UsbServices implementation.
  	 * @return The UsbServices implementation instance.
! 	 * @exception UsbException If there is an error creating the UsbSerivces implementation.
  	 * @exception SecurityException If the caller does not have security access.
  	 */
***************
*** 44,48 ****
  	 * If the properties have not yet been loaded, this loads them.
  	 * @return An copy of the Properties.
! 	 * @exception UsbException If an error occurrs while loading the properties.
  	 * @exception SecurityException If the caller does not have security access.
  	 */
--- 44,48 ----
  	 * If the properties have not yet been loaded, this loads them.
  	 * @return An copy of the Properties.
! 	 * @exception UsbException If an error occurs while loading the properties.
  	 * @exception SecurityException If the caller does not have security access.
  	 */

[javax-usb-cvs] javax-usb-ri/src/com/ibm/jusb UsbDeviceImp.java,1.51,1.52

From: Dan S. <dds...@us...> - 2005-12-20 01:06:35

Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17807/src/com/ibm/jusb

Modified Files:
	UsbDeviceImp.java 
Log Message:
javadoc update - add period to make javadoc happy.


Index: UsbDeviceImp.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/UsbDeviceImp.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** UsbDeviceImp.java	13 Apr 2005 16:57:11 -0000	1.51
--- UsbDeviceImp.java	20 Dec 2005 01:06:24 -0000	1.52
***************
*** 312,316 ****
  
  	/**
! 	 * Sets the active configuration index
  	 * <p>
  	 * Since this may be called before the associated configuration is actually added,
--- 312,316 ----
  
  	/**
! 	 * Sets the active configuration index.
  	 * <p>
  	 * Since this may be called before the associated configuration is actually added,

[javax-usb-cvs] javax-usb-tck/src/javax/usb/tck TopologyTests.java,1.4,1.5

From: Dan S. <dds...@us...> - 2005-12-20 00:02:15

Update of /cvsroot/javax-usb/javax-usb-tck/src/javax/usb/tck
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28799/src/javax/usb/tck

Modified Files:
	TopologyTests.java 
Log Message:
change APIVersion string to 1.0.1


Index: TopologyTests.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-tck/src/javax/usb/tck/TopologyTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TopologyTests.java	23 Feb 2005 21:10:50 -0000	1.4
--- TopologyTests.java	20 Dec 2005 00:02:08 -0000	1.5
***************
*** 133,137 ****
      // String Descriptor Constants for the programable device
  
!     public static final String APIVersion = "1.0.0";                                         // @P1C
      public static final String USBVersion = "1.1";
      public static final String programableStrings[] = {"Manufacturer", 
--- 133,137 ----
      // String Descriptor Constants for the programable device
  
!     public static final String APIVersion = "1.0.1";                                         // @P1C
      public static final String USBVersion = "1.1";
      public static final String programableStrings[] = {"Manufacturer",

[javax-usb-cvs] javax-usb-ri-linux/src/com/ibm/jusb/os/linux Version.java,1.14,1.15

From: Dan S. <dds...@us...> - 2005-12-19 23:59:40

Update of /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27252/src/com/ibm/jusb/os/linux

Modified Files:
	Version.java 
Log Message:
update version number to 1.0.2-CVS


Index: Version.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux/Version.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Version.java	19 Dec 2005 19:11:15 -0000	1.14
--- Version.java	19 Dec 2005 23:59:32 -0000	1.15
***************
*** 25,29 ****
  
  	public static final String LINUX_API_VERSION = "1.0.0";
! 	public static final String LINUX_IMP_VERSION = "1.0.1";
  	public static final String LINUX_IMP_DESCRIPTION =
  		 "JSR80 : javax.usb"
--- 25,29 ----
  
  	public static final String LINUX_API_VERSION = "1.0.0";
! 	public static final String LINUX_IMP_VERSION = "1.0.2-CVS";
  	public static final String LINUX_IMP_DESCRIPTION =
  		 "JSR80 : javax.usb"

[javax-usb-cvs] javax-usb-ri/src/com/ibm/jusb Version.java,1.18,1.19

From: Dan S. <dds...@us...> - 2005-12-19 23:58:44

Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27123/src/com/ibm/jusb

Modified Files:
	Version.java 
Log Message:
update version number to 1.0.2-CVS


Index: Version.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/Version.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Version.java	19 Dec 2005 19:10:36 -0000	1.18
--- Version.java	19 Dec 2005 23:58:36 -0000	1.19
***************
*** 56,59 ****
  
  	private static final String VERSION_API = "1.0.0";
! 	private static final String VERSION_PLATFORM_INDEPENDENT_RI = "1.0.1";
  }
--- 56,59 ----
  
  	private static final String VERSION_API = "1.0.0";
! 	private static final String VERSION_PLATFORM_INDEPENDENT_RI = "1.0.2-CVS";
  }

[javax-usb-cvs] javax-usb/src/javax/usb Version.java,1.20,1.21

From: Dan S. <dds...@us...> - 2005-12-19 23:57:53

Update of /cvsroot/javax-usb/javax-usb/src/javax/usb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27041/src/javax/usb

Modified Files:
	Version.java 
Log Message:
update version number to 1.0.2-CVS


Index: Version.java
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/Version.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Version.java	19 Dec 2005 19:08:39 -0000	1.20
--- Version.java	19 Dec 2005 23:57:45 -0000	1.21
***************
*** 65,68 ****
  
  	private static final String VERSION_USB_SPECIFICATION = "1.1";
! 	private static final String VERSION_JAVAX_USB = "1.0.1";
  }
--- 65,68 ----
  
  	private static final String VERSION_USB_SPECIFICATION = "1.1";
! 	private static final String VERSION_JAVAX_USB = "1.0.2-CVS";
  }

[javax-usb-cvs] javax-usb-ri-linux javax-usb-ri-linux.spec,1.5,1.6

From: Dan S. <dds...@us...> - 2005-12-19 19:23:09

Update of /cvsroot/javax-usb/javax-usb-ri-linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28288

Modified Files:
	javax-usb-ri-linux.spec 
Log Message:
update version number to 1.0.1


Index: javax-usb-ri-linux.spec
===================================================================
RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/javax-usb-ri-linux.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** javax-usb-ri-linux.spec	2 Mar 2005 19:38:36 -0000	1.5
--- javax-usb-ri-linux.spec	19 Dec 2005 19:23:00 -0000	1.6
***************
*** 1,6 ****
  Summary: javax.usb Linux Implementation
  Name: javax-usb-ri-linux
! Version: 1.0.0
! Release: 2
  Copyright: (c)Copyright International Business Machines Corporation 2001. All rights reserved.
  Group: System Environment/Libraries
--- 1,6 ----
  Summary: javax.usb Linux Implementation
  Name: javax-usb-ri-linux
! Version: 1.0.1
! Release: 1
  Copyright: (c)Copyright International Business Machines Corporation 2001. All rights reserved.
  Group: System Environment/Libraries

Flat | Threaded

<< < 1 2 3 4 > >> (Page 3 of 4)

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (12)
2006	Jan (9)	Feb	Mar	Apr	May	Jun	Jul (6)	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb	Mar	Apr	May	Jun	Jul (3)	Aug	Sep	Oct	Nov (1)	Dec (3)
2008	Jan	Feb (6)	Mar	Apr	May	Jun (7)	Jul	Aug (24)	Sep	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2011	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan (6)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec