Menu
▾
▴
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
|
Update of /cvsroot/javax-usb/javax-usb-libusb/src/com/mcreations/usb/windows In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27274 Modified Files: JavaxUsb.java WindowsDeviceOsImp.java WindowsInterfaceOsImp.java WindowsPipeOsImp.java WindowsUsbServices.java Log Message: Now using up to date jrs80 implementation, libusb-win32.dll and libusbJNI.dll. Changes to fix broken interrupt driven data transfer. Get and Set Requests now working. Cleanup of log messages Index: WindowsUsbServices.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/com/mcreations/usb/windows/WindowsUsbServices.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** WindowsUsbServices.java 9 Jan 2006 21:12:36 -0000 1.1.1.1 --- WindowsUsbServices.java 5 Aug 2008 16:26:52 -0000 1.2 *************** *** 13,18 **** import com.ibm.jusb.UsbDeviceImp; import com.ibm.jusb.UsbHubImp; - import com.ibm.jusb.UsbInterfaceImp; - import com.ibm.jusb.UsbPortImp; import com.ibm.jusb.os.AbstractUsbServices; import com.ibm.jusb.util.RunnableManager; --- 13,16 ---- *************** *** 23,26 **** --- 21,27 ---- import java.util.Properties; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import javax.usb.UsbDevice; import javax.usb.UsbDeviceDescriptor; *************** *** 30,34 **** import javax.usb.UsbServices; import javax.usb.event.UsbServicesEvent; ! import javax.usb.util.UsbUtil; --- 31,35 ---- import javax.usb.UsbServices; import javax.usb.event.UsbServicesEvent; ! //import javax.usb.util.UsbUtil; *************** *** 41,47 **** --- 42,52 ---- implements UsbServices { + /** Used for logging */ + Log log = LogFactory.getLog(WindowsUsbServices.class); + public WindowsUsbServices() throws UsbException { + JavaxUsb.initialise(); *************** *** 60,63 **** --- 65,70 ---- throws UsbException { + if(log.isDebugEnabled()) log.debug( "getRootUsbHub() requested hub" ); + synchronized (topologyLock) { *************** *** 136,142 **** { if (p.containsKey(TOPOLOGY_UPDATE_DELAY_KEY)) ! topologyUpdateDelay = ! Integer.decode(p.getProperty(TOPOLOGY_UPDATE_DELAY_KEY)) ! .intValue(); } catch (Exception e) --- 143,147 ---- { if (p.containsKey(TOPOLOGY_UPDATE_DELAY_KEY)) ! topologyUpdateDelay = Integer.decode(p.getProperty(TOPOLOGY_UPDATE_DELAY_KEY)).intValue(); } catch (Exception e) *************** *** 147,154 **** { if (p.containsKey(TOPOLOGY_UPDATE_NEW_DEVICE_DELAY_KEY)) ! topologyUpdateNewDeviceDelay = ! Integer.decode( ! p.getProperty(TOPOLOGY_UPDATE_NEW_DEVICE_DELAY_KEY)) ! .intValue(); } catch (Exception e) --- 152,156 ---- { if (p.containsKey(TOPOLOGY_UPDATE_NEW_DEVICE_DELAY_KEY)) ! topologyUpdateNewDeviceDelay = Integer.decode(p.getProperty(TOPOLOGY_UPDATE_NEW_DEVICE_DELAY_KEY)).intValue(); } catch (Exception e) *************** *** 159,166 **** { if (p.containsKey(TOPOLOGY_UPDATE_USE_POLLING_KEY)) ! topologyUpdateUsePolling = ! Boolean.valueOf( ! p.getProperty(TOPOLOGY_UPDATE_USE_POLLING_KEY)) ! .booleanValue(); } catch (Exception e) --- 161,165 ---- { if (p.containsKey(TOPOLOGY_UPDATE_USE_POLLING_KEY)) ! topologyUpdateUsePolling = Boolean.valueOf(p.getProperty(TOPOLOGY_UPDATE_USE_POLLING_KEY)).booleanValue(); } catch (Exception e) *************** *** 171,176 **** { if (p.containsKey(TRACING_KEY)) ! JavaxUsb.setTracing( ! Boolean.valueOf(p.getProperty(TRACING_KEY)).booleanValue()); } catch (Exception e) --- 170,174 ---- { if (p.containsKey(TRACING_KEY)) ! JavaxUsb.setTracing(Boolean.valueOf(p.getProperty(TRACING_KEY)).booleanValue()); } catch (Exception e) *************** *** 182,189 **** { if (p.containsKey(TRACE_DEFAULT_KEY)) ! JavaxUsb.setTraceType( ! Boolean.valueOf(p.getProperty(TRACE_DEFAULT_KEY)) ! .booleanValue(), ! "default"); } catch (Exception e) --- 180,184 ---- { if (p.containsKey(TRACE_DEFAULT_KEY)) ! JavaxUsb.setTraceType(Boolean.valueOf(p.getProperty(TRACE_DEFAULT_KEY)).booleanValue(),"default"); } catch (Exception e) *************** *** 236,241 **** } /** @return If the topology listener is listening */ ! private boolean isListening() { try --- 231,237 ---- } + /** @return If the topology listener is listening */ ! /* private boolean isListening() { try *************** *** 248,251 **** --- 244,248 ---- } } + */ /** Start Topology Change Listener Thread */ *************** *** 254,261 **** Runnable r = null; String threadName = null; ! if (topologyUpdateUsePolling) { threadName = "USB Topology Poller"; r = new Runnable() { --- 251,259 ---- Runnable r = null; String threadName = null; ! if (topologyUpdateUsePolling) { threadName = "USB Topology Poller"; + if(log.isDebugEnabled())log.debug( "startTopologyListner started TopologyListner using polling with thread name <"+threadName+">" ); r = new Runnable() { *************** *** 286,292 **** public void run() { ! topologyListenerExit( ! JavaxUsb.nativeTopologyListener( ! WindowsUsbServices.this)); } }; --- 284,288 ---- public void run() { ! topologyListenerExit(JavaxUsb.nativeTopologyListener(WindowsUsbServices.this)); } }; *************** *** 298,305 **** topologyListener.setName(threadName); ! topologyListenerError = 0; topologyListener.start(); } /** Update the topology and fire connect/disconnect events */ private void updateTopology() --- 294,302 ---- topologyListener.setName(threadName); ! // topologyListenerError = 0; topologyListener.start(); } + /** Update the topology and fire connect/disconnect events */ private void updateTopology() *************** *** 308,319 **** List disconnectedDevices = new ArrayList(); ! fillDeviceList( ! getRootUsbHubImp(), ! disconnectedDevices); disconnectedDevices.remove(getRootUsbHubImp()); ! topologyUpdateResult = ! JavaxUsb.nativeTopologyUpdater( ! this, connectedDevices, disconnectedDevices); for (int i = 0; i < disconnectedDevices.size(); i++) --- 305,313 ---- List disconnectedDevices = new ArrayList(); ! fillDeviceList(getRootUsbHubImp(),disconnectedDevices); disconnectedDevices.remove(getRootUsbHubImp()); ! // topologyUpdateResult = ! JavaxUsb.nativeTopologyUpdater(this, connectedDevices, disconnectedDevices); for (int i = 0; i < disconnectedDevices.size(); i++) *************** *** 326,330 **** // fixme: setActiveConfig... is omitted to find out, whether it // is really needed in libusb implementation ! // setActiveConfigAndInterfaceSettings(device); try { --- 320,324 ---- // fixme: setActiveConfig... is omitted to find out, whether it // is really needed in libusb implementation ! // setActiveConfigAndInterfaceSettings(device); try { *************** *** 350,363 **** } ! listenerImp.usbDeviceAttached( ! new UsbServicesEvent( ! this, (UsbDevice) connectedDevices.get(k))); } } for (int i = 0; i < disconnectedDevices.size(); i++) ! listenerImp.usbDeviceDetached( ! new UsbServicesEvent( ! this, (UsbDevice) disconnectedDevices.get(i))); synchronized (topologyLock) --- 344,353 ---- } ! listenerImp.usbDeviceAttached(new UsbServicesEvent(this, (UsbDevice) connectedDevices.get(k))); } } for (int i = 0; i < disconnectedDevices.size(); i++) ! listenerImp.usbDeviceDetached(new UsbServicesEvent(this, (UsbDevice) disconnectedDevices.get(i))); synchronized (topologyLock) *************** *** 368,373 **** } /** Is called from native code to enqueue an update topology request. */ ! private void topologyChange() { try --- 358,364 ---- } + /** Is called from native code to enqueue an update topology request. */ ! /* private void topologyChange() { try *************** *** 390,393 **** --- 381,385 ---- topologyUpdateManager.add(r); } + */ /** *************** *** 398,402 **** { //FIXME - disconnet all devices ! topologyListenerError = error; synchronized (topologyLock) --- 390,394 ---- { //FIXME - disconnet all devices ! // topologyListenerError = error; synchronized (topologyLock) *************** *** 419,423 **** * @return The new UsbDeviceImp or existing UsbDeviceImp. */ ! private UsbDeviceImp checkUsbDeviceImp( UsbHubImp hub, int p, --- 411,415 ---- * @return The new UsbDeviceImp or existing UsbDeviceImp. */ ! /* private UsbDeviceImp checkUsbDeviceImp( UsbHubImp hub, int p, *************** *** 426,432 **** List disconnected) { ! JavaxUsb.log( ! JavaxUsb.LOG_HOTPLUG, JavaxUsb.FUNC, "WindowsUsbServices", ! "checkUsbDeviceImp", "Entered with device " + device); byte port = (byte) p; --- 418,422 ---- List disconnected) { ! if(log.isDebugEnabled()) log.debug("checkUsbDeviceImp() Entered with device " + device); byte port = (byte) p; *************** *** 439,446 **** } ! JavaxUsb.log( ! JavaxUsb.LOG_HOTPLUG, JavaxUsb.DEBUG, "WindowsUsbServices", ! "checkUsbDeviceImp", ! "Hub now has " + hub.getNumberOfPorts() + " ports"); if (!usbPortImp.isUsbDeviceAttached()) --- 429,433 ---- } ! if(log.isDebugEnabled()) log.debug("checkUsbDeviceImp() Hub now has " + hub.getNumberOfPorts() + " ports"); if (!usbPortImp.isUsbDeviceAttached()) *************** *** 448,454 **** connected.add(device); device.setParentUsbPortImp(usbPortImp); ! JavaxUsb.log( ! JavaxUsb.LOG_HOTPLUG, JavaxUsb.FUNC, "WindowsUsbServices", ! "checkUsbDeviceImp", "Leaving with device " + device); return device; --- 435,439 ---- connected.add(device); device.setParentUsbPortImp(usbPortImp); ! if(log.isDebugEnabled()) log.debug("checkUsbDeviceImp() Leaving with device " + device); return device; *************** *** 460,466 **** { disconnected.remove(existingDevice); ! JavaxUsb.log( ! JavaxUsb.LOG_HOTPLUG, JavaxUsb.FUNC, "WindowsUsbServices", ! "checkUsbDeviceImp", "Leaving with device " + existingDevice); return existingDevice; --- 445,449 ---- { disconnected.remove(existingDevice); ! if(log.isDebugEnabled()) log.debug("checkUsbDeviceImp Leaving with device " + existingDevice); return existingDevice; *************** *** 470,481 **** connected.add(device); device.setParentUsbPortImp(usbPortImp); ! JavaxUsb.log( ! JavaxUsb.LOG_HOTPLUG, JavaxUsb.FUNC, "WindowsUsbServices", ! "checkUsbDeviceImp", "Leaving with device " + device); return device; } } ! /** * Return if the specified devices appear to be equal. --- 453,462 ---- connected.add(device); device.setParentUsbPortImp(usbPortImp); ! if(log.isDebugEnabled()) log.debug("checkUsbDeviceImp Leaving with device " + device); return device; } } ! */ /** * Return if the specified devices appear to be equal. *************** *** 507,512 **** // Instance variables private RunnableManager topologyUpdateManager = new RunnableManager(); ! private int topologyListenerError = 0; ! private int topologyUpdateResult = 0; private Object topologyLock = new Object(); --- 488,493 ---- // Instance variables private RunnableManager topologyUpdateManager = new RunnableManager(); ! // private int topologyListenerError = 0; ! // private int topologyUpdateResult = 0; private Object topologyLock = new Object(); *************** *** 530,535 **** */ public static final int TOPOLOGY_UPDATE_DELAY = 5000; /* 5 seconds */ ! public static final String TOPOLOGY_UPDATE_DELAY_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.topologyUpdateDelay"; /* This is a delay when new devices are found, before sending the notification event that there is a new device. --- 511,515 ---- */ public static final int TOPOLOGY_UPDATE_DELAY = 5000; /* 5 seconds */ ! public static final String TOPOLOGY_UPDATE_DELAY_KEY = "com.mcreations.usb.windows.WindowsUsbServices.topologyUpdateDelay"; /* This is a delay when new devices are found, before sending the notification event that there is a new device. *************** *** 537,565 **** */ public static final int TOPOLOGY_UPDATE_NEW_DEVICE_DELAY = 500; /* 1/2 second per device */ ! public static final String TOPOLOGY_UPDATE_NEW_DEVICE_DELAY_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.topologyUpdateNewDeviceDelay"; /* Whether to use polling to wait for connect/disconnect notification */ public static final boolean TOPOLOGY_UPDATE_USE_POLLING = true; ! public static final String TOPOLOGY_UPDATE_USE_POLLING_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.topologyUpdateUsePolling"; /* The key in the properties file for this setting. */ ! public static final String TRACING_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.JNI.tracing"; ! public static final String TRACE_LEVEL_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_level"; ! public static final String TRACE_DEFAULT_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_default"; ! public static final String TRACE_HOTPLUG_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_hotplug"; ! public static final String TRACE_XFER_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_xfer"; ! public static final String TRACE_URB_KEY = ! "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_urb"; public static final String WINDOWS_API_VERSION = "0.10.0"; public static final String WINDOWS_IMP_VERSION = "0.10.0"; ! public static final String WINDOWS_IMP_DESCRIPTION = ! "\t" + "JSR80 : javax.usb" + "\n" + "\n" + "Implementation for Windows 98, 2000, and XP.\n" + "\n" + "\n" + "*" + "\n" --- 517,536 ---- */ public static final int TOPOLOGY_UPDATE_NEW_DEVICE_DELAY = 500; /* 1/2 second per device */ ! public static final String TOPOLOGY_UPDATE_NEW_DEVICE_DELAY_KEY = "com.mcreations.usb.windows.WindowsUsbServices.topologyUpdateNewDeviceDelay"; /* Whether to use polling to wait for connect/disconnect notification */ public static final boolean TOPOLOGY_UPDATE_USE_POLLING = true; ! public static final String TOPOLOGY_UPDATE_USE_POLLING_KEY ="com.mcreations.usb.windows.WindowsUsbServices.topologyUpdateUsePolling"; /* The key in the properties file for this setting. */ ! public static final String TRACING_KEY = "com.mcreations.usb.windows.WindowsUsbServices.JNI.tracing"; ! public static final String TRACE_LEVEL_KEY = "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_level"; ! public static final String TRACE_DEFAULT_KEY = "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_default"; ! public static final String TRACE_HOTPLUG_KEY = "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_hotplug"; ! public static final String TRACE_XFER_KEY = "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_xfer"; ! public static final String TRACE_URB_KEY = "com.mcreations.usb.windows.WindowsUsbServices.JNI.trace_urb"; public static final String WINDOWS_API_VERSION = "0.10.0"; public static final String WINDOWS_IMP_VERSION = "0.10.0"; ! public static final String WINDOWS_IMP_DESCRIPTION = "\t" + "JSR80 : javax.usb" + "\n" + "\n" + "Implementation for Windows 98, 2000, and XP.\n" + "\n" + "\n" + "*" + "\n" *************** *** 571,574 **** --- 542,546 ---- + "\n" + "\n" + "http://javax-usb.org/" + "\n" + "\n"; + /** * Fill the List with all devices. *************** *** 576,582 **** * @param list The list to add to. */ ! private void fillDeviceList( ! UsbDeviceImp device, ! List list) { list.add(device); --- 548,552 ---- * @param list The list to add to. */ ! private void fillDeviceList(UsbDeviceImp device,List list) { list.add(device); *************** *** 594,602 **** } /** * Find and set the active config and interface settings for this device. * @param device The UsbDeviceImp. */ ! protected void setActiveConfigAndInterfaceSettings(UsbDeviceImp device) { WindowsDeviceOsImp windowsDeviceOsImp = --- 564,573 ---- } + /** * Find and set the active config and interface settings for this device. * @param device The UsbDeviceImp. */ ! /* protected void setActiveConfigAndInterfaceSettings(UsbDeviceImp device) { WindowsDeviceOsImp windowsDeviceOsImp = *************** *** 609,614 **** else ! return; /* either the device is unconfigured or there was an error, so we can't continue */ ! Iterator interfaces = device.getActiveUsbConfiguration().getUsbInterfaces().iterator(); --- 580,584 ---- else ! return; // either the device is unconfigured or there was an error, so we can't continue Iterator interfaces = device.getActiveUsbConfiguration().getUsbInterfaces().iterator(); *************** *** 635,639 **** else { ! /* If there is only one setting, just set it to the active setting. */ usbInterfaceImp.setActiveSettingNumber( usbInterfaceImp.getUsbInterfaceDescriptor() --- 605,609 ---- else { ! // If there is only one setting, just set it to the active setting. usbInterfaceImp.setActiveSettingNumber( usbInterfaceImp.getUsbInterfaceDescriptor() *************** *** 642,644 **** --- 612,615 ---- } } + */ } Index: WindowsPipeOsImp.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/com/mcreations/usb/windows/WindowsPipeOsImp.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** WindowsPipeOsImp.java 9 Jan 2006 21:12:35 -0000 1.1.1.1 --- WindowsPipeOsImp.java 5 Aug 2008 16:26:52 -0000 1.2 *************** *** 179,187 **** throws UsbException { ! log.debug("Entering open()"); // we don't need to store the handle, here, so just call getHandle ! getWindowsInterfaceOsImp().getWindowsDeviceOsImp().getHandle(); ! log.debug("Leaving open()"); } --- 179,187 ---- throws UsbException { ! // log.debug("Entering open()"); // we don't need to store the handle, here, so just call getHandle ! // getWindowsInterfaceOsImp().getWindowsDeviceOsImp().getHandle(); ! // log.debug("Leaving open()"); } *************** *** 191,197 **** public void close() { ! log.debug("Entering close()"); ! try { // what shall "close a pipe" do? We close the corresponding device. --- 191,197 ---- public void close() { ! log.debug("Closing Pipe"); ! /* try { // what shall "close a pipe" do? We close the corresponding device. *************** *** 203,208 **** throw new RuntimeException(e); } ! ! log.debug("Leaving close()"); } --- 203,208 ---- throw new RuntimeException(e); } ! */ ! // log.debug("Leaving close()"); } *************** *** 216,220 **** throws UsbException { - log.debug("Entering submitIrp"); UsbEndpoint ep = getUsbPipeImp().getUsbEndpoint(); --- 216,219 ---- *************** *** 228,231 **** --- 227,231 ---- // lock the access to the libusb JavaxUsb.getMutex().acquire(); + // log.debug("Entering submitIrp, epType: "+epType+" epDir: "+epDir+" timeout: "+timeout+" ms"); try *************** *** 276,280 **** action = "bulk read"; ! byte[] bytes = new byte[64]; result = Libusb.usb_bulk_read( --- 276,280 ---- action = "bulk read"; ! // byte[] bytes = new byte[64]; result = Libusb.usb_bulk_read( *************** *** 295,331 **** { action = "interrupt write"; ! result = ! Libusb.usb_interrupt_write( ! handle, ! getEndpointAddress(), ! irp.getData(), ! timeout); } else if (epDir == UsbConst.ENDPOINT_DIRECTION_IN) { action = "interrupt read"; ! result = ! Libusb.usb_interrupt_read( ! handle, ! getEndpointAddress(), ! irp.getData(), ! timeout); } ! default : ! throw new RuntimeException( ! "WindowsPipeOsImp.asyncSubmit: end point type not (yet) supported!"); } - if (log.isDebugEnabled()) - log.debug( - "Result of " + action + " operation: " + result - + ", Irp.actualLength = " + irp.getActualLength()); - if (result < 0) { ! String msg = ! "Error during " + action + ", error code " + result + ": " ! + Libusb.usb_strerror(); log.debug(msg); throw new UsbException(msg); --- 295,314 ---- { action = "interrupt write"; ! result = Libusb.usb_interrupt_write(handle,getEndpointAddress(),irp.getData(),timeout); ! } else if (epDir == UsbConst.ENDPOINT_DIRECTION_IN) { action = "interrupt read"; ! result = Libusb.usb_interrupt_read(handle,getEndpointAddress(),irp.getData(),timeout); } ! break; default : ! throw new RuntimeException("WindowsPipeOsImp.submitIrp: end point ("+epType+") type not (yet) supported!"); } if (result < 0) { ! String msg = "submitIrp: Error during " + action + ", error code " + result + ": "+ Libusb.usb_strerror(); log.debug(msg); throw new UsbException(msg); *************** *** 335,348 **** irp.setActualLength(result); } } finally { ! // releas the lock, so access to libusb is possible, again JavaxUsb.getMutex().release(); // we currently use libusb synchronous calls, only irp.complete(); - log.debug("Leaving submitIrp"); } } --- 318,334 ---- irp.setActualLength(result); } + + // if (log.isDebugEnabled()) + // log.debug("Result of " + action + " operation: " + " Irp.actualLength = " + irp.getActualLength()); } finally { ! // release the lock, so access to libusb is possible, again JavaxUsb.getMutex().release(); // we currently use libusb synchronous calls, only irp.complete(); } + // log.debug("Leaving submitIrp"); } *************** *** 354,362 **** throws UsbException { ! log.debug("Entering asyncSubmit"); ! submitIrp( ! irp, ! JavaxUsb.getIoTimeout()); ! log.debug("Leaving asyncSubmit"); } --- 340,344 ---- throws UsbException { ! submitIrp(irp,JavaxUsb.getIoTimeout()); } *************** *** 364,370 **** throws UsbException { ! log.debug("Entering syncSubmit"); ! submitIrp(irp, 0); ! log.debug("Leaving syncSubmit"); } } --- 346,350 ---- throws UsbException { ! submitIrp(irp, JavaxUsb.getIoTimeout()); } } Index: WindowsInterfaceOsImp.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/com/mcreations/usb/windows/WindowsInterfaceOsImp.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** WindowsInterfaceOsImp.java 9 Jan 2006 21:12:33 -0000 1.1.1.1 --- WindowsInterfaceOsImp.java 5 Aug 2008 16:26:51 -0000 1.2 *************** *** 26,29 **** --- 26,32 ---- import com.ibm.jusb.os.UsbInterfaceOsImp; + //import javax.usb.UsbDevice; + import net.sf.libusb.usb_config_descriptor; + import net.sf.libusb.usb_device; /** *************** *** 165,168 **** --- 168,172 ---- private byte interfaceNumber = 0; + /** Claims the interface using libusb method. Note, that *************** *** 172,180 **** This implementation currently ignores the argument policy. */ ! public synchronized void claim(UsbInterfacePolicy policy) ! throws UsbClaimException, UsbException, UsbNotActiveException, ! UsbDisconnectedException { ! log.debug("Entering claim."); // acquire the mutex, so we access libusb exclusively --- 176,182 ---- This implementation currently ignores the argument policy. */ ! public synchronized void claim(UsbInterfacePolicy policy) throws UsbClaimException, UsbException, UsbNotActiveException, UsbDisconnectedException { ! log.debug("Entering claim.with handle: "+getWindowsDeviceOsImp().getHandle()+" iface: " +getInterfaceNumber()); // acquire the mutex, so we access libusb exclusively *************** *** 183,196 **** try { ! int result = ! Libusb.usb_claim_interface( ! getWindowsDeviceOsImp().getHandle(), ! getInterfaceNumber()); if (result != 0) { ! String msg = ! "Couldn't claim interface. usb error: " ! + Libusb.usb_strerror(); log.debug(msg); throw new UsbClaimException(msg); --- 185,197 ---- try { ! usb_config_descriptor ucd = getWindowsDeviceOsImp().getDevice().getConfig(); ! log.debug("Setting libusb to configuration number: "+ucd.getIConfiguration()); + Libusb.usb_set_configuration(getWindowsDeviceOsImp().getHandle(),ucd.getIConfiguration()); + + int result = Libusb.usb_claim_interface(getWindowsDeviceOsImp().getHandle(),getInterfaceNumber()); if (result != 0) { ! String msg = "Couldn't claim interface. usb error: "+ Libusb.usb_strerror(); log.debug(msg); throw new UsbClaimException(msg); *************** *** 203,209 **** } ! log.debug("Leaving claim"); } /* (non-Javadoc) * @see javax.usb.UsbInterface#release() --- 204,211 ---- } ! // log.debug("Leaving claim"); } + /* (non-Javadoc) * @see javax.usb.UsbInterface#release() *************** *** 213,218 **** UsbDisconnectedException { - log.debug("Entering release."); - // acquire the mutex, so we access libusb exclusively JavaxUsb.getMutex().acquire(); --- 215,218 ---- *************** *** 220,233 **** try { ! int result = ! Libusb.usb_release_interface( ! getWindowsDeviceOsImp().getHandle(), ! getInterfaceNumber()); ! if (result != 0) { ! String msg = ! "Couldn't release interface. usb error: " ! + Libusb.usb_strerror(); log.debug(msg); throw new UsbClaimException(msg); --- 220,227 ---- try { ! int result = Libusb.usb_release_interface(getWindowsDeviceOsImp().getHandle(),getInterfaceNumber()); if (result != 0) { ! String msg = "Couldn't release interface. usb error: "+ Libusb.usb_strerror(); log.debug(msg); throw new UsbClaimException(msg); *************** *** 239,244 **** JavaxUsb.getMutex().release(); } - - log.debug("Leaving release"); } --- 233,236 ---- Index: WindowsDeviceOsImp.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/com/mcreations/usb/windows/WindowsDeviceOsImp.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** WindowsDeviceOsImp.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- WindowsDeviceOsImp.java 5 Aug 2008 16:26:51 -0000 1.2 *************** *** 129,132 **** --- 129,134 ---- throws UsbException { + if(log.isDebugEnabled())log.debug("syncSubmit() sending an irp" ); + sendRequest(irp); *************** *** 151,154 **** --- 153,158 ---- if (irp instanceof UsbControlIrpImp) { + if (log.isDebugEnabled()) log.debug( "sendRequest() irp instance of UsbControlIrpImp"); + UsbControlIrpImp cIrp = (UsbControlIrpImp) irp; *************** *** 169,181 **** // FIXME timeout value hard-coded ! int result = ! Libusb.usb_control_msg( ! handle, ! cIrp.bmRequestType(), ! cIrp.bRequest(), ! cIrp.wValue(), ! cIrp.wIndex(), ! cIrp.getData(), ! 5000); } finally --- 173,183 ---- // FIXME timeout value hard-coded ! // int result = Libusb.usb_control_msg(handle,cIrp.bmRequestType(),cIrp.bRequest(), ! // cIrp.wValue(),cIrp.wIndex(),cIrp.getData(),5000); ! int result = Libusb.usb_control_msg(handle,cIrp.bmRequestType(),cIrp.bRequest(), ! cIrp.wValue(),cIrp.wIndex(),cIrp.getData(),JavaxUsb.getIoTimeout()); ! cIrp.setActualLength(result); ! if(log.isDebugEnabled()) log.debug( "sendRequest() Libusb.usb_control_msg returned "+result); ! } finally *************** *** 333,337 **** } } ! } } finally --- 335,339 ---- } } ! } // end if isDebugEnabled() } finally *************** *** 375,380 **** } - // set this device to unconfigured state - setActiveUsbConfigurationNumber((byte) 0); handle = null; } --- 377,380 ---- Index: JavaxUsb.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/com/mcreations/usb/windows/JavaxUsb.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** JavaxUsb.java 9 Jan 2006 21:12:36 -0000 1.1.1.1 --- JavaxUsb.java 5 Aug 2008 16:26:51 -0000 1.2 *************** *** 14,18 **** import com.ibm.jusb.UsbConfigurationImp; import com.ibm.jusb.UsbControlPipeImp; - import com.ibm.jusb.UsbDeviceDescriptorImp; import com.ibm.jusb.UsbDeviceImp; import com.ibm.jusb.UsbEndpointDescriptorImp; --- 14,17 ---- *************** *** 32,45 **** import net.sf.libusb.usb_interface; import net.sf.libusb.usb_interface_descriptor; [...973 lines suppressed...] ! public static final String ERROR_WHILE_LOADING_SHARED_LIBRARY = ! "Error while loading shared library"; ! public static final String EXCEPTION_WHILE_LOADING_SHARED_LIBRARY = ! "Exception while loading shared library"; ! private static final int SPEED_UNKNOWN = 0; ! private static final int SPEED_LOW = 1; ! private static final int SPEED_FULL = 2; public static final String LOG_DEFAULT = "default"; public static final String LOG_XFER = "xfer"; --- 1149,1158 ---- // Class constants public static final String LIBRARY_NAME = "LibusbJNI"; ! // public static final String LIBRARY_NAME = "usbJNI"; ! public static final String ERROR_WHILE_LOADING_SHARED_LIBRARY = "Error while loading shared library"; ! public static final String EXCEPTION_WHILE_LOADING_SHARED_LIBRARY = "Exception while loading shared library"; ! // private static final int SPEED_UNKNOWN = 0; ! // private static final int SPEED_LOW = 1; ! // private static final int SPEED_FULL = 2; public static final String LOG_DEFAULT = "default"; public static final String LOG_XFER = "xfer"; |
|
From: Mike C. <mc...@us...> - 2008-08-05 16:20:51
|
Update of /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23055 Added Files: SWIGTYPE_p_p_usb_device.java Log Message: changes resulting from switching to gcc compiler --- NEW FILE: SWIGTYPE_p_p_usb_device.java --- /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). * Version 1.3.36 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. * ----------------------------------------------------------------------------- */ package net.sf.libusb; public class SWIGTYPE_p_p_usb_device { private long swigCPtr; protected SWIGTYPE_p_p_usb_device(long cPtr, boolean futureUse) { swigCPtr = cPtr; } protected SWIGTYPE_p_p_usb_device() { swigCPtr = 0; } protected static long getCPtr(SWIGTYPE_p_p_usb_device obj) { return (obj == null) ? 0 : obj.swigCPtr; } } |
Update of /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20288 Removed Files: SWIGTYPE_p_DWORD.java SWIGTYPE_p_OVERLAPPED.java SWIGTYPE_p_libusb_request.java SWIGTYPE_p_p_usb_context.java SWIGTYPE_p_p_void.java SWIGTYPE_p_signed_char.java SWIGTYPE_p_usb_bus.java SWIGTYPE_p_usb_config_descriptor.java SWIGTYPE_p_usb_context.java SWIGTYPE_p_usb_device.java SWIGTYPE_p_usb_endpoint_descriptor.java SWIGTYPE_p_usb_interface.java SWIGTYPE_p_usb_interface_descriptor.java Log Message: changes resulting from switching to gcc compiler --- SWIGTYPE_p_p_void.java DELETED --- --- SWIGTYPE_p_signed_char.java DELETED --- --- SWIGTYPE_p_OVERLAPPED.java DELETED --- --- SWIGTYPE_p_usb_config_descriptor.java DELETED --- --- SWIGTYPE_p_usb_interface.java DELETED --- --- SWIGTYPE_p_DWORD.java DELETED --- --- SWIGTYPE_p_usb_interface_descriptor.java DELETED --- --- SWIGTYPE_p_libusb_request.java DELETED --- --- SWIGTYPE_p_usb_device.java DELETED --- --- SWIGTYPE_p_usb_bus.java DELETED --- --- SWIGTYPE_p_p_usb_context.java DELETED --- --- SWIGTYPE_p_usb_endpoint_descriptor.java DELETED --- --- SWIGTYPE_p_usb_context.java DELETED --- |
|
From: Mike C. <mc...@us...> - 2008-08-05 16:13:18
|
Update of /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18317 Modified Files: SWIGTYPE_p_unsigned_char.java SWIGTYPE_p_unsigned_short.java SWIGTYPE_p_usb_dev_handle.java usb_bus.java usb_config_descriptor.java usb_descriptor_header.java usb_device.java usb_hid_descriptor.java Log Message: changes resulting in switch to gcc compiler Index: SWIGTYPE_p_usb_dev_handle.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/SWIGTYPE_p_usb_dev_handle.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SWIGTYPE_p_usb_dev_handle.java 9 Jan 2006 21:12:38 -0000 1.1.1.1 --- SWIGTYPE_p_usb_dev_handle.java 5 Aug 2008 16:13:10 -0000 1.2 *************** *** 1,26 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_usb_dev_handle { ! private long swigCPtr; ! ! protected SWIGTYPE_p_usb_dev_handle(long cPtr, boolean bFutureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_usb_dev_handle() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_usb_dev_handle obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! --- 1,26 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_usb_dev_handle { ! private long swigCPtr; ! ! protected SWIGTYPE_p_usb_dev_handle(long cPtr, boolean futureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_usb_dev_handle() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_usb_dev_handle obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! Index: usb_descriptor_header.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/usb_descriptor_header.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** usb_descriptor_header.java 9 Jan 2006 21:12:38 -0000 1.1.1.1 --- usb_descriptor_header.java 5 Aug 2008 16:13:11 -0000 1.2 *************** *** 1,56 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_descriptor_header { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_descriptor_header(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_descriptor_header obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_descriptor_header(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBLength(short bLength) { ! LibusbJNI.set_usb_descriptor_header_bLength(swigCPtr, bLength); ! } ! ! public short getBLength() { ! return LibusbJNI.get_usb_descriptor_header_bLength(swigCPtr); ! } ! ! public void setBDescriptorType(short bDescriptorType) { ! LibusbJNI.set_usb_descriptor_header_bDescriptorType(swigCPtr, bDescriptorType); ! } ! ! public short getBDescriptorType() { ! return LibusbJNI.get_usb_descriptor_header_bDescriptorType(swigCPtr); ! } ! ! public usb_descriptor_header() { ! this(LibusbJNI.new_usb_descriptor_header(), true); ! } ! ! } --- 1,56 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_descriptor_header { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_descriptor_header(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_descriptor_header obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public synchronized void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_descriptor_header(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBLength(short value) { ! LibusbJNI.usb_descriptor_header_bLength_set(swigCPtr, this, value); ! } ! ! public short getBLength() { ! return LibusbJNI.usb_descriptor_header_bLength_get(swigCPtr, this); ! } ! ! public void setBDescriptorType(short value) { ! LibusbJNI.usb_descriptor_header_bDescriptorType_set(swigCPtr, this, value); ! } ! ! public short getBDescriptorType() { ! return LibusbJNI.usb_descriptor_header_bDescriptorType_get(swigCPtr, this); ! } ! ! public usb_descriptor_header() { ! this(LibusbJNI.new_usb_descriptor_header(), true); ! } ! ! } Index: SWIGTYPE_p_unsigned_short.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/SWIGTYPE_p_unsigned_short.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SWIGTYPE_p_unsigned_short.java 9 Jan 2006 21:12:38 -0000 1.1.1.1 --- SWIGTYPE_p_unsigned_short.java 5 Aug 2008 16:13:10 -0000 1.2 *************** *** 1,26 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_unsigned_short { ! private long swigCPtr; ! ! protected SWIGTYPE_p_unsigned_short(long cPtr, boolean bFutureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_unsigned_short() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_unsigned_short obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! --- 1,26 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_unsigned_short { ! private long swigCPtr; ! ! protected SWIGTYPE_p_unsigned_short(long cPtr, boolean futureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_unsigned_short() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_unsigned_short obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! Index: usb_hid_descriptor.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/usb_hid_descriptor.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** usb_hid_descriptor.java 9 Jan 2006 21:12:38 -0000 1.1.1.1 --- usb_hid_descriptor.java 5 Aug 2008 16:13:11 -0000 1.2 *************** *** 1,80 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_hid_descriptor { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_hid_descriptor(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_hid_descriptor obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_hid_descriptor(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBLength(short bLength) { ! LibusbJNI.set_usb_hid_descriptor_bLength(swigCPtr, bLength); ! } ! ! public short getBLength() { ! return LibusbJNI.get_usb_hid_descriptor_bLength(swigCPtr); ! } ! ! public void setBDescriptorType(short bDescriptorType) { ! LibusbJNI.set_usb_hid_descriptor_bDescriptorType(swigCPtr, bDescriptorType); ! } ! ! public short getBDescriptorType() { ! return LibusbJNI.get_usb_hid_descriptor_bDescriptorType(swigCPtr); ! } ! ! public void setBcdHID(int bcdHID) { ! LibusbJNI.set_usb_hid_descriptor_bcdHID(swigCPtr, bcdHID); ! } ! ! public int getBcdHID() { ! return LibusbJNI.get_usb_hid_descriptor_bcdHID(swigCPtr); ! } ! ! public void setBCountryCode(short bCountryCode) { ! LibusbJNI.set_usb_hid_descriptor_bCountryCode(swigCPtr, bCountryCode); ! } ! ! public short getBCountryCode() { ! return LibusbJNI.get_usb_hid_descriptor_bCountryCode(swigCPtr); ! } ! ! public void setBNumDescriptors(short bNumDescriptors) { ! LibusbJNI.set_usb_hid_descriptor_bNumDescriptors(swigCPtr, bNumDescriptors); ! } ! ! public short getBNumDescriptors() { ! return LibusbJNI.get_usb_hid_descriptor_bNumDescriptors(swigCPtr); ! } ! ! public usb_hid_descriptor() { ! this(LibusbJNI.new_usb_hid_descriptor(), true); ! } ! ! } --- 1,80 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_hid_descriptor { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_hid_descriptor(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_hid_descriptor obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public synchronized void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_hid_descriptor(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBLength(short value) { ! LibusbJNI.usb_hid_descriptor_bLength_set(swigCPtr, this, value); ! } ! ! public short getBLength() { ! return LibusbJNI.usb_hid_descriptor_bLength_get(swigCPtr, this); ! } ! ! public void setBDescriptorType(short value) { ! LibusbJNI.usb_hid_descriptor_bDescriptorType_set(swigCPtr, this, value); ! } ! ! public short getBDescriptorType() { ! return LibusbJNI.usb_hid_descriptor_bDescriptorType_get(swigCPtr, this); ! } ! ! public void setBcdHID(int value) { ! LibusbJNI.usb_hid_descriptor_bcdHID_set(swigCPtr, this, value); ! } ! ! public int getBcdHID() { ! return LibusbJNI.usb_hid_descriptor_bcdHID_get(swigCPtr, this); ! } ! ! public void setBCountryCode(short value) { ! LibusbJNI.usb_hid_descriptor_bCountryCode_set(swigCPtr, this, value); ! } ! ! public short getBCountryCode() { ! return LibusbJNI.usb_hid_descriptor_bCountryCode_get(swigCPtr, this); ! } ! ! public void setBNumDescriptors(short value) { ! LibusbJNI.usb_hid_descriptor_bNumDescriptors_set(swigCPtr, this, value); ! } ! ! public short getBNumDescriptors() { ! return LibusbJNI.usb_hid_descriptor_bNumDescriptors_get(swigCPtr, this); ! } ! ! public usb_hid_descriptor() { ! this(LibusbJNI.new_usb_hid_descriptor(), true); ! } ! ! } Index: usb_device.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/usb_device.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** usb_device.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- usb_device.java 5 Aug 2008 16:13:11 -0000 1.2 *************** *** 1,102 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_device { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_device(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_device obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_device(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setNext(usb_device next) { ! LibusbJNI.set_usb_device_next(swigCPtr, usb_device.getCPtr(next)); ! } ! ! public usb_device getNext() { ! long cPtr = LibusbJNI.get_usb_device_next(swigCPtr); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public void setPrev(usb_device prev) { ! LibusbJNI.set_usb_device_prev(swigCPtr, usb_device.getCPtr(prev)); ! } ! ! public usb_device getPrev() { ! long cPtr = LibusbJNI.get_usb_device_prev(swigCPtr); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public void setFilename(String filename) { ! LibusbJNI.set_usb_device_filename(swigCPtr, filename); ! } ! ! public String getFilename() { ! return LibusbJNI.get_usb_device_filename(swigCPtr); ! } ! ! public void setBus(usb_bus bus) { ! LibusbJNI.set_usb_device_bus(swigCPtr, usb_bus.getCPtr(bus)); ! } ! ! public usb_bus getBus() { ! long cPtr = LibusbJNI.get_usb_device_bus(swigCPtr); ! return (cPtr == 0) ? null : new usb_bus(cPtr, false); ! } ! ! public void setDescriptor(usb_device_descriptor descriptor) { ! LibusbJNI.set_usb_device_descriptor(swigCPtr, usb_device_descriptor.getCPtr(descriptor)); ! } ! ! public usb_device_descriptor getDescriptor() { ! long cPtr = LibusbJNI.get_usb_device_descriptor(swigCPtr); ! return (cPtr == 0) ? null : new usb_device_descriptor(cPtr, false); ! } ! ! public void setConfig(usb_config_descriptor config) { ! LibusbJNI.set_usb_device_config(swigCPtr, usb_config_descriptor.getCPtr(config)); ! } ! ! public usb_config_descriptor getConfig() { ! long cPtr = LibusbJNI.get_usb_device_config(swigCPtr); ! return (cPtr == 0) ? null : new usb_config_descriptor(cPtr, false); ! } ! ! public void setDev(SWIGTYPE_p_void dev) { ! LibusbJNI.set_usb_device_dev(swigCPtr, SWIGTYPE_p_void.getCPtr(dev)); ! } ! ! public SWIGTYPE_p_void getDev() { ! long cPtr = LibusbJNI.get_usb_device_dev(swigCPtr); ! return (cPtr == 0) ? null : new SWIGTYPE_p_void(cPtr, false); ! } ! ! public usb_device() { ! this(LibusbJNI.new_usb_device(), true); ! } ! ! } --- 1,127 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_device { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_device(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_device obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public synchronized void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_device(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setNext(usb_device value) { ! LibusbJNI.usb_device_next_set(swigCPtr, this, usb_device.getCPtr(value), value); ! } ! ! public usb_device getNext() { ! long cPtr = LibusbJNI.usb_device_next_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public void setPrev(usb_device value) { ! LibusbJNI.usb_device_prev_set(swigCPtr, this, usb_device.getCPtr(value), value); ! } ! ! public usb_device getPrev() { ! long cPtr = LibusbJNI.usb_device_prev_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public void setFilename(String value) { ! LibusbJNI.usb_device_filename_set(swigCPtr, this, value); ! } ! ! public String getFilename() { ! return LibusbJNI.usb_device_filename_get(swigCPtr, this); ! } ! ! public void setBus(usb_bus value) { ! LibusbJNI.usb_device_bus_set(swigCPtr, this, usb_bus.getCPtr(value), value); ! } ! ! public usb_bus getBus() { ! long cPtr = LibusbJNI.usb_device_bus_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_bus(cPtr, false); ! } ! ! public void setDescriptor(usb_device_descriptor value) { ! LibusbJNI.usb_device_descriptor_set(swigCPtr, this, usb_device_descriptor.getCPtr(value), value); ! } ! ! public usb_device_descriptor getDescriptor() { ! long cPtr = LibusbJNI.usb_device_descriptor_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_device_descriptor(cPtr, false); ! } ! ! public void setConfig(usb_config_descriptor value) { ! LibusbJNI.usb_device_config_set(swigCPtr, this, usb_config_descriptor.getCPtr(value), value); ! } ! ! public usb_config_descriptor getConfig() { ! long cPtr = LibusbJNI.usb_device_config_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_config_descriptor(cPtr, false); ! } ! ! public void setDev(SWIGTYPE_p_void value) { ! LibusbJNI.usb_device_dev_set(swigCPtr, this, SWIGTYPE_p_void.getCPtr(value)); ! } ! ! public SWIGTYPE_p_void getDev() { ! long cPtr = LibusbJNI.usb_device_dev_get(swigCPtr, this); ! return (cPtr == 0) ? null : new SWIGTYPE_p_void(cPtr, false); ! } ! ! public void setDevnum(short value) { ! LibusbJNI.usb_device_devnum_set(swigCPtr, this, value); ! } ! ! public short getDevnum() { ! return LibusbJNI.usb_device_devnum_get(swigCPtr, this); ! } ! ! public void setNum_children(short value) { ! LibusbJNI.usb_device_num_children_set(swigCPtr, this, value); ! } ! ! public short getNum_children() { ! return LibusbJNI.usb_device_num_children_get(swigCPtr, this); ! } ! ! public void setChildren(SWIGTYPE_p_p_usb_device value) { ! LibusbJNI.usb_device_children_set(swigCPtr, this, SWIGTYPE_p_p_usb_device.getCPtr(value)); ! } ! ! public SWIGTYPE_p_p_usb_device getChildren() { ! long cPtr = LibusbJNI.usb_device_children_get(swigCPtr, this); ! return (cPtr == 0) ? null : new SWIGTYPE_p_p_usb_device(cPtr, false); ! } ! ! public usb_device() { ! this(LibusbJNI.new_usb_device(), true); ! } ! ! } Index: usb_config_descriptor.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/usb_config_descriptor.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** usb_config_descriptor.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- usb_config_descriptor.java 5 Aug 2008 16:13:11 -0000 1.2 *************** *** 1,130 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_config_descriptor { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_config_descriptor(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_config_descriptor obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_config_descriptor(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBLength(short bLength) { ! LibusbJNI.set_usb_config_descriptor_bLength(swigCPtr, bLength); ! } ! ! public short getBLength() { ! return LibusbJNI.get_usb_config_descriptor_bLength(swigCPtr); ! } ! ! public void setBDescriptorType(short bDescriptorType) { ! LibusbJNI.set_usb_config_descriptor_bDescriptorType(swigCPtr, bDescriptorType); ! } ! ! public short getBDescriptorType() { ! return LibusbJNI.get_usb_config_descriptor_bDescriptorType(swigCPtr); ! } ! ! public void setWTotalLength(int wTotalLength) { ! LibusbJNI.set_usb_config_descriptor_wTotalLength(swigCPtr, wTotalLength); ! } ! ! public int getWTotalLength() { ! return LibusbJNI.get_usb_config_descriptor_wTotalLength(swigCPtr); ! } ! ! public void setBNumInterfaces(short bNumInterfaces) { ! LibusbJNI.set_usb_config_descriptor_bNumInterfaces(swigCPtr, bNumInterfaces); ! } ! ! public short getBNumInterfaces() { ! return LibusbJNI.get_usb_config_descriptor_bNumInterfaces(swigCPtr); ! } ! ! public void setBConfigurationValue(short bConfigurationValue) { ! LibusbJNI.set_usb_config_descriptor_bConfigurationValue(swigCPtr, bConfigurationValue); ! } ! ! public short getBConfigurationValue() { ! return LibusbJNI.get_usb_config_descriptor_bConfigurationValue(swigCPtr); ! } ! ! public void setIConfiguration(short iConfiguration) { ! LibusbJNI.set_usb_config_descriptor_iConfiguration(swigCPtr, iConfiguration); ! } ! ! public short getIConfiguration() { ! return LibusbJNI.get_usb_config_descriptor_iConfiguration(swigCPtr); ! } ! ! public void setBmAttributes(short bmAttributes) { ! LibusbJNI.set_usb_config_descriptor_bmAttributes(swigCPtr, bmAttributes); ! } ! ! public short getBmAttributes() { ! return LibusbJNI.get_usb_config_descriptor_bmAttributes(swigCPtr); ! } ! ! public void setMaxPower(short MaxPower) { ! LibusbJNI.set_usb_config_descriptor_MaxPower(swigCPtr, MaxPower); ! } ! ! public short getMaxPower() { ! return LibusbJNI.get_usb_config_descriptor_MaxPower(swigCPtr); ! } ! ! public void setInterface(usb_interface usbInterface) { ! LibusbJNI.set_usb_config_descriptor_interface(swigCPtr, usb_interface.getCPtr(usbInterface)); ! } ! ! public usb_interface getInterface() { ! long cPtr = LibusbJNI.get_usb_config_descriptor_interface(swigCPtr); ! return (cPtr == 0) ? null : new usb_interface(cPtr, false); ! } ! ! public void setExtra(SWIGTYPE_p_unsigned_char extra) { ! LibusbJNI.set_usb_config_descriptor_extra(swigCPtr, SWIGTYPE_p_unsigned_char.getCPtr(extra)); ! } ! ! public SWIGTYPE_p_unsigned_char getExtra() { ! long cPtr = LibusbJNI.get_usb_config_descriptor_extra(swigCPtr); ! return (cPtr == 0) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); ! } ! ! public void setExtralen(int extralen) { ! LibusbJNI.set_usb_config_descriptor_extralen(swigCPtr, extralen); ! } ! ! public int getExtralen() { ! return LibusbJNI.get_usb_config_descriptor_extralen(swigCPtr); ! } ! ! public usb_config_descriptor() { ! this(LibusbJNI.new_usb_config_descriptor(), true); ! } ! ! } --- 1,130 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_config_descriptor { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_config_descriptor(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_config_descriptor obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public synchronized void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_config_descriptor(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBLength(short value) { ! LibusbJNI.usb_config_descriptor_bLength_set(swigCPtr, this, value); ! } ! ! public short getBLength() { ! return LibusbJNI.usb_config_descriptor_bLength_get(swigCPtr, this); ! } ! ! public void setBDescriptorType(short value) { ! LibusbJNI.usb_config_descriptor_bDescriptorType_set(swigCPtr, this, value); ! } ! ! public short getBDescriptorType() { ! return LibusbJNI.usb_config_descriptor_bDescriptorType_get(swigCPtr, this); ! } ! ! public void setWTotalLength(int value) { ! LibusbJNI.usb_config_descriptor_wTotalLength_set(swigCPtr, this, value); ! } ! ! public int getWTotalLength() { ! return LibusbJNI.usb_config_descriptor_wTotalLength_get(swigCPtr, this); ! } ! ! public void setBNumInterfaces(short value) { ! LibusbJNI.usb_config_descriptor_bNumInterfaces_set(swigCPtr, this, value); ! } ! ! public short getBNumInterfaces() { ! return LibusbJNI.usb_config_descriptor_bNumInterfaces_get(swigCPtr, this); ! } ! ! public void setBConfigurationValue(short value) { ! LibusbJNI.usb_config_descriptor_bConfigurationValue_set(swigCPtr, this, value); ! } ! ! public short getBConfigurationValue() { ! return LibusbJNI.usb_config_descriptor_bConfigurationValue_get(swigCPtr, this); ! } ! ! public void setIConfiguration(short value) { ! LibusbJNI.usb_config_descriptor_iConfiguration_set(swigCPtr, this, value); ! } ! ! public short getIConfiguration() { ! return LibusbJNI.usb_config_descriptor_iConfiguration_get(swigCPtr, this); ! } ! ! public void setBmAttributes(short value) { ! LibusbJNI.usb_config_descriptor_bmAttributes_set(swigCPtr, this, value); ! } ! ! public short getBmAttributes() { ! return LibusbJNI.usb_config_descriptor_bmAttributes_get(swigCPtr, this); ! } ! ! public void setMaxPower(short value) { ! LibusbJNI.usb_config_descriptor_MaxPower_set(swigCPtr, this, value); ! } ! ! public short getMaxPower() { ! return LibusbJNI.usb_config_descriptor_MaxPower_get(swigCPtr, this); ! } ! ! public void set_interface(usb_interface value) { ! LibusbJNI.usb_config_descriptor__interface_set(swigCPtr, this, usb_interface.getCPtr(value), value); ! } ! ! public usb_interface get_interface() { ! long cPtr = LibusbJNI.usb_config_descriptor__interface_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_interface(cPtr, false); ! } ! ! public void setExtra(SWIGTYPE_p_unsigned_char value) { ! LibusbJNI.usb_config_descriptor_extra_set(swigCPtr, this, SWIGTYPE_p_unsigned_char.getCPtr(value)); ! } ! ! public SWIGTYPE_p_unsigned_char getExtra() { ! long cPtr = LibusbJNI.usb_config_descriptor_extra_get(swigCPtr, this); ! return (cPtr == 0) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); ! } ! ! public void setExtralen(int value) { ! LibusbJNI.usb_config_descriptor_extralen_set(swigCPtr, this, value); ! } ! ! public int getExtralen() { ! return LibusbJNI.usb_config_descriptor_extralen_get(swigCPtr, this); ! } ! ! public usb_config_descriptor() { ! this(LibusbJNI.new_usb_config_descriptor(), true); ! } ! ! } Index: usb_bus.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/usb_bus.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** usb_bus.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- usb_bus.java 5 Aug 2008 16:13:11 -0000 1.2 *************** *** 1,83 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_bus { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_bus(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_bus obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_bus(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setNext(usb_bus next) { ! LibusbJNI.set_usb_bus_next(swigCPtr, usb_bus.getCPtr(next)); ! } ! ! public usb_bus getNext() { ! long cPtr = LibusbJNI.get_usb_bus_next(swigCPtr); ! return (cPtr == 0) ? null : new usb_bus(cPtr, false); ! } ! ! public void setPrev(usb_bus prev) { ! LibusbJNI.set_usb_bus_prev(swigCPtr, usb_bus.getCPtr(prev)); ! } ! ! public usb_bus getPrev() { ! long cPtr = LibusbJNI.get_usb_bus_prev(swigCPtr); ! return (cPtr == 0) ? null : new usb_bus(cPtr, false); ! } ! ! public void setDirname(String dirname) { ! LibusbJNI.set_usb_bus_dirname(swigCPtr, dirname); ! } ! ! public String getDirname() { ! return LibusbJNI.get_usb_bus_dirname(swigCPtr); ! } ! ! public void setDevices(usb_device devices) { ! LibusbJNI.set_usb_bus_devices(swigCPtr, usb_device.getCPtr(devices)); ! } ! ! public usb_device getDevices() { ! long cPtr = LibusbJNI.get_usb_bus_devices(swigCPtr); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public void setLocation(long location) { ! LibusbJNI.set_usb_bus_location(swigCPtr, location); ! } ! ! public long getLocation() { ! return LibusbJNI.get_usb_bus_location(swigCPtr); ! } ! ! public usb_bus() { ! this(LibusbJNI.new_usb_bus(), true); ! } ! ! } --- 1,92 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_bus { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_bus(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_bus obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public synchronized void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_bus(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setNext(usb_bus value) { ! LibusbJNI.usb_bus_next_set(swigCPtr, this, usb_bus.getCPtr(value), value); ! } ! ! public usb_bus getNext() { ! long cPtr = LibusbJNI.usb_bus_next_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_bus(cPtr, false); ! } ! ! public void setPrev(usb_bus value) { ! LibusbJNI.usb_bus_prev_set(swigCPtr, this, usb_bus.getCPtr(value), value); ! } ! ! public usb_bus getPrev() { ! long cPtr = LibusbJNI.usb_bus_prev_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_bus(cPtr, false); ! } ! ! public void setDirname(String value) { ! LibusbJNI.usb_bus_dirname_set(swigCPtr, this, value); ! } ! ! public String getDirname() { ! return LibusbJNI.usb_bus_dirname_get(swigCPtr, this); ! } ! ! public void setDevices(usb_device value) { ! LibusbJNI.usb_bus_devices_set(swigCPtr, this, usb_device.getCPtr(value), value); ! } ! ! public usb_device getDevices() { ! long cPtr = LibusbJNI.usb_bus_devices_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public void setLocation(long value) { ! LibusbJNI.usb_bus_location_set(swigCPtr, this, value); ! } ! ! public long getLocation() { ! return LibusbJNI.usb_bus_location_get(swigCPtr, this); ! } ! ! public void setRoot_dev(usb_device value) { ! LibusbJNI.usb_bus_root_dev_set(swigCPtr, this, usb_device.getCPtr(value), value); ! } ! ! public usb_device getRoot_dev() { ! long cPtr = LibusbJNI.usb_bus_root_dev_get(swigCPtr, this); ! return (cPtr == 0) ? null : new usb_device(cPtr, false); ! } ! ! public usb_bus() { ! this(LibusbJNI.new_usb_bus(), true); ! } ! ! } Index: SWIGTYPE_p_unsigned_char.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/SWIGTYPE_p_unsigned_char.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SWIGTYPE_p_unsigned_char.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- SWIGTYPE_p_unsigned_char.java 5 Aug 2008 16:13:10 -0000 1.2 *************** *** 1,26 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_unsigned_char { ! private long swigCPtr; ! ! protected SWIGTYPE_p_unsigned_char(long cPtr, boolean bFutureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_unsigned_char() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_unsigned_char obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! --- 1,26 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_unsigned_char { ! private long swigCPtr; ! ! protected SWIGTYPE_p_unsigned_char(long cPtr, boolean futureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_unsigned_char() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_unsigned_char obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! |
Update of /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16648 Modified Files: usb_version_driver.java usb_version_dll.java usb_version.java usb_string_descriptor.java usb_interface_descriptor.java usb_interface.java usb_endpoint_descriptor.java usb_device_descriptor.java usb_ctrl_setup.java SWIGTYPE_p_void.java Libusb.java LibusbJNI.java LibusbConstants.java Log Message: changes resulting in switch to gcc compiler Index: LibusbConstants.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/LibusbConstants.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** LibusbConstants.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- LibusbConstants.java 5 Aug 2008 16:09:52 -0000 1.2 *************** *** 1,70 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public interface LibusbConstants { ! public final static int LIBUSB_PATH_MAX = LibusbJNI.get_LIBUSB_PATH_MAX(); ! public final static int USB_CLASS_PER_INTERFACE = LibusbJNI.get_USB_CLASS_PER_INTERFACE(); ! public final static int USB_CLASS_AUDIO = LibusbJNI.get_USB_CLASS_AUDIO(); ! public final static int USB_CLASS_COMM = LibusbJNI.get_USB_CLASS_COMM(); ! public final static int USB_CLASS_HID = LibusbJNI.get_USB_CLASS_HID(); ! public final static int USB_CLASS_PRINTER = LibusbJNI.get_USB_CLASS_PRINTER(); ! public final static int USB_CLASS_MASS_STORAGE = LibusbJNI.get_USB_CLASS_MASS_STORAGE(); ! public final static int USB_CLASS_HUB = LibusbJNI.get_USB_CLASS_HUB(); ! public final static int USB_CLASS_DATA = LibusbJNI.get_USB_CLASS_DATA(); ! public final static int USB_CLASS_VENDOR_SPEC = LibusbJNI.get_USB_CLASS_VENDOR_SPEC(); ! public final static int USB_DT_DEVICE = LibusbJNI.get_USB_DT_DEVICE(); ! public final static int USB_DT_CONFIG = LibusbJNI.get_USB_DT_CONFIG(); ! public final static int USB_DT_STRING = LibusbJNI.get_USB_DT_STRING(); ! public final static int USB_DT_INTERFACE = LibusbJNI.get_USB_DT_INTERFACE(); ! public final static int USB_DT_ENDPOINT = LibusbJNI.get_USB_DT_ENDPOINT(); ! public final static int USB_DT_HID = LibusbJNI.get_USB_DT_HID(); ! public final static int USB_DT_REPORT = LibusbJNI.get_USB_DT_REPORT(); ! public final static int USB_DT_PHYSICAL = LibusbJNI.get_USB_DT_PHYSICAL(); ! public final static int USB_DT_HUB = LibusbJNI.get_USB_DT_HUB(); ! public final static int USB_DT_DEVICE_SIZE = LibusbJNI.get_USB_DT_DEVICE_SIZE(); ! public final static int USB_DT_CONFIG_SIZE = LibusbJNI.get_USB_DT_CONFIG_SIZE(); ! public final static int USB_DT_INTERFACE_SIZE = LibusbJNI.get_USB_DT_INTERFACE_SIZE(); ! public final static int USB_DT_ENDPOINT_SIZE = LibusbJNI.get_USB_DT_ENDPOINT_SIZE(); ! public final static int USB_DT_ENDPOINT_AUDIO_SIZE = LibusbJNI.get_USB_DT_ENDPOINT_AUDIO_SIZE(); ! public final static int USB_DT_HUB_NONVAR_SIZE = LibusbJNI.get_USB_DT_HUB_NONVAR_SIZE(); ! public final static int USB_MAXENDPOINTS = LibusbJNI.get_USB_MAXENDPOINTS(); ! public final static int USB_ENDPOINT_ADDRESS_MASK = LibusbJNI.get_USB_ENDPOINT_ADDRESS_MASK(); ! public final static int USB_ENDPOINT_DIR_MASK = LibusbJNI.get_USB_ENDPOINT_DIR_MASK(); ! public final static int USB_ENDPOINT_TYPE_MASK = LibusbJNI.get_USB_ENDPOINT_TYPE_MASK(); ! public final static int USB_ENDPOINT_TYPE_CONTROL = LibusbJNI.get_USB_ENDPOINT_TYPE_CONTROL(); ! public final static int USB_ENDPOINT_TYPE_ISOCHRONOUS = LibusbJNI.get_USB_ENDPOINT_TYPE_ISOCHRONOUS(); ! public final static int USB_ENDPOINT_TYPE_BULK = LibusbJNI.get_USB_ENDPOINT_TYPE_BULK(); ! public final static int USB_ENDPOINT_TYPE_INTERRUPT = LibusbJNI.get_USB_ENDPOINT_TYPE_INTERRUPT(); ! public final static int USB_MAXINTERFACES = LibusbJNI.get_USB_MAXINTERFACES(); ! public final static int USB_MAXALTSETTING = LibusbJNI.get_USB_MAXALTSETTING(); ! public final static int USB_MAXCONFIG = LibusbJNI.get_USB_MAXCONFIG(); ! public final static int USB_REQ_GET_STATUS = LibusbJNI.get_USB_REQ_GET_STATUS(); ! public final static int USB_REQ_CLEAR_FEATURE = LibusbJNI.get_USB_REQ_CLEAR_FEATURE(); ! public final static int USB_REQ_SET_FEATURE = LibusbJNI.get_USB_REQ_SET_FEATURE(); ! public final static int USB_REQ_SET_ADDRESS = LibusbJNI.get_USB_REQ_SET_ADDRESS(); ! public final static int USB_REQ_GET_DESCRIPTOR = LibusbJNI.get_USB_REQ_GET_DESCRIPTOR(); ! public final static int USB_REQ_SET_DESCRIPTOR = LibusbJNI.get_USB_REQ_SET_DESCRIPTOR(); ! public final static int USB_REQ_GET_CONFIGURATION = LibusbJNI.get_USB_REQ_GET_CONFIGURATION(); ! public final static int USB_REQ_SET_CONFIGURATION = LibusbJNI.get_USB_REQ_SET_CONFIGURATION(); ! public final static int USB_REQ_GET_INTERFACE = LibusbJNI.get_USB_REQ_GET_INTERFACE(); ! public final static int USB_REQ_SET_INTERFACE = LibusbJNI.get_USB_REQ_SET_INTERFACE(); ! public final static int USB_REQ_SYNCH_FRAME = LibusbJNI.get_USB_REQ_SYNCH_FRAME(); ! public final static int USB_TYPE_STANDARD = LibusbJNI.get_USB_TYPE_STANDARD(); ! public final static int USB_TYPE_CLASS = LibusbJNI.get_USB_TYPE_CLASS(); ! public final static int USB_TYPE_VENDOR = LibusbJNI.get_USB_TYPE_VENDOR(); ! public final static int USB_TYPE_RESERVED = LibusbJNI.get_USB_TYPE_RESERVED(); ! public final static int USB_RECIP_DEVICE = LibusbJNI.get_USB_RECIP_DEVICE(); ! public final static int USB_RECIP_INTERFACE = LibusbJNI.get_USB_RECIP_INTERFACE(); ! public final static int USB_RECIP_ENDPOINT = LibusbJNI.get_USB_RECIP_ENDPOINT(); ! public final static int USB_RECIP_OTHER = LibusbJNI.get_USB_RECIP_OTHER(); ! public final static int USB_ENDPOINT_IN = LibusbJNI.get_USB_ENDPOINT_IN(); ! public final static int USB_ENDPOINT_OUT = LibusbJNI.get_USB_ENDPOINT_OUT(); ! public final static int USB_ERROR_BEGIN = LibusbJNI.get_USB_ERROR_BEGIN(); ! } --- 1,70 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public interface LibusbConstants { ! public final static int LIBUSB_PATH_MAX = LibusbJNI.LIBUSB_PATH_MAX_get(); ! public final static int USB_CLASS_PER_INTERFACE = LibusbJNI.USB_CLASS_PER_INTERFACE_get(); ! public final static int USB_CLASS_AUDIO = LibusbJNI.USB_CLASS_AUDIO_get(); ! public final static int USB_CLASS_COMM = LibusbJNI.USB_CLASS_COMM_get(); ! public final static int USB_CLASS_HID = LibusbJNI.USB_CLASS_HID_get(); ! public final static int USB_CLASS_PRINTER = LibusbJNI.USB_CLASS_PRINTER_get(); ! public final static int USB_CLASS_MASS_STORAGE = LibusbJNI.USB_CLASS_MASS_STORAGE_get(); ! public final static int USB_CLASS_HUB = LibusbJNI.USB_CLASS_HUB_get(); ! public final static int USB_CLASS_DATA = LibusbJNI.USB_CLASS_DATA_get(); ! public final static int USB_CLASS_VENDOR_SPEC = LibusbJNI.USB_CLASS_VENDOR_SPEC_get(); ! public final static int USB_DT_DEVICE = LibusbJNI.USB_DT_DEVICE_get(); ! public final static int USB_DT_CONFIG = LibusbJNI.USB_DT_CONFIG_get(); ! public final static int USB_DT_STRING = LibusbJNI.USB_DT_STRING_get(); ! public final static int USB_DT_INTERFACE = LibusbJNI.USB_DT_INTERFACE_get(); ! public final static int USB_DT_ENDPOINT = LibusbJNI.USB_DT_ENDPOINT_get(); ! public final static int USB_DT_HID = LibusbJNI.USB_DT_HID_get(); ! public final static int USB_DT_REPORT = LibusbJNI.USB_DT_REPORT_get(); ! public final static int USB_DT_PHYSICAL = LibusbJNI.USB_DT_PHYSICAL_get(); ! public final static int USB_DT_HUB = LibusbJNI.USB_DT_HUB_get(); ! public final static int USB_DT_DEVICE_SIZE = LibusbJNI.USB_DT_DEVICE_SIZE_get(); ! public final static int USB_DT_CONFIG_SIZE = LibusbJNI.USB_DT_CONFIG_SIZE_get(); ! public final static int USB_DT_INTERFACE_SIZE = LibusbJNI.USB_DT_INTERFACE_SIZE_get(); ! public final static int USB_DT_ENDPOINT_SIZE = LibusbJNI.USB_DT_ENDPOINT_SIZE_get(); ! public final static int USB_DT_ENDPOINT_AUDIO_SIZE = LibusbJNI.USB_DT_ENDPOINT_AUDIO_SIZE_get(); ! public final static int USB_DT_HUB_NONVAR_SIZE = LibusbJNI.USB_DT_HUB_NONVAR_SIZE_get(); ! public final static int USB_MAXENDPOINTS = LibusbJNI.USB_MAXENDPOINTS_get(); ! public final static int USB_ENDPOINT_ADDRESS_MASK = LibusbJNI.USB_ENDPOINT_ADDRESS_MASK_get(); ! public final static int USB_ENDPOINT_DIR_MASK = LibusbJNI.USB_ENDPOINT_DIR_MASK_get(); ! public final static int USB_ENDPOINT_TYPE_MASK = LibusbJNI.USB_ENDPOINT_TYPE_MASK_get(); ! public final static int USB_ENDPOINT_TYPE_CONTROL = LibusbJNI.USB_ENDPOINT_TYPE_CONTROL_get(); ! public final static int USB_ENDPOINT_TYPE_ISOCHRONOUS = LibusbJNI.USB_ENDPOINT_TYPE_ISOCHRONOUS_get(); ! public final static int USB_ENDPOINT_TYPE_BULK = LibusbJNI.USB_ENDPOINT_TYPE_BULK_get(); ! public final static int USB_ENDPOINT_TYPE_INTERRUPT = LibusbJNI.USB_ENDPOINT_TYPE_INTERRUPT_get(); ! public final static int USB_MAXINTERFACES = LibusbJNI.USB_MAXINTERFACES_get(); ! public final static int USB_MAXALTSETTING = LibusbJNI.USB_MAXALTSETTING_get(); ! public final static int USB_MAXCONFIG = LibusbJNI.USB_MAXCONFIG_get(); ! public final static int USB_REQ_GET_STATUS = LibusbJNI.USB_REQ_GET_STATUS_get(); ! public final static int USB_REQ_CLEAR_FEATURE = LibusbJNI.USB_REQ_CLEAR_FEATURE_get(); ! public final static int USB_REQ_SET_FEATURE = LibusbJNI.USB_REQ_SET_FEATURE_get(); ! public final static int USB_REQ_SET_ADDRESS = LibusbJNI.USB_REQ_SET_ADDRESS_get(); ! public final static int USB_REQ_GET_DESCRIPTOR = LibusbJNI.USB_REQ_GET_DESCRIPTOR_get(); ! public final static int USB_REQ_SET_DESCRIPTOR = LibusbJNI.USB_REQ_SET_DESCRIPTOR_get(); ! public final static int USB_REQ_GET_CONFIGURATION = LibusbJNI.USB_REQ_GET_CONFIGURATION_get(); ! public final static int USB_REQ_SET_CONFIGURATION = LibusbJNI.USB_REQ_SET_CONFIGURATION_get(); ! public final static int USB_REQ_GET_INTERFACE = LibusbJNI.USB_REQ_GET_INTERFACE_get(); ! public final static int USB_REQ_SET_INTERFACE = LibusbJNI.USB_REQ_SET_INTERFACE_get(); ! public final static int USB_REQ_SYNCH_FRAME = LibusbJNI.USB_REQ_SYNCH_FRAME_get(); ! public final static int USB_TYPE_STANDARD = LibusbJNI.USB_TYPE_STANDARD_get(); ! public final static int USB_TYPE_CLASS = LibusbJNI.USB_TYPE_CLASS_get(); ! public final static int USB_TYPE_VENDOR = LibusbJNI.USB_TYPE_VENDOR_get(); ! public final static int USB_TYPE_RESERVED = LibusbJNI.USB_TYPE_RESERVED_get(); ! public final static int USB_RECIP_DEVICE = LibusbJNI.USB_RECIP_DEVICE_get(); ! public final static int USB_RECIP_INTERFACE = LibusbJNI.USB_RECIP_INTERFACE_get(); ! public final static int USB_RECIP_ENDPOINT = LibusbJNI.USB_RECIP_ENDPOINT_get(); ! public final static int USB_RECIP_OTHER = LibusbJNI.USB_RECIP_OTHER_get(); ! public final static int USB_ENDPOINT_IN = LibusbJNI.USB_ENDPOINT_IN_get(); ! public final static int USB_ENDPOINT_OUT = LibusbJNI.USB_ENDPOINT_OUT_get(); ! public final static int USB_ERROR_BEGIN = LibusbJNI.USB_ERROR_BEGIN_get(); ! } Index: usb_ctrl_setup.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/usb_ctrl_setup.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** usb_ctrl_setup.java 9 Jan 2006 21:12:38 -0000 1.1.1.1 --- usb_ctrl_setup.java 5 Aug 2008 16:09:52 -0000 1.2 *************** *** 1,80 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_ctrl_setup { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_ctrl_setup(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_ctrl_setup obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_ctrl_setup(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBRequestType(short bRequestType) { ! LibusbJNI.set_usb_ctrl_setup_bRequestType(swigCPtr, bRequestType); ! } ! ! public short getBRequestType() { ! return LibusbJNI.get_usb_ctrl_setup_bRequestType(swigCPtr); ! } ! ! public void setBRequest(short bRequest) { ! LibusbJNI.set_usb_ctrl_setup_bRequest(swigCPtr, bRequest); ! } ! ! public short getBRequest() { ! return LibusbJNI.get_usb_ctrl_setup_bRequest(swigCPtr); ! } ! ! public void setWValue(int wValue) { ! LibusbJNI.set_usb_ctrl_setup_wValue(swigCPtr, wValue); ! } ! ! public int getWValue() { ! return LibusbJNI.get_usb_ctrl_setup_wValue(swigCPtr); ! } ! ! public void setWIndex(int wIndex) { ! LibusbJNI.set_usb_ctrl_setup_wIndex(swigCPtr, wIndex); ! } ! ! public int getWIndex() { ! return LibusbJNI.get_usb_ctrl_setup_wIndex(swigCPtr); ! } ! ! public void setWLength(int wLength) { ! LibusbJNI.set_usb_ctrl_setup_wLength(swigCPtr, wLength); ! } ! ! public int getWLength() { ! return LibusbJNI.get_usb_ctrl_setup_wLength(swigCPtr); ! } ! ! public usb_ctrl_setup() { ! this(LibusbJNI.new_usb_ctrl_setup(), true); ! } ! ! } --- 1,80 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class usb_ctrl_setup { ! private long swigCPtr; ! protected boolean swigCMemOwn; ! ! protected usb_ctrl_setup(long cPtr, boolean cMemoryOwn) { ! swigCMemOwn = cMemoryOwn; ! swigCPtr = cPtr; ! } ! ! protected static long getCPtr(usb_ctrl_setup obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! ! protected void finalize() { ! delete(); ! } ! ! public synchronized void delete() { ! if(swigCPtr != 0 && swigCMemOwn) { ! swigCMemOwn = false; ! LibusbJNI.delete_usb_ctrl_setup(swigCPtr); ! } ! swigCPtr = 0; ! } ! ! public void setBRequestType(short value) { ! LibusbJNI.usb_ctrl_setup_bRequestType_set(swigCPtr, this, value); ! } ! ! public short getBRequestType() { ! return LibusbJNI.usb_ctrl_setup_bRequestType_get(swigCPtr, this); ! } ! ! public void setBRequest(short value) { ! LibusbJNI.usb_ctrl_setup_bRequest_set(swigCPtr, this, value); ! } ! ! public short getBRequest() { ! return LibusbJNI.usb_ctrl_setup_bRequest_get(swigCPtr, this); ! } ! ! public void setWValue(int value) { ! LibusbJNI.usb_ctrl_setup_wValue_set(swigCPtr, this, value); ! } ! ! public int getWValue() { ! return LibusbJNI.usb_ctrl_setup_wValue_get(swigCPtr, this); ! } ! ! public void setWIndex(int value) { ! LibusbJNI.usb_ctrl_setup_wIndex_set(swigCPtr, this, value); ! } ! ! public int getWIndex() { ! return LibusbJNI.usb_ctrl_setup_wIndex_get(swigCPtr, this); ! } ! ! public void setWLength(int value) { ! LibusbJNI.usb_ctrl_setup_wLength_set(swigCPtr, this, value); ! } ! ! public int getWLength() { ! return LibusbJNI.usb_ctrl_setup_wLength_get(swigCPtr, this); ! } ! ! public usb_ctrl_setup() { ! this(LibusbJNI.new_usb_ctrl_setup(), true); ! } ! ! } Index: SWIGTYPE_p_void.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/SWIGTYPE_p_void.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SWIGTYPE_p_void.java 9 Jan 2006 21:12:37 -0000 1.1.1.1 --- SWIGTYPE_p_void.java 5 Aug 2008 16:09:52 -0000 1.2 *************** *** 1,26 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_void { ! private long swigCPtr; ! ! protected SWIGTYPE_p_void(long cPtr, boolean bFutureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_void() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_void obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! --- 1,26 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! public class SWIGTYPE_p_void { ! private long swigCPtr; ! ! protected SWIGTYPE_p_void(long cPtr, boolean futureUse) { ! swigCPtr = cPtr; ! } ! ! protected SWIGTYPE_p_void() { ! swigCPtr = 0; ! } ! ! protected static long getCPtr(SWIGTYPE_p_void obj) { ! return (obj == null) ? 0 : obj.swigCPtr; ! } ! } ! Index: LibusbJNI.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/src/net/sf/libusb/LibusbJNI.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** LibusbJNI.java 9 Jan 2006 21:12:38 -0000 1.1.1.1 --- LibusbJNI.java 5 Aug 2008 16:09:52 -0000 1.2 *************** *** 1,305 **** ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.24 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! class LibusbJNI { ! public final static native int get_LIBUSB_PATH_MAX(); ! public final static native int get_USB_CLASS_PER_INTERFACE(); ! public final static native int get_USB_CLASS_AUDIO(); ! public final static native int get_USB_CLASS_COMM(); ! public final static native int get_USB_CLASS_HID(); ! public final static native int get_USB_CLASS_PRINTER(); ! public final static native int get_USB_CLASS_MASS_STORAGE(); ! public final static native int get_USB_CLASS_HUB(); ! public final static native int get_USB_CLASS_DATA(); ! public final static native int get_USB_CLASS_VENDOR_SPEC(); ! public final static native int get_USB_DT_DEVICE(); ! public final static native int get_USB_DT_CONFIG(); ! public final static native int get_USB_DT_STRING(); ! public final static native int get_USB_DT_INTERFACE(); ! public final static native int get_USB_DT_ENDPOINT(); ! public final static native int get_USB_DT_HID(); ! public final static native int get_USB_DT_REPORT(); ! public final static native int get_USB_DT_PHYSICAL(); ! public final static native int get_USB_DT_HUB(); ! public final static native int get_USB_DT_DEVICE_SIZE(); ! public final static native int get_USB_DT_CONFIG_SIZE(); ! public final static native int get_USB_DT_INTERFACE_SIZE(); ! public final static native int get_USB_DT_ENDPOINT_SIZE(); ! public final static native int get_USB_DT_ENDPOINT_AUDIO_SIZE(); ! public final static native int get_USB_DT_HUB_NONVAR_SIZE(); ! public final static native void set_usb_descriptor_header_bLength(long jarg1, short jarg2); ! public final static native short get_usb_descriptor_header_bLength(long jarg1); ! public final static native void set_usb_descriptor_header_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_descriptor_header_bDescriptorType(long jarg1); ! public final static native long new_usb_descriptor_header(); ! public final static native void delete_usb_descriptor_header(long jarg1); ! public final static native void set_usb_string_descriptor_bLength(long jarg1, short jarg2); ! public final static native short get_usb_string_descriptor_bLength(long jarg1); ! public final static native void set_usb_string_descriptor_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_string_descriptor_bDescriptorType(long jarg1); ! public final static native void set_usb_string_descriptor_wData(long jarg1, long jarg2); ! public final static native long get_usb_string_descriptor_wData(long jarg1); ! public final static native long new_usb_string_descriptor(); ! public final static native void delete_usb_string_descriptor(long jarg1); ! public final static native void set_usb_hid_descriptor_bLength(long jarg1, short jarg2); ! public final static native short get_usb_hid_descriptor_bLength(long jarg1); ! public final static native void set_usb_hid_descriptor_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_hid_descriptor_bDescriptorType(long jarg1); ! public final static native void set_usb_hid_descriptor_bcdHID(long jarg1, int jarg2); ! public final static native int get_usb_hid_descriptor_bcdHID(long jarg1); ! public final static native void set_usb_hid_descriptor_bCountryCode(long jarg1, short jarg2); ! public final static native short get_usb_hid_descriptor_bCountryCode(long jarg1); ! public final static native void set_usb_hid_descriptor_bNumDescriptors(long jarg1, short jarg2); ! public final static native short get_usb_hid_descriptor_bNumDescriptors(long jarg1); ! public final static native long new_usb_hid_descriptor(); ! public final static native void delete_usb_hid_descriptor(long jarg1); ! public final static native int get_USB_MAXENDPOINTS(); ! public final static native void set_usb_endpoint_descriptor_bLength(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bLength(long jarg1); ! public final static native void set_usb_endpoint_descriptor_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bDescriptorType(long jarg1); ! public final static native void set_usb_endpoint_descriptor_bEndpointAddress(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bEndpointAddress(long jarg1); ! public final static native void set_usb_endpoint_descriptor_bmAttributes(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bmAttributes(long jarg1); ! public final static native void set_usb_endpoint_descriptor_wMaxPacketSize(long jarg1, int jarg2); ! public final static native int get_usb_endpoint_descriptor_wMaxPacketSize(long jarg1); ! public final static native void set_usb_endpoint_descriptor_bInterval(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bInterval(long jarg1); ! public final static native void set_usb_endpoint_descriptor_bRefresh(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bRefresh(long jarg1); ! public final static native void set_usb_endpoint_descriptor_bSynchAddress(long jarg1, short jarg2); ! public final static native short get_usb_endpoint_descriptor_bSynchAddress(long jarg1); ! public final static native void set_usb_endpoint_descriptor_extra(long jarg1, long jarg2); ! public final static native long get_usb_endpoint_descriptor_extra(long jarg1); ! public final static native void set_usb_endpoint_descriptor_extralen(long jarg1, int jarg2); ! public final static native int get_usb_endpoint_descriptor_extralen(long jarg1); ! public final static native long new_usb_endpoint_descriptor(); ! public final static native void delete_usb_endpoint_descriptor(long jarg1); ! public final static native int get_USB_ENDPOINT_ADDRESS_MASK(); ! public final static native int get_USB_ENDPOINT_DIR_MASK(); ! public final static native int get_USB_ENDPOINT_TYPE_MASK(); ! public final static native int get_USB_ENDPOINT_TYPE_CONTROL(); ! public final static native int get_USB_ENDPOINT_TYPE_ISOCHRONOUS(); ! public final static native int get_USB_ENDPOINT_TYPE_BULK(); ! public final static native int get_USB_ENDPOINT_TYPE_INTERRUPT(); ! public final static native int get_USB_MAXINTERFACES(); ! public final static native void set_usb_interface_descriptor_bLength(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bLength(long jarg1); ! public final static native void set_usb_interface_descriptor_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bDescriptorType(long jarg1); ! public final static native void set_usb_interface_descriptor_bInterfaceNumber(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bInterfaceNumber(long jarg1); ! public final static native void set_usb_interface_descriptor_bAlternateSetting(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bAlternateSetting(long jarg1); ! public final static native void set_usb_interface_descriptor_bNumEndpoints(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bNumEndpoints(long jarg1); ! public final static native void set_usb_interface_descriptor_bInterfaceClass(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bInterfaceClass(long jarg1); ! public final static native void set_usb_interface_descriptor_bInterfaceSubClass(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bInterfaceSubClass(long jarg1); ! public final static native void set_usb_interface_descriptor_bInterfaceProtocol(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_bInterfaceProtocol(long jarg1); ! public final static native void set_usb_interface_descriptor_iInterface(long jarg1, short jarg2); ! public final static native short get_usb_interface_descriptor_iInterface(long jarg1); ! public final static native void set_usb_interface_descriptor_endpoint(long jarg1, long jarg2); ! public final static native long get_usb_interface_descriptor_endpoint(long jarg1); ! public final static native void set_usb_interface_descriptor_extra(long jarg1, long jarg2); ! public final static native long get_usb_interface_descriptor_extra(long jarg1); ! public final static native void set_usb_interface_descriptor_extralen(long jarg1, int jarg2); ! public final static native int get_usb_interface_descriptor_extralen(long jarg1); ! public final static native long new_usb_interface_descriptor(); ! public final static native void delete_usb_interface_descriptor(long jarg1); ! public final static native int get_USB_MAXALTSETTING(); ! public final static native void set_usb_interface_altsetting(long jarg1, long jarg2); ! public final static native long get_usb_interface_altsetting(long jarg1); ! public final static native void set_usb_interface_num_altsetting(long jarg1, int jarg2); ! public final static native int get_usb_interface_num_altsetting(long jarg1); ! public final static native long new_usb_interface(); ! public final static native void delete_usb_interface(long jarg1); ! public final static native int get_USB_MAXCONFIG(); ! public final static native void set_usb_config_descriptor_bLength(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_bLength(long jarg1); ! public final static native void set_usb_config_descriptor_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_bDescriptorType(long jarg1); ! public final static native void set_usb_config_descriptor_wTotalLength(long jarg1, int jarg2); ! public final static native int get_usb_config_descriptor_wTotalLength(long jarg1); ! public final static native void set_usb_config_descriptor_bNumInterfaces(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_bNumInterfaces(long jarg1); ! public final static native void set_usb_config_descriptor_bConfigurationValue(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_bConfigurationValue(long jarg1); ! public final static native void set_usb_config_descriptor_iConfiguration(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_iConfiguration(long jarg1); ! public final static native void set_usb_config_descriptor_bmAttributes(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_bmAttributes(long jarg1); ! public final static native void set_usb_config_descriptor_MaxPower(long jarg1, short jarg2); ! public final static native short get_usb_config_descriptor_MaxPower(long jarg1); ! public final static native void set_usb_config_descriptor_interface(long jarg1, long jarg2); ! public final static native long get_usb_config_descriptor_interface(long jarg1); ! public final static native void set_usb_config_descriptor_extra(long jarg1, long jarg2); ! public final static native long get_usb_config_descriptor_extra(long jarg1); ! public final static native void set_usb_config_descriptor_extralen(long jarg1, int jarg2); ! public final static native int get_usb_config_descriptor_extralen(long jarg1); ! public final static native long new_usb_config_descriptor(); ! public final static native void delete_usb_config_descriptor(long jarg1); ! public final static native void set_usb_device_descriptor_bLength(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bLength(long jarg1); ! public final static native void set_usb_device_descriptor_bDescriptorType(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bDescriptorType(long jarg1); ! public final static native void set_usb_device_descriptor_bcdUSB(long jarg1, int jarg2); ! public final static native int get_usb_device_descriptor_bcdUSB(long jarg1); ! public final static native void set_usb_device_descriptor_bDeviceClass(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bDeviceClass(long jarg1); ! public final static native void set_usb_device_descriptor_bDeviceSubClass(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bDeviceSubClass(long jarg1); ! public final static native void set_usb_device_descriptor_bDeviceProtocol(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bDeviceProtocol(long jarg1); ! public final static native void set_usb_device_descriptor_bMaxPacketSize0(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bMaxPacketSize0(long jarg1); ! public final static native void set_usb_device_descriptor_idVendor(long jarg1, int jarg2); ! public final static native int get_usb_device_descriptor_idVendor(long jarg1); ! public final static native void set_usb_device_descriptor_idProduct(long jarg1, int jarg2); ! public final static native int get_usb_device_descriptor_idProduct(long jarg1); ! public final static native void set_usb_device_descriptor_bcdDevice(long jarg1, int jarg2); ! public final static native int get_usb_device_descriptor_bcdDevice(long jarg1); ! public final static native void set_usb_device_descriptor_iManufacturer(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_iManufacturer(long jarg1); ! public final static native void set_usb_device_descriptor_iProduct(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_iProduct(long jarg1); ! public final static native void set_usb_device_descriptor_iSerialNumber(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_iSerialNumber(long jarg1); ! public final static native void set_usb_device_descriptor_bNumConfigurations(long jarg1, short jarg2); ! public final static native short get_usb_device_descriptor_bNumConfigurations(long jarg1); ! public final static native long new_usb_device_descriptor(); ! public final static native void delete_usb_device_descriptor(long jarg1); ! public final static native void set_usb_ctrl_setup_bRequestType(long jarg1, short jarg2); ! public final static native short get_usb_ctrl_setup_bRequestType(long jarg1); ! public final static native void set_usb_ctrl_setup_bRequest(long jarg1, short jarg2); ! public final static native short get_usb_ctrl_setup_bRequest(long jarg1); ! public final static native void set_usb_ctrl_setup_wValue(long jarg1, int jarg2); ! public final static native int get_usb_ctrl_setup_wValue(long jarg1); ! public final static native void set_usb_ctrl_setup_wIndex(long jarg1, int jarg2); ! public final static native int get_usb_ctrl_setup_wIndex(long jarg1); ! public final static native void set_usb_ctrl_setup_wLength(long jarg1, int jarg2); ! public final static native int get_usb_ctrl_setup_wLength(long jarg1); ! public final static native long new_usb_ctrl_setup(); ! public final static native void delete_usb_ctrl_setup(long jarg1); ! public final static native int get_USB_REQ_GET_STATUS(); ! public final static native int get_USB_REQ_CLEAR_FEATURE(); ! public final static native int get_USB_REQ_SET_FEATURE(); ! public final static native int get_USB_REQ_SET_ADDRESS(); ! public final static native int get_USB_REQ_GET_DESCRIPTOR(); ! public final static native int get_USB_REQ_SET_DESCRIPTOR(); ! public final static native int get_USB_REQ_GET_CONFIGURATION(); ! public final static native int get_USB_REQ_SET_CONFIGURATION(); ! public final static native int get_USB_REQ_GET_INTERFACE(); ! public final static native int get_USB_REQ_SET_INTERFACE(); ! public final static native int get_USB_REQ_SYNCH_FRAME(); ! public final static native int get_USB_TYPE_STANDARD(); ! public final static native int get_USB_TYPE_CLASS(); ! public final static native int get_USB_TYPE_VENDOR(); ! public final static native int get_USB_TYPE_RESERVED(); ! public final static native int get_USB_RECIP_DEVICE(); ! public final static native int get_USB_RECIP_INTERFACE(); ! public final static native int get_USB_RECIP_ENDPOINT(); ! public final static native int get_USB_RECIP_OTHER(); ! public final static native int get_USB_ENDPOINT_IN(); ! public final static native int get_USB_ENDPOINT_OUT(); ! public final static native int get_USB_ERROR_BEGIN(); ! public final static native void set_usb_device_next(long jarg1, long jarg2); ! public final static native long get_usb_device_next(long jarg1); ! public final static native void set_usb_device_prev(long jarg1, long jarg2); ! public final static native long get_usb_device_prev(long jarg1); ! public final static native void set_usb_device_filename(long jarg1, String jarg2); ! public final static native String get_usb_device_filename(long jarg1); ! public final static native void set_usb_device_bus(long jarg1, long jarg2); ! public final static native long get_usb_device_bus(long jarg1); ! public final static native void set_usb_device_descriptor(long jarg1, long jarg2); ! public final static native long get_usb_device_descriptor(long jarg1); ! public final static native void set_usb_device_config(long jarg1, long jarg2); ! public final static native long get_usb_device_config(long jarg1); ! public final static native void set_usb_device_dev(long jarg1, long jarg2); ! public final static native long get_usb_device_dev(long jarg1); ! public final static native long new_usb_device(); ! public final static native void delete_usb_device(long jarg1); ! public final static native void set_usb_bus_next(long jarg1, long jarg2); ! public final static native long get_usb_bus_next(long jarg1); ! public final static native void set_usb_bus_prev(long jarg1, long jarg2); ! public final static native long get_usb_bus_prev(long jarg1); ! public final static native void set_usb_bus_dirname(long jarg1, String jarg2); ! public final static native String get_usb_bus_dirname(long jarg1); ! public final static native void set_usb_bus_devices(long jarg1, long jarg2); ! public final static native long get_usb_bus_devices(long jarg1); ! public final static native void set_usb_bus_location(long jarg1, long jarg2); ! public final static native long get_usb_bus_location(long jarg1); ! public final static native long new_usb_bus(); ! public final static native void delete_usb_bus(long jarg1); ! public final static native long get_usb_version_driver(long jarg1); ! public final static native long get_usb_version_dll(long jarg1); ! public final static native long new_usb_version(); ! public final static native void delete_usb_version(long jarg1); ! public final static native void set_usb_version_driver_major(long jarg1, int jarg2); ! public final static native int get_usb_version_driver_major(long jarg1); ! public final static native void set_usb_version_driver_minor(long jarg1, int jarg2); ! public final static native int get_usb_version_driver_minor(long jarg1); ! public final static native void set_usb_version_driver_micro(long jarg1, int jarg2); ! public final static native int get_usb_version_driver_micro(long jarg1); ! public final static native void set_usb_version_driver_nano(long jarg1, int jarg2); ! public final static native int get_usb_version_driver_nano(long jarg1); ! public final static native long new_usb_version_driver(); ! public final static native void delete_usb_version_driver(long jarg1); ! public final static native void set_usb_version_dll_major(long jarg1, int jarg2); ! public final static native int get_usb_version_dll_major(long jarg1); ! public final static native void set_usb_version_dll_minor(long jarg1, int jarg2); ! public final static native int get_usb_version_dll_minor(long jarg1); ! public final static native void set_usb_version_dll_micro(long jarg1, int jarg2); ! public final static native int get_usb_version_dll_micro(long jarg1); ! public final static native void set_usb_version_dll_nano(long jarg1, int jarg2); ! public final static native int get_usb_version_dll_nano(long jarg1); ! public final static native long new_usb_version_dll(); ! public final static native void delete_usb_version_dll(long jarg1); ! public final static native long usb_open(long jarg1); ! public final static native int usb_close(long jarg1); ! public final static native int usb_get_string(long jarg1, int jarg2, int jarg3, byte[] jarg4); ! public final static native int usb_get_string_simple(long jarg1, int jarg2, byte[] jarg3); ! public final static native int usb_get_descriptor_by_endpoint(long jarg1, int jarg2, short jarg3, short jarg4, byte[] jarg5); ! public final static native int usb_get_descriptor(long jarg1, short jarg2, short jarg3, byte[] jarg4); ! public final static native int usb_bulk_write(long jarg1, int jarg2, byte[] jarg3, int jarg5); ! public final static native int usb_bulk_read(long jarg1, int jarg2, byte[] jarg3, int jarg5); ! public final static native int usb_interrupt_write(long jarg1, int jarg2, byte[] jarg3, int jarg5); ! public final static native int usb_interrupt_read(long jarg1, int jarg2, byte[] jarg3, int jarg5); ! public final static native int usb_control_msg(long jarg1, int jarg2, int jarg3, int jarg4, int jarg5, byte[] jarg6, int jarg8); ! public final static native int usb_set_configuration(long jarg1, int jarg2); ! public final static native int usb_claim_interface(long jarg1, int jarg2); ! public final static native int usb_release_interface(long jarg1, int jarg2); ! public final static native int usb_set_altinterface(long jarg1, int jarg2); ! public final static native int usb_resetep(long jarg1, long jarg2); ! public final static native int usb_clear_halt(long jarg1, long jarg2); ! public final static native int usb_reset(long jarg1); ! public final static native String usb_strerror(); ! public final static native void usb_init(); ! public final static native void usb_set_debug(int jarg1); ! public final static native int usb_find_busses(); ! public final static native int usb_find_devices(); ! public final static native long usb_get_device(long jarg1); ! public final static native long usb_get_busses(); ! public final static native long usb_get_version(); ! public final static native int usb_isochronous_setup_async(long jarg1, long jarg2, short jarg3, int jarg4); ! public final static native int usb_bulk_setup_async(long jarg1, long jarg2, short jarg3); ! public final static native int usb_interrupt_setup_async(long jarg1, long jarg2, short jarg3); ! public final static native int usb_submit_async(long jarg1, byte[] jarg2); ! public final static native int usb_reap_async(long jarg1, int jarg2); ! public final static native int usb_free_async(long jarg1); ! public final static native long usb_interface_index(long jarg1, long jarg2); ! public final static native long usb_device_index(long jarg1, long jarg2); ! public final static native long usb_endpoint_descriptor_index(long jarg1, long jarg2); ! public final static native long usb_config_descriptor_index(long jarg1, long jarg2); ! public final static native long usb_interface_descriptor_index(long jarg1, long jarg2); ! } --- 1,306 ---- ! /* ---------------------------------------------------------------------------- ! * This file was automatically generated by SWIG (http://www.swig.org). ! * Version 1.3.36 ! * ! * Do not make changes to this file unless you know what you are doing--modify ! * the SWIG interface file instead. ! * ----------------------------------------------------------------------------- */ ! ! package net.sf.libusb; ! ! class LibusbJNI { ! public final static native int LIBUSB_PATH_MAX_get(); ! public final static native int USB_CLASS_PER_INTERFACE_get(); ! public final static native int USB_CLASS_AUDIO_get(); ! public final static native int USB_CLASS_COMM_get(); ! public final static native int USB_CLASS_HID_get(); ! public final static native int USB_CLASS_PRINTER_get(); ! public final static native int USB_CLASS_MASS_STORAGE_get(); ! public final static native int USB_CLASS_HUB_get(); ! public final static native int USB_CLASS_DATA_get(); ! public final static native int USB_CLASS_VENDOR_SPEC_get(); ! public final static native int USB_DT_DEVICE_get(); ! public final static native int USB_DT_CONFIG_get(); ! public final static native int USB_DT_STRING_get(); ! public final static native int USB_DT_INTERFACE_get(); ! public final static native int USB_DT_ENDPOINT_get(); ! public final static native int USB_DT_HID_get(); ! public final static native int USB_DT_REPORT_get(); ! public final static native int USB_DT_PHYSICAL_get(); ! public final static native int USB_DT_HUB_get(); ! public final static native int USB_DT_DEVICE_SIZE_get(); ! public final static native int USB_DT_CONFIG_SIZE_get(); ! public final static native int USB_DT_INTERFACE_SIZE_get(); ! public final static native int USB_DT_ENDPOINT_SIZE_get(); ! public final static native int USB_DT_ENDPOINT_AUDIO_SIZE_get(); ! public final static native int USB_DT_HUB_NONVAR_SIZE_get(); ! public final static native void usb_descriptor_header_bLength_set(long jarg1, usb_descriptor_header jarg1_, short jarg2); ! public final static native short usb_descriptor_header_bLength_get(long jarg1, usb_descriptor_header jarg1_); ! public final static native void usb_descriptor_header_bDescriptorType_set(long jarg1, usb_descriptor_header jarg1_, short jarg2); ! public final static native short usb_descriptor_header_bDescriptorType_get(long jarg1, usb_descriptor_header jarg1_); ! public final static native long new_usb_descriptor_header(); ! public final static native void delete_usb_descriptor_header(long jarg1); ! public final static native void usb_string_descriptor_bLength_set(long jarg1, usb_string_descriptor jarg1_, short jarg2); ! public final static native short usb_string_descriptor_bLength_get(long jarg1, usb_string_descriptor jarg1_); ! public final static native void usb_string_descriptor_bDescriptorType_set(long jarg1, usb_string_descriptor jarg1_, short jarg2); ! public final static native short usb_string_descriptor_bDescriptorType_get(long jarg1, usb_string_descriptor jarg1_); ! public final static native void usb_string_descriptor_wData_set(long jarg1, usb_string_descriptor jarg1_, long jarg2); ! public final static native long usb_string_descriptor_wData_get(long jarg1, usb_string_descriptor jarg1_); ! public final static native long new_usb_string_descriptor(); ! public final static native void delete_usb_string_descriptor(long jarg1); ! public final static native void usb_hid_descriptor_bLength_set(long jarg1, usb_hid_descriptor jarg1_, short jarg2); ! public final static native short usb_hid_descriptor_bLength_get(long jarg1, usb_hid_descriptor jarg1_); ! public final static native void usb_hid_descriptor_bDescriptorType_set(long jarg1, usb_hid_descriptor jarg1_, short jarg2); ! public final static native short usb_hid_descriptor_bDescriptorType_get(long jarg1, usb_hid_descriptor jarg1_); ! public final static native void usb_hid_descriptor_bcdHID_set(long jarg1, usb_hid_descriptor jarg1_, int jarg2); ! public final static native int usb_hid_descriptor_bcdHID_get(long jarg1, usb_hid_descriptor jarg1_); ! public final static native void usb_hid_descriptor_bCountryCode_set(long jarg1, usb_hid_descriptor jarg1_, short jarg2); ! public final static native short usb_hid_descriptor_bCountryCode_get(long jarg1, usb_hid_descriptor jarg1_); ! public final static native void usb_hid_descriptor_bNumDescriptors_set(long jarg1, usb_hid_descriptor jarg1_, short jarg2); ! public final static native short usb_hid_descriptor_bNumDescriptors_get(long jarg1, usb_hid_descriptor jarg1_); ! public final static native long new_usb_hid_descriptor(); ! public final static native void delete_usb_hid_descriptor(long jarg1); ! public final static native int USB_MAXENDPOINTS_get(); ! public final static native void usb_endpoint_descriptor_bLength_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bLength_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_bDescriptorType_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bDescriptorType_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_bEndpointAddress_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bEndpointAddress_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_bmAttributes_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bmAttributes_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_wMaxPacketSize_set(long jarg1, usb_endpoint_descriptor jarg1_, int jarg2); ! public final static native int usb_endpoint_descriptor_wMaxPacketSize_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_bInterval_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bInterval_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_bRefresh_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bRefresh_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_bSynchAddress_set(long jarg1, usb_endpoint_descriptor jarg1_, short jarg2); ! public final static native short usb_endpoint_descriptor_bSynchAddress_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_extra_set(long jarg1, usb_endpoint_descriptor jarg1_, long jarg2); ! public final static native long usb_endpoint_descriptor_extra_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native void usb_endpoint_descriptor_extralen_set(long jarg1, usb_endpoint_descriptor jarg1_, int jarg2); ! public final static native int usb_endpoint_descriptor_extralen_get(long jarg1, usb_endpoint_descriptor jarg1_); ! public final static native long new_usb_endpoint_descriptor(); ! public final static native void delete_usb_endpoint_descriptor(long jarg1); ! public final static native int USB_ENDPOINT_ADDRESS_MASK_get(); ! public final static native int USB_ENDPOINT_DIR_MASK_get(); ! public final static native int USB_ENDPOINT_TYPE_MASK_get(); ! public final static native int USB_ENDPOINT_TYPE_CONTROL_get(); ! public final static native int USB_ENDPOINT_TYPE_ISOCHRONOUS_get(); ! public final static native int USB_ENDPOINT_TYPE_BULK_get(); ! public final static native int USB_ENDPOINT_TYPE_INTERRUPT_get(); ! public final static native int USB_MAXINTERFACES_get(); ! public final static native void usb_interface_descriptor_bLength_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bLength_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bDescriptorType_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bDescriptorType_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bInterfaceNumber_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bInterfaceNumber_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bAlternateSetting_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bAlternateSetting_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bNumEndpoints_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bNumEndpoints_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bInterfaceClass_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bInterfaceClass_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bInterfaceSubClass_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bInterfaceSubClass_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_bInterfaceProtocol_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_bInterfaceProtocol_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_iInterface_set(long jarg1, usb_interface_descriptor jarg1_, short jarg2); ! public final static native short usb_interface_descriptor_iInterface_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_endpoint_set(long jarg1, usb_interface_descriptor jarg1_, long jarg2, usb_endpoint_descriptor jarg2_); ! public final static native long usb_interface_descriptor_endpoint_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_extra_set(long jarg1, usb_interface_descriptor jarg1_, long jarg2); ! public final static native long usb_interface_descriptor_extra_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native void usb_interface_descriptor_extralen_set(long jarg1, usb_interface_descriptor jarg1_, int jarg2); ! public final static native int usb_interface_descriptor_extralen_get(long jarg1, usb_interface_descriptor jarg1_); ! public final static native long new_usb_interface_descriptor(); ! public final static native void delete_usb_interface_descriptor(long jarg1); ! public final static native int USB_MAXALTSETTING_get(); ! public final static native void usb_interface_altsetting_set(long jarg1, usb_interface jarg1_, long jarg2, usb_interface_descriptor jarg2_); ! public final static native long usb_interface_altsetting_get(long jarg1, usb_interface jarg1_); ! public final static native void usb_interface_num_altsetting_set(long jarg1, usb_interface jarg1_, int jarg2); ! public final static native int usb_interface_num_altsetting_get(long jarg1, usb_interface jarg1_); ! public final static native long new_usb_interface(); ! public final static native void delete_usb_interface(long jarg1); ! public final static native int USB_MAXCONFIG_get(); ! public final static native void usb_config_descriptor_bLength_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_bLength_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_bDescriptorType_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_bDescriptorType_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_wTotalLength_set(long jarg1, usb_config_descriptor jarg1_, int jarg2); ! public final static native int usb_config_descriptor_wTotalLength_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_bNumInterfaces_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_bNumInterfaces_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_bConfigurationValue_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_bConfigurationValue_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_iConfiguration_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_iConfiguration_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_bmAttributes_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_bmAttributes_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_MaxPower_set(long jarg1, usb_config_descriptor jarg1_, short jarg2); ! public final static native short usb_config_descriptor_MaxPower_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor__interface_set(long jarg1, usb_config_descriptor jarg1_, long jarg2, usb_interface jarg2_); ! public final static native long usb_config_descriptor__interface_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_extra_set(long jarg1, usb_config_descriptor jarg1_, long jarg2); ! public final static native long usb_config_descriptor_extra_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native void usb_config_descriptor_extralen_set(long jarg1, usb_config_descriptor jarg1_, int jarg2); ! public final static native int usb_config_descriptor_extralen_get(long jarg1, usb_config_descriptor jarg1_); ! public final static native long new_usb_config_descriptor(); ! public final static native void delete_usb_config_descriptor(long jarg1); ! public final static native void usb_device_descriptor_bLength_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_bLength_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bDescriptorType_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_bDescriptorType_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bcdUSB_set(long jarg1, usb_device_descriptor jarg1_, int jarg2); ! public final static native int usb_device_descriptor_bcdUSB_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bDeviceClass_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_bDeviceClass_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bDeviceSubClass_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_bDeviceSubClass_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bDeviceProtocol_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_bDeviceProtocol_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bMaxPacketSize0_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_bMaxPacketSize0_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_idVendor_set(long jarg1, usb_device_descriptor jarg1_, int jarg2); ! public final static native int usb_device_descriptor_idVendor_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_idProduct_set(long jarg1, usb_device_descriptor jarg1_, int jarg2); ! public final static native int usb_device_descriptor_idProduct_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_bcdDevice_set(long jarg1, usb_device_descriptor jarg1_, int jarg2); ! public final static native int usb_device_descriptor_bcdDevice_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descriptor_iManufacturer_set(long jarg1, usb_device_descriptor jarg1_, short jarg2); ! public final static native short usb_device_descriptor_iManufacturer_get(long jarg1, usb_device_descriptor jarg1_); ! public final static native void usb_device_descrip... [truncated message content] |
Update of /cvsroot/javax-usb/javax-usb-libusb/lib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv1481 Modified Files: log4j.properties jsr80_windows.jar jsr80_ri.jar jsr80.jar MANIFEST.MF LibusbJNI.dll Log Message: changed to gcc compiler, updated to latest .jar files Index: LibusbJNI.dll =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/lib/LibusbJNI.dll,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsTzSLHw and /tmp/cvs0Sx21B differ Index: log4j.properties =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/lib/log4j.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** log4j.properties 9 Jan 2006 21:12:33 -0000 1.1.1.1 --- log4j.properties 5 Aug 2008 15:33:40 -0000 1.2 *************** *** 1,6 **** # For the general syntax of property based configuration files see the # documenation of org.apache.log4j.PropertyConfigurator. ! ! log4j.rootLogger=debug, stdout, file # this one would log to file usb.log (which will be backed up to usb.log.1) --- 1,6 ---- # For the general syntax of property based configuration files see the # documenation of org.apache.log4j.PropertyConfigurator. ! log4j.rootLogger=error, stdout, file ! #log4j.rootLogger=debug, stdout, file # this one would log to file usb.log (which will be backed up to usb.log.1) Index: jsr80_ri.jar =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/lib/jsr80_ri.jar,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvs983PsI and /tmp/cvstAIDxQ differ Index: jsr80_windows.jar =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/lib/jsr80_windows.jar,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsCjxRRn and /tmp/cvsR1AMgx differ Index: jsr80.jar =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/lib/jsr80.jar,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsgKRLv0 and /tmp/cvsRKaJnb differ Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/lib/MANIFEST.MF,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MANIFEST.MF 9 Jan 2006 21:11:57 -0000 1.1.1.1 --- MANIFEST.MF 5 Aug 2008 15:33:41 -0000 1.2 *************** *** 1,8 **** Manifest-Version: 1.0 ! Ant-Version: Apache Ant 1.6.5 ! Created-By: 1.4.2_07-b05 (Sun Microsystems Inc.) ! Built-By: darabi Implementation-Title: javax.usb Windows Implementation ! Implementation-Version: 0.9.0 2005-08-22 22:53 Implementation-Vendor: m-creations gmbh Class-Path: jsr80.jar jsr80_ri.jar commons-logging.jar log4j.jar --- 1,8 ---- Manifest-Version: 1.0 ! Ant-Version: Apache Ant 1.7.1 ! Created-By: 10.0-b23 (Sun Microsystems Inc.) ! Built-By: Mike Implementation-Title: javax.usb Windows Implementation ! Implementation-Version: 0.9.0 2008-07-30 16:19 Implementation-Vendor: m-creations gmbh Class-Path: jsr80.jar jsr80_ri.jar commons-logging.jar log4j.jar |
|
From: Mike C. <mc...@us...> - 2008-08-05 15:26:03
|
Update of /cvsroot/javax-usb/javax-usb-libusb/swig In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30243 Removed Files: usb.h LibusbJNI.dll Log Message: moved dll to lib and now using libusb-win32 verstion of usb.h --- LibusbJNI.dll DELETED --- --- usb.h DELETED --- |
|
From: Mike C. <mc...@us...> - 2008-08-05 15:24:05
|
Update of /cvsroot/javax-usb/javax-usb-libusb/swig In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29401 Modified Files: libusb.i makefile Log Message: changes resulting from switch to gcc compiler Index: libusb.i =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/swig/libusb.i,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** libusb.i 9 Jan 2006 21:12:53 -0000 1.1.1.1 --- libusb.i 5 Aug 2008 15:23:56 -0000 1.2 *************** *** 1,3 **** --- 1,9 ---- %module Libusb + + typedef unsigned char u_int8_t; + typedef unsigned short u_int16_t; + typedef char int8_t; + typedef short int16_t; + %{ #include "usb.h" Index: makefile =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/swig/makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile 9 Jan 2006 21:12:53 -0000 1.1.1.1 --- makefile 5 Aug 2008 15:23:56 -0000 1.2 *************** *** 1,61 **** - # NMAKE (VC++ 6.0) Makefile for using SWIG and Java for C code - # # Copyright (c) 2005 m-creations gmbh http://www.m-creations.com # - # - JAVA_HOME should point to your jdk # - location of SWIG should be corrected - # - location of libusb ! SWIG = C:\Programme\swig\swig.exe ! LIBUSB = M:\Programme\libusb-win32 ! LIBUSB_LIBPATH= $(LIBUSB)\lib\msvc - VC_PATH = "C:\Programme\Microsoft Visual Studio\VC98" IFILE = Libusb INTERFACE = $(IFILE).i ! WRAPFILE = $(IFILE)_wrap.c ! ! # Location of the Visual C++ tools (32 bit assumed) ! ! TARGET = $(IFILE).dll ! CC = cl.exe ! LINK = link.exe ! MACHINE = I386 ! ! # C Library needed to build a DLL ! ! DLLIBC = msvcrt.lib oldnames.lib ! ! # Windows libraries that are apparently needed ! WINLIB = kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib ! ! # Libraries common to all DLLs ! LIBS = libusb.lib $(DLLIBC) $(WINLIB) ! ! # Linker options ! LOPT = -debug:full -debugtype:cv /NODEFAULTLIB /RELEASE /NOLOGO \ ! /libpath:$(LIBUSB_LIBPATH) /MACHINE:$(MACHINE) \ ! -entry:_DllMainCRTStartup@12 -dll ! ! # C compiler flags ! CFLAGS = /Z7 /Od /c /nologo ! JAVA_INCLUDE = -I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32 -I$(LIBUSB)\src\src java:: ! $(SWIG) -package net.sf.libusb -v -Wall -java -o $(WRAPFILE) $(INTERFACE) ! $(CC) $(CFLAGS) $(JAVA_INCLUDE) $(WRAPFILE) ! set LIB=$(VC_PATH)\lib ! $(LINK) $(LOPT) -out:$(IFILE)JNI.dll $(LIBS) $(IFILE)_wrap.obj ! javac *.java clean : ! -@erase .\$(IFILE)_wrap.* ! -@erase .\LibusbJNI.* ! -@erase .\SWIGTYPE_* ! -@erase .\*~ --- 1,44 ---- # Copyright (c) 2005 m-creations gmbh http://www.m-creations.com # # - JAVA_HOME should point to your jdk # - location of SWIG should be corrected ! SWIG = /cygdrive/c/usr/bin/swigwin-1.3.36/swig.exe ! JAVA_HOME = /cygdrive/c/Program\ Files/Java/jdk1.6.0_07 IFILE = Libusb INTERFACE = $(IFILE).i ! WRAPFILE = $(IFILE)_wrap ! CC = gcc ! SWIG_DEST = ../src/net/sf/libusb + LIBUSB_PATH = ../../libusb-win32-device-bin-0.1.12.1 + INCLUDE = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 -I$(LIBUSB_PATH)/include + JNI_DLL = LibusbJNI.dll java:: ! $(SWIG) -package net.sf.libusb -I${INCLUDE} -v -Wall -java -o $(WRAPFILE).c $(INTERFACE) ! $(CC) -c -mno-cygwin -shared $(INCLUDE) $(WRAPFILE).c -o $(WRAPFILE).o ! $(CC) -shared $(WRAPFILE).o -o $(JNI_DLL) -L$(LIBUSB_PATH)/lib/gcc -lusb -Wl,--kill-at -mno-cygwin ! ! chmod 666 $(WRAPFILE).c ! chmod 777 $(JNI_DLL) ! mv $(JNI_DLL) ../lib/ ! # the reset just makes an moves java files around ! chmod 666 *.java ! rm -f $(SWIG_DEST)/*.java ! mv *.java $(SWIG_DEST)/ clean : ! rm -f $(IFILE)_wrap.* ! rm -f LibusbJNI.* ! rm -f SWIGTYPE_* ! rm -f *.java ! rm -f *.class ! rm -f $(JNI_DLL) ! rm -f *~ ! rm -f ../lib/$(JNI_DLL) |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:52:17
|
Update of /cvsroot/javax-usb/javax-usb/src/javax/usb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14515/src/javax/usb Modified Files: Version.java Log Message: Update version number to 1.0.3-CVS Index: Version.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/Version.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Version.java 3 Jun 2008 19:36:07 -0000 1.22 --- Version.java 3 Jun 2008 19:52:14 -0000 1.23 *************** *** 65,68 **** private static final String VERSION_USB_SPECIFICATION = "1.1"; ! private static final String VERSION_JAVAX_USB = "1.0.2"; } --- 65,68 ---- private static final String VERSION_USB_SPECIFICATION = "1.1"; ! private static final String VERSION_JAVAX_USB = "1.0.3-CVS"; } |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:51:51
|
Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14127/src/com/ibm/jusb Modified Files: Version.java Log Message: Update version number to 1.0.3-CVS Index: Version.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/Version.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Version.java 3 Jun 2008 19:48:23 -0000 1.20 --- Version.java 3 Jun 2008 19:51:48 -0000 1.21 *************** *** 56,59 **** private static final String VERSION_API = "1.0.0"; ! private static final String VERSION_PLATFORM_INDEPENDENT_RI = "1.0.2"; } --- 56,59 ---- private static final String VERSION_API = "1.0.0"; ! private static final String VERSION_PLATFORM_INDEPENDENT_RI = "1.0.3-CVS"; } |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:51:29
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13243/src/com/ibm/jusb/os/linux Modified Files: Version.java Log Message: Update version number to 1.0.3-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.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Version.java 3 Jun 2008 19:49:24 -0000 1.16 --- Version.java 3 Jun 2008 19:51:20 -0000 1.17 *************** *** 25,29 **** public static final String LINUX_API_VERSION = "1.0.0"; ! public static final String LINUX_IMP_VERSION = "1.0.2"; 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.3-CVS"; public static final String LINUX_IMP_DESCRIPTION = "JSR80 : javax.usb" |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:49:28
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13205/src/com/ibm/jusb/os/linux Modified Files: Version.java Log Message: Update version number to 1.0.2 actual Index: Version.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux/Version.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Version.java 19 Dec 2005 23:59:32 -0000 1.15 --- Version.java 3 Jun 2008 19:49:24 -0000 1.16 *************** *** 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" --- 25,29 ---- public static final String LINUX_API_VERSION = "1.0.0"; ! public static final String LINUX_IMP_VERSION = "1.0.2"; public static final String LINUX_IMP_DESCRIPTION = "JSR80 : javax.usb" |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:48:26
|
Update of /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12768/src/com/ibm/jusb Modified Files: Version.java Log Message: Update version number to 1.0.2 actual Index: Version.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri/src/com/ibm/jusb/Version.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Version.java 19 Dec 2005 23:58:36 -0000 1.19 --- Version.java 3 Jun 2008 19:48:23 -0000 1.20 *************** *** 56,59 **** private static final String VERSION_API = "1.0.0"; ! private static final String VERSION_PLATFORM_INDEPENDENT_RI = "1.0.2-CVS"; } --- 56,59 ---- private static final String VERSION_API = "1.0.0"; ! private static final String VERSION_PLATFORM_INDEPENDENT_RI = "1.0.2"; } |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:36:12
|
Update of /cvsroot/javax-usb/javax-usb/src/javax/usb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6934 Modified Files: Version.java Log Message: Update version to 1.0.2 actual Index: Version.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/Version.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Version.java 19 Dec 2005 23:57:45 -0000 1.21 --- Version.java 3 Jun 2008 19:36:07 -0000 1.22 *************** *** 65,68 **** private static final String VERSION_USB_SPECIFICATION = "1.1"; ! private static final String VERSION_JAVAX_USB = "1.0.2-CVS"; } --- 65,68 ---- private static final String VERSION_USB_SPECIFICATION = "1.1"; ! private static final String VERSION_JAVAX_USB = "1.0.2"; } |
|
From: Dan S. <dds...@us...> - 2008-06-03 19:35:26
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6221/jni Modified Files: JavaxUsbKernel.c Log Message: Handle /dev/bus/usb/001/001 and /dev/bus/usb/1/1 naming format Index: JavaxUsbKernel.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JavaxUsbKernel.c 11 Feb 2008 20:22:20 -0000 1.5 --- JavaxUsbKernel.c 3 Jun 2008 19:35:20 -0000 1.6 *************** *** 103,108 **** #define USBDEVFS_PATH_NEW "/dev/bus/usb" #define USBDEVFS_DEVICES_NEW "/dev/bus/usb/devices" ! #define USBDEVFS_SPRINTF_NODE_NEW "/dev/bus/usb/%d/%d" ! #define USBDEVFS_SSCANF_NODE_NEW "/dev/bus/usb/%d/%d" char *usbdevfs_path() --- 103,112 ---- #define USBDEVFS_PATH_NEW "/dev/bus/usb" #define USBDEVFS_DEVICES_NEW "/dev/bus/usb/devices" ! #define USBDEVFS_SPRINTF_NODE_NEW1 "/dev/bus/usb/%3.03d/%3.03d" ! #define USBDEVFS_SPRINTF_NODE_NEW2 "/dev/bus/usb/%d/%d" ! #define USBDEVFS_SSCANF_NODE_NEW1 "/dev/bus/usb/%3d/%3d" ! #define USBDEVFS_SSCANF_NODE_NEW2 "/dev/bus/usb/%d/%d" ! #define USBDEVFS_CHECK_NODE_NEW1 "/dev/bus/usb/001/001" ! #define USBDEVFS_CHECK_NODE_NEW2 "/dev/bus/usb/1/1" char *usbdevfs_path() *************** *** 127,132 **** { 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; --- 131,138 ---- { struct stat buf; ! if ((0 == stat(USBDEVFS_CHECK_NODE_NEW1, &buf))) ! return USBDEVFS_SSCANF_NODE_NEW1; ! else if ((0 == stat(USBDEVFS_CHECK_NODE_NEW2, &buf))) ! return USBDEVFS_SSCANF_NODE_NEW2; else return USBDEVFS_SSCANF_NODE_OLD; *************** *** 136,141 **** { 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; --- 142,149 ---- { struct stat buf; ! if ((0 == stat(USBDEVFS_CHECK_NODE_NEW1, &buf))) ! return USBDEVFS_SPRINTF_NODE_NEW1; ! else if ((0 == stat(USBDEVFS_CHECK_NODE_NEW2, &buf))) ! return USBDEVFS_SPRINTF_NODE_NEW2; else return USBDEVFS_SPRINTF_NODE_OLD; |
|
From: Dan S. <dds...@us...> - 2008-02-12 23:11:46
|
Update of /cvsroot/javax-usb/javax-usb/src/javax/usb In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20302/src/javax/usb Modified Files: UsbHostManager.java Log Message: first check 'java.home'/lib for javax.usb.properties file, if not found then use UsbHostManager.class.getClassLoader().getResourceAsStream instead of ClassLoader.getSystemResourceAsStream Index: UsbHostManager.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb/src/javax/usb/UsbHostManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** UsbHostManager.java 30 Dec 2005 18:08:56 -0000 1.15 --- UsbHostManager.java 12 Feb 2008 23:11:39 -0000 1.16 *************** *** 97,101 **** private static void setupProperties() throws UsbException,SecurityException { ! InputStream i = ClassLoader.getSystemResourceAsStream(JAVAX_USB_PROPERTIES_FILE); if (null == i) throw new UsbException(PROPERTIES_FILE_NOT_FOUND); --- 97,115 ---- private static void setupProperties() throws UsbException,SecurityException { ! InputStream i = null; ! ! // First look in 'java.home'/lib ! String h = System.getProperty("java.home"); ! String s = System.getProperty("file.separator"); ! if (null != h && null != s) ! { ! try { i = new FileInputStream(h + s + "lib" + s + JAVAX_USB_PROPERTIES_FILE); } ! catch ( FileNotFoundException fnfE ) { /* no 'java.home'/lib properties file, ok */ } ! } ! ! // Now check the normal CLASSPATH ! if (null == i) ! i = UsbHostManager.class.getClassLoader().getResourceAsStream(JAVAX_USB_PROPERTIES_FILE); ! if (null == i) throw new UsbException(PROPERTIES_FILE_NOT_FOUND); |
|
From: Dan S. <dds...@us...> - 2008-02-12 21:38:16
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15153 Modified Files: JavaxUsbActive.c Log Message: fix size_t error, change to ssize_t Index: JavaxUsbActive.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbActive.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JavaxUsbActive.c 11 Feb 2008 20:22:20 -0000 1.9 --- JavaxUsbActive.c 12 Feb 2008 21:38:12 -0000 1.10 *************** *** 19,23 **** FILE *file = NULL; #define LINELEN 1024 ! size_t linelen, len; char *line = NULL, busstr[32], devstr[32]; int in_dev = 0; --- 19,23 ---- FILE *file = NULL; #define LINELEN 1024 ! ssize_t linelen, len; char *line = NULL, busstr[32], devstr[32]; int in_dev = 0; *************** *** 96,100 **** FILE *file = NULL; #define LINELEN 1024 ! size_t linelen, len; char *line = NULL, busstr[32], devstr[32], cfgstr[32], ifstr[32]; int in_dev = 0, in_cfg = 0; --- 96,100 ---- FILE *file = NULL; #define LINELEN 1024 ! ssize_t linelen, len; char *line = NULL, busstr[32], devstr[32], cfgstr[32], ifstr[32]; int in_dev = 0, in_cfg = 0; |
|
From: Dan S. <dds...@us...> - 2008-02-12 21:35:29
|
Update of /cvsroot/javax-usb/javax-usb/docs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13941/docs Modified Files: jsr80.pdf Log Message: fix figure 11 Index: jsr80.pdf =================================================================== RCS file: /cvsroot/javax-usb/javax-usb/docs/jsr80.pdf,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsQdzi3v and /tmp/cvscN3CfV differ |
|
From: Dan S. <dds...@us...> - 2008-02-12 21:35:28
|
Update of /cvsroot/javax-usb/javax-usb/docs/src/figs In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13941/docs/src/figs Modified Files: UsbPipeAsync.eps Log Message: fix figure 11 Index: UsbPipeAsync.eps =================================================================== RCS file: /cvsroot/javax-usb/javax-usb/docs/src/figs/UsbPipeAsync.eps,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UsbPipeAsync.eps 23 Jan 2004 05:21:15 -0000 1.1 --- UsbPipeAsync.eps 12 Feb 2008 21:35:24 -0000 1.2 *************** *** 1,8 **** %!PS-Adobe-2.0 EPSF-2.0 ! %%Title: UsbPipeAsync.eps ! %%Creator: fig2dev Version 3.2 Patchlevel 3c ! %%CreationDate: Sat Jan 10 12:16:35 2004 ! %%For: ddstreet@pigpen () ! %%BoundingBox: 0 0 556 434 %%Magnification: 1.0000 %%EndComments --- 1,8 ---- %!PS-Adobe-2.0 EPSF-2.0 ! %%Title: UsbPipeAsync.fig ! %%Creator: fig2dev Version 3.2 Patchlevel 4 ! %%CreationDate: Tue Feb 12 16:32:17 2008 ! %%For: ddstreet@floyd () ! %%BoundingBox: 0 0 555 434 %%Magnification: 1.0000 %%EndComments *************** *** 46,51 **** end save ! newpath 0 434 moveto 0 0 lineto 556 0 lineto 556 434 lineto closepath clip newpath ! -129.0 505.0 translate 1 -1 scale --- 46,51 ---- end save ! newpath 0 434 moveto 0 0 lineto 555 0 lineto 555 434 lineto closepath clip newpath ! -129.8 504.7 translate 1 -1 scale *************** *** 85,94 **** $F2psBegin - %%Page: 1 1 10 setmiterlimit 0.06000 0.06000 sc % % Fig objects follow % % Polyline 7.500 slw --- 85,96 ---- $F2psBegin 10 setmiterlimit + 0 slj 0 slc 0.06000 0.06000 sc % % Fig objects follow % + % + % here starts figure with depth 50 % Polyline 7.500 slw *************** *** 122,134 **** n 10542 5865 m 10362 5925 l 10542 5985 l 10542 5865 l cp gs 0.00 setgray ef gr col0 s % Polyline - gs clippath - 6360 6915 m 6360 7035 l 6567 7035 l 6387 6975 l 6567 6915 l cp - eoclip - n 7800 6975 m - 6375 6975 l gs col0 s gr gr - - % arrowhead - n 6567 6915 m 6387 6975 l 6567 7035 l 6567 6915 l cp gs 0.00 setgray ef gr col0 s - % Polyline [60] 0 sd n 7950 3000 m --- 124,127 ---- *************** *** 215,233 **** % Polyline gs clippath - 6360 7290 m 6360 7410 l 6567 7410 l 6387 7350 l 6567 7290 l cp - eoclip - n 7800 7350 m - 6375 7350 l gs col0 s gr gr - - % arrowhead - n 6567 7290 m 6387 7350 l 6567 7410 l 6567 7290 l cp gs 0.00 setgray ef gr col0 s - % Polyline - n 6075 5850 m 6375 5850 l 6375 7500 l 6075 7500 l - cp gs col0 s gr - % Polyline - n 2550 5850 m 2850 5850 l 2850 7500 l 2550 7500 l - cp gs col0 s gr - % Polyline - gs clippath 6090 5910 m 6090 5790 l 5883 5790 l 6063 5850 l 5883 5910 l cp eoclip --- 208,211 ---- *************** *** 239,249 **** % Polyline gs clippath ! 2835 7440 m 2835 7560 l 3042 7560 l 2862 7500 l 3042 7440 l cp eoclip ! n 6075 7500 m ! 2850 7500 l gs col0 s gr gr % arrowhead ! n 3042 7440 m 2862 7500 l 3042 7560 l 3042 7440 l cp gs 0.00 setgray ef gr col0 s % Polyline n 4200 8100 m 4500 8100 l 4500 8250 l 4200 8250 l --- 217,227 ---- % Polyline gs clippath ! 2835 7215 m 2835 7335 l 3042 7335 l 2862 7275 l 3042 7215 l cp eoclip ! n 6075 7275 m ! 2850 7275 l gs col0 s gr gr % arrowhead ! n 3042 7215 m 2862 7275 l 3042 7335 l 3042 7215 l cp gs 0.00 setgray ef gr col0 s % Polyline n 4200 8100 m 4500 8100 l 4500 8250 l 4200 8250 l *************** *** 271,274 **** --- 249,276 ---- n 6225 3000 m 6225 8400 l gs col0 s gr [] 0 sd + % Polyline + gs clippath + 6360 6765 m 6360 6885 l 6567 6885 l 6387 6825 l 6567 6765 l cp + eoclip + n 7800 6825 m + 6375 6825 l gs col0 s gr gr + + % arrowhead + n 6567 6765 m 6387 6825 l 6567 6885 l 6567 6765 l cp gs 0.00 setgray ef gr col0 s + % Polyline + gs clippath + 6360 7140 m 6360 7260 l 6567 7260 l 6387 7200 l 6567 7140 l cp + eoclip + n 7800 7200 m + 6375 7200 l gs col0 s gr gr + + % arrowhead + n 6567 7140 m 6387 7200 l 6567 7260 l 6567 7140 l cp gs 0.00 setgray ef gr col0 s + % Polyline + n 6075 5850 m 6375 5850 l 6375 7275 l 6075 7275 l + cp gs col0 s gr + % Polyline + n 2550 5850 m 2850 5850 l 2850 7275 l 2550 7275 l + cp gs col0 s gr /Times-Roman ff 270.00 scf sf 9300 2775 m *************** *** 289,301 **** 7500 2775 m gs 1 -1 sc (UsbPipe) col0 sh gr - /Times-Roman ff 180.00 scf sf - 7050 6525 m - gs 1 -1 sc (setActualLength\(\)) dup sw pop 2 div neg 0 rm col0 sh gr - /Times-Roman ff 180.00 scf sf - 7050 6675 m - gs 1 -1 sc (or) dup sw pop 2 div neg 0 rm col0 sh gr - /Times-Roman ff 180.00 scf sf - 7050 6900 m - gs 1 -1 sc (setUsbException\(\)) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 270.00 scf sf 5850 2775 m --- 291,294 ---- *************** *** 320,340 **** gs 1 -1 sc (process) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 180.00 scf sf - 7125 7275 m - gs 1 -1 sc (complete\(\)) dup sw pop 2 div neg 0 rm col0 sh gr - /Times-Roman ff 180.00 scf sf 4500 5775 m gs 1 -1 sc (waitUntilComplete\(\)) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 180.00 scf sf ! 6150 7725 m gs 1 -1 sc (setActualLength\(\)) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 180.00 scf sf ! 6150 8025 m gs 1 -1 sc (setUsbException\(\)) dup sw pop 2 div neg 0 rm col0 sh gr - /Times-Roman ff 270.00 scf sf - 3525 2775 m - gs 1 -1 sc (UsbPipeListener) col0 sh gr /Times-Roman ff 180.00 scf sf ! 6075 7875 m gs 1 -1 sc (or) dup sw pop 2 div neg 0 rm col0 sh gr $F2psEnd rs --- 313,344 ---- gs 1 -1 sc (process) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 180.00 scf sf 4500 5775 m gs 1 -1 sc (waitUntilComplete\(\)) dup sw pop 2 div neg 0 rm col0 sh gr + /Times-Roman ff 270.00 scf sf + 3525 2775 m + gs 1 -1 sc (UsbPipeListener) col0 sh gr /Times-Roman ff 180.00 scf sf ! 7125 6225 m gs 1 -1 sc (setActualLength\(\)) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 180.00 scf sf ! 7125 6450 m ! gs 1 -1 sc (or) dup sw pop 2 div neg 0 rm col0 sh gr ! /Times-Roman ff 180.00 scf sf ! 7125 6750 m gs 1 -1 sc (setUsbException\(\)) dup sw pop 2 div neg 0 rm col0 sh gr /Times-Roman ff 180.00 scf sf ! 7125 7125 m ! gs 1 -1 sc (complete\(\)) dup sw pop 2 div neg 0 rm col0 sh gr ! /Times-Roman ff 180.00 scf sf ! 6075 7575 m ! gs 1 -1 sc (dataEventOccurred\(\)) dup sw pop 2 div neg 0 rm col0 sh gr ! /Times-Roman ff 180.00 scf sf ! 6075 7800 m gs 1 -1 sc (or) dup sw pop 2 div neg 0 rm col0 sh gr + /Times-Roman ff 180.00 scf sf + 6075 8025 m + gs 1 -1 sc (errorEventOccurred\(\)) dup sw pop 2 div neg 0 rm col0 sh gr + % here ends figure; $F2psEnd rs + showpage |
|
From: Dan S. <dds...@us...> - 2008-02-11 20:22:28
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8527/src/com/ibm/jusb/os/linux Modified Files: LinuxPipeRequest.java Log Message: redefined all needed kernel header info, as the kernel header files are unreliable update to correctly find /dev/bus/usb nodes preferentially over /proc/bus/usb nodes use long instead of int for storing URB pointer address, so it works on 64bit systems Index: LinuxPipeRequest.java =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/src/com/ibm/jusb/os/linux/LinuxPipeRequest.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** LinuxPipeRequest.java 6 Jul 2004 14:57:05 -0000 1.14 --- LinuxPipeRequest.java 11 Feb 2008 20:22:21 -0000 1.15 *************** *** 63,70 **** /** @return the address of the assocaited URB */ ! public int getUrbAddress() { return urbAddress; } /** @param address the address of the assocaited URB */ ! public void setUrbAddress( int address ) { urbAddress = address; } /** @param c If this is completed or not */ --- 63,70 ---- /** @return the address of the assocaited URB */ ! public long getUrbAddress() { return urbAddress; } /** @param address the address of the assocaited URB */ ! public void setUrbAddress( long address ) { urbAddress = address; } /** @param c If this is completed or not */ *************** *** 121,125 **** private LinuxPipeOsImp linuxPipeImp = null; ! private int urbAddress = 0; /* These MUST match those defined in jni/linux/JavaxUsbRequest.c */ --- 121,125 ---- private LinuxPipeOsImp linuxPipeImp = null; ! private long urbAddress = 0; /* These MUST match those defined in jni/linux/JavaxUsbRequest.c */ |
|
From: Dan S. <dds...@us...> - 2008-02-11 20:22:27
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8527/jni Modified Files: JavaxUsb.h JavaxUsbActive.c JavaxUsbChecks.h JavaxUsbIsochronousRequest.c JavaxUsbKernel.c JavaxUsbKernel.h JavaxUsbPipeRequest.c JavaxUsbTopologyUpdater.c Makefile Log Message: redefined all needed kernel header info, as the kernel header files are unreliable update to correctly find /dev/bus/usb nodes preferentially over /proc/bus/usb nodes use long instead of int for storing URB pointer address, so it works on 64bit systems Index: JavaxUsb.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsb.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JavaxUsb.h 17 Jul 2007 20:01:37 -0000 1.18 --- JavaxUsb.h 11 Feb 2008 20:22:20 -0000 1.19 *************** *** 50,104 **** struct jusb_device_descriptor { ! __u8 bLength; ! __u8 bDescriptorType; ! __u16 bcdUSB; ! __u8 bDeviceClass; ! __u8 bDeviceSubClass; ! __u8 bDeviceProtocol; ! __u8 bMaxPacketSize0; ! __u16 idVendor; ! __u16 idProduct; ! __u16 bcdDevice; ! __u8 iManufacturer; ! __u8 iProduct; ! __u8 iSerialNumber; ! __u8 bNumConfigurations; }; struct jusb_config_descriptor { ! __u8 bLength; ! __u8 bDescriptorType; ! __u16 wTotalLength; ! __u8 bNumInterfaces; ! __u8 bConfigurationValue; ! __u8 iConfiguration; ! __u8 bmAttributes; ! __u8 bMaxPower; }; struct jusb_interface_descriptor { ! __u8 bLength; ! __u8 bDescriptorType; ! __u8 bInterfaceNumber; ! __u8 bAlternateSetting; ! __u8 bNumEndpoints; ! __u8 bInterfaceClass; ! __u8 bInterfaceSubClass; ! __u8 bInterfaceProtocol; ! __u8 iInterface; }; struct jusb_endpoint_descriptor { ! __u8 bLength; ! __u8 bDescriptorType; ! __u8 bEndpointAddress; ! __u8 bmAttributes; ! __u16 wMaxPacketSize; ! __u8 bInterval; }; struct jusb_string_descriptor { ! __u8 bLength; ! __u8 bDescriptorType; unsigned char bString[254]; }; --- 50,104 ---- struct jusb_device_descriptor { ! unsigned char bLength; ! unsigned char bDescriptorType; ! unsigned short bcdUSB; ! unsigned char bDeviceClass; ! unsigned char bDeviceSubClass; ! unsigned char bDeviceProtocol; ! unsigned char bMaxPacketSize0; ! unsigned short idVendor; ! unsigned short idProduct; ! unsigned short bcdDevice; ! unsigned char iManufacturer; ! unsigned char iProduct; ! unsigned char iSerialNumber; ! unsigned char bNumConfigurations; }; struct jusb_config_descriptor { ! unsigned char bLength; ! unsigned char bDescriptorType; ! unsigned short wTotalLength; ! unsigned char bNumInterfaces; ! unsigned char bConfigurationValue; ! unsigned char iConfiguration; ! unsigned char bmAttributes; ! unsigned char bMaxPower; }; struct jusb_interface_descriptor { ! unsigned char bLength; ! unsigned char bDescriptorType; ! unsigned char bInterfaceNumber; ! unsigned char bAlternateSetting; ! unsigned char bNumEndpoints; ! unsigned char bInterfaceClass; ! unsigned char bInterfaceSubClass; ! unsigned char bInterfaceProtocol; ! unsigned char iInterface; }; struct jusb_endpoint_descriptor { ! unsigned char bLength; ! unsigned char bDescriptorType; ! unsigned char bEndpointAddress; ! unsigned char bmAttributes; ! unsigned short wMaxPacketSize; ! unsigned char bInterval; }; struct jusb_string_descriptor { ! unsigned char bLength; ! unsigned char bDescriptorType; unsigned char bString[254]; }; *************** *** 191,200 **** int getActiveConfig( JNIEnv *env, int fd, unsigned char bus, unsigned char dev ); ! int getActiveInterfaceSetting( JNIEnv *env, int fd, unsigned char bus, unsigned char dev, __u8 interface ); //****************************************************************************** // Utility methods ! static inline __u16 bcd( __u8 msb, __u8 lsb ) { return ( (msb << 8) & 0xff00 ) | ( lsb & 0x00ff ); --- 191,200 ---- int getActiveConfig( JNIEnv *env, int fd, unsigned char bus, unsigned char dev ); ! int getActiveInterfaceSetting( JNIEnv *env, int fd, unsigned char bus, unsigned char dev, unsigned char interface ); //****************************************************************************** // Utility methods ! static inline unsigned short bcd( unsigned char msb, unsigned char lsb ) { return ( (msb << 8) & 0xff00 ) | ( lsb & 0x00ff ); Index: JavaxUsbPipeRequest.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbPipeRequest.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JavaxUsbPipeRequest.c 8 Oct 2004 21:05:01 -0000 1.8 --- JavaxUsbPipeRequest.c 11 Feb 2008 20:22:20 -0000 1.9 *************** *** 39,43 **** getPipeType = CheckedGetMethodID( env, LinuxPipeRequest, "getPipeType", "()I" ); type = CheckedCallIntMethod( env, linuxPipeRequest, getPipeType ); ! setUrbAddress = CheckedGetMethodID( env, LinuxPipeRequest, "setUrbAddress", "(I)V" ); getAcceptShortPacket = CheckedGetMethodID( env, LinuxPipeRequest, "getAcceptShortPacket", "()Z" ); acceptShortPacket = CheckedCallBooleanMethod( env, linuxPipeRequest, getAcceptShortPacket ); --- 39,43 ---- getPipeType = CheckedGetMethodID( env, LinuxPipeRequest, "getPipeType", "()I" ); type = CheckedCallIntMethod( env, linuxPipeRequest, getPipeType ); ! setUrbAddress = CheckedGetMethodID( env, LinuxPipeRequest, "setUrbAddress", "(J)V" ); getAcceptShortPacket = CheckedGetMethodID( env, LinuxPipeRequest, "getAcceptShortPacket", "()Z" ); acceptShortPacket = CheckedCallBooleanMethod( env, linuxPipeRequest, getAcceptShortPacket ); *************** *** 102,110 **** LinuxPipeRequest = CheckedGetObjectClass( env, linuxPipeRequest ); getPipeType = CheckedGetMethodID( env, LinuxPipeRequest, "getPipeType", "()I" ); ! getUrbAddress = CheckedGetMethodID( env, LinuxPipeRequest, "getUrbAddress", "()I" ); type = CheckedCallIntMethod( env, linuxPipeRequest, getPipeType ); CheckedDeleteLocalRef( env, LinuxPipeRequest ); ! if (!(urb = (struct usbdevfs_urb*)CheckedCallIntMethod( env, linuxPipeRequest, getUrbAddress ))) { log( LOG_XFER_ERROR, "No URB to complete." ); return -EINVAL; --- 102,110 ---- LinuxPipeRequest = CheckedGetObjectClass( env, linuxPipeRequest ); getPipeType = CheckedGetMethodID( env, LinuxPipeRequest, "getPipeType", "()I" ); ! getUrbAddress = CheckedGetMethodID( env, LinuxPipeRequest, "getUrbAddress", "()J" ); type = CheckedCallIntMethod( env, linuxPipeRequest, getPipeType ); CheckedDeleteLocalRef( env, LinuxPipeRequest ); ! if (!(urb = (struct usbdevfs_urb*)CheckedCallLongMethod( env, linuxPipeRequest, getUrbAddress ))) { log( LOG_XFER_ERROR, "No URB to complete." ); return -EINVAL; *************** *** 143,152 **** LinuxPipeRequest = CheckedGetObjectClass( env, linuxPipeRequest ); ! getUrbAddress = CheckedGetMethodID( env, LinuxPipeRequest, "getUrbAddress", "()I" ); CheckedDeleteLocalRef( env, LinuxPipeRequest ); log( LOG_XFER_REQUEST, "Canceling URB." ); ! urb = (struct usbdevfs_urb *)CheckedCallIntMethod( env, linuxPipeRequest, getUrbAddress ); if (!urb) { --- 143,152 ---- LinuxPipeRequest = CheckedGetObjectClass( env, linuxPipeRequest ); ! getUrbAddress = CheckedGetMethodID( env, LinuxPipeRequest, "getUrbAddress", "()J" ); CheckedDeleteLocalRef( env, LinuxPipeRequest ); log( LOG_XFER_REQUEST, "Canceling URB." ); ! urb = (struct usbdevfs_urb *)CheckedCallLongMethod( env, linuxPipeRequest, getUrbAddress ); if (!urb) { *************** *** 157,160 **** errno = 0; if (0 > (ioctl( fd, USBDEVFS_DISCARDURB, urb ))) ! log( LOG_XFER_ERROR, "Could not unlink urb %#x (error %d)", (unsigned int)urb, -errno ); } --- 157,160 ---- errno = 0; if (0 > (ioctl( fd, USBDEVFS_DISCARDURB, urb ))) ! log( LOG_XFER_ERROR, "Could not unlink urb %p (error %d)", urb, -errno ); } Index: JavaxUsbTopologyUpdater.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbTopologyUpdater.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JavaxUsbTopologyUpdater.c 17 Jul 2007 20:01:37 -0000 1.12 --- JavaxUsbTopologyUpdater.c 11 Feb 2008 20:22:20 -0000 1.13 *************** *** 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, usbdevfs_sprintf_node(), (0xff&bus), (0xff&dev)); keyString = CheckedNewStringUTF( env, node ); *************** *** 348,355 **** */ int n = atoi(entry->d_name); ! /* If the number conversion of the name is 1-999 and the name is 3 characters long (exactly), ! * it's (hopefully) ok. Technically, the number should be no larger than 127, but let's not get ! * unnecessarily picky. */ ! return (0 < n) && (n < 1000) && (3 == strlen(entry->d_name)); } --- 348,353 ---- */ int n = atoi(entry->d_name); ! /* If the number conversion of the name is 1-999, it's (hopefully) ok. */ ! return (0 < n) && (n < 1000); } Index: Makefile =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 8 Oct 2004 00:36:22 -0000 1.4 --- Makefile 11 Feb 2008 20:22:20 -0000 1.5 *************** *** 28,32 **** JSR80_INCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(CINCLUDES) ! JSR80_CFLAGS = -Wall $(JUSB_FLAGS) $(CFLAGS) JSR80_SOFLAGS = -shared $(SOFLAGS) --- 28,32 ---- JSR80_INCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(CINCLUDES) ! JSR80_CFLAGS = -Wall -fPIC $(JUSB_FLAGS) $(CFLAGS) JSR80_SOFLAGS = -shared $(SOFLAGS) Index: JavaxUsbIsochronousRequest.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbIsochronousRequest.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JavaxUsbIsochronousRequest.c 19 May 2005 22:51:11 -0000 1.9 --- JavaxUsbIsochronousRequest.c 11 Feb 2008 20:22:20 -0000 1.10 *************** *** 123,127 **** getTotalLength = CheckedGetMethodID( env, LinuxIsochronousRequest, "getTotalLength", "()I" ); size = CheckedGetMethodID( env, LinuxIsochronousRequest, "size", "()I" ); ! setUrbAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "setUrbAddress", "(I)V" ); getEndpointAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "getEndpointAddress", "()B" ); npackets = (unsigned int)CheckedCallIntMethod( env, linuxIsochronousRequest, size ); --- 123,127 ---- getTotalLength = CheckedGetMethodID( env, LinuxIsochronousRequest, "getTotalLength", "()I" ); size = CheckedGetMethodID( env, LinuxIsochronousRequest, "size", "()I" ); ! setUrbAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "setUrbAddress", "(J)V" ); getEndpointAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "getEndpointAddress", "()B" ); npackets = (unsigned int)CheckedCallIntMethod( env, linuxIsochronousRequest, size ); *************** *** 198,207 **** LinuxIsochronousRequest = CheckedGetObjectClass( env, linuxIsochronousRequest ); ! getUrbAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "getUrbAddress", "()I" ); CheckedDeleteLocalRef( env, LinuxIsochronousRequest ); log( LOG_XFER_OTHER, "Canceling URB" ); ! urb = (struct usbdevfs_urb *)CheckedCallIntMethod( env, linuxIsochronousRequest, getUrbAddress ); if (!urb) { --- 198,207 ---- LinuxIsochronousRequest = CheckedGetObjectClass( env, linuxIsochronousRequest ); ! getUrbAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "getUrbAddress", "()J" ); CheckedDeleteLocalRef( env, LinuxIsochronousRequest ); log( LOG_XFER_OTHER, "Canceling URB" ); ! urb = (struct usbdevfs_urb *)CheckedCallLongMethod( env, linuxIsochronousRequest, getUrbAddress ); if (!urb) { *************** *** 230,237 **** LinuxIsochronousRequest = CheckedGetObjectClass( env, linuxIsochronousRequest ); ! getUrbAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "getUrbAddress", "()I" ); CheckedDeleteLocalRef( env, LinuxIsochronousRequest ); ! if (!(urb = (struct usbdevfs_urb*)CheckedCallIntMethod( env, linuxIsochronousRequest, getUrbAddress ))) { log( LOG_XFER_ERROR, "No URB to complete!" ); return -EINVAL; --- 230,237 ---- LinuxIsochronousRequest = CheckedGetObjectClass( env, linuxIsochronousRequest ); ! getUrbAddress = CheckedGetMethodID( env, LinuxIsochronousRequest, "getUrbAddress", "()J" ); CheckedDeleteLocalRef( env, LinuxIsochronousRequest ); ! if (!(urb = (struct usbdevfs_urb*)CheckedCallLongMethod( env, linuxIsochronousRequest, getUrbAddress ))) { log( LOG_XFER_ERROR, "No URB to complete!" ); return -EINVAL; Index: JavaxUsbKernel.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JavaxUsbKernel.c 17 Jul 2007 20:03:51 -0000 1.4 --- JavaxUsbKernel.c 11 Feb 2008 20:22:20 -0000 1.5 *************** *** 103,108 **** #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() --- 103,108 ---- #define USBDEVFS_PATH_NEW "/dev/bus/usb" #define USBDEVFS_DEVICES_NEW "/dev/bus/usb/devices" ! #define USBDEVFS_SPRINTF_NODE_NEW "/dev/bus/usb/%d/%d" ! #define USBDEVFS_SSCANF_NODE_NEW "/dev/bus/usb/%d/%d" char *usbdevfs_path() Index: JavaxUsbActive.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbActive.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JavaxUsbActive.c 17 Jul 2007 20:01:37 -0000 1.8 --- JavaxUsbActive.c 11 Feb 2008 20:22:20 -0000 1.9 *************** *** 92,96 **** #ifdef INTERFACE_SETTING_USE_DEVICES_FILE ! static int interface_use_devices_file( JNIEnv *env, unsigned char bus, unsigned char dev, __u8 interface ) { FILE *file = NULL; --- 92,96 ---- #ifdef INTERFACE_SETTING_USE_DEVICES_FILE ! static int interface_use_devices_file( JNIEnv *env, unsigned char bus, unsigned char dev, unsigned char interface ) { FILE *file = NULL; *************** *** 186,190 **** int ret = 0; ! struct javaxusb_usbdevfs_ctrltransfer *ctrl = NULL; unsigned char *actconfig = NULL; --- 186,190 ---- int ret = 0; ! struct usbdevfs_ctrltransfer *ctrl = NULL; unsigned char *actconfig = NULL; *************** *** 197,201 **** *actconfig = 0; ! ctrl->bmRequestType = (__u8)0x80; ctrl->bRequest = 0x08; ctrl->wValue = 0x00; --- 197,201 ---- *actconfig = 0; ! ctrl->bmRequestType = (unsigned char)0x80; ctrl->bRequest = 0x08; ctrl->wValue = 0x00; *************** *** 224,228 **** #ifdef INTERFACE_SETTING_ASK_DEVICE #define INTERFACE_ASK_DEVICE_TIMEOUT 500 /* ms */ ! static int interface_ask_device( JNIEnv *env, int fd, __u8 interface ) { int ret = 0; --- 224,228 ---- #ifdef INTERFACE_SETTING_ASK_DEVICE #define INTERFACE_ASK_DEVICE_TIMEOUT 500 /* ms */ ! static int interface_ask_device( JNIEnv *env, int fd, unsigned char interface ) { int ret = 0; *************** *** 239,243 **** *actsetting = 0; ! ctrl->bmRequestType = (__u8)0x81; ctrl->bRequest = 0x0a; ctrl->wValue = 0x00; --- 239,243 ---- *actsetting = 0; ! ctrl->bmRequestType = (unsigned char)0x81; ctrl->bRequest = 0x0a; ctrl->wValue = 0x00; *************** *** 292,296 **** } ! int getActiveInterfaceSetting( JNIEnv *env, int fd, unsigned char bus, unsigned char dev, __u8 interface ) { int ret = -1; /* -1 = failure */ --- 292,296 ---- } ! int getActiveInterfaceSetting( JNIEnv *env, int fd, unsigned char bus, unsigned char dev, unsigned char interface ) { int ret = -1; /* -1 = failure */ *************** *** 384,388 **** devnum = (unsigned char)get_devnum_from_jname( env, jname ); ! settingNumber = getActiveInterfaceSetting( env, fd, busnum, devnum, (__u8)interfaceNumber ); close(fd); --- 384,388 ---- devnum = (unsigned char)get_devnum_from_jname( env, jname ); ! settingNumber = getActiveInterfaceSetting( env, fd, busnum, devnum, (unsigned char)interfaceNumber ); close(fd); Index: JavaxUsbChecks.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbChecks.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JavaxUsbChecks.h 5 Dec 2007 16:23:46 -0000 1.2 --- JavaxUsbChecks.h 11 Feb 2008 20:22:20 -0000 1.3 *************** *** 33,36 **** --- 33,37 ---- //FIXME - implement #define CheckedCallObjectMethod(env,object,method,args...) (*env)->CallObjectMethod(env,object,method,##args) + #define CheckedCallLongMethod(env,object,method,args...) (*env)->CallLongMethod(env,object,method,##args) #define CheckedCallIntMethod(env,object,method,args...) (*env)->CallIntMethod(env,object,method,##args) #define CheckedCallShortMethod(env,object,method,args...) (*env)->CallShortMethod(env,object,method,##args) *************** *** 46,49 **** --- 47,51 ---- //FIXME - implement #define CheckedCallStaticObjectMethod(env,class,method,args...) (*env)->CallStaticObjectMethod(env,class,method,##args) + #define CheckedCallStaticLongMethod(env,class,method,args...) (*env)->CallStaticLongMethod(env,class,method,##args) #define CheckedCallStaticIntMethod(env,class,method,args...) (*env)->CallStaticIntMethod(env,class,method,##args) #define CheckedCallStaticShortMethod(env,class,method,args...) (*env)->CallStaticShortMethod(env,class,method,##args) Index: JavaxUsbKernel.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JavaxUsbKernel.h 3 Dec 2007 16:12:22 -0000 1.7 --- JavaxUsbKernel.h 11 Feb 2008 20:22:20 -0000 1.8 *************** *** 16,38 **** #include <sys/utsname.h> - #include <linux/usbdevice_fs.h> - #include <linux/usb.h> ! // The names of this struct's fields change from 2.4 to 2.6. ! // But it's binary compatible, so let's just define it here. ! struct javaxusb_usbdevfs_ctrltransfer { ! __u8 bmRequestType; ! __u8 bRequest; ! __u16 wValue; ! __u16 wIndex; ! __u16 wLength; ! __u32 timeout; /* in milliseconds */ void *data; }; ! // This is defined only in later kernel versions ! #ifndef USBDEVFS_DISCONNECT #define USBDEVFS_DISCONNECT _IO('U', 22) - #endif int getShortPacketFlag(int accept); --- 16,138 ---- #include <sys/utsname.h> ! // I give up - the kernel guys can't keep their headers clean enough to include them from userspace programs. ! // So everything we need is redefined here. ! ! #define USB_DT_DEVICE 0x01 ! #define USB_DT_CONFIG 0x02 ! #define USB_DT_STRING 0x03 ! #define USB_DT_INTERFACE 0x04 ! #define USB_DT_ENDPOINT 0x05 ! ! #define USB_DT_HID 0x21 ! #define USB_DT_REPORT 0x22 ! #define USB_DT_PHYSICAL 0x23 ! #define USB_DT_HUB 0x29 ! ! /* ! * Descriptor sizes per descriptor type ! */ ! #define USB_DT_DEVICE_SIZE 18 ! #define USB_DT_CONFIG_SIZE 9 ! #define USB_DT_INTERFACE_SIZE 9 ! #define USB_DT_ENDPOINT_SIZE 7 ! #define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ ! #define USB_DT_HUB_NONVAR_SIZE 7 ! ! #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ ! #define USB_CLASS_AUDIO 1 ! #define USB_CLASS_COMM 2 ! #define USB_CLASS_HID 3 ! #define USB_CLASS_PRINTER 7 ! #define USB_CLASS_PTP 6 ! #define USB_CLASS_MASS_STORAGE 8 ! #define USB_CLASS_HUB 9 ! #define USB_CLASS_DATA 10 ! #define USB_CLASS_VENDOR_SPEC 0xff ! ! #define USBDEVFS_URB_SHORT_NOT_OK 1 ! #define USBDEVFS_URB_ISO_ASAP 2 ! ! #define USBDEVFS_URB_TYPE_ISO 0 ! #define USBDEVFS_URB_TYPE_INTERRUPT 1 ! #define USBDEVFS_URB_TYPE_CONTROL 2 ! #define USBDEVFS_URB_TYPE_BULK 3 ! ! struct usbdevfs_ctrltransfer { ! unsigned char bmRequestType; ! unsigned char bRequest; ! unsigned short wValue; ! unsigned short wIndex; ! unsigned short wLength; ! unsigned int timeout; /* in milliseconds */ void *data; }; ! struct usbdevfs_setinterface { ! unsigned int interface; ! unsigned int altsetting; ! }; ! ! struct usbdevfs_iso_packet_desc { ! unsigned int length; ! unsigned int actual_length; ! unsigned int status; ! }; ! ! struct usbdevfs_urb { ! unsigned char type; ! unsigned char endpoint; ! int status; ! unsigned int flags; ! void *buffer; ! int buffer_length; ! int actual_length; ! int start_frame; ! int number_of_packets; ! int error_count; ! unsigned int signr; /* signal to be sent on error, -1 if none should be sent */ ! void *usercontext; ! struct usbdevfs_iso_packet_desc iso_frame_desc[0]; ! }; ! ! #define USBDEVFS_MAXDRIVERNAME 255 ! ! struct usbdevfs_getdriver { ! unsigned int interface; ! char driver[USBDEVFS_MAXDRIVERNAME + 1]; ! }; ! ! struct usbdevfs_connectinfo { ! unsigned int devnum; ! unsigned char slow; ! }; ! ! struct usbdevfs_ioctl { ! int ifno; /* interface 0..N ; negative numbers reserved */ ! int ioctl_code; /* MUST encode size + direction of data so the ! * macros in <asm/ioctl.h> give correct values */ ! void *data; /* param buffer (in, or out) */ ! }; ! ! struct usbdevfs_hub_portinfo { ! char nports; /* number of downstream ports in this hub */ ! char port [127]; /* e.g. port 3 connects to device 27 */ ! }; ! ! #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) ! #define USBDEVFS_SETINTERFACE _IOR('U', 4, struct usbdevfs_setinterface) ! #define USBDEVFS_SETCONFIGURATION _IOR('U', 5, unsigned int) ! #define USBDEVFS_GETDRIVER _IOW('U', 8, struct usbdevfs_getdriver) ! #define USBDEVFS_SUBMITURB _IOR('U', 10, struct usbdevfs_urb) ! #define USBDEVFS_DISCARDURB _IO('U', 11) ! #define USBDEVFS_REAPURB _IOW('U', 12, void *) ! #define USBDEVFS_REAPURBNDELAY _IOW('U', 13, void *) ! #define USBDEVFS_CLAIMINTERFACE _IOR('U', 15, unsigned int) ! #define USBDEVFS_RELEASEINTERFACE _IOR('U', 16, unsigned int) ! #define USBDEVFS_CONNECTINFO _IOW('U', 17, struct usbdevfs_connectinfo) ! #define USBDEVFS_IOCTL _IOWR('U', 18, struct usbdevfs_ioctl) ! #define USBDEVFS_HUB_PORTINFO _IOR('U', 19, struct usbdevfs_hub_portinfo) #define USBDEVFS_DISCONNECT _IO('U', 22) int getShortPacketFlag(int accept); |
|
From: Dan S. <dds...@us...> - 2007-12-05 16:23:54
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25567/jni Modified Files: JavaxUsbChecks.h JavaxUsbLog.h Log Message: replace __FUNCTION__ with C99 standard __func__ Index: JavaxUsbChecks.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbChecks.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JavaxUsbChecks.h 22 Jan 2003 01:42:04 -0000 1.1 --- JavaxUsbChecks.h 5 Dec 2007 16:23:46 -0000 1.2 *************** *** 19,33 **** /* Non-static checked JNI function wrappers */ ! #define CheckedGetObjectClass(env,object) debugGetObjectClass(__FILE__,__FUNCTION__,__LINE__,env,object,#env","#object) ! #define CheckedGetMethodID(env,class,name,id) debugGetMethodID(__FILE__,__FUNCTION__,__LINE__,env,class,name,id,#env","#class","#name","#id) ! #define CheckedGetFieldID(env,class,name,id) debugGetFieldID(__FILE__,__FUNCTION__,__LINE__,env,class,name,id,#env","#class","#name","#id) ! #define CheckedNewStringUTF(env,string) debugNewStringUTF(__FILE__,__FUNCTION__,__LINE__,env,string,#env","#string) ! #define CheckedNewGlobalRef(env,object) debugNewGlobalRef(__FILE__,__FUNCTION__,__LINE__,env,object,#env","#object) ! #define CheckedDeleteLocalRef(env,object) debugDeleteLocalRef(__FILE__,__FUNCTION__,__LINE__,env,object,#env","#object) ! #define CheckedDeleteGlobalRef(env,object) debugDeleteGlobalRef(__FILE__,__FUNCTION__,__LINE__,env,object,#env","#object) ! #define CheckedGetByteArrayRegion(env,array,offset,length,buffer) debugGetByteArrayRegion(__FILE__,__FUNCTION__,__LINE__,env,array,offset,length,buffer,#env","#array","#offset","#length","#buffer) ! #define CheckedSetByteArrayRegion(env,array,offset,length,buffer) debugSetByteArrayRegion(__FILE__,__FUNCTION__,__LINE__,env,array,offset,length,buffer,#env","#array","#offset","#length","#buffer) ! #define CheckedGetArrayLength(env,array) debugGetArrayLength(__FILE__,__FUNCTION__,__LINE__,env,array,#env","#array) //FIXME - implement --- 19,33 ---- /* Non-static checked JNI function wrappers */ ! #define CheckedGetObjectClass(env,object) debugGetObjectClass(__FILE__,__func__,__LINE__,env,object,#env","#object) ! #define CheckedGetMethodID(env,class,name,id) debugGetMethodID(__FILE__,__func__,__LINE__,env,class,name,id,#env","#class","#name","#id) ! #define CheckedGetFieldID(env,class,name,id) debugGetFieldID(__FILE__,__func__,__LINE__,env,class,name,id,#env","#class","#name","#id) ! #define CheckedNewStringUTF(env,string) debugNewStringUTF(__FILE__,__func__,__LINE__,env,string,#env","#string) ! #define CheckedNewGlobalRef(env,object) debugNewGlobalRef(__FILE__,__func__,__LINE__,env,object,#env","#object) ! #define CheckedDeleteLocalRef(env,object) debugDeleteLocalRef(__FILE__,__func__,__LINE__,env,object,#env","#object) ! #define CheckedDeleteGlobalRef(env,object) debugDeleteGlobalRef(__FILE__,__func__,__LINE__,env,object,#env","#object) ! #define CheckedGetByteArrayRegion(env,array,offset,length,buffer) debugGetByteArrayRegion(__FILE__,__func__,__LINE__,env,array,offset,length,buffer,#env","#array","#offset","#length","#buffer) ! #define CheckedSetByteArrayRegion(env,array,offset,length,buffer) debugSetByteArrayRegion(__FILE__,__func__,__LINE__,env,array,offset,length,buffer,#env","#array","#offset","#length","#buffer) ! #define CheckedGetArrayLength(env,array) debugGetArrayLength(__FILE__,__func__,__LINE__,env,array,#env","#array) //FIXME - implement *************** *** 41,46 **** /* Static checked JNI function wrappers */ ! #define CheckedGetStaticMethodID(env,class,name,id) debugGetStaticMethodID(__FILE__,__FUNCTION__,__LINE__,env,class,name,id,#env","#class","#name","#id) ! #define CheckedGetStaticFieldID(env,class,name,id) debugGetStaticFieldID(__FILE__,__FUNCTION__,__LINE__,env,class,name,id,#env","#class","#name","#id) //FIXME - implement --- 41,46 ---- /* Static checked JNI function wrappers */ ! #define CheckedGetStaticMethodID(env,class,name,id) debugGetStaticMethodID(__FILE__,__func__,__LINE__,env,class,name,id,#env","#class","#name","#id) ! #define CheckedGetStaticFieldID(env,class,name,id) debugGetStaticFieldID(__FILE__,__func__,__LINE__,env,class,name,id,#env","#class","#name","#id) //FIXME - implement *************** *** 70,74 **** } ! static inline void debug_exception( JNIEnv *env, char *file, char *func, int line, char *jnicall, char *args ) { if (JNI_TRUE == (*env)->ExceptionCheck(env)) { --- 70,74 ---- } ! static inline void debug_exception( JNIEnv *env, const char *file, const char *func, int line, char *jnicall, char *args ) { if (JNI_TRUE == (*env)->ExceptionCheck(env)) { *************** *** 79,83 **** } ! static inline jclass debugGetObjectClass( char *file, char *func, int line, JNIEnv *env, jobject object, char *args ) { jclass class = (*env)->GetObjectClass( env, object ); --- 79,83 ---- } ! static inline jclass debugGetObjectClass( const char *file, const char *func, int line, JNIEnv *env, jobject object, char *args ) { jclass class = (*env)->GetObjectClass( env, object ); *************** *** 86,90 **** } ! static inline jmethodID debugGetMethodID( char *file, char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jmethodID method = (*env)->GetMethodID( env, class, name, id ); --- 86,90 ---- } ! static inline jmethodID debugGetMethodID( const char *file, const char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jmethodID method = (*env)->GetMethodID( env, class, name, id ); *************** *** 93,97 **** } ! static inline jfieldID debugGetFieldID( char *file, char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jfieldID field = (*env)->GetFieldID( env, class, name, id ); --- 93,97 ---- } ! static inline jfieldID debugGetFieldID( const char *file, const char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jfieldID field = (*env)->GetFieldID( env, class, name, id ); *************** *** 100,104 **** } ! static inline jstring debugNewStringUTF( char *file, char *func, int line, JNIEnv *env, char *str, char *args ) { jstring string = (*env)->NewStringUTF( env, str ); --- 100,104 ---- } ! static inline jstring debugNewStringUTF( const char *file, const char *func, int line, JNIEnv *env, char *str, char *args ) { jstring string = (*env)->NewStringUTF( env, str ); *************** *** 107,111 **** } ! static inline jobject debugNewGlobalRef( char *file, char *func, int line, JNIEnv *env, jobject object, char *args ) { jobject newObject = (*env)->NewGlobalRef( env , object ); --- 107,111 ---- } ! static inline jobject debugNewGlobalRef( const char *file, const char *func, int line, JNIEnv *env, jobject object, char *args ) { jobject newObject = (*env)->NewGlobalRef( env , object ); *************** *** 114,118 **** } ! static inline void debugDeleteLocalRef( char *file, char *func, int line, JNIEnv *env, jobject object, char *args ) { (*env)->DeleteLocalRef( env, object ); --- 114,118 ---- } ! static inline void debugDeleteLocalRef( const char *file, const char *func, int line, JNIEnv *env, jobject object, char *args ) { (*env)->DeleteLocalRef( env, object ); *************** *** 120,124 **** } ! static inline void debugDeleteGlobalRef( char *file, char *func, int line, JNIEnv *env, jobject object, char *args ) { (*env)->DeleteGlobalRef( env, object ); --- 120,124 ---- } ! static inline void debugDeleteGlobalRef( const char *file, const char *func, int line, JNIEnv *env, jobject object, char *args ) { (*env)->DeleteGlobalRef( env, object ); *************** *** 126,130 **** } ! static inline void debugGetByteArrayRegion( char *file, char *func, int line, JNIEnv *env, jbyteArray array, jsize offset, jsize length, jbyte *buffer, char *args ) { (*env)->GetByteArrayRegion( env, array, offset, length, buffer ); --- 126,130 ---- } ! static inline void debugGetByteArrayRegion( const char *file, const char *func, int line, JNIEnv *env, jbyteArray array, jsize offset, jsize length, jbyte *buffer, char *args ) { (*env)->GetByteArrayRegion( env, array, offset, length, buffer ); *************** *** 132,136 **** } ! static inline void debugSetByteArrayRegion( char *file, char *func, int line, JNIEnv *env, jbyteArray array, jsize offset, jsize length, jbyte *buffer, char *args ) { (*env)->SetByteArrayRegion( env, array, offset, length, buffer ); --- 132,136 ---- } ! static inline void debugSetByteArrayRegion( const char *file, const char *func, int line, JNIEnv *env, jbyteArray array, jsize offset, jsize length, jbyte *buffer, char *args ) { (*env)->SetByteArrayRegion( env, array, offset, length, buffer ); *************** *** 138,142 **** } ! static inline jsize debugGetArrayLength( char *file, char *func, int line, JNIEnv *env, jarray array, char *args ) { jsize size = (*env)->GetArrayLength( env, array ); --- 138,142 ---- } ! static inline jsize debugGetArrayLength( const char *file, const char *func, int line, JNIEnv *env, jarray array, char *args ) { jsize size = (*env)->GetArrayLength( env, array ); *************** *** 145,149 **** } ! static inline jmethodID debugGetStaticMethodID( char *file, char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jmethodID method = (*env)->GetStaticMethodID( env, class, name, id ); --- 145,149 ---- } ! static inline jmethodID debugGetStaticMethodID( const char *file, const char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jmethodID method = (*env)->GetStaticMethodID( env, class, name, id ); *************** *** 152,156 **** } ! static inline jfieldID debugGetStaticFieldID( char *file, char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jfieldID field = (*env)->GetStaticFieldID( env, class, name, id ); --- 152,156 ---- } ! static inline jfieldID debugGetStaticFieldID( const char *file, const char *func, int line, JNIEnv *env, jclass class, char *name, char *id, char *args ) { jfieldID field = (*env)->GetStaticFieldID( env, class, name, id ); Index: JavaxUsbLog.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbLog.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JavaxUsbLog.h 12 May 2005 19:14:52 -0000 1.9 --- JavaxUsbLog.h 5 Dec 2007 16:23:46 -0000 1.10 *************** *** 95,99 **** } \ } \ ! do_log(logname,(LOG_LEVEL_MASK&level),__FILE__,__FUNCTION__,__LINE__,buffer); \ if (buf2) free(buf2); \ } while (0) --- 95,99 ---- } \ } \ ! do_log(logname,(LOG_LEVEL_MASK&level),__FILE__,__func__,__LINE__,buffer); \ if (buf2) free(buf2); \ } while (0) |
|
From: Roger L. <rli...@us...> - 2007-12-03 16:12:37
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26838/jni Modified Files: JavaxUsbKernel.h Log Message: Reveret to using linux/usb.h since linux/usb/ch9.h seems to have different location between distributions. Index: JavaxUsbKernel.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JavaxUsbKernel.h 3 Dec 2007 11:50:30 -0000 1.6 --- JavaxUsbKernel.h 3 Dec 2007 16:12:22 -0000 1.7 *************** *** 14,20 **** //****************************************************************************** // Kernel-specific #include <sys/utsname.h> #include <linux/usbdevice_fs.h> ! #include <linux/usb/ch9.h> // The names of this struct's fields change from 2.4 to 2.6. --- 14,21 ---- //****************************************************************************** // Kernel-specific + #include <sys/utsname.h> #include <linux/usbdevice_fs.h> ! #include <linux/usb.h> // The names of this struct's fields change from 2.4 to 2.6. |
|
From: Roger L. <rli...@us...> - 2007-12-03 12:11:27
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19374/jni Modified Files: JavaxUsbDeviceProxy.c JavaxUsbKernel.h Log Message: Changed sleep in polling loop from 10ms to 1 ms. Index: JavaxUsbDeviceProxy.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbDeviceProxy.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JavaxUsbDeviceProxy.c 28 Nov 2007 23:54:05 -0000 1.6 --- JavaxUsbDeviceProxy.c 3 Dec 2007 11:50:30 -0000 1.7 *************** *** 33,37 **** int fd = 0; struct usbdevfs_urb *urb; - int loop_count = 0; jclass LinuxDeviceProxy; --- 33,36 ---- *************** *** 64,73 **** /* run forever...? */ while (1) { ! /* FIXME - stop using polling! */ ! if ( loop_count > 20 ) { ! usleep( 10000 ); ! loop_count = 0; ! } ! loop_count ++; if (JNI_TRUE == CheckedCallBooleanMethod( env, linuxDeviceProxy, isRequestWaiting )) { --- 63,67 ---- /* run forever...? */ while (1) { ! usleep( 1000 ); // Sleep 1 ms to avoid too much polling if (JNI_TRUE == CheckedCallBooleanMethod( env, linuxDeviceProxy, isRequestWaiting )) { Index: JavaxUsbKernel.h =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbKernel.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JavaxUsbKernel.h 17 Jul 2007 20:01:37 -0000 1.5 --- JavaxUsbKernel.h 3 Dec 2007 11:50:30 -0000 1.6 *************** *** 14,21 **** //****************************************************************************** // Kernel-specific - #include <sys/utsname.h> #include <linux/usbdevice_fs.h> ! #include <linux/usb.h> // The names of this struct's fields change from 2.4 to 2.6. --- 14,20 ---- //****************************************************************************** // Kernel-specific #include <sys/utsname.h> #include <linux/usbdevice_fs.h> ! #include <linux/usb/ch9.h> // The names of this struct's fields change from 2.4 to 2.6. |
|
From: Dan S. <dds...@us...> - 2007-11-28 23:54:09
|
Update of /cvsroot/javax-usb/javax-usb-ri-linux/jni In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3773 Modified Files: JavaxUsbDeviceProxy.c Log Message: Fix for 100% CPU usage; modified patch from Mark Scott Index: JavaxUsbDeviceProxy.c =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-ri-linux/jni/JavaxUsbDeviceProxy.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JavaxUsbDeviceProxy.c 19 Jul 2004 17:40:02 -0000 1.5 --- JavaxUsbDeviceProxy.c 28 Nov 2007 23:54:05 -0000 1.6 *************** *** 66,70 **** /* FIXME - stop using polling! */ if ( loop_count > 20 ) { ! usleep( 0 ); loop_count = 0; } --- 66,70 ---- /* FIXME - stop using polling! */ if ( loop_count > 20 ) { ! usleep( 10000 ); loop_count = 0; } |
