rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device handle check fixed (check for 0 and not <0 as this may be a valid address)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@252 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
spandi
2007-08-11 12:54:13 +00:00
parent 7fb6e148ed
commit 8dc3f8c515
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/src/ch/ntb/usb/Device.java
View File

@@ -174,7 +174,7 @@ public class Device {
this.dev_interface = interface_; this.dev_interface = interface_;
this.dev_altinterface = altinterface; this.dev_altinterface = altinterface;
if (usbDevHandle > 0) { if (usbDevHandle != 0) {
throw new USBException("device opened, close or reset first"); throw new USBException("device opened, close or reset first");
} }
@@ -191,7 +191,7 @@ public class Device {
usbDevHandle = res; usbDevHandle = res;
} }
if (dev == null || usbDevHandle <= 0) { if (dev == null || usbDevHandle == 0) {
throw new USBException("USB device with idVendor 0x" throw new USBException("USB device with idVendor 0x"
+ Integer.toHexString(idVendor & 0xFFFF) + Integer.toHexString(idVendor & 0xFFFF)
+ " and idProduct 0x" + " and idProduct 0x"
@@ -217,7 +217,7 @@ public class Device {
* @throws USBException * @throws USBException
*/ */
public void close() throws USBException { public void close() throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
release_interface(usbDevHandle, dev_interface); release_interface(usbDevHandle, dev_interface);
@@ -239,7 +239,7 @@ public class Device {
* @throws USBException * @throws USBException
*/ */
public void reset() throws USBException { public void reset() throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
release_interface(usbDevHandle, dev_interface); release_interface(usbDevHandle, dev_interface);
@@ -272,7 +272,7 @@ public class Device {
*/ */
public int writeBulk(int out_ep_address, byte[] data, int size, public int writeBulk(int out_ep_address, byte[] data, int size,
int timeout, boolean reopenOnTimeout) throws USBException { int timeout, boolean reopenOnTimeout) throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
if (data == null) { if (data == null) {
@@ -332,7 +332,7 @@ public class Device {
*/ */
public int readBulk(int in_ep_address, byte[] data, int size, int timeout, public int readBulk(int in_ep_address, byte[] data, int size, int timeout,
boolean reopenOnTimeout) throws USBException { boolean reopenOnTimeout) throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
if (data == null) { if (data == null) {
@@ -392,7 +392,7 @@ public class Device {
*/ */
public int writeInterrupt(int out_ep_address, byte[] data, int size, public int writeInterrupt(int out_ep_address, byte[] data, int size,
int timeout, boolean reopenOnTimeout) throws USBException { int timeout, boolean reopenOnTimeout) throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
if (data == null) { if (data == null) {
@@ -453,7 +453,7 @@ public class Device {
*/ */
public int readInterrupt(int in_ep_address, byte[] data, int size, public int readInterrupt(int in_ep_address, byte[] data, int size,
int timeout, boolean reopenOnTimeout) throws USBException { int timeout, boolean reopenOnTimeout) throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
if (data == null) { if (data == null) {
@@ -529,7 +529,7 @@ public class Device {
public int controlMsg(int requestType, int request, int value, int index, public int controlMsg(int requestType, int request, int value, int index,
byte[] data, int size, int timeout, boolean reopenOnTimeout) byte[] data, int size, int timeout, boolean reopenOnTimeout)
throws USBException { throws USBException {
if (usbDevHandle <= 0) { if (usbDevHandle == 0) {
throw new USBException("invalid device handle"); throw new USBException("invalid device handle");
} }
if (data == null) { if (data == null) {
@@ -705,7 +705,7 @@ public class Device {
* @return true if the device is open * @return true if the device is open
*/ */
public boolean isOpen() { public boolean isOpen() {
return usbDevHandle > 0; return usbDevHandle != 0;
} }
/** /**

2
java/version.properties
View File

@@ -1,4 +1,4 @@
#Thu Aug 24 14:28:28 CEST 2006 #Thu Aug 24 14:28:28 CEST 2006
version.major=0 version.major=0
version.minor=5 version.minor=5
version.release=3 version.release=4