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

- TestApp ported from SWT to Swing

Browse Source 
- Start TestApp from UsbView with selected interface
- some refactoring

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@225 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-12-04 08:01:32 +00:00
parent 3f79739681
commit db8d66c992
11 changed files with 1223 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/test/ch/ntb/usb/test/AT90USB1287.java
View File

@@ -18,12 +18,12 @@ public class AT90USB1287 extends AbstractDeviceInfo {
setConfiguration(1);
setInterface(0);
setAltinterface(-1);
setOUT_EP_BULK(0x01);
setIN_EP_BULK(0x82);
setOUT_EP_INT(0x03);
setIN_EP_INT(0x84);
setOutEPBulk(0x01);
setInEPBulk(0x82);
setOutEPInt(0x03);
setInEPInt(0x84);
setSleepTimeout(2000);
setMaxDataSize(USB.FULLSPEED_MAX_BULK_PACKET_SIZE);
setMode(WriteMode.Bulk);
setMode(TransferMode.Bulk);
}
}

98
java/test/ch/ntb/usb/test/AbstractDeviceInfo.java
View File

@@ -8,33 +8,33 @@ package ch.ntb.usb.test;
public abstract class AbstractDeviceInfo {
private short IdVendor;
private short idVendor;
private short IdProduct;
private short idProduct;
private int Timeout;
private int timeout;
private int Configuration;
private int configuration;
private int Interface;
private int interface_;
private int Altinterface;
private int altinterface;
private int OUT_EP_BULK;
private int outEPBulk;
private int IN_EP_BULK;
private int inEPBulk;
private int OUT_EP_INT;
private int outEPInt;
private int IN_EP_INT;
private int inEPInt;
private int SleepTimeout;
private int sleepTimeout;
private int MaxDataSize;
private int maxDataSize;
private WriteMode mode;
private TransferMode mode;
public static enum WriteMode {
public static enum TransferMode {
Bulk, Interrupt
}
@@ -45,106 +45,106 @@ public abstract class AbstractDeviceInfo {
abstract public void initValues();
public int getAltinterface() {
return Altinterface;
return altinterface;
}
public int getConfiguration() {
return Configuration;
return configuration;
}
public short getIdProduct() {
return IdProduct;
return idProduct;
}
public short getIdVendor() {
return IdVendor;
return idVendor;
}
public int getIN_EP_BULK() {
return IN_EP_BULK;
public int getInEPBulk() {
return inEPBulk;
}
public int getIN_EP_INT() {
return IN_EP_INT;
public int getInEPInt() {
return inEPInt;
}
public int getInterface() {
return Interface;
return interface_;
}
public int getMaxDataSize() {
return MaxDataSize;
return maxDataSize;
}
public int getOUT_EP_BULK() {
return OUT_EP_BULK;
public int getOutEPBulk() {
return outEPBulk;
}
public int getOUT_EP_INT() {
return OUT_EP_INT;
public int getOutEPInt() {
return outEPInt;
}
public int getSleepTimeout() {
return SleepTimeout;
return sleepTimeout;
}
public int getTimeout() {
return Timeout;
return timeout;
}
public void setAltinterface(int altinterface) {
Altinterface = altinterface;
this.altinterface = altinterface;
}
public void setConfiguration(int configuration) {
Configuration = configuration;
this.configuration = configuration;
}
public void setIdProduct(short idProduct) {
IdProduct = idProduct;
this.idProduct = idProduct;
}
public void setIdVendor(short idVendor) {
IdVendor = idVendor;
this.idVendor = idVendor;
}
public void setIN_EP_BULK(int in_ep_bulk) {
IN_EP_BULK = in_ep_bulk;
public void setInEPBulk(int in_ep_bulk) {
this.inEPBulk = in_ep_bulk;
}
public void setIN_EP_INT(int in_ep_int) {
IN_EP_INT = in_ep_int;
public void setInEPInt(int in_ep_int) {
this.inEPInt = in_ep_int;
}
public void setInterface(int interface1) {
Interface = interface1;
public void setInterface(int interface_) {
this.interface_ = interface_;
}
public void setMaxDataSize(int maxDataSize) {
MaxDataSize = maxDataSize;
this.maxDataSize = maxDataSize;
}
public void setOUT_EP_BULK(int out_ep_bulk) {
OUT_EP_BULK = out_ep_bulk;
public void setOutEPBulk(int out_ep_bulk) {
this.outEPBulk = out_ep_bulk;
}
public void setOUT_EP_INT(int out_ep_int) {
OUT_EP_INT = out_ep_int;
public void setOutEPInt(int out_ep_int) {
this.outEPInt = out_ep_int;
}
public void setSleepTimeout(int sleepTimeout) {
SleepTimeout = sleepTimeout;
this.sleepTimeout = sleepTimeout;
}
public void setTimeout(int timeout) {
Timeout = timeout;
this.timeout = timeout;
}
public WriteMode getMode() {
public TransferMode getMode() {
return mode;
}
public void setMode(WriteMode mode) {
public void setMode(TransferMode mode) {
this.mode = mode;
}

10
java/test/ch/ntb/usb/test/CY7C68013A.java
View File

@@ -18,12 +18,12 @@ public class CY7C68013A extends AbstractDeviceInfo {
setConfiguration(1);
setInterface(0);
setAltinterface(-1);
setOUT_EP_INT(0x02);
setIN_EP_INT(0x86);
setOUT_EP_BULK(0x04);
setIN_EP_BULK(0x88);
setOutEPInt(0x02);
setInEPInt(0x86);
setOutEPBulk(0x04);
setInEPBulk(0x88);
setSleepTimeout(2000);
setMaxDataSize(USB.HIGHSPEED_MAX_BULK_PACKET_SIZE);
setMode(WriteMode.Bulk);
setMode(TransferMode.Bulk);
}
}

34
java/test/ch/ntb/usb/test/DeviceTest.java
View File

@@ -25,7 +25,7 @@ import ch.ntb.usb.USB;
import ch.ntb.usb.USBException;
import ch.ntb.usb.Usb_Config_Descriptor;
import ch.ntb.usb.Usb_Device_Descriptor;
import ch.ntb.usb.test.AbstractDeviceInfo.WriteMode;
import ch.ntb.usb.test.AbstractDeviceInfo.TransferMode;
public class DeviceTest {
@@ -91,7 +91,7 @@ public class DeviceTest {
doOpen();
doClose();
// this call must throw an exception, because the device is closed
dev.writeBulk(devinfo.getOUT_EP_BULK(), testData, testData.length,
dev.writeBulk(devinfo.getOutEPBulk(), testData, testData.length,
devinfo.getTimeout(), false);
}
@@ -101,7 +101,7 @@ public class DeviceTest {
dev.reset();
timeout();
// this call must throw an exception, because the device is closed
dev.writeBulk(devinfo.getOUT_EP_BULK(), testData, testData.length,
dev.writeBulk(devinfo.getOutEPBulk(), testData, testData.length,
devinfo.getTimeout(), false);
}
@@ -116,13 +116,13 @@ public class DeviceTest {
@Test
public void bulkWriteRead() throws Exception {
devinfo.setMode(WriteMode.Bulk);
devinfo.setMode(TransferMode.Bulk);
doOpenWriteReadClose();
}
@Test
public void interruptWriteRead() throws Exception {
devinfo.setMode(WriteMode.Interrupt);
devinfo.setMode(TransferMode.Interrupt);
doOpenWriteReadClose();
}
@@ -130,7 +130,7 @@ public class DeviceTest {
public void bulkWriteReadMultiple() throws Exception {
final int NumberOfIterations = 100;
devinfo.setMode(WriteMode.Bulk);
devinfo.setMode(TransferMode.Bulk);
doOpen();
for (int i = 0; i < NumberOfIterations; i++) {
initTestData();
@@ -142,7 +142,7 @@ public class DeviceTest {
@Test
public void multipleOpenCloseWithBulkWrite() throws Exception {
devinfo.setMode(WriteMode.Bulk);
devinfo.setMode(TransferMode.Bulk);
for (int i = 0; i < 5; i++) {
doOpen();
doClose();
@@ -164,10 +164,10 @@ public class DeviceTest {
public void bulkAndInterrupt() throws Exception {
doOpen();
// BULK
devinfo.setMode(WriteMode.Bulk);
devinfo.setMode(TransferMode.Bulk);
doWriteRead();
// INTERRUPT
devinfo.setMode(WriteMode.Interrupt);
devinfo.setMode(TransferMode.Interrupt);
doWriteRead();
doClose();
}
@@ -175,9 +175,9 @@ public class DeviceTest {
@Test
public void bulkAndInterruptMultiple() throws Exception {
for (int i = 0; i < 20; i++) {
devinfo.setMode(WriteMode.Bulk);
devinfo.setMode(TransferMode.Bulk);
doOpenWriteReadClose();
devinfo.setMode(WriteMode.Interrupt);
devinfo.setMode(TransferMode.Interrupt);
doOpenWriteReadClose();
}
}
@@ -239,15 +239,15 @@ public class DeviceTest {
private void doWriteRead() throws Exception {
initTestData();
if (devinfo.getMode().equals(WriteMode.Bulk)) {
dev.writeBulk(devinfo.getOUT_EP_BULK(), testData, testData.length,
if (devinfo.getMode().equals(TransferMode.Bulk)) {
dev.writeBulk(devinfo.getOutEPBulk(), testData, testData.length,
devinfo.getTimeout(), false);
dev.readBulk(devinfo.getIN_EP_BULK(), readData, readData.length,
dev.readBulk(devinfo.getInEPBulk(), readData, readData.length,
devinfo.getTimeout(), false);
} else if (devinfo.getMode().equals(WriteMode.Interrupt)) {
dev.writeInterrupt(devinfo.getOUT_EP_INT(), testData,
} else if (devinfo.getMode().equals(TransferMode.Interrupt)) {
dev.writeInterrupt(devinfo.getOutEPInt(), testData,
testData.length, devinfo.getTimeout(), false);
dev.readInterrupt(devinfo.getIN_EP_INT(), readData,
dev.readInterrupt(devinfo.getInEPInt(), readData,
readData.length, devinfo.getTimeout(), false);
}
compare(testData, readData);