From 5ef50110e7b3ff3406102ab34528cf6a3e670a6d Mon Sep 17 00:00:00 2001 From: uniederer Date: Fri, 16 Mar 2012 12:17:47 +0000 Subject: [PATCH] - Changed the project name according to the new naming convention - Changed package names according to the new naming convention git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@277 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c --- LibusbJava/LibusbJava.cpp | 48 +- LibusbJava/LibusbJava.h | 410 +++++++++--------- java/.project | 2 +- java/META-INF/MANIFEST.MF | 2 +- java/build.xml | 8 +- java/deployment.xml | 8 +- java/project.properties | 4 +- java/src/.configure | 6 +- .../ntb/{usb => inf/libusbJava}/Device.java | 10 +- .../{usb => inf/libusbJava}/LibusbJava.java | 2 +- .../ch/ntb/{usb => inf/libusbJava}/USB.java | 34 +- .../{usb => inf/libusbJava}/USBException.java | 2 +- .../libusbJava}/USBTimeoutException.java | 2 +- .../ntb/{usb => inf/libusbJava}/Usb_Bus.java | 2 +- .../libusbJava}/Usb_Config_Descriptor.java | 6 +- .../libusbJava}/Usb_Descriptor.java | 2 +- .../{usb => inf/libusbJava}/Usb_Device.java | 2 +- .../libusbJava}/Usb_Device_Descriptor.java | 6 +- .../libusbJava}/Usb_Endpoint_Descriptor.java | 6 +- .../libusbJava}/Usb_Interface.java | 2 +- .../libusbJava}/Usb_Interface_Descriptor.java | 6 +- .../ch/ntb/{usb => inf/libusbJava}/Utils.java | 2 +- .../libusbJava}/logger/LogUtil.java | 4 +- .../libusbJava}/logger/package.html | 0 .../ntb/{usb => inf/libusbJava}/package.html | 0 .../testApp/AbstractDeviceInfo.java | 2 +- .../libusbJava}/testApp/TestApp.java | 2 +- .../libusbJava}/testApp/TestDevice.java | 12 +- .../libusbJava}/testApp/package.html | 0 .../libusbJava}/usbView/UsbTreeModel.java | 18 +- .../libusbJava}/usbView/UsbView.java | 22 +- .../libusbJava}/usbView/package.html | 0 java/test/ch/ntb/usb/demo/LogBus.java | 8 +- java/test/ch/ntb/usb/demo/ReadWrite.java | 6 +- java/test/ch/ntb/usb/test/DeviceTest.java | 20 +- java/test/ch/ntb/usb/test/MemoryLeakTest.java | 16 +- java/test/ch/ntb/usb/test/TestLibUsbJava.java | 14 +- .../ch/ntb/usb/test/devices/AT90USB1287.java | 4 +- .../ch/ntb/usb/test/devices/CY7C68013A.java | 4 +- java/test/ch/ntb/usb/test/devices/MX500.java | 2 +- .../ch/ntb/usb/test/devices/MousePlus.java | 2 +- java/testdevice.properties | 12 +- java/uml/ch.ntb.usb.uml | 4 +- 43 files changed, 362 insertions(+), 362 deletions(-) rename java/src/ch/ntb/{usb => inf/libusbJava}/Device.java (96%) rename java/src/ch/ntb/{usb => inf/libusbJava}/LibusbJava.java (96%) rename java/src/ch/ntb/{usb => inf/libusbJava}/USB.java (84%) rename java/src/ch/ntb/{usb => inf/libusbJava}/USBException.java (89%) rename java/src/ch/ntb/{usb => inf/libusbJava}/USBTimeoutException.java (89%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Bus.java (93%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Config_Descriptor.java (90%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Descriptor.java (93%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Device.java (94%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Device_Descriptor.java (92%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Endpoint_Descriptor.java (91%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Interface.java (92%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Usb_Interface_Descriptor.java (90%) rename java/src/ch/ntb/{usb => inf/libusbJava}/Utils.java (94%) rename java/src/ch/ntb/{usb => inf/libusbJava}/logger/LogUtil.java (94%) rename java/src/ch/ntb/{usb => inf/libusbJava}/logger/package.html (100%) rename java/src/ch/ntb/{usb => inf/libusbJava}/package.html (100%) rename java/src/ch/ntb/{usb => inf/libusbJava}/testApp/AbstractDeviceInfo.java (93%) rename java/src/ch/ntb/{usb => inf/libusbJava}/testApp/TestApp.java (96%) rename java/src/ch/ntb/{usb => inf/libusbJava}/testApp/TestDevice.java (91%) rename java/src/ch/ntb/{usb => inf/libusbJava}/testApp/package.html (100%) rename java/src/ch/ntb/{usb => inf/libusbJava}/usbView/UsbTreeModel.java (94%) rename java/src/ch/ntb/{usb => inf/libusbJava}/usbView/UsbView.java (91%) rename java/src/ch/ntb/{usb => inf/libusbJava}/usbView/package.html (100%) diff --git a/LibusbJava/LibusbJava.cpp b/LibusbJava/LibusbJava.cpp index 4a72b65..f0e0722 100644 --- a/LibusbJava/LibusbJava.cpp +++ b/LibusbJava/LibusbJava.cpp @@ -85,7 +85,7 @@ jfieldID usb_epDescFID_bLength, usb_epDescFID_bDescriptorType, \ * Method: usb_set_debug * Signature: (B)V */ -JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1debug +JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1set_1debug (JNIEnv *env, jclass obj, jint level) { clearLibusbJavaError(); @@ -96,7 +96,7 @@ JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1debug * Method: usb_init * Signature: ()V */ -JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava_usb_1init +JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1init (JNIEnv *env, jclass obj) { clearLibusbJavaError(); @@ -108,7 +108,7 @@ JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava_usb_1init * Method: usb_find_busses * Signature: ()I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1busses +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1find_1busses (JNIEnv *env, jclass obj) { clearLibusbJavaError(); @@ -120,7 +120,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1busses * Method: usb_find_devices * Signature: ()I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1devices +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1find_1devices (JNIEnv *env, jclass obj) { clearLibusbJavaError(); @@ -132,7 +132,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1devices * Method: usb_get_busses * Signature: ()Lch/ntb/usb/Usb_Bus; */ -JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses +JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1busses (JNIEnv *env, jclass obj) { @@ -545,7 +545,7 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses * Method: usb_open * Signature: (Lch/ntb/usb/Usb_Device;)I */ -JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava_usb_1open +JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1open (JNIEnv *env, jclass obj, jobject dev) { clearLibusbJavaError(); @@ -576,7 +576,7 @@ JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava_usb_1open * Method: usb_close * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1close +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1close (JNIEnv *env, jclass obj, jlong dev_handle) { clearLibusbJavaError(); @@ -588,7 +588,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1close * Method: usb_set_configuration * Signature: (II)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1configuration +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1set_1configuration (JNIEnv *env, jclass obj, jlong dev_handle, jint configuration) { clearLibusbJavaError(); @@ -600,7 +600,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1configuration * Method: usb_set_altinterface * Signature: (II)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1altinterface +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1set_1altinterface (JNIEnv *env, jclass obj, jlong dev_handle, jint alternate) { clearLibusbJavaError(); @@ -612,7 +612,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1altinterface * Method: usb_clear_halt * Signature: (II)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1clear_1halt +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1clear_1halt (JNIEnv *env, jclass obj, jlong dev_handle, jint ep) { clearLibusbJavaError(); @@ -624,7 +624,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1clear_1halt * Method: usb_reset * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1reset +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1reset (JNIEnv *env, jclass obj, jlong dev_handle) { clearLibusbJavaError(); @@ -636,7 +636,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1reset * Method: usb_claim_interface * Signature: (II)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1claim_1interface +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1claim_1interface (JNIEnv *env, jclass obj, jlong dev_handle, jint interface) { clearLibusbJavaError(); @@ -648,7 +648,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1claim_1interface * Method: usb_release_interface * Signature: (II)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1release_1interface +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1release_1interface (JNIEnv *env, jclass obj, jlong dev_handle, jint interface) { clearLibusbJavaError(); @@ -660,7 +660,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1release_1interface * Method: usb_control_msg * Signature: (IIIII[BII)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1control_1msg +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1control_1msg (JNIEnv *env, jclass obj, jlong dev_handle, jint requesttype, jint request, jint value, jint index, jbyteArray jbytes, jint size, jint timeout) { clearLibusbJavaError(); @@ -676,7 +676,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1control_1msg * Method: usb_get_string * Signature: (III)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1string +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1string (JNIEnv *env, jclass obj, jlong dev_handle, jint index, jint langid) { clearLibusbJavaError(); @@ -692,7 +692,7 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1string * Method: usb_get_string_simple * Signature: (II)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1string_1simple +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1string_1simple (JNIEnv *env, jclass obj, jlong dev_handle, jint index) { clearLibusbJavaError(); @@ -708,7 +708,7 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1string_1simple * Method: usb_get_descriptor * Signature: (IBBI)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1descriptor +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1descriptor (JNIEnv *env, jclass obj, jlong dev_handle, jbyte type, jbyte index, jint size) { clearLibusbJavaError(); @@ -725,7 +725,7 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1descriptor * Method: usb_get_descriptor_by_endpoint * Signature: (IIBBI)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1descriptor_1by_1endpoint +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1descriptor_1by_1endpoint (JNIEnv *env, jclass obj, jlong dev_handle, jint ep, jbyte type, jbyte index, jint size) { clearLibusbJavaError(); @@ -742,7 +742,7 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1descriptor_1by_1e * Method: usb_bulk_write * Signature: (II[BII)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1write +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1bulk_1write (JNIEnv *env, jclass obj, jlong dev_handle, jint ep, jbyteArray jbytes, jint size, jint timeout) { clearLibusbJavaError(); @@ -757,7 +757,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1write * Method: usb_bulk_read * Signature: (II[BII)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1read +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1bulk_1read (JNIEnv *env, jclass obj, jlong dev_handle, jint ep, jbyteArray jbytes, jint size, jint timeout) { clearLibusbJavaError(); @@ -774,7 +774,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1read * Method: usb_interrupt_write * Signature: (II[BII)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1write +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1interrupt_1write (JNIEnv *env, jclass obj, jlong dev_handle, jint ep, jbyteArray jbytes, jint size, jint timeout) { clearLibusbJavaError(); @@ -789,7 +789,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1write * Method: usb_interrupt_read * Signature: (II[BII)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1read +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1interrupt_1read (JNIEnv *env, jclass obj, jlong dev_handle, jint ep, jbyteArray jbytes, jint size, jint timeout) { clearLibusbJavaError(); @@ -806,7 +806,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1read * Method: usb_strerror * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1strerror (JNIEnv *env, jclass obj){ char *str; @@ -826,7 +826,7 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror * Method: usb_error_no * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1error_1no +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1error_1no (JNIEnv *env, jclass obj, jint java_error_no){ switch (java_error_no) { diff --git a/LibusbJava/LibusbJava.h b/LibusbJava/LibusbJava.h index b1982cf..ae7a4b8 100644 --- a/LibusbJava/LibusbJava.h +++ b/LibusbJava/LibusbJava.h @@ -1,205 +1,205 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class ch_ntb_usb_LibusbJava */ - -#ifndef _Included_ch_ntb_usb_LibusbJava -#define _Included_ch_ntb_usb_LibusbJava -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_set_debug - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1debug - (JNIEnv *, jclass, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_init - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava_usb_1init - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_find_busses - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1busses - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_find_devices - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1devices - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_get_busses - * Signature: ()Lch/ntb/usb/Usb_Bus; - */ -JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_open - * Signature: (Lch/ntb/usb/Usb_Device;)J - */ -JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava_usb_1open - (JNIEnv *, jclass, jobject); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_close - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1close - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_set_configuration - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1configuration - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_set_altinterface - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1set_1altinterface - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_clear_halt - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1clear_1halt - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_reset - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1reset - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_claim_interface - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1claim_1interface - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_release_interface - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1release_1interface - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_control_msg - * Signature: (JIIII[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1control_1msg - (JNIEnv *, jclass, jlong, jint, jint, jint, jint, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_get_string - * Signature: (JII)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1string - (JNIEnv *, jclass, jlong, jint, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_get_string_simple - * Signature: (JI)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1string_1simple - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_get_descriptor - * Signature: (JBBI)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1descriptor - (JNIEnv *, jclass, jlong, jbyte, jbyte, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_get_descriptor_by_endpoint - * Signature: (JIBBI)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1descriptor_1by_1endpoint - (JNIEnv *, jclass, jlong, jint, jbyte, jbyte, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_bulk_write - * Signature: (JI[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1write - (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_bulk_read - * Signature: (JI[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1read - (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_interrupt_write - * Signature: (JI[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1write - (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_interrupt_read - * Signature: (JI[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1read - (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_strerror - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_usb_LibusbJava - * Method: usb_error_no - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1error_1no - (JNIEnv *, jclass, jint); - -#ifdef __cplusplus -} -#endif -#endif +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class ch_ntb_inf_libusbJava_LibusbJava */ + +#ifndef _Included_ch_ntb_inf_libusbJava_LibusbJava +#define _Included_ch_ntb_inf_libusbJava_LibusbJava +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_set_debug + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1set_1debug + (JNIEnv *, jclass, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_init + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1init + (JNIEnv *, jclass); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_find_busses + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1find_1busses + (JNIEnv *, jclass); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_find_devices + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1find_1devices + (JNIEnv *, jclass); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_get_busses + * Signature: ()Lch/ntb/inf/libusbJava/Usb_Bus; + */ +JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1busses + (JNIEnv *, jclass); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_open + * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)J + */ +JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1open + (JNIEnv *, jclass, jobject); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_close + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1close + (JNIEnv *, jclass, jlong); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_set_configuration + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1set_1configuration + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_set_altinterface + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1set_1altinterface + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_clear_halt + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1clear_1halt + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_reset + * Signature: (J)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1reset + (JNIEnv *, jclass, jlong); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_claim_interface + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1claim_1interface + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_release_interface + * Signature: (JI)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1release_1interface + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_control_msg + * Signature: (JIIII[BII)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1control_1msg + (JNIEnv *, jclass, jlong, jint, jint, jint, jint, jbyteArray, jint, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_get_string + * Signature: (JII)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1string + (JNIEnv *, jclass, jlong, jint, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_get_string_simple + * Signature: (JI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1string_1simple + (JNIEnv *, jclass, jlong, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_get_descriptor + * Signature: (JBBI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1descriptor + (JNIEnv *, jclass, jlong, jbyte, jbyte, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_get_descriptor_by_endpoint + * Signature: (JIBBI)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1get_1descriptor_1by_1endpoint + (JNIEnv *, jclass, jlong, jint, jbyte, jbyte, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_bulk_write + * Signature: (JI[BII)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1bulk_1write + (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_bulk_read + * Signature: (JI[BII)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1bulk_1read + (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_interrupt_write + * Signature: (JI[BII)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1interrupt_1write + (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_interrupt_read + * Signature: (JI[BII)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1interrupt_1read + (JNIEnv *, jclass, jlong, jint, jbyteArray, jint, jint); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_strerror + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1strerror + (JNIEnv *, jclass); + +/* + * Class: ch_ntb_inf_libusbJava_LibusbJava + * Method: usb_error_no + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava_usb_1error_1no + (JNIEnv *, jclass, jint); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/java/.project b/java/.project index 88c62bc..9aa9f0b 100644 --- a/java/.project +++ b/java/.project @@ -1,6 +1,6 @@ - ch.ntb.usb + ch.ntb.inf.libusbJava diff --git a/java/META-INF/MANIFEST.MF b/java/META-INF/MANIFEST.MF index c3b6940..5718e20 100644 --- a/java/META-INF/MANIFEST.MF +++ b/java/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: ch.ntb.usb Bundle-Version: 1.0.2 Bundle-Vendor: libusbjava.sourceforge.net Require-Bundle: org.junit4 -Export-Package: ch.ntb.usb +Export-Package: ch.ntb.inf.libusbJava Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/java/build.xml b/java/build.xml index 20fe9d7..b154039 100644 --- a/java/build.xml +++ b/java/build.xml @@ -1,12 +1,12 @@ - + - Ant tasks for ch.ntb.usb + Ant tasks for ch.ntb.inf.libusbJava diff --git a/java/deployment.xml b/java/deployment.xml index 07ead7d..2215112 100644 --- a/java/deployment.xml +++ b/java/deployment.xml @@ -1,7 +1,7 @@ - + - Ant deployment tasks for ch.ntb.usb + Ant deployment tasks for ch.ntb.inf.libusbJava diff --git a/java/project.properties b/java/project.properties index 561a532..bd48a3e 100644 --- a/java/project.properties +++ b/java/project.properties @@ -1,5 +1,5 @@ #Thu Aug 24 14:28:28 CEST 2006 -project.name=ch.ntb.usb +project.name=ch.ntb.inf.libusbJava project.vendor=inf.ntb.ch project.dir.src=src project.dir.bin=bin @@ -7,4 +7,4 @@ project.dir.lib=lib project.dir.doc=doc project.dir.demos=demos project.jarfile=${project.name} -project.manifest.mainclass=ch.ntb.usb.usbView.UsbView +project.manifest.mainclass=ch.ntb.inf.libusbJava.usbView.UsbView diff --git a/java/src/.configure b/java/src/.configure index 3974ee4..ddcfdbe 100644 --- a/java/src/.configure +++ b/java/src/.configure @@ -1,6 +1,6 @@ # enable or disable logging -ch.ntb.usb/debug = true +ch.ntb.inf.libusbJava/debug = true # set and configure individual loggers here # the format is: projectName/debug/ = / -ch.ntb.usb/debug/logger0 = ch.ntb.usb/OFF -ch.ntb.usb/debug/logger1 = ch.ntb.usb.test/INFO +ch.ntb.inf.libusbJava/debug/logger0 = ch.ntb.inf.libusbJava/OFF +ch.ntb.inf.libusbJava/debug/logger1 = ch.ntb.inf.libusbJava.test/INFO diff --git a/java/src/ch/ntb/usb/Device.java b/java/src/ch/ntb/inf/libusbJava/Device.java similarity index 96% rename from java/src/ch/ntb/usb/Device.java rename to java/src/ch/ntb/inf/libusbJava/Device.java index 2184278..a345a78 100644 --- a/java/src/ch/ntb/usb/Device.java +++ b/java/src/ch/ntb/inf/libusbJava/Device.java @@ -5,12 +5,12 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; import java.util.logging.Level; import java.util.logging.Logger; -import ch.ntb.usb.logger.LogUtil; +import ch.ntb.inf.libusbJava.logger.LogUtil; /** * This class represents an USB device.
@@ -19,7 +19,7 @@ import ch.ntb.usb.logger.LogUtil; */ public class Device { - private static final Logger logger = LogUtil.getLogger("ch.ntb.usb"); + private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava"); private int maxPacketSize; @@ -545,11 +545,11 @@ public class Device { * * @param requestType * USB device request type (USB specification 9.3, - * bmRequestType). Use constants from {@link ch.ntb.usb.USB} + * bmRequestType). Use constants from {@link ch.ntb.inf.libusbJava.USB} * (REQ_TYPE_xxx). * @param request * specific request (USB specification 9.4, bRequest). Use - * constants from {@link ch.ntb.usb.USB} (REQ_xxx). + * constants from {@link ch.ntb.inf.libusbJava.USB} (REQ_xxx). * @param value * field that varies according to request (USB specification 9.4, * wValue) diff --git a/java/src/ch/ntb/usb/LibusbJava.java b/java/src/ch/ntb/inf/libusbJava/LibusbJava.java similarity index 96% rename from java/src/ch/ntb/usb/LibusbJava.java rename to java/src/ch/ntb/inf/libusbJava/LibusbJava.java index ad0e30f..f96dac3 100644 --- a/java/src/ch/ntb/usb/LibusbJava.java +++ b/java/src/ch/ntb/inf/libusbJava/LibusbJava.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * This class represents the Java Native Interface to the shared library which diff --git a/java/src/ch/ntb/usb/USB.java b/java/src/ch/ntb/inf/libusbJava/USB.java similarity index 84% rename from java/src/ch/ntb/usb/USB.java rename to java/src/ch/ntb/inf/libusbJava/USB.java index abdcfd8..7cde236 100644 --- a/java/src/ch/ntb/usb/USB.java +++ b/java/src/ch/ntb/inf/libusbJava/USB.java @@ -5,13 +5,13 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; import java.util.Iterator; import java.util.LinkedList; import java.util.logging.Logger; -import ch.ntb.usb.logger.LogUtil; +import ch.ntb.inf.libusbJava.logger.LogUtil; /** * This class manages all USB devices and defines some USB specific constants.
@@ -23,7 +23,7 @@ public class USB { /** * This request returns status for the specified recipient (USB spec 9.4.5). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_GET_STATUS = 0x00; @@ -31,7 +31,7 @@ public class USB { * This request is used to clear or disable a specific feature (USB spec * 9.4.1). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_CLEAR_FEATURE = 0x01; @@ -40,7 +40,7 @@ public class USB { * This request is used to set or enable a specific feature (USB spec * 9.4.9). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_SET_FEATURE = 0x03; @@ -49,7 +49,7 @@ public class USB { * This request sets the device address for all future device accesses (USB * spec 9.4.6). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_SET_ADDRESS = 0x05; @@ -57,7 +57,7 @@ public class USB { * This request returns the specified descriptor if the descriptor exists * (USB spec 9.4.3). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_GET_DESCRIPTOR = 0x06; @@ -65,7 +65,7 @@ public class USB { * This request is optional and may be used to update existing descriptors * or new descriptors may be added (USB spec 9.4.8). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_SET_DESCRIPTOR = 0x07; @@ -73,14 +73,14 @@ public class USB { * This request returns the current device configuration value (USB spec * 9.4.2). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_GET_CONFIGURATION = 0x08; /** * This request sets the device configuration (USB spec 9.4.7). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_SET_CONFIGURATION = 0x09; @@ -88,7 +88,7 @@ public class USB { * This request returns the selected alternate setting for the specified * interface (USB spec 9.4.4). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_GET_INTERFACE = 0x0A; @@ -96,7 +96,7 @@ public class USB { * This request allows the host to select an alternate setting for the * specified interface (USB spec 9.4.10). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_SET_INTERFACE = 0x0B; @@ -104,7 +104,7 @@ public class USB { * This request is used to set and then report an endpoint’s synchronization * frame (USB spec 9.4.11). * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_SYNCH_FRAME = 0x0C; @@ -117,7 +117,7 @@ public class USB { * signifying there is no Data stage.
* Specifies bit 7 of bmRequestType. * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_TYPE_DIR_HOST_TO_DEVICE = (0x00 << 7), @@ -128,7 +128,7 @@ public class USB { * Specifies the type of the request.
* Specifies bits 6..5 of bmRequestType. * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_TYPE_TYPE_STANDARD = (0x00 << 5), @@ -144,7 +144,7 @@ public class USB { * specified, the wIndex field identifies the interface or endpoint.
* Specifies bits 4..0 of bmRequestType. * - * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int, + * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int, * boolean) */ public static final int REQ_TYPE_RECIP_DEVICE = 0x00, @@ -163,7 +163,7 @@ public class USB { */ public static int FULLSPEED_MAX_BULK_PACKET_SIZE = 64; - private static final Logger logger = LogUtil.getLogger("ch.ntb.usb"); + private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava"); private static LinkedList devices = new LinkedList(); diff --git a/java/src/ch/ntb/usb/USBException.java b/java/src/ch/ntb/inf/libusbJava/USBException.java similarity index 89% rename from java/src/ch/ntb/usb/USBException.java rename to java/src/ch/ntb/inf/libusbJava/USBException.java index af40cd2..5273f2a 100644 --- a/java/src/ch/ntb/usb/USBException.java +++ b/java/src/ch/ntb/inf/libusbJava/USBException.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; import java.io.IOException; diff --git a/java/src/ch/ntb/usb/USBTimeoutException.java b/java/src/ch/ntb/inf/libusbJava/USBTimeoutException.java similarity index 89% rename from java/src/ch/ntb/usb/USBTimeoutException.java rename to java/src/ch/ntb/inf/libusbJava/USBTimeoutException.java index 3b8cf01..1bd6c00 100644 --- a/java/src/ch/ntb/usb/USBTimeoutException.java +++ b/java/src/ch/ntb/inf/libusbJava/USBTimeoutException.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; public class USBTimeoutException extends USBException { diff --git a/java/src/ch/ntb/usb/Usb_Bus.java b/java/src/ch/ntb/inf/libusbJava/Usb_Bus.java similarity index 93% rename from java/src/ch/ntb/usb/Usb_Bus.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Bus.java index fd668d3..7e00096 100644 --- a/java/src/ch/ntb/usb/Usb_Bus.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Bus.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents an USB bus.
diff --git a/java/src/ch/ntb/usb/Usb_Config_Descriptor.java b/java/src/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java similarity index 90% rename from java/src/ch/ntb/usb/Usb_Config_Descriptor.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java index 3ba9fda..f511295 100644 --- a/java/src/ch/ntb/usb/Usb_Config_Descriptor.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java @@ -5,15 +5,15 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents the descriptor of a USB configuration.
* A USB device can have several different configuration.
*
* The length of the configuration descriptor is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_CONFIG_SIZE} and the type is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_CONFIG}. + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_CONFIG_SIZE} and the type is + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_CONFIG}. * */ public class Usb_Config_Descriptor extends Usb_Descriptor { diff --git a/java/src/ch/ntb/usb/Usb_Descriptor.java b/java/src/ch/ntb/inf/libusbJava/Usb_Descriptor.java similarity index 93% rename from java/src/ch/ntb/usb/Usb_Descriptor.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Descriptor.java index d8f4c17..e08f6e1 100644 --- a/java/src/ch/ntb/usb/Usb_Descriptor.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Descriptor.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Common USB descriptor values.
diff --git a/java/src/ch/ntb/usb/Usb_Device.java b/java/src/ch/ntb/inf/libusbJava/Usb_Device.java similarity index 94% rename from java/src/ch/ntb/usb/Usb_Device.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Device.java index 4fc7aeb..7a3cdd3 100644 --- a/java/src/ch/ntb/usb/Usb_Device.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Device.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents an USB device.
diff --git a/java/src/ch/ntb/usb/Usb_Device_Descriptor.java b/java/src/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java similarity index 92% rename from java/src/ch/ntb/usb/Usb_Device_Descriptor.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java index 720909f..f78f717 100644 --- a/java/src/ch/ntb/usb/Usb_Device_Descriptor.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents the descriptor of a USB device.
@@ -13,8 +13,8 @@ package ch.ntb.usb; * yet important information about the device.
*
* The length of the device descriptor is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_DEVICE_SIZE} and the type is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_DEVICE}. + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_DEVICE_SIZE} and the type is + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_DEVICE}. * */ public class Usb_Device_Descriptor extends Usb_Descriptor { diff --git a/java/src/ch/ntb/usb/Usb_Endpoint_Descriptor.java b/java/src/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java similarity index 91% rename from java/src/ch/ntb/usb/Usb_Endpoint_Descriptor.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java index 049cbd4..1284ba9 100644 --- a/java/src/ch/ntb/usb/Usb_Endpoint_Descriptor.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents the descriptor of an USB endpoint.
@@ -16,8 +16,8 @@ package ch.ntb.usb; * the bus.
*
* The length of the configuration descriptor is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_ENDPOINT_SIZE} and the type is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_ENDPOINT}. + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_ENDPOINT_SIZE} and the type is + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_ENDPOINT}. * */ public class Usb_Endpoint_Descriptor extends Usb_Descriptor { diff --git a/java/src/ch/ntb/usb/Usb_Interface.java b/java/src/ch/ntb/inf/libusbJava/Usb_Interface.java similarity index 92% rename from java/src/ch/ntb/usb/Usb_Interface.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Interface.java index 4ea724a..d96d59e 100644 --- a/java/src/ch/ntb/usb/Usb_Interface.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Interface.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents an USB interface.
diff --git a/java/src/ch/ntb/usb/Usb_Interface_Descriptor.java b/java/src/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java similarity index 90% rename from java/src/ch/ntb/usb/Usb_Interface_Descriptor.java rename to java/src/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java index 683f143..519343a 100644 --- a/java/src/ch/ntb/usb/Usb_Interface_Descriptor.java +++ b/java/src/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; /** * Represents the descriptor of a USB interface.
@@ -13,8 +13,8 @@ package ch.ntb.usb; * endpoints into a functional group performing a single feature of the device.
*
* The length of the interface descriptor is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_INTERFACE_SIZE} and the type is - * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_INTERFACE}. + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_INTERFACE_SIZE} and the type is + * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_INTERFACE}. * */ public class Usb_Interface_Descriptor extends Usb_Descriptor { diff --git a/java/src/ch/ntb/usb/Utils.java b/java/src/ch/ntb/inf/libusbJava/Utils.java similarity index 94% rename from java/src/ch/ntb/usb/Utils.java rename to java/src/ch/ntb/inf/libusbJava/Utils.java index e14591d..6ba6a73 100644 --- a/java/src/ch/ntb/usb/Utils.java +++ b/java/src/ch/ntb/inf/libusbJava/Utils.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb; +package ch.ntb.inf.libusbJava; import java.io.PrintStream; diff --git a/java/src/ch/ntb/usb/logger/LogUtil.java b/java/src/ch/ntb/inf/libusbJava/logger/LogUtil.java similarity index 94% rename from java/src/ch/ntb/usb/logger/LogUtil.java rename to java/src/ch/ntb/inf/libusbJava/logger/LogUtil.java index f227a14..ac18644 100644 --- a/java/src/ch/ntb/usb/logger/LogUtil.java +++ b/java/src/ch/ntb/inf/libusbJava/logger/LogUtil.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb.logger; +package ch.ntb.inf.libusbJava.logger; import java.io.InputStream; import java.util.Properties; @@ -20,7 +20,7 @@ public class LogUtil { // debug this class private static final boolean debugLogUtil = false; - private static final String PLUGIN_ID = "ch.ntb.usb"; + private static final String PLUGIN_ID = "ch.ntb.inf.libusbJava"; private static final String PROPERTIES_FILE = ".configure"; private static final String LOGGER_WARNING = "Warning in class " + LogUtil.class.getName() diff --git a/java/src/ch/ntb/usb/logger/package.html b/java/src/ch/ntb/inf/libusbJava/logger/package.html similarity index 100% rename from java/src/ch/ntb/usb/logger/package.html rename to java/src/ch/ntb/inf/libusbJava/logger/package.html diff --git a/java/src/ch/ntb/usb/package.html b/java/src/ch/ntb/inf/libusbJava/package.html similarity index 100% rename from java/src/ch/ntb/usb/package.html rename to java/src/ch/ntb/inf/libusbJava/package.html diff --git a/java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java b/java/src/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java similarity index 93% rename from java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java rename to java/src/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java index 871a397..049edca 100644 --- a/java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java +++ b/java/src/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb.testApp; +package ch.ntb.inf.libusbJava.testApp; public abstract class AbstractDeviceInfo { diff --git a/java/src/ch/ntb/usb/testApp/TestApp.java b/java/src/ch/ntb/inf/libusbJava/testApp/TestApp.java similarity index 96% rename from java/src/ch/ntb/usb/testApp/TestApp.java rename to java/src/ch/ntb/inf/libusbJava/testApp/TestApp.java index c521666..08e98c7 100644 --- a/java/src/ch/ntb/usb/testApp/TestApp.java +++ b/java/src/ch/ntb/inf/libusbJava/testApp/TestApp.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb.testApp; +package ch.ntb.inf.libusbJava.testApp; import java.awt.BorderLayout; import java.awt.Color; diff --git a/java/src/ch/ntb/usb/testApp/TestDevice.java b/java/src/ch/ntb/inf/libusbJava/testApp/TestDevice.java similarity index 91% rename from java/src/ch/ntb/usb/testApp/TestDevice.java rename to java/src/ch/ntb/inf/libusbJava/testApp/TestDevice.java index 4c67257..8a699ed 100644 --- a/java/src/ch/ntb/usb/testApp/TestDevice.java +++ b/java/src/ch/ntb/inf/libusbJava/testApp/TestDevice.java @@ -5,20 +5,20 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb.testApp; +package ch.ntb.inf.libusbJava.testApp; import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -import ch.ntb.usb.Device; -import ch.ntb.usb.USB; -import ch.ntb.usb.USBException; -import ch.ntb.usb.logger.LogUtil; +import ch.ntb.inf.libusbJava.Device; +import ch.ntb.inf.libusbJava.USB; +import ch.ntb.inf.libusbJava.USBException; +import ch.ntb.inf.libusbJava.logger.LogUtil; public class TestDevice extends AbstractDeviceInfo { - private static final Logger logger = LogUtil.getLogger("ch.ntb.usb.test"); + private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava.test"); private String sendData = "0x5b 0x02 0x01 0x00 0x03 0x03 0xf0 0xf0 0x1f"; diff --git a/java/src/ch/ntb/usb/testApp/package.html b/java/src/ch/ntb/inf/libusbJava/testApp/package.html similarity index 100% rename from java/src/ch/ntb/usb/testApp/package.html rename to java/src/ch/ntb/inf/libusbJava/testApp/package.html diff --git a/java/src/ch/ntb/usb/usbView/UsbTreeModel.java b/java/src/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java similarity index 94% rename from java/src/ch/ntb/usb/usbView/UsbTreeModel.java rename to java/src/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java index 26ddb43..fa38f0b 100644 --- a/java/src/ch/ntb/usb/usbView/UsbTreeModel.java +++ b/java/src/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb.usbView; +package ch.ntb.inf.libusbJava.usbView; import java.util.Vector; @@ -18,14 +18,14 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import ch.ntb.usb.LibusbJava; -import ch.ntb.usb.Usb_Bus; -import ch.ntb.usb.Usb_Config_Descriptor; -import ch.ntb.usb.Usb_Device; -import ch.ntb.usb.Usb_Device_Descriptor; -import ch.ntb.usb.Usb_Endpoint_Descriptor; -import ch.ntb.usb.Usb_Interface; -import ch.ntb.usb.Usb_Interface_Descriptor; +import ch.ntb.inf.libusbJava.LibusbJava; +import ch.ntb.inf.libusbJava.Usb_Bus; +import ch.ntb.inf.libusbJava.Usb_Config_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Device; +import ch.ntb.inf.libusbJava.Usb_Device_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Endpoint_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Interface; +import ch.ntb.inf.libusbJava.Usb_Interface_Descriptor; public class UsbTreeModel implements TreeModel, TreeSelectionListener { diff --git a/java/src/ch/ntb/usb/usbView/UsbView.java b/java/src/ch/ntb/inf/libusbJava/usbView/UsbView.java similarity index 91% rename from java/src/ch/ntb/usb/usbView/UsbView.java rename to java/src/ch/ntb/inf/libusbJava/usbView/UsbView.java index dfeed49..83fb90e 100644 --- a/java/src/ch/ntb/usb/usbView/UsbView.java +++ b/java/src/ch/ntb/inf/libusbJava/usbView/UsbView.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.usb.usbView; +package ch.ntb.inf.libusbJava.usbView; import java.awt.BorderLayout; import java.awt.Component; @@ -28,16 +28,16 @@ import javax.swing.JTree; import javax.swing.KeyStroke; import javax.swing.tree.TreePath; -import ch.ntb.usb.LibusbJava; -import ch.ntb.usb.Usb_Bus; -import ch.ntb.usb.Usb_Config_Descriptor; -import ch.ntb.usb.Usb_Device; -import ch.ntb.usb.Usb_Device_Descriptor; -import ch.ntb.usb.Usb_Endpoint_Descriptor; -import ch.ntb.usb.Usb_Interface_Descriptor; -import ch.ntb.usb.testApp.TestApp; -import ch.ntb.usb.testApp.TestDevice; -import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode; +import ch.ntb.inf.libusbJava.LibusbJava; +import ch.ntb.inf.libusbJava.Usb_Bus; +import ch.ntb.inf.libusbJava.Usb_Config_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Device; +import ch.ntb.inf.libusbJava.Usb_Device_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Endpoint_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Interface_Descriptor; +import ch.ntb.inf.libusbJava.testApp.TestApp; +import ch.ntb.inf.libusbJava.testApp.TestDevice; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo.TransferMode; public class UsbView extends JFrame { diff --git a/java/src/ch/ntb/usb/usbView/package.html b/java/src/ch/ntb/inf/libusbJava/usbView/package.html similarity index 100% rename from java/src/ch/ntb/usb/usbView/package.html rename to java/src/ch/ntb/inf/libusbJava/usbView/package.html diff --git a/java/test/ch/ntb/usb/demo/LogBus.java b/java/test/ch/ntb/usb/demo/LogBus.java index 413bd02..9a54ecd 100644 --- a/java/test/ch/ntb/usb/demo/LogBus.java +++ b/java/test/ch/ntb/usb/demo/LogBus.java @@ -7,9 +7,9 @@ */ package ch.ntb.usb.demo; -import ch.ntb.usb.LibusbJava; -import ch.ntb.usb.Usb_Bus; -import ch.ntb.usb.Utils; +import ch.ntb.inf.libusbJava.LibusbJava; +import ch.ntb.inf.libusbJava.Usb_Bus; +import ch.ntb.inf.libusbJava.Utils; /** * Initalises Libusb and prints the bus(ses) with attached devices to the @@ -20,7 +20,7 @@ import ch.ntb.usb.Utils; public class LogBus { private static void logBus() { - // if you don't use the ch.ntb.usb.Device class you must initialise + // if you don't use the ch.ntb.inf.libusbJava.Device class you must initialise // Libusb before use LibusbJava.usb_init(); LibusbJava.usb_find_busses(); diff --git a/java/test/ch/ntb/usb/demo/ReadWrite.java b/java/test/ch/ntb/usb/demo/ReadWrite.java index 61b77de..eade352 100644 --- a/java/test/ch/ntb/usb/demo/ReadWrite.java +++ b/java/test/ch/ntb/usb/demo/ReadWrite.java @@ -7,9 +7,9 @@ */ package ch.ntb.usb.demo; -import ch.ntb.usb.Device; -import ch.ntb.usb.USB; -import ch.ntb.usb.USBException; +import ch.ntb.inf.libusbJava.Device; +import ch.ntb.inf.libusbJava.USB; +import ch.ntb.inf.libusbJava.USBException; /** * Demo class to demonstrate simple read and write operations to an USB device.
diff --git a/java/test/ch/ntb/usb/test/DeviceTest.java b/java/test/ch/ntb/usb/test/DeviceTest.java index 6411a5d..bd07aaa 100644 --- a/java/test/ch/ntb/usb/test/DeviceTest.java +++ b/java/test/ch/ntb/usb/test/DeviceTest.java @@ -26,16 +26,16 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import ch.ntb.usb.Device; -import ch.ntb.usb.LibusbJava; -import ch.ntb.usb.USB; -import ch.ntb.usb.USBException; -import ch.ntb.usb.Usb_Bus; -import ch.ntb.usb.Usb_Config_Descriptor; -import ch.ntb.usb.Usb_Device_Descriptor; -import ch.ntb.usb.Utils; -import ch.ntb.usb.testApp.AbstractDeviceInfo; -import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode; +import ch.ntb.inf.libusbJava.Device; +import ch.ntb.inf.libusbJava.LibusbJava; +import ch.ntb.inf.libusbJava.USB; +import ch.ntb.inf.libusbJava.USBException; +import ch.ntb.inf.libusbJava.Usb_Bus; +import ch.ntb.inf.libusbJava.Usb_Config_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Device_Descriptor; +import ch.ntb.inf.libusbJava.Utils; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo.TransferMode; public class DeviceTest { diff --git a/java/test/ch/ntb/usb/test/MemoryLeakTest.java b/java/test/ch/ntb/usb/test/MemoryLeakTest.java index 525405d..55cfedc 100644 --- a/java/test/ch/ntb/usb/test/MemoryLeakTest.java +++ b/java/test/ch/ntb/usb/test/MemoryLeakTest.java @@ -21,14 +21,14 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import ch.ntb.usb.Device; -import ch.ntb.usb.LibusbJava; -import ch.ntb.usb.USB; -import ch.ntb.usb.USBException; -import ch.ntb.usb.Usb_Bus; -import ch.ntb.usb.Utils; -import ch.ntb.usb.testApp.AbstractDeviceInfo; -import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode; +import ch.ntb.inf.libusbJava.Device; +import ch.ntb.inf.libusbJava.LibusbJava; +import ch.ntb.inf.libusbJava.USB; +import ch.ntb.inf.libusbJava.USBException; +import ch.ntb.inf.libusbJava.Usb_Bus; +import ch.ntb.inf.libusbJava.Utils; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo.TransferMode; public class MemoryLeakTest { diff --git a/java/test/ch/ntb/usb/test/TestLibUsbJava.java b/java/test/ch/ntb/usb/test/TestLibUsbJava.java index 0a582a8..23bb0ca 100644 --- a/java/test/ch/ntb/usb/test/TestLibUsbJava.java +++ b/java/test/ch/ntb/usb/test/TestLibUsbJava.java @@ -7,13 +7,13 @@ */ package ch.ntb.usb.test; -import ch.ntb.usb.LibusbJava; -import ch.ntb.usb.Usb_Bus; -import ch.ntb.usb.Usb_Config_Descriptor; -import ch.ntb.usb.Usb_Device; -import ch.ntb.usb.Usb_Endpoint_Descriptor; -import ch.ntb.usb.Usb_Interface; -import ch.ntb.usb.Usb_Interface_Descriptor; +import ch.ntb.inf.libusbJava.LibusbJava; +import ch.ntb.inf.libusbJava.Usb_Bus; +import ch.ntb.inf.libusbJava.Usb_Config_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Device; +import ch.ntb.inf.libusbJava.Usb_Endpoint_Descriptor; +import ch.ntb.inf.libusbJava.Usb_Interface; +import ch.ntb.inf.libusbJava.Usb_Interface_Descriptor; /** * This class replicates the code from testlibusb.c supplied in the diff --git a/java/test/ch/ntb/usb/test/devices/AT90USB1287.java b/java/test/ch/ntb/usb/test/devices/AT90USB1287.java index 33603f6..53d0010 100644 --- a/java/test/ch/ntb/usb/test/devices/AT90USB1287.java +++ b/java/test/ch/ntb/usb/test/devices/AT90USB1287.java @@ -7,8 +7,8 @@ */ package ch.ntb.usb.test.devices; -import ch.ntb.usb.USB; -import ch.ntb.usb.testApp.AbstractDeviceInfo; +import ch.ntb.inf.libusbJava.USB; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; public class AT90USB1287 extends AbstractDeviceInfo { diff --git a/java/test/ch/ntb/usb/test/devices/CY7C68013A.java b/java/test/ch/ntb/usb/test/devices/CY7C68013A.java index 6664d1a..45c0cba 100644 --- a/java/test/ch/ntb/usb/test/devices/CY7C68013A.java +++ b/java/test/ch/ntb/usb/test/devices/CY7C68013A.java @@ -7,8 +7,8 @@ */ package ch.ntb.usb.test.devices; -import ch.ntb.usb.USB; -import ch.ntb.usb.testApp.AbstractDeviceInfo; +import ch.ntb.inf.libusbJava.USB; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; public class CY7C68013A extends AbstractDeviceInfo { diff --git a/java/test/ch/ntb/usb/test/devices/MX500.java b/java/test/ch/ntb/usb/test/devices/MX500.java index c6fe7c3..eb50936 100644 --- a/java/test/ch/ntb/usb/test/devices/MX500.java +++ b/java/test/ch/ntb/usb/test/devices/MX500.java @@ -7,7 +7,7 @@ */ package ch.ntb.usb.test.devices; -import ch.ntb.usb.testApp.AbstractDeviceInfo; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; public class MX500 extends AbstractDeviceInfo { diff --git a/java/test/ch/ntb/usb/test/devices/MousePlus.java b/java/test/ch/ntb/usb/test/devices/MousePlus.java index 9bb1a80..90eb4ba 100644 --- a/java/test/ch/ntb/usb/test/devices/MousePlus.java +++ b/java/test/ch/ntb/usb/test/devices/MousePlus.java @@ -7,7 +7,7 @@ */ package ch.ntb.usb.test.devices; -import ch.ntb.usb.testApp.AbstractDeviceInfo; +import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; public class MousePlus extends AbstractDeviceInfo { diff --git a/java/testdevice.properties b/java/testdevice.properties index a10e97d..7c92baa 100644 --- a/java/testdevice.properties +++ b/java/testdevice.properties @@ -1,13 +1,13 @@ ################################################################ -# define the usb test class for test/ch.ntb.usb.DeviceTest here -# it must implement ch.ntb.usb.AbstractDeviceInfo +# define the usb test class for test/ch.ntb.inf.libusbJava.DeviceTest here +# it must implement ch.ntb.inf.libusbJava.AbstractDeviceInfo ################################################################ # Atmel AVR AT90USB1287 -testdeviceInfo=ch.ntb.usb.test.devices.AT90USB1287 +testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.AT90USB1287 # Cypress FX2 CY7C68013A -#testdeviceInfo=ch.ntb.usb.test.devices.CY7C68013A +#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.CY7C68013A # MX500 Mouse -#testdeviceInfo=ch.ntb.usb.test.devices.MX500 +#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.MX500 # Logitech Notebook Mouse Plus -#testdeviceInfo=ch.ntb.usb.test.devices.MousePlus +#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.MousePlus diff --git a/java/uml/ch.ntb.usb.uml b/java/uml/ch.ntb.usb.uml index 7de7f42..4f55368 100644 --- a/java/uml/ch.ntb.usb.uml +++ b/java/uml/ch.ntb.usb.uml @@ -64,7 +64,7 @@ BWFMxN62oEGNP+kKcODiEgAA -ch.ntb.usb +ch.ntb.inf.libusbJava False @@ -1441,7 +1441,7 @@ type Usb_Device 16 -ch.ntb.usb +ch.ntb.inf.libusbJava +VhQCvPWpkq9N+U+GjchOQAA 1 3aqcGmdQBU2yR8XWwbH6wgAA