diff --git a/LibusbJava/.cdtproject b/LibusbJava/.cdtproject deleted file mode 100644 index b95c82a..0000000 --- a/LibusbJava/.cdtproject +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LibusbJava/.cproject b/LibusbJava/.cproject deleted file mode 100644 index 4c46a1f..0000000 --- a/LibusbJava/.cproject +++ /dev/null @@ -1,399 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LibusbJava/.project b/LibusbJava/.project deleted file mode 100644 index 3b07456..0000000 --- a/LibusbJava/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - LibusbJava-1.0 - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean, - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - make - - - org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/LibusbJava-1.0/Debug} - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - false - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - true - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/LibusbJava/build.xml b/LibusbJava/build.xml deleted file mode 100644 index 499ff5d..0000000 --- a/LibusbJava/build.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - Build file for libusbJava Shared Library - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LibusbJava/build_rc.cmd b/LibusbJava/build_rc.cmd deleted file mode 100644 index 7e48db2..0000000 --- a/LibusbJava/build_rc.cmd +++ /dev/null @@ -1,32 +0,0 @@ -@echo off -echo #include ^ > %1 -echo. >> %1 -echo VS_VERSION_INFO VERSIONINFO >> %1 -echo FILEVERSION %2, %3, %4, %5 >> %1 -echo PRODUCTVERSION %2, %3, %4, %5 >> %1 -echo FILEFLAGSMASK 0x3FL >> %1 -echo FILEFLAGS 0x0L >> %1 -echo FILEOS VOS_NT_WINDOWS32 >> %1 -echo FILETYPE VFT_DLL >> %1 -echo FILESUBTYPE VFT2_UNKNOWN >> %1 -echo BEGIN >> %1 -echo BLOCK "StringFileInfo" >> %1 -echo BEGIN >> %1 -echo BLOCK "040904b0" >> %1 -echo BEGIN >> %1 -echo VALUE "CompanyName", "http://libusbjava.sourceforge.net" >> %1 -echo VALUE "FileDescription", "JNI Library for LibusbJava stub" >> %1 -echo VALUE "FileVersion", "%2.%3.%4.%5\0" >> %1 -echo VALUE "InternalName", "LibusbJava-1_0.dll" >> %1 -echo VALUE "LegalCopyright", "2012 NTB Interstate University of Applied Sciences of Technology Buchs/Chur/St.Gallen" >> %1 -echo VALUE "OriginalFilename","LibusbJava-1_0.dll" >> %1 -echo VALUE "ProductName", "LibusbJava" >> %1 -echo VALUE "ProductVersion", "%2.%3.%4.%5\0" >> %1 -echo END >> %1 -echo END >> %1 -echo. >> %1 -echo BLOCK "VarFileInfo" >> %1 -echo BEGIN >> %1 -echo VALUE "Translation", 0x409, 1200 >> %1 -echo END >> %1 -echo END >> %1 diff --git a/LibusbJava/project.properties b/LibusbJava/project.properties deleted file mode 100644 index d84b4ae..0000000 --- a/LibusbJava/project.properties +++ /dev/null @@ -1,54 +0,0 @@ -############################ -# common build properties # -############################ -# folders -build.dir.src=src -build.dir.bin=bin - -# filenames -build.lib.libusb=libusb.a -build.lib.libusbpp=libusbpp.a -build.linux.lib.libusb=libusb.so -build.linux.lib.libusbpp=libusbpp.so -build.mac.lib.libusb=libusb.dylib -build.mac.lib.libusbpp=libusbpp.dylib -build.shlib.srcname=LibusbJava.cpp -build.shlib.win.shlibname=LibusbJava.dll -build.shlib.linux.shlibname=libusbJava.so -build.shlib.mac.shlibname=libusbJava.jnilib - -build.test.srcname=LibusbTest -build.test.execname=LibusbTest - -##################################### -# Windows specific build properties # -##################################### -build.win.compiler=g++ -build.win.windres=windres -build.win.resource.rc=resource.rc -build.win.resource.obj=resource.o - -#################################### -# Linux specific build properties # -#################################### -build.linux.compiler=g++ -build.linux.includes=/usr/lib -build.linux.includes2=${build.linux.includes} -build.linux.includes3=${build.linux.includes} - -## set the following properties if you require additional include paths -# -## e.g. on ubuntu linux (with gcj) -# build.linux.includes2=/usr/lib/jvm/java-1.4.2.gcj-4.1-1.4.2.0/include -# -## e.g. on ubuntu linux (with jdk 6) use -# build.linux.includes2=/usr/lib/jvm/java-6-sun-1.6.0.00/include -# build.linux.includes3=${build.linux.includes2}/linux - -#################################### -# Mac specific build properties # -#################################### -build.mac.compiler=gcc -build.mac.jni=/System/Library/Frameworks/JavaVM.framework/Headers/ -build.mac.includes=/usr/local/lib -build.mac.stdclib=stdc++ diff --git a/LibusbJava/version.properties b/LibusbJava/version.properties deleted file mode 100644 index 8d9f590..0000000 --- a/LibusbJava/version.properties +++ /dev/null @@ -1,4 +0,0 @@ -version.major=1 -version.minor=0 -version.micro=1 -version.nano=0 \ No newline at end of file diff --git a/java/README.txt b/README.txt similarity index 97% rename from java/README.txt rename to README.txt index c5dc21f..da3c678 100644 --- a/java/README.txt +++ b/README.txt @@ -1,27 +1,27 @@ -Project description -------------------- -Java libusb wrapper is a Java wrapper for the libsub and libusb-win32 USB library. -* libusb aim is to create a library for use by user level applications to access USB devices regardless of OS. -* libusb-win32 is a port of the libusb library to the Windows operating systems. The library allows user space applications to access any USB device on Windows in a generic way without writing any line of kernel driver code. - -For more information about libusb visit: - http://libusb.sourceforge.net/ - -For more information about LibUsb-Win32 visit: - http://libusb-win32.sourceforge.net - http://sourceforge.net/projects/libusb-win32 - -For more information about Java LibUsb-Win32 wrapper visit: - http://libusbjava.sourceforge.net - http://sourceforge.net/projects/libusbjava - -License -------- -The Java libusb wrapper library is released under the LGPL. See LGPL.txt -for more information. -For licensing information about libusb see http://sourceforge.net/projects/libusb/. -For licensing information about LibUsb-Win32 see http://libusb-win32.sourceforge.net/#license. - -Authors -------- -Andreas Schläpfer +Project description +------------------- +Java libusb wrapper is a Java wrapper for the libsub and libusb-win32 USB library. +* libusb aim is to create a library for use by user level applications to access USB devices regardless of OS. +* libusb-win32 is a port of the libusb library to the Windows operating systems. The library allows user space applications to access any USB device on Windows in a generic way without writing any line of kernel driver code. + +For more information about libusb visit: + http://libusb.sourceforge.net/ + +For more information about LibUsb-Win32 visit: + http://libusb-win32.sourceforge.net + http://sourceforge.net/projects/libusb-win32 + +For more information about Java LibUsb-Win32 wrapper visit: + http://libusbjava.sourceforge.net + http://sourceforge.net/projects/libusbjava + +License +------- +The Java libusb wrapper library is released under the LGPL. See LGPL.txt +for more information. +For licensing information about libusb see http://sourceforge.net/projects/libusb/. +For licensing information about LibUsb-Win32 see http://libusb-win32.sourceforge.net/#license. + +Authors +------- +Andreas Schläpfer diff --git a/build.gradle b/build.gradle index 136db4b..1ad20ba 100644 --- a/build.gradle +++ b/build.gradle @@ -3,20 +3,162 @@ apply plugin: 'cpp' apply plugin: 'maven' apply plugin: 'eclipse' -group = 'com.github.boukefalos' -archivesBaseName = 'jlibusb' -version = '0.5.7' - repositories { + maven { + url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' + } mavenCentral() } dependencies { + compile 'com.github.boukefalos:jlibloader:0.2' testCompile 'junit:junit:4.11' } -uploadArchives { - repositories.mavenDeployer { - repository(url: uri('.maven')) +group = 'com.github.boukefalos' +project.archivesBaseName = 'jlibusb' +version = '0.5.7' +def jniVersion = '0.2.3.0' + +task wrapper(type: Wrapper) { + gradleVersion = '1.12' +} + +model { + platforms { + windows_i386 { + architecture 'i386' + operatingSystem 'windows' + } + windows_amd64 { + architecture 'amd64' + operatingSystem 'windows' + } + } + toolChains { + gcc(Gcc) { + addPlatformConfiguration(new TargetPlatformConfiguration() { + boolean supportsPlatform(Platform platform) { + platform.operatingSystem.current && platform.operatingSystem.name == 'windows' && + platform.architecture.name == 'amd64' + } + List getCppCompilerArgs() { ['-m64', '-fpermissive'] } + List getCCompilerArgs() { ['-m64'] } + List getObjectiveCCompilerArgs() { ['-m64'] } + List getObjectiveCppCompilerArgs() { ['-m64'] } + List getAssemblerArgs() { ['--64'] } + List getLinkerArgs() { ['-m64'] } + List getStaticLibraryArchiverArgs() { [] } + }) + } + } + repositories { + libs(PrebuiltLibraries) { + usb { lib -> + binaries.withType(StaticLibraryBinary) { + staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll.a") + } + } + } + } +} + +def jniHeadersDir = file("$buildDir/headers") + +task jniHeaders(dependsOn: compileJava) { + def outputFile = file("$jniHeadersDir/LibusbJava.h") + inputs.files sourceSets.main.output + outputs.file outputFile + exec { + executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') + args '-o', outputFile + args '-classpath', sourceSets.main.output.classesDir + args '-classpath', file("$buildDir/../bin") + args 'ch.ntb.usb.LibusbJava1' } +} + +libraries { + main { + baseName project.archivesBaseName + } + all { + binaries.all { + cppCompiler.args '-I' + jniHeadersDir + cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include" + cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32" + linker.args '-Wl,--kill-at', '-static-libgcc', '-static-libstdc++' + tasks.withType(CppCompile) { task -> + //task.dependsOn jniHeaders + } + + lib library: 'usb', linkage: 'static' + } + } +} + +tasks.withType(Upload) { + repositories { + mavenDeployer { + repository(url: uri('.maven')) + } + } +} + +configurations { + jni +} + +def deployer = uploadJni.repositories.mavenDeployer + +binaries.withType(SharedLibraryBinary) { binary -> + if (!buildable) { + return + } + def variantName = "${targetPlatform.operatingSystem.name}-${targetPlatform.architecture.name}" + def taskName = "jar-${variantName}" + def nativeJar = project.tasks.findByName(taskName) + if (nativeJar == null) { + nativeJar = project.task(taskName, type: Jar) { + baseName = "${project.archivesBaseName}-$variantName" + } + artifacts { + jni nativeJar + } + def jniPom = deployer.addFilter(variantName) { artifact, file -> + return file == nativeJar.archivePath + } + jniPom.groupId = project.group + jniPom.artifactId = nativeJar.baseName + jniPom.version = jniVersion + jniPom.scopeMappings.mappings.clear() + } + def builderTask = binary.tasks.builder + def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" + nativeJar.into(libraryDirectory) { from builderTask.outputFile } + nativeJar.dependsOn builderTask +} + +def mainPom = uploadArchives.repositories.mavenDeployer.pom +mainPom.groupId = project.group +mainPom.artifactId = jar.baseName +mainPom.version = project.version +mainPom.scopeMappings.mappings.clear() +mainPom.withXml { provider -> + def node = provider.asNode() + def deps = node.appendNode('dependencies') + ['windows-amd64', 'windows-i386'].each { platform -> + def dep = deps.appendNode('dependency') + dep.appendNode('groupId', project.group) + dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}") + dep.appendNode('version', jniVersion) + } + def dep = deps.appendNode('dependency') + dep.appendNode('groupId', 'com.github.boukefalos') + dep.appendNode('artifactId', 'jlibloader') + dep.appendNode('version', '0.2') +} + +jar { + from sourceSets.main.allSource } \ No newline at end of file diff --git a/java/doc/Overview.odg b/doc/Overview.odg similarity index 100% rename from java/doc/Overview.odg rename to doc/Overview.odg diff --git a/java/doc/Overview.png b/doc/Overview.png similarity index 100% rename from java/doc/Overview.png rename to doc/Overview.png diff --git a/java/.classpath b/java/.classpath deleted file mode 100644 index 70b82ed..0000000 --- a/java/.classpath +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/java/.project b/java/.project deleted file mode 100644 index d404604..0000000 --- a/java/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - ch.ntb.inf.libusbJava - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsensis.installoptions.InstallOptionsBuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.jem.beaninfo.BeanInfoNature - org.eclipse.pde.PluginNature - net.sf.eclipsensis.installoptions.InstallOptionsNature - - diff --git a/java/UsbView.launch b/java/UsbView.launch deleted file mode 100644 index 0997abe..0000000 --- a/java/UsbView.launch +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/java/build.properties b/java/build.properties deleted file mode 100644 index 4790385..0000000 --- a/java/build.properties +++ /dev/null @@ -1 +0,0 @@ -# MTJ Build Properties diff --git a/java/build.xml b/java/build.xml deleted file mode 100644 index 00f17ad..0000000 --- a/java/build.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - Ant tasks for ch.ntb.inf.libusbJava - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Building Version ${version.major}.${version.minor}.${version.release} - - - - - - - - - - -
- - - -
- - - - - - - - - - - - diff --git a/java/deployment.properties b/java/deployment.properties deleted file mode 100644 index 148931a..0000000 --- a/java/deployment.properties +++ /dev/null @@ -1,8 +0,0 @@ -java2html.dir.lib=D:/MyDocuments/Download/Programming/java2html -java2html.dir.src=test/ch/ntb/usb/demo/ - -project.server.name=shell.sourceforge.net -project.server.dir=/home/groups/l/li/libusbjava/htdocs/wp/res -project.server.dir.doc=${project.server.dir}/doc -project.server.dir.bin=${project.server.dir}/bin -project.server.dir.demos=${project.server.dir}/demos diff --git a/java/deployment.xml b/java/deployment.xml deleted file mode 100644 index 2215112..0000000 --- a/java/deployment.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - Ant deployment tasks for ch.ntb.inf.libusbJava - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/project.properties b/java/project.properties deleted file mode 100644 index 6c301cf..0000000 --- a/java/project.properties +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Mar 30 10:58:35 CEST 2010 -project.name=ch.ntb.inf.libusbJava -project.vendor=inf.ntb.ch -project.dir.src=src -project.dir.bin=bin -project.dir.lib=lib -project.dir.doc=doc -project.dir.demos=demos -project.jarfile=${project.name} -project.manifest.mainclass=ch.ntb.inf.libusbJava.usbView.UsbView diff --git a/java/version.properties b/java/version.properties deleted file mode 100644 index 9326970..0000000 --- a/java/version.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Mar 30 10:58:35 CEST 2010 -version.major=1 -version.minor=0 -version.release=0 diff --git a/lib/libusb-1.0.def b/lib/libusb-1.0.def deleted file mode 100644 index 3aba343..0000000 --- a/lib/libusb-1.0.def +++ /dev/null @@ -1,126 +0,0 @@ -LIBRARY "libusb-1.0.dll" -EXPORTS - libusb_alloc_transfer - libusb_alloc_transfer@4 = libusb_alloc_transfer - libusb_attach_kernel_driver - libusb_attach_kernel_driver@8 = libusb_attach_kernel_driver - libusb_bulk_transfer - libusb_bulk_transfer@24 = libusb_bulk_transfer - libusb_cancel_transfer - libusb_cancel_transfer@4 = libusb_cancel_transfer - libusb_claim_interface - libusb_claim_interface@8 = libusb_claim_interface - libusb_clear_halt - libusb_clear_halt@8 = libusb_clear_halt - libusb_close - libusb_close@4 = libusb_close - libusb_control_transfer - libusb_control_transfer@32 = libusb_control_transfer - libusb_detach_kernel_driver - libusb_detach_kernel_driver@8 = libusb_detach_kernel_driver - libusb_error_name - libusb_error_name@4 = libusb_error_name - libusb_event_handler_active - libusb_event_handler_active@4 = libusb_event_handler_active - libusb_event_handling_ok - libusb_event_handling_ok@4 = libusb_event_handling_ok - libusb_exit - libusb_exit@4 = libusb_exit - libusb_free_config_descriptor - libusb_free_config_descriptor@4 = libusb_free_config_descriptor - libusb_free_device_list - libusb_free_device_list@8 = libusb_free_device_list - libusb_free_transfer - libusb_free_transfer@4 = libusb_free_transfer - libusb_get_active_config_descriptor - libusb_get_active_config_descriptor@8 = libusb_get_active_config_descriptor - libusb_get_bus_number - libusb_get_bus_number@4 = libusb_get_bus_number - libusb_get_config_descriptor - libusb_get_config_descriptor@12 = libusb_get_config_descriptor - libusb_get_config_descriptor_by_value - libusb_get_config_descriptor_by_value@12 = libusb_get_config_descriptor_by_value - libusb_get_configuration - libusb_get_configuration@8 = libusb_get_configuration - libusb_get_device - libusb_get_device@4 = libusb_get_device - libusb_get_device_address - libusb_get_device_address@4 = libusb_get_device_address - libusb_get_device_descriptor - libusb_get_device_descriptor@8 = libusb_get_device_descriptor - libusb_get_device_list - libusb_get_device_list@8 = libusb_get_device_list - libusb_get_device_speed - libusb_get_device_speed@4 = libusb_get_device_speed - libusb_get_max_iso_packet_size - libusb_get_max_iso_packet_size@8 = libusb_get_max_iso_packet_size - libusb_get_max_packet_size - libusb_get_max_packet_size@8 = libusb_get_max_packet_size - libusb_get_next_timeout - libusb_get_next_timeout@8 = libusb_get_next_timeout - libusb_get_parent - libusb_get_parent@4 = libusb_get_parent - libusb_get_pollfds - libusb_get_pollfds@4 = libusb_get_pollfds - libusb_get_port_number - libusb_get_port_number@4 = libusb_get_port_number - libusb_get_port_path - libusb_get_port_path@16 = libusb_get_port_path - libusb_get_string_descriptor_ascii - libusb_get_string_descriptor_ascii@16 = libusb_get_string_descriptor_ascii - libusb_get_version - libusb_get_version@0 = libusb_get_version - libusb_handle_events - libusb_handle_events@4 = libusb_handle_events - libusb_handle_events_completed - libusb_handle_events_completed@8 = libusb_handle_events_completed - libusb_handle_events_locked - libusb_handle_events_locked@8 = libusb_handle_events_locked - libusb_handle_events_timeout - libusb_handle_events_timeout@8 = libusb_handle_events_timeout - libusb_handle_events_timeout_completed - libusb_handle_events_timeout_completed@12 = libusb_handle_events_timeout_completed - libusb_has_capability - libusb_has_capability@4 = libusb_has_capability - libusb_init - libusb_init@4 = libusb_init - libusb_interrupt_transfer - libusb_interrupt_transfer@24 = libusb_interrupt_transfer - libusb_kernel_driver_active - libusb_kernel_driver_active@8 = libusb_kernel_driver_active - libusb_lock_event_waiters - libusb_lock_event_waiters@4 = libusb_lock_event_waiters - libusb_lock_events - libusb_lock_events@4 = libusb_lock_events - libusb_open - libusb_open@8 = libusb_open - libusb_open_device_with_vid_pid - libusb_open_device_with_vid_pid@12 = libusb_open_device_with_vid_pid - libusb_pollfds_handle_timeouts - libusb_pollfds_handle_timeouts@4 = libusb_pollfds_handle_timeouts - libusb_ref_device - libusb_ref_device@4 = libusb_ref_device - libusb_release_interface - libusb_release_interface@8 = libusb_release_interface - libusb_reset_device - libusb_reset_device@4 = libusb_reset_device - libusb_set_configuration - libusb_set_configuration@8 = libusb_set_configuration - libusb_set_debug - libusb_set_debug@8 = libusb_set_debug - libusb_set_interface_alt_setting - libusb_set_interface_alt_setting@12 = libusb_set_interface_alt_setting - libusb_set_pollfd_notifiers - libusb_set_pollfd_notifiers@16 = libusb_set_pollfd_notifiers - libusb_submit_transfer - libusb_submit_transfer@4 = libusb_submit_transfer - libusb_try_lock_events - libusb_try_lock_events@4 = libusb_try_lock_events - libusb_unlock_event_waiters - libusb_unlock_event_waiters@4 = libusb_unlock_event_waiters - libusb_unlock_events - libusb_unlock_events@4 = libusb_unlock_events - libusb_unref_device - libusb_unref_device@4 = libusb_unref_device - libusb_wait_for_event - libusb_wait_for_event@8 = libusb_wait_for_event diff --git a/lib/windows_amd64/LibusbJava.dll b/lib/windows_amd64/LibusbJava.dll new file mode 100644 index 0000000..3910247 Binary files /dev/null and b/lib/windows_amd64/LibusbJava.dll differ diff --git a/lib/MinGW64/static/libusb-1.0.a b/lib/windows_amd64/libusb-1.0.a similarity index 100% rename from lib/MinGW64/static/libusb-1.0.a rename to lib/windows_amd64/libusb-1.0.a diff --git a/lib/MinGW64/dll/libusb-1.0.dll b/lib/windows_amd64/libusb-1.0.dll similarity index 100% rename from lib/MinGW64/dll/libusb-1.0.dll rename to lib/windows_amd64/libusb-1.0.dll diff --git a/lib/MinGW64/dll/libusb-1.0.dll.a b/lib/windows_amd64/libusb-1.0.dll.a similarity index 100% rename from lib/MinGW64/dll/libusb-1.0.dll.a rename to lib/windows_amd64/libusb-1.0.dll.a diff --git a/lib/windows_i386/LibusbJava.dll b/lib/windows_i386/LibusbJava.dll new file mode 100644 index 0000000..a2c97cd Binary files /dev/null and b/lib/windows_i386/LibusbJava.dll differ diff --git a/lib/MinGW32/static/libusb-1.0.a b/lib/windows_i386/libusb-1.0.a similarity index 100% rename from lib/MinGW32/static/libusb-1.0.a rename to lib/windows_i386/libusb-1.0.a diff --git a/lib/MinGW32/dll/libusb-1.0.dll b/lib/windows_i386/libusb-1.0.dll similarity index 100% rename from lib/MinGW32/dll/libusb-1.0.dll rename to lib/windows_i386/libusb-1.0.dll diff --git a/lib/MinGW32/dll/libusb-1.0.dll.a b/lib/windows_i386/libusb-1.0.dll.a similarity index 100% rename from lib/MinGW32/dll/libusb-1.0.dll.a rename to lib/windows_i386/libusb-1.0.dll.a diff --git a/src/main/java/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java b/src/app/java/ch/ntb/usb/testApp/AbstractDeviceInfo.java similarity index 98% rename from src/main/java/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java rename to src/app/java/ch/ntb/usb/testApp/AbstractDeviceInfo.java index ecb4c9f..3fe8bbf 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java +++ b/src/app/java/ch/ntb/usb/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.inf.libusbJava.testApp; +package ch.ntb.usb.testApp; public abstract class AbstractDeviceInfo { diff --git a/src/main/java/ch/ntb/inf/libusbJava/testApp/TestApp.java b/src/app/java/ch/ntb/usb/testApp/TestApp.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/testApp/TestApp.java rename to src/app/java/ch/ntb/usb/testApp/TestApp.java index c861dbd..1f25eaa 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/testApp/TestApp.java +++ b/src/app/java/ch/ntb/usb/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.inf.libusbJava.testApp; +package ch.ntb.usb.testApp; import java.awt.BorderLayout; import java.awt.Color; diff --git a/src/main/java/ch/ntb/inf/libusbJava/testApp/TestDevice.java b/src/app/java/ch/ntb/usb/testApp/TestDevice.java similarity index 95% rename from src/main/java/ch/ntb/inf/libusbJava/testApp/TestDevice.java rename to src/app/java/ch/ntb/usb/testApp/TestDevice.java index d3d92a4..62dd19a 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/testApp/TestDevice.java +++ b/src/app/java/ch/ntb/usb/testApp/TestDevice.java @@ -5,16 +5,16 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.testApp; +package ch.ntb.usb.testApp; import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -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; +import ch.ntb.usb.Device; +import ch.ntb.usb.USB; +import ch.ntb.usb.USBException; +import ch.ntb.usb.logger.LogUtil; public class TestDevice extends AbstractDeviceInfo { diff --git a/src/main/java/ch/ntb/inf/libusbJava/testApp/package.html b/src/app/java/ch/ntb/usb/testApp/package.html similarity index 100% rename from src/main/java/ch/ntb/inf/libusbJava/testApp/package.html rename to src/app/java/ch/ntb/usb/testApp/package.html diff --git a/src/main/java/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java b/src/app/java/ch/ntb/usb/usbView/UsbTreeModel.java similarity index 97% rename from src/main/java/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java rename to src/app/java/ch/ntb/usb/usbView/UsbTreeModel.java index cb0abde..4741121 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java +++ b/src/app/java/ch/ntb/usb/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.inf.libusbJava.usbView; +package ch.ntb.usb.usbView; import java.util.Vector; @@ -18,15 +18,15 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import ch.ntb.inf.libusbJava.LibusbJava1; -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; -import ch.ntb.inf.libusbJava.exceptions.LibusbError; +import ch.ntb.usb.LibusbJava1; +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.usb.exceptions.LibusbError; public class UsbTreeModel implements TreeModel, TreeSelectionListener { diff --git a/src/main/java/ch/ntb/inf/libusbJava/usbView/UsbView.java b/src/app/java/ch/ntb/usb/usbView/UsbView.java similarity index 95% rename from src/main/java/ch/ntb/inf/libusbJava/usbView/UsbView.java rename to src/app/java/ch/ntb/usb/usbView/UsbView.java index 8315417..e8847bf 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/usbView/UsbView.java +++ b/src/app/java/ch/ntb/usb/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.inf.libusbJava.usbView; +package ch.ntb.usb.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.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; +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.AbstractDeviceInfo.TransferMode; +import ch.ntb.usb.testApp.TestApp; +import ch.ntb.usb.testApp.TestDevice; public class UsbView extends JFrame { diff --git a/src/main/java/ch/ntb/inf/libusbJava/usbView/package.html b/src/app/java/ch/ntb/usb/usbView/package.html similarity index 100% rename from src/main/java/ch/ntb/inf/libusbJava/usbView/package.html rename to src/app/java/ch/ntb/usb/usbView/package.html diff --git a/src/main/java/ch/ntb/inf/libusbJava/demo/LogBus.java b/src/demo/java/ch/ntb/usb/demo/LogBus.java similarity index 86% rename from src/main/java/ch/ntb/inf/libusbJava/demo/LogBus.java rename to src/demo/java/ch/ntb/usb/demo/LogBus.java index d6ad3f1..564c582 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/demo/LogBus.java +++ b/src/demo/java/ch/ntb/usb/demo/LogBus.java @@ -5,11 +5,11 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.demo; +package ch.ntb.usb.demo; -import ch.ntb.inf.libusbJava.LibusbJava; -import ch.ntb.inf.libusbJava.Usb_Bus; -import ch.ntb.inf.libusbJava.Utils; +import ch.ntb.usb.LibusbJava; +import ch.ntb.usb.Usb_Bus; +import ch.ntb.usb.Utils; /** * Initalises Libusb and prints the bus(ses) with attached devices to the diff --git a/src/main/java/ch/ntb/inf/libusbJava/demo/ReadWrite.java b/src/demo/java/ch/ntb/usb/demo/ReadWrite.java similarity index 91% rename from src/main/java/ch/ntb/inf/libusbJava/demo/ReadWrite.java rename to src/demo/java/ch/ntb/usb/demo/ReadWrite.java index 7dbaf2f..de74950 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/demo/ReadWrite.java +++ b/src/demo/java/ch/ntb/usb/demo/ReadWrite.java @@ -5,11 +5,11 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.demo; +package ch.ntb.usb.demo; -import ch.ntb.inf.libusbJava.Device; -import ch.ntb.inf.libusbJava.USB; -import ch.ntb.inf.libusbJava.USBException; +import ch.ntb.usb.Device; +import ch.ntb.usb.USB; +import ch.ntb.usb.USBException; /** * Demo class to demonstrate simple read and write operations to an USB device.
diff --git a/LibusbJava/test/CuTest.c b/src/main/cpp/CuTest.cpp similarity index 100% rename from LibusbJava/test/CuTest.c rename to src/main/cpp/CuTest.cpp diff --git a/src/main/cpp/LibusbJava.cpp b/src/main/cpp/LibusbJava.cpp index 61ee3fb..caa7431 100644 --- a/src/main/cpp/LibusbJava.cpp +++ b/src/main/cpp/LibusbJava.cpp @@ -41,7 +41,7 @@ #include #include "LibusbJava.h" -#include "objects/Usb_Device.h" +#include "Usb_Device.h" //#define DEBUGON @@ -212,8 +212,8 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) info.jni.onLoadCalled=10; /* Load the LibusbJava1 class to force the initialization of the library */ - jclass clazz = env->FindClass("ch/ntb/inf/libusbJava/LibusbJava1"); - CuAssert(tc, "ch/ntb/inf/libusbJava/LibusbJava1 loaded", clazz != NULL); + jclass clazz = env->FindClass("ch/ntb/usb/LibusbJava1"); + CuAssert(tc, "ch/ntb/usb/LibusbJava1 loaded", clazz != NULL); CuAssert(tc, "JNI_OnLoad was executed", info.jni.onLoadCalled != 0); env->DeleteLocalRef(clazz); @@ -253,11 +253,11 @@ void JNI_OnUnload(JavaVM *vm, void *reserved) *******************************************************************************************/ /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_set_debug * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1debug( JNIEnv *env, jclass obj, jlong ctx, jint level) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1set_1debug( JNIEnv *env, jclass obj, jlong ctx, jint level) { clearLibusbJavaError(); libusb_context *context = NULL; if (ctx) { @@ -267,11 +267,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1debug } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_init * Signature: ()J ********************************************************************************************/ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1init( JNIEnv *env, jclass obj) { +JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1init( JNIEnv *env, jclass obj) { int res; libusb_context *context; clearLibusbJavaError(); @@ -296,11 +296,11 @@ JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1init( JNI } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_exit * Signature: (J)V *******************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1exit(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1exit(JNIEnv *env, jclass obj, jlong ctx) { libusb_context *context = NULL; clearLibusbJavaError(); if (ctx) { @@ -310,11 +310,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1exit(JNIEn } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_device_list - * Signature: (J)Lch/ntb/inf/libusbJava/Usb_Device; + * Signature: (J)Lch/ntb/usb/Usb_Device; ********************************************************************************************/ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1device_1list( JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1device_1list( JNIEnv *env, jclass obj, jlong ctx) { libusb_device **devs; libusb_context *context = (ctx != 0) ? (libusb_context*)ctx : NULL; ssize_t cnt; @@ -576,11 +576,11 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1de } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_bus_number - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)S + * Signature: (Lch/ntb/usb/Usb_Device;)S ********************************************************************************************/ -JNIEXPORT jshort JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1bus_1number( JNIEnv *env, jclass obj, jobject dev) { +JNIEXPORT jshort JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1bus_1number( JNIEnv *env, jclass obj, jobject dev) { clearLibusbJavaError(); if (ReferencesCheck(&info, env) != 0) return 0; @@ -595,12 +595,12 @@ JNIEXPORT jshort JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1bus } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_max_iso_packet_size - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;S)I + * Signature: (Lch/ntb/usb/Usb_Device;S)I ********************************************************************************************/ JNIEXPORT jint -JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1max_1iso_1packet_1size( JNIEnv *env, jclass obj, jobject dev, jshort epAddr) { +JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1max_1iso_1packet_1size( JNIEnv *env, jclass obj, jobject dev, jshort epAddr) { clearLibusbJavaError(); if (ReferencesCheck(&info, env) != 0) return 0; @@ -615,11 +615,11 @@ JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1max_1iso_1packet_1si } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_ref_device - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)Lch/ntb/inf/libusbJava/Usb_Device; + * Signature: (Lch/ntb/usb/Usb_Device;)Lch/ntb/usb/Usb_Device; ********************************************************************************************/ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1ref_1device(JNIEnv *env, jclass obj, jobject dev) { +JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1ref_1device(JNIEnv *env, jclass obj, jobject dev) { clearLibusbJavaError(); if (ReferencesCheck(&info, env) != 0) return NULL; @@ -635,11 +635,11 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1ref_1de } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_unref_device - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)V + * Signature: (Lch/ntb/usb/Usb_Device;)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unref_1device(JNIEnv *env, jclass obj, jobject dev) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1unref_1device(JNIEnv *env, jclass obj, jobject dev) { clearLibusbJavaError(); if (ReferencesCheck(&info, env) != 0) return; libusb_device *libusb_dev = Usb_Device_HandleGet(env, dev); @@ -652,11 +652,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unref_1dev } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_open - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)J + * Signature: (Lch/ntb/usb/Usb_Device;)J ********************************************************************************************/ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1open( JNIEnv *env, jclass obj, jobject dev) { +JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1open( JNIEnv *env, jclass obj, jobject dev) { clearLibusbJavaError(); libusb_device_handle *handle = NULL; if (ReferencesCheck(&info, env) != 0) return 0; @@ -678,32 +678,32 @@ JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1open( JNI } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_open_device_with_vid_pid * Signature: (JII)J ********************************************************************************************/ JNIEXPORT jlong -JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1open_1device_1with_1vid_1pid(JNIEnv *env, jclass obj, jlong ctx, jint vendor_id, jint product_id) { +JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1open_1device_1with_1vid_1pid(JNIEnv *env, jclass obj, jlong ctx, jint vendor_id, jint product_id) { clearLibusbJavaError(); return (jlong) libusb_open_device_with_vid_pid((libusb_context*) (unsigned long) ctx, vendor_id, product_id); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_close * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1close(JNIEnv *env, jclass obj, jlong dev_handle) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1close(JNIEnv *env, jclass obj, jlong dev_handle) { clearLibusbJavaError(); libusb_close((libusb_device_handle*) (unsigned long) dev_handle); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_device - * Signature: (J)Lch/ntb/inf/libusbJava/Usb_Device; + * Signature: (J)Lch/ntb/usb/Usb_Device; ********************************************************************************************/ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1device(JNIEnv *env, jclass obj, jlong handle) { +JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1device(JNIEnv *env, jclass obj, jlong handle) { int res, a; uint8_t c, h, e; clearLibusbJavaError(); @@ -910,11 +910,11 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1de return usb_devObj; } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_configuration * Signature: (J)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1configuration(JNIEnv *env, jclass obj, jlong handle) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1configuration(JNIEnv *env, jclass obj, jlong handle) { int config = 0; int libusb_result = 0; @@ -931,71 +931,71 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1confi } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_set_configuration * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1configuration(JNIEnv *env, jclass obj, jlong handle, jint config) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1set_1configuration(JNIEnv *env, jclass obj, jlong handle, jint config) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_set_configuration((libusb_device_handle*) (unsigned long) handle, config)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_claim_interface * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1claim_1interface(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1claim_1interface(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_claim_interface((libusb_device_handle*) (unsigned long) handle, iNumber)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_release_interface * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1release_1interface(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1release_1interface(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_release_interface((libusb_device_handle*) (unsigned long) handle, iNumber)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_set_interface_alt_setting * Signature: (JII)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1interface_1alt_1setting(JNIEnv *env, jclass obj, jlong handle, jint iNumber, jint altSet) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1set_1interface_1alt_1setting(JNIEnv *env, jclass obj, jlong handle, jint iNumber, jint altSet) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_set_interface_alt_setting((libusb_device_handle*) (unsigned long) handle, iNumber, altSet)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_clear_halt * Signature: (JS)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1clear_1halt(JNIEnv *env, jclass obj, jlong handle, jshort ep) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1clear_1halt(JNIEnv *env, jclass obj, jlong handle, jshort ep) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_clear_halt((libusb_device_handle*) (unsigned long) handle, ep)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_reset_device * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1reset_1device(JNIEnv *env, jclass obj, jlong handle) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1reset_1device(JNIEnv *env, jclass obj, jlong handle) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_reset_device((libusb_device_handle*) (unsigned long) handle)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_kernel_driver_active * Signature: (JI)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1kernel_1driver_1active(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1kernel_1driver_1active(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { int libusb_result = 0; clearLibusbJavaError(); @@ -1011,31 +1011,31 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1kernel_1dr } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_detach_kernel_driver * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1detach_1kernel_1driver(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1detach_1kernel_1driver(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_detach_kernel_driver((libusb_device_handle*) (unsigned long) handle, iNumber)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_attach_kernel_driver * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1attach_1kernel_1driver(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1attach_1kernel_1driver(JNIEnv *env, jclass obj, jlong handle, jint iNumber) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_attach_kernel_driver((libusb_device_handle*) (unsigned long) handle, iNumber)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_active_config_descriptor - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)Lch/ntb/inf/libusbJava/Usb_Config_Descriptor; + * Signature: (Lch/ntb/usb/Usb_Device;)Lch/ntb/usb/Usb_Config_Descriptor; ********************************************************************************************/ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1active_1config_1descriptor(JNIEnv *env, jclass obj, jobject dev) { +JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1active_1config_1descriptor(JNIEnv *env, jclass obj, jobject dev) { uint8_t a, e; clearLibusbJavaError(); if (ReferencesCheck(&info, env) != 0) return NULL; @@ -1185,11 +1185,11 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1ac } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_string_descriptor_ascii * Signature: (JSI)Ljava/lang/String; ********************************************************************************************/ -JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1string_1descriptor_1ascii( JNIEnv *env, jclass obj, jlong handle, jshort desc_index, jint length) { +JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1string_1descriptor_1ascii( JNIEnv *env, jclass obj, jlong handle, jshort desc_index, jint length) { jstring string; int res = 0; clearLibusbJavaError(); @@ -1211,12 +1211,12 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1st return string; } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_descriptor * Signature: (JISI)[B ********************************************************************************************/ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1descriptor( +JNIEXPORT jbyteArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1descriptor( JNIEnv *env, jclass obj, jlong handle, jint desc_type, jshort desc_index, jint size) { @@ -1234,12 +1234,12 @@ JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_ return to_byteArray(env, data, res); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_string_descriptor * Signature: (JSII)Ljava/lang/String; ********************************************************************************************/ JNIEXPORT jstring -JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1string_1descriptor(JNIEnv *env, jclass obj, jlong handle, jshort desc_index, jint langid, jint size) { +JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1string_1descriptor(JNIEnv *env, jclass obj, jlong handle, jshort desc_index, jint langid, jint size) { clearLibusbJavaError(); int res; jstring string; @@ -1260,50 +1260,50 @@ JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1string_1descriptor(J } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_alloc_transfer * Signature: (I)J ********************************************************************************************/ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1alloc_1transfer( JNIEnv *env, jclass obj, jint iso_packets) { +JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1alloc_1transfer( JNIEnv *env, jclass obj, jint iso_packets) { clearLibusbJavaError(); return (jlong) libusb_alloc_transfer(iso_packets); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_free_transfer * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1free_1transfer( JNIEnv *env, jclass obj, jlong transfernumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1free_1transfer( JNIEnv *env, jclass obj, jlong transfernumber) { clearLibusbJavaError(); libusb_free_transfer((libusb_transfer*) (unsigned long) transfernumber); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_submit_transfer * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1submit_1transfer(JNIEnv *env, jclass obj, jlong transfernumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1submit_1transfer(JNIEnv *env, jclass obj, jlong transfernumber) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_submit_transfer((libusb_transfer*) (unsigned long) transfernumber)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_cancel_transfer * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1cancel_1transfer(JNIEnv *env, jclass obj, jlong transfernumber) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1cancel_1transfer(JNIEnv *env, jclass obj, jlong transfernumber) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_cancel_transfer((libusb_transfer*) (unsigned long) transfernumber)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_control_transfer_get_data * Signature: (J)[B ********************************************************************************************/ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1transfer_1get_1data(JNIEnv *env, jclass obj, jlong transfernumber) { +JNIEXPORT jbyteArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1control_1transfer_1get_1data(JNIEnv *env, jclass obj, jlong transfernumber) { clearLibusbJavaError(); unsigned char *data; libusb_transfer* trans = (libusb_transfer*) (unsigned long) transfernumber; @@ -1316,11 +1316,11 @@ JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1cont } /********************************************************************************************* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_control_transfer_get_setup * Signature: (J)[B ********************************************************************************************/ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1transfer_1get_1setup(JNIEnv *env, jclass obj, jlong transfernumber) { +JNIEXPORT jbyteArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1control_1transfer_1get_1setup(JNIEnv *env, jclass obj, jlong transfernumber) { clearLibusbJavaError(); unsigned char *data; libusb_transfer* trans = (libusb_transfer*) (unsigned long) transfernumber; @@ -1334,11 +1334,11 @@ JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1cont return to_byteArray(env, data, 8); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_fill_control_setup * Signature: (IIIII)[B ********************************************************************************************/ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1control_1setup(JNIEnv *env, jclass obj, jint bmRequestType, jint bRequest, jint wValue, jint wIndex, jint wLength) { +JNIEXPORT jbyteArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1fill_1control_1setup(JNIEnv *env, jclass obj, jint bmRequestType, jint bRequest, jint wValue, jint wIndex, jint wLength) { clearLibusbJavaError(); unsigned char setup[8]; @@ -1348,11 +1348,11 @@ JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_fill_control_transfer * Signature: (JJ[BI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1control_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle, jbyteArray buffer, jint timeout) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1fill_1control_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle, jbyteArray buffer, jint timeout) { clearLibusbJavaError(); jbyte *byteArrayElements = env->GetByteArrayElements(buffer, NULL); libusb_fill_control_transfer((libusb_transfer*) (unsigned long) transfernumber,(libusb_device_handle*) (unsigned long) handle,(unsigned char*) byteArrayElements, transfer_callback, env,(unsigned int) timeout); @@ -1360,11 +1360,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1cont } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_fill_bulk_transfer * Signature: (JJB[BII)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1bulk_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1fill_1bulk_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { clearLibusbJavaError(); jbyte *byteArrayElements = env->GetByteArrayElements(buffer, NULL); libusb_fill_bulk_transfer((libusb_transfer*) (unsigned long) transfernumber,(libusb_device_handle*) (unsigned long) handle, endpoint,(unsigned char*) byteArrayElements, length, transfer_callback, env,(unsigned int) timeout); @@ -1372,11 +1372,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1bulk } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_fill_interrupt_transfer * Signature: (JJB[BII)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1interrupt_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle,jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1fill_1interrupt_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle,jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { clearLibusbJavaError(); jbyte *byteArrayElements = env->GetByteArrayElements(buffer, NULL); libusb_fill_interrupt_transfer((libusb_transfer*) (unsigned long) transfernumber,(libusb_device_handle*) (unsigned long) handle, endpoint,(unsigned char*) byteArrayElements, length, transfer_callback, env, timeout); @@ -1384,11 +1384,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1inte } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_fill_iso_transfer * Signature: (JJB[BIII)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1iso_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint num_iso_packets, jint timeout) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1fill_1iso_1transfer(JNIEnv *env, jclass obj, jlong transfernumber, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint num_iso_packets, jint timeout) { clearLibusbJavaError(); jbyte *byteArrayElements = env->GetByteArrayElements(buffer, NULL); libusb_fill_iso_transfer((libusb_transfer*) (unsigned long) transfernumber, (libusb_device_handle*) (unsigned long) handle, endpoint, (unsigned char*) byteArrayElements, length, num_iso_packets, transfer_callback, env, timeout); @@ -1396,22 +1396,22 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1iso_ } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_set_iso_packet_lengths * Signature: (JI)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1iso_1packet_1lengths(JNIEnv *env, jclass obj, jlong transfernumber, jint length) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1set_1iso_1packet_1lengths(JNIEnv *env, jclass obj, jlong transfernumber, jint length) { clearLibusbJavaError(); libusb_set_iso_packet_lengths((libusb_transfer*) (unsigned long) transfernumber, length); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_iso_packet_buffer * Signature: (JI)[B ********************************************************************************************/ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1iso_1packet_1buffer(JNIEnv *env, jclass obj, jlong transfernumber, jint packet) { +JNIEXPORT jbyteArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1iso_1packet_1buffer(JNIEnv *env, jclass obj, jlong transfernumber, jint packet) { clearLibusbJavaError(); int size = 0; unsigned char *data = NULL; @@ -1436,11 +1436,11 @@ JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_ } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_iso_packet_buffer_simple * Signature: (JI)[B ********************************************************************************************/ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1iso_1packet_1buffer_1simple(JNIEnv *env, jclass obj, jlong transfernumber, jint packet) { +JNIEXPORT jbyteArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1iso_1packet_1buffer_1simple(JNIEnv *env, jclass obj, jlong transfernumber, jint packet) { clearLibusbJavaError(); int size = 0; unsigned char *data = NULL; @@ -1466,82 +1466,82 @@ JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_ } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_try_lock_events * Signature: (J)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1try_1lock_1events(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1try_1lock_1events(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); return libusb_try_lock_events((libusb_context*) (unsigned long) ctx); // return libusb_try_lock_events(NULL); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_lock_events * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1lock_1events(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1lock_1events(JNIEnv *env, jclass obj, jlong ctx) { libusb_lock_events((libusb_context*) (unsigned long) ctx); // libusb_lock_events(NULL); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_unlock_events * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unlock_1events(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1unlock_1events(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); libusb_unlock_events((libusb_context*) (unsigned long) ctx); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_event_handling_ok * Signature: (J)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1event_1handling_1ok(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1event_1handling_1ok(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); return libusb_event_handling_ok((libusb_context*) (unsigned long) ctx); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_event_handler_active * Signature: (J)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1event_1handler_1active(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1event_1handler_1active(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); return libusb_event_handler_active((libusb_context*) (unsigned long) ctx); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_lock_event_waiters * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1lock_1event_1waiters(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1lock_1event_1waiters(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); libusb_lock_event_waiters((libusb_context*) (unsigned long) ctx); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_unlock_event_waiters * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unlock_1event_1waiters(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1unlock_1event_1waiters(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); libusb_unlock_event_waiters((libusb_context*) (unsigned long) ctx); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_wait_for_event * Signature: (JJ)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1wait_1for_1event(JNIEnv *env, jclass obj, jlong ctx, jlong timevalue) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1wait_1for_1event(JNIEnv *env, jclass obj, jlong ctx, jlong timevalue) { clearLibusbJavaError(); if (timevalue) { timeval tv; @@ -1553,11 +1553,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1wait_1for_ } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_handle_events_timeout * Signature: (JJ)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1events_1timeout(JNIEnv *env, jclass obj, jlong ctx, jlong timevalue) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1handle_1events_1timeout(JNIEnv *env, jclass obj, jlong ctx, jlong timevalue) { clearLibusbJavaError(); if (timevalue != 0) { @@ -1573,21 +1573,21 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1ev } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_handle_events * Signature: (J)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1events(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1handle_1events(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); ThrowIfUnsuccessful(env, libusb_handle_events((libusb_context*) (unsigned long) ctx)); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_handle_events_locked * Signature: (JJ)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1events_1locked(JNIEnv *env, jclass obj, jlong ctx, jlong timevalue) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1handle_1events_1locked(JNIEnv *env, jclass obj, jlong ctx, jlong timevalue) { clearLibusbJavaError(); if (timevalue) { timeval tv; @@ -1602,21 +1602,21 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1ev } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_pollfds_handle_timeouts * Signature: (J)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1pollfds_1handle_1timeouts(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1pollfds_1handle_1timeouts(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); return libusb_pollfds_handle_timeouts((libusb_context*) (unsigned long) ctx); } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_next_timeout * Signature: (J)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1next_1timeout(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1next_1timeout(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); int res; timeval tv; @@ -1643,11 +1643,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1next_ } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_set_pollfd_notifiers * Signature: (JZ)V ********************************************************************************************/ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1pollfd_1notifiers(JNIEnv *env, jclass obj, jlong ctx, jboolean remove) { +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1set_1pollfd_1notifiers(JNIEnv *env, jclass obj, jlong ctx, jboolean remove) { clearLibusbJavaError(); if (remove) { @@ -1660,11 +1660,11 @@ JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1pollf } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_get_pollfds - * Signature: (J)[Lch/ntb/inf/libusbJava/Libusb_pollfd; + * Signature: (J)[Lch/ntb/usb/Libusb_pollfd; ********************************************************************************************/ -JNIEXPORT jobjectArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1pollfds(JNIEnv *env, jclass obj, jlong ctx) { +JNIEXPORT jobjectArray JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1get_1pollfds(JNIEnv *env, jclass obj, jlong ctx) { clearLibusbJavaError(); int count = 0; jobjectArray pollfdArray; @@ -1699,11 +1699,11 @@ JNIEXPORT jobjectArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1ge } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_control_transfer * Signature: (JIIII[BII)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1transfer(JNIEnv *env, jclass obj, jlong handle, jint bmRequestType, jint bRequest, jint wValue, jint wIndex, jbyteArray buffer, jint wLength, jint timeout) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1control_1transfer(JNIEnv *env, jclass obj, jlong handle, jint bmRequestType, jint bRequest, jint wValue, jint wIndex, jbyteArray buffer, jint wLength, jint timeout) { clearLibusbJavaError(); int res; unsigned char* data; @@ -1715,11 +1715,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1t } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_bulk_transfer * Signature: (JB[BII)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1bulk_1transfer(JNIEnv *env, jclass obj, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1bulk_1transfer(JNIEnv *env, jclass obj, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { clearLibusbJavaError(); int libusb_result = 0; int bytes_transferred = 0; @@ -1738,11 +1738,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1bulk_1tran } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_interrupt_transfer * Signature: (JB[BII)I ********************************************************************************************/ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1interrupt_1transfer(JNIEnv *env, jclass obj, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1interrupt_1transfer(JNIEnv *env, jclass obj, jlong handle, jbyte endpoint, jbyteArray buffer, jint length, jint timeout) { clearLibusbJavaError(); int libusb_result; int bytes_transferred = 0; @@ -1760,11 +1760,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1interrupt_ } /******************************************************************************************** - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: libusb_strerror * Signature: ()Ljava/lang/String; ********************************************************************************************/ -JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1strerror(JNIEnv *env, jclass obj) { +JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava1_libusb_1strerror(JNIEnv *env, jclass obj) { char *str = "Libusb-1.0 Error"; /* check for LibusbJava specific errors first*/ @@ -1777,21 +1777,21 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1strerro } /* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: setup * Signature: ()I */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_setup(JNIEnv *env, jclass obj) +JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava1_setup(JNIEnv *env, jclass obj) { return ReferencesLoad(&info, env, jniObjects); } /* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 + * Class: ch_ntb_usb_LibusbJava1 * Method: teardown * Signature: ()V */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_teardown(JNIEnv *env, jclass obj) +JNIEXPORT void JNICALL Java_ch_ntb_usb_LibusbJava1_teardown(JNIEnv *env, jclass obj) { ReferencesUnload(&info, env); } @@ -1923,7 +1923,7 @@ static __inline void JNICALL ThrowLibusbError(JNIEnv *env, jint code) jmethodID constructor = NULL; jthrowable exception = NULL; - jclass clazz = env->FindClass("ch/ntb/inf/libusbJava/exceptions/LibusbError"); + jclass clazz = env->FindClass("ch/ntb/usb/exceptions/LibusbError"); if (clazz == NULL) { goto no_class; @@ -1970,7 +1970,7 @@ no_class: #ifdef DO_UNIT_TEST static void ThrowLibusbErrorTestEvaluate(CuTest *tc, JNIEnv *env, int code) { /* Prepare the needed environment */ - jclass clazz = env->FindClass("ch/ntb/inf/libusbJava/exceptions/LibusbError"); + jclass clazz = env->FindClass("ch/ntb/usb/exceptions/LibusbError"); CuAssert(tc, "LibusbError class not found!", clazz != NULL); jfieldID f_code = env->GetFieldID(clazz, "code", "I"); CuAssert(tc, "LibusbError has a field \"code\"", f_code != NULL); @@ -2087,7 +2087,7 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t printf("usb_device references loaded\n"); #endif /* usb_device_descriptor*/ - jobject devDescClazz = env->FindClass("ch/ntb/inf/libusbJava/Usb_Device_Descriptor");//returns a local reference + jobject devDescClazz = env->FindClass("ch/ntb/usb/Usb_Device_Descriptor");//returns a local reference usb_devDescClazz = (jclass)env->NewGlobalRef(devDescClazz);//make it global if (usb_devDescClazz == NULL) { return -1; /* exception thrown */ @@ -2116,7 +2116,7 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t printf("usb_device_descriptor references loaded\n"); #endif /* usb_configuration_descriptor*/ - jobject confDescClazz = env->FindClass("ch/ntb/inf/libusbJava/Usb_Config_Descriptor");//returns a local reference + jobject confDescClazz = env->FindClass("ch/ntb/usb/Usb_Config_Descriptor");//returns a local reference usb_confDescClazz = (jclass)env->NewGlobalRef(confDescClazz);//make it global if (usb_confDescClazz == NULL) { return -1; /* exception thrown */ @@ -2134,14 +2134,14 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t usb_confDescFID_iConfiguration = env->GetFieldID(usb_confDescClazz, "iConfiguration", "B"); usb_confDescFID_bmAttributes = env->GetFieldID(usb_confDescClazz, "bmAttributes", "B"); usb_confDescFID_MaxPower = env->GetFieldID(usb_confDescClazz, "MaxPower", "B"); - usb_confDescFID_interface_ = env->GetFieldID(usb_confDescClazz, "interface_", "[Lch/ntb/inf/libusbJava/Usb_Interface;"); + usb_confDescFID_interface_ = env->GetFieldID(usb_confDescClazz, "interface_", "[Lch/ntb/usb/Usb_Interface;"); usb_confDescFID_extra = env->GetFieldID(usb_confDescClazz, "extra", "[B"); usb_confDescFID_extralen = env->GetFieldID(usb_confDescClazz, "extralen", "I"); #ifdef DEBUGON printf("usb_configuration_descriptor references loaded\n"); #endif /* usb_interface*/ - jobject intClazz = env->FindClass("ch/ntb/inf/libusbJava/Usb_Interface");//returns a local reference + jobject intClazz = env->FindClass("ch/ntb/usb/Usb_Interface");//returns a local reference usb_intClazz = (jclass)env->NewGlobalRef(intClazz);//make it global if (usb_intClazz == NULL) { return -1; /* exception thrown */ @@ -2150,13 +2150,13 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t if (usb_intMid == NULL) { return -1; } - usb_intFID_altsetting = env->GetFieldID(usb_intClazz, "altsetting", "[Lch/ntb/inf/libusbJava/Usb_Interface_Descriptor;"); + usb_intFID_altsetting = env->GetFieldID(usb_intClazz, "altsetting", "[Lch/ntb/usb/Usb_Interface_Descriptor;"); usb_intFID_num_altsetting = env->GetFieldID(usb_intClazz, "num_altsetting", "I"); #ifdef DEBUGON printf("usb_interface references loaded\n"); #endif /* usb_interface_descriptor*/ - jobject intDescClazz = env->FindClass( "ch/ntb/inf/libusbJava/Usb_Interface_Descriptor");//returns a local reference + jobject intDescClazz = env->FindClass( "ch/ntb/usb/Usb_Interface_Descriptor");//returns a local reference usb_intDescClazz = (jclass)env->NewGlobalRef(intDescClazz);//make it global if (usb_intDescClazz == NULL) { return -1; /* exception thrown */ @@ -2174,14 +2174,14 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t usb_intDescFID_bInterfaceSubClass = env->GetFieldID(usb_intDescClazz, "bInterfaceSubClass", "B"); usb_intDescFID_bInterfaceProtocol = env->GetFieldID(usb_intDescClazz, "bInterfaceProtocol", "B"); usb_intDescFID_iInterface = env->GetFieldID(usb_intDescClazz, "iInterface", "B"); - usb_intDescFID_endpoint = env->GetFieldID(usb_intDescClazz, "endpoint", "[Lch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor;"); + usb_intDescFID_endpoint = env->GetFieldID(usb_intDescClazz, "endpoint", "[Lch/ntb/usb/Usb_Endpoint_Descriptor;"); usb_intDescFID_extra = env->GetFieldID(usb_intDescClazz, "extra", "[B"); usb_intDescFID_extralen = env->GetFieldID(usb_intDescClazz, "extralen", "I"); #ifdef DEBUGON printf("usb_interface_descriptor references loaded\n"); #endif /* usb_endpoint_descriptor*/ - jobject epDescClazz = env->FindClass("ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor");//returns a local reference + jobject epDescClazz = env->FindClass("ch/ntb/usb/Usb_Endpoint_Descriptor");//returns a local reference usb_epDescClazz = (jclass)env->NewGlobalRef(epDescClazz);//make it global if (usb_epDescClazz == NULL) { return -1; /* exception thrown */ @@ -2204,7 +2204,7 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t printf("usb_endpoint_descriptor references loaded\n"); #endif /*libusb_event*/ - jobject cb_clazz = env->FindClass("ch/ntb/inf/libusbJava/Libusb_event");//returns a local reference + jobject cb_clazz = env->FindClass("ch/ntb/usb/Libusb_event");//returns a local reference usb_cb_clazz = (jclass)env->NewGlobalRef(cb_clazz);//make it global if (usb_cb_clazz == NULL) { printf("load Clazz failed\n"); @@ -2229,13 +2229,13 @@ static __inline int ReferencesLoad(tLUJ_Instance *instance, JNIEnv *env, const t printf("usb_event_descriptor references loaded\n"); #endif /*Libusb_pollfd*/ - jobject pollfd_clazz = env->FindClass("ch/ntb/inf/libusbJava/Libusb_pollfd");//returns a local reference + jobject pollfd_clazz = env->FindClass("ch/ntb/usb/Libusb_pollfd");//returns a local reference usb_pollfd_clazz = (jclass)env->NewGlobalRef(pollfd_clazz);//make it global if (usb_pollfd_clazz == NULL) { return -1; /*exception thrown*/ } usb_pollfd_Mid = env->GetMethodID(usb_pollfd_clazz, "", "()V"); - // Bugfix: if (usb_devMid == NULL) @ Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1device_1list - Copy-paste error + // Bugfix: if (usb_devMid == NULL) @ Java_ch_ntb_usb_LibusbJava1_libusb_1get_1device_1list - Copy-paste error if (usb_pollfd_Mid == NULL) { return -1; /*exception thrown*/ } diff --git a/LibusbJava/test/LibusbJavaTest.cpp b/src/main/cpp/LibusbJavaTest.cpp similarity index 100% rename from LibusbJava/test/LibusbJavaTest.cpp rename to src/main/cpp/LibusbJavaTest.cpp diff --git a/src/main/cpp/Usb_Device.cpp b/src/main/cpp/Usb_Device.cpp index f26eaab..c572898 100644 --- a/src/main/cpp/Usb_Device.cpp +++ b/src/main/cpp/Usb_Device.cpp @@ -8,7 +8,7 @@ #include #ifdef DO_UNIT_TEST -# include +# include # define TEST_CASE(name) static void name(CuTest *tc) #endif @@ -50,7 +50,7 @@ static tUsb_Device *me = &instance; int Usb_Device_connect(JNIEnv *env) { - jobject theClass = env->FindClass("ch/ntb/inf/libusbJava/Usb_Device"); + jobject theClass = env->FindClass("ch/ntb/usb/Usb_Device"); if (theClass == NULL) goto no_class; me->clazz = (jclass) env->NewGlobalRef(theClass); // make it global to avoid class unloading and therefore @@ -60,15 +60,15 @@ int Usb_Device_connect(JNIEnv *env) me->constructor = env->GetMethodID(me->clazz, "", "()V"); if (me->constructor == NULL) goto no_constructor; - LOAD_FIELD(env, me, "Lch/ntb/inf/libusbJava/Usb_Device;", next); - LOAD_FIELD(env, me, "Lch/ntb/inf/libusbJava/Usb_Device;", prev); + LOAD_FIELD(env, me, "Lch/ntb/usb/Usb_Device;", next); + LOAD_FIELD(env, me, "Lch/ntb/usb/Usb_Device;", prev); LOAD_FIELD(env, me, "Ljava/lang/String;", filename); - LOAD_FIELD(env, me, "Lch/ntb/inf/libusbJava/Usb_Bus;", bus); - LOAD_FIELD(env, me, "Lch/ntb/inf/libusbJava/Usb_Device_Descriptor;", descriptor); - LOAD_FIELD(env, me, "[Lch/ntb/inf/libusbJava/Usb_Config_Descriptor;", config); + LOAD_FIELD(env, me, "Lch/ntb/usb/Usb_Bus;", bus); + LOAD_FIELD(env, me, "Lch/ntb/usb/Usb_Device_Descriptor;", descriptor); + LOAD_FIELD(env, me, "[Lch/ntb/usb/Usb_Config_Descriptor;", config); LOAD_FIELD(env, me, "B", devnum); LOAD_FIELD(env, me, "B", num_children); - LOAD_FIELD(env, me, "Lch/ntb/inf/libusbJava/Usb_Device;", children); + LOAD_FIELD(env, me, "Lch/ntb/usb/Usb_Device;", children); LOAD_FIELD(env, me, "J", devStructAddr); me->loaded = 1; diff --git a/LibusbJava/test/CuTest.h b/src/main/headers/CuTest.h similarity index 100% rename from LibusbJava/test/CuTest.h rename to src/main/headers/CuTest.h diff --git a/src/main/headers/LibusbJava.h b/src/main/headers/LibusbJava.h deleted file mode 100644 index ef37b4d..0000000 --- a/src/main/headers/LibusbJava.h +++ /dev/null @@ -1,509 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class ch_ntb_inf_libusbJava_LibusbJava1 */ - -#ifndef _Included_ch_ntb_inf_libusbJava_LibusbJava1 -#define _Included_ch_ntb_inf_libusbJava_LibusbJava1 -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_set_debug - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1debug - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_init - * Signature: ()J - */ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1init - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_exit - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1exit - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_device_list - * Signature: (J)Lch/ntb/inf/libusbJava/Usb_Device; - */ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1device_1list - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_bus_number - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)S - */ -JNIEXPORT jshort JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1bus_1number - (JNIEnv *, jclass, jobject); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_max_iso_packet_size - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;S)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1max_1iso_1packet_1size - (JNIEnv *, jclass, jobject, jshort); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_ref_device - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)Lch/ntb/inf/libusbJava/Usb_Device; - */ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1ref_1device - (JNIEnv *, jclass, jobject); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_unref_device - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unref_1device - (JNIEnv *, jclass, jobject); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_open - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)J - */ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1open - (JNIEnv *, jclass, jobject); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_open_device_with_vid_pid - * Signature: (JII)J - */ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1open_1device_1with_1vid_1pid - (JNIEnv *, jclass, jlong, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_close - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1close - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_device - * Signature: (J)Lch/ntb/inf/libusbJava/Usb_Device; - */ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1device - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_configuration - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1configuration - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_set_configuration - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1configuration - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_claim_interface - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1claim_1interface - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_release_interface - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1release_1interface - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_set_interface_alt_setting - * Signature: (JII)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1interface_1alt_1setting - (JNIEnv *, jclass, jlong, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_clear_halt - * Signature: (JS)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1clear_1halt - (JNIEnv *, jclass, jlong, jshort); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_reset_device - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1reset_1device - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_kernel_driver_active - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1kernel_1driver_1active - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_detach_kernel_driver - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1detach_1kernel_1driver - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_attach_kernel_driver - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1attach_1kernel_1driver - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_active_config_descriptor - * Signature: (Lch/ntb/inf/libusbJava/Usb_Device;)Lch/ntb/inf/libusbJava/Usb_Config_Descriptor; - */ -JNIEXPORT jobject JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1active_1config_1descriptor - (JNIEnv *, jclass, jobject); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_string_descriptor_ascii - * Signature: (JSI)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1string_1descriptor_1ascii - (JNIEnv *, jclass, jlong, jshort, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_descriptor - * Signature: (JISI)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1descriptor - (JNIEnv *, jclass, jlong, jint, jshort, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_string_descriptor - * Signature: (JSII)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1string_1descriptor - (JNIEnv *, jclass, jlong, jshort, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_alloc_transfer - * Signature: (I)J - */ -JNIEXPORT jlong JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1alloc_1transfer - (JNIEnv *, jclass, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_free_transfer - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1free_1transfer - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_submit_transfer - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1submit_1transfer - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_cancel_transfer - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1cancel_1transfer - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_control_transfer_get_data - * Signature: (J)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1transfer_1get_1data - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_control_transfer_get_setup - * Signature: (J)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1transfer_1get_1setup - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_fill_control_setup - * Signature: (IIIII)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1control_1setup - (JNIEnv *, jclass, jint, jint, jint, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_fill_control_transfer - * Signature: (JJ[BI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1control_1transfer - (JNIEnv *, jclass, jlong, jlong, jbyteArray, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_fill_bulk_transfer - * Signature: (JJB[BII)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1bulk_1transfer - (JNIEnv *, jclass, jlong, jlong, jbyte, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_fill_interrupt_transfer - * Signature: (JJB[BII)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1interrupt_1transfer - (JNIEnv *, jclass, jlong, jlong, jbyte, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_fill_iso_transfer - * Signature: (JJB[BIII)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1fill_1iso_1transfer - (JNIEnv *, jclass, jlong, jlong, jbyte, jbyteArray, jint, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_set_iso_packet_lengths - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1iso_1packet_1lengths - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_iso_packet_buffer - * Signature: (JI)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1iso_1packet_1buffer - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_iso_packet_buffer_simple - * Signature: (JI)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1iso_1packet_1buffer_1simple - (JNIEnv *, jclass, jlong, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_try_lock_events - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1try_1lock_1events - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_lock_events - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1lock_1events - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_unlock_events - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unlock_1events - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_event_handling_ok - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1event_1handling_1ok - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_event_handler_active - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1event_1handler_1active - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_lock_event_waiters - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1lock_1event_1waiters - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_unlock_event_waiters - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1unlock_1event_1waiters - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_wait_for_event - * Signature: (JJ)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1wait_1for_1event - (JNIEnv *, jclass, jlong, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_handle_events_timeout - * Signature: (JJ)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1events_1timeout - (JNIEnv *, jclass, jlong, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_handle_events - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1events - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_handle_events_locked - * Signature: (JJ)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1handle_1events_1locked - (JNIEnv *, jclass, jlong, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_pollfds_handle_timeouts - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1pollfds_1handle_1timeouts - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_next_timeout - * Signature: (J)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1next_1timeout - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_set_pollfd_notifiers - * Signature: (JZ)V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1set_1pollfd_1notifiers - (JNIEnv *, jclass, jlong, jboolean); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_get_pollfds - * Signature: (J)[Lch/ntb/inf/libusbJava/Libusb_pollfd; - */ -JNIEXPORT jobjectArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1get_1pollfds - (JNIEnv *, jclass, jlong); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_control_transfer - * Signature: (JIIII[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1control_1transfer - (JNIEnv *, jclass, jlong, jint, jint, jint, jint, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_bulk_transfer - * Signature: (JB[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1bulk_1transfer - (JNIEnv *, jclass, jlong, jbyte, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_interrupt_transfer - * Signature: (JB[BII)I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1interrupt_1transfer - (JNIEnv *, jclass, jlong, jbyte, jbyteArray, jint, jint); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: libusb_strerror - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_libusb_1strerror - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: setup - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_setup - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: teardown - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_teardown - (JNIEnv *, jclass); - -/* - * Class: ch_ntb_inf_libusbJava_LibusbJava1 - * Method: to_byteArrayTest - * Signature: (Ljava/lang/String;I)[B - */ -JNIEXPORT jbyteArray JNICALL Java_ch_ntb_inf_libusbJava_LibusbJava1_to_1byteArrayTest - (JNIEnv *, jclass, jstring, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/main/java/ch/ntb/inf/libusbJava/Device.java b/src/main/java/ch/ntb/usb/Device.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/Device.java rename to src/main/java/ch/ntb/usb/Device.java index 5da307d..823c9a5 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Device.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; import java.util.logging.Level; import java.util.logging.Logger; -import ch.ntb.inf.libusbJava.logger.LogUtil; +import ch.ntb.usb.logger.LogUtil; /** * This class represents an USB device.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/LibusbJava.java b/src/main/java/ch/ntb/usb/LibusbJava.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/LibusbJava.java rename to src/main/java/ch/ntb/usb/LibusbJava.java index 506e943..a578118 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/LibusbJava.java +++ b/src/main/java/ch/ntb/usb/LibusbJava.java @@ -10,9 +10,9 @@ * 18.10.2010 NTB / Roger Millischer change from native interface to compatibility layer * */ -package ch.ntb.inf.libusbJava; +package ch.ntb.usb; -import ch.ntb.inf.libusbJava.exceptions.LibusbError; +import ch.ntb.usb.exceptions.LibusbError; /** * This class is used as compatibility layer for libusb 0.1 projects. @@ -60,14 +60,14 @@ public class LibusbJava { if (defaultCTX != 0) { return; } - try { + /*try { defaultCTX = LibusbJava1.libusb_init(); } catch (LibusbError e) { System.err.println("LibusbJava-1.0 init failed with errorcode: " + e.getMessage()); e.printStackTrace(); defaultCTX = 0; - } + }*/ LibusbJava1.libusb_set_debug(0, 0); } diff --git a/src/main/java/ch/ntb/inf/libusbJava/LibusbJava1.java b/src/main/java/ch/ntb/usb/LibusbJava1.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/LibusbJava1.java rename to src/main/java/ch/ntb/usb/LibusbJava1.java index d1843fa..8801245 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/LibusbJava1.java +++ b/src/main/java/ch/ntb/usb/LibusbJava1.java @@ -4,9 +4,11 @@ * * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava; +package ch.ntb.usb; -import ch.ntb.inf.libusbJava.exceptions.LibusbError; +import ch.ntb.usb.exceptions.LibusbError; + +import com.github.boukefalos.jlibloader.Native; /** * This class represents the Java Native Interface to the shared library which @@ -1378,12 +1380,7 @@ public class LibusbJava1 { public static native String libusb_strerror(); static { - String os = System.getProperty("os.name"); - if (os.contains("Windows")) { - System.loadLibrary("LibusbJava-1_0"); - } else { - System.loadLibrary("usbJava-1.0"); - } + Native.load("com.github.boukefalos", "jlibusb"); /* * After loading the library, we register a "shutdown hook" to be called diff --git a/src/main/java/ch/ntb/inf/libusbJava/Libusb_event.java b/src/main/java/ch/ntb/usb/Libusb_event.java similarity index 88% rename from src/main/java/ch/ntb/inf/libusbJava/Libusb_event.java rename to src/main/java/ch/ntb/usb/Libusb_event.java index c7a34c8..2efcbd3 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Libusb_event.java +++ b/src/main/java/ch/ntb/usb/Libusb_event.java @@ -1,4 +1,4 @@ -package ch.ntb.inf.libusbJava; +package ch.ntb.usb; public class Libusb_event { diff --git a/src/main/java/ch/ntb/inf/libusbJava/Libusb_pollfd.java b/src/main/java/ch/ntb/usb/Libusb_pollfd.java similarity index 64% rename from src/main/java/ch/ntb/inf/libusbJava/Libusb_pollfd.java rename to src/main/java/ch/ntb/usb/Libusb_pollfd.java index e05d311..7edaf95 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Libusb_pollfd.java +++ b/src/main/java/ch/ntb/usb/Libusb_pollfd.java @@ -1,4 +1,4 @@ -package ch.ntb.inf.libusbJava; +package ch.ntb.usb; public class Libusb_pollfd { int fd; diff --git a/src/main/java/ch/ntb/inf/libusbJava/USB.java b/src/main/java/ch/ntb/usb/USB.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/USB.java rename to src/main/java/ch/ntb/usb/USB.java index e02211c..6b79e0a 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/USB.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; import java.util.Iterator; import java.util.LinkedList; import java.util.logging.Logger; -import ch.ntb.inf.libusbJava.logger.LogUtil; +import ch.ntb.usb.logger.LogUtil; /** * This class manages all USB devices and defines some USB specific constants.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/USBException.java b/src/main/java/ch/ntb/usb/USBException.java similarity index 93% rename from src/main/java/ch/ntb/inf/libusbJava/USBException.java rename to src/main/java/ch/ntb/usb/USBException.java index ff4fd1d..21f1f5c 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/USBException.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; import java.io.IOException; diff --git a/src/main/java/ch/ntb/inf/libusbJava/USBTimeoutException.java b/src/main/java/ch/ntb/usb/USBTimeoutException.java similarity index 93% rename from src/main/java/ch/ntb/inf/libusbJava/USBTimeoutException.java rename to src/main/java/ch/ntb/usb/USBTimeoutException.java index 2aa9aeb..4b8c3c6 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/USBTimeoutException.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; public class USBTimeoutException extends USBException { diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Bus.java b/src/main/java/ch/ntb/usb/Usb_Bus.java similarity index 98% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Bus.java rename to src/main/java/ch/ntb/usb/Usb_Bus.java index 9ff2bdb..fb0a828 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Bus.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Represents an USB bus.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java b/src/main/java/ch/ntb/usb/Usb_Config_Descriptor.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java rename to src/main/java/ch/ntb/usb/Usb_Config_Descriptor.java index ffad600..320e78b 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java +++ b/src/main/java/ch/ntb/usb/Usb_Config_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.inf.libusbJava; +package ch.ntb.usb; /** * Represents the descriptor of a USB configuration.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Descriptor.java b/src/main/java/ch/ntb/usb/Usb_Descriptor.java similarity index 97% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Descriptor.java rename to src/main/java/ch/ntb/usb/Usb_Descriptor.java index 379a77f..d1b9ab0 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Descriptor.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Common USB descriptor values.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Device.java b/src/main/java/ch/ntb/usb/Usb_Device.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Device.java rename to src/main/java/ch/ntb/usb/Usb_Device.java index 580f3ec..95ba0ca 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Device.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Represents an USB device.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java b/src/main/java/ch/ntb/usb/Usb_Device_Descriptor.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java rename to src/main/java/ch/ntb/usb/Usb_Device_Descriptor.java index 138c779..8a0a618 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Represents the descriptor of a USB device.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java b/src/main/java/ch/ntb/usb/Usb_Endpoint_Descriptor.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java rename to src/main/java/ch/ntb/usb/Usb_Endpoint_Descriptor.java index 03b4227..626d4a9 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Represents the descriptor of an USB endpoint.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Interface.java b/src/main/java/ch/ntb/usb/Usb_Interface.java similarity index 97% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Interface.java rename to src/main/java/ch/ntb/usb/Usb_Interface.java index 284feb3..a8bb6bc 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Interface.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Represents an USB interface.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java b/src/main/java/ch/ntb/usb/Usb_Interface_Descriptor.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java rename to src/main/java/ch/ntb/usb/Usb_Interface_Descriptor.java index bedb94e..dc136f7 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; /** * Represents the descriptor of a USB interface.
diff --git a/src/main/java/ch/ntb/inf/libusbJava/Utils.java b/src/main/java/ch/ntb/usb/Utils.java similarity index 98% rename from src/main/java/ch/ntb/inf/libusbJava/Utils.java rename to src/main/java/ch/ntb/usb/Utils.java index 4e1f89d..d13a5ba 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/Utils.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava; +package ch.ntb.usb; import java.io.PrintStream; diff --git a/src/main/java/ch/ntb/inf/libusbJava/exceptions/LibusbError.java b/src/main/java/ch/ntb/usb/exceptions/LibusbError.java similarity index 98% rename from src/main/java/ch/ntb/inf/libusbJava/exceptions/LibusbError.java rename to src/main/java/ch/ntb/usb/exceptions/LibusbError.java index 86db07a..e7e31f2 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/exceptions/LibusbError.java +++ b/src/main/java/ch/ntb/usb/exceptions/LibusbError.java @@ -1,4 +1,4 @@ -package ch.ntb.inf.libusbJava.exceptions; +package ch.ntb.usb.exceptions; public class LibusbError extends Exception { private static final long serialVersionUID = 9096323614080207236L; diff --git a/src/main/java/ch/ntb/inf/libusbJava/logger/LogUtil.java b/src/main/java/ch/ntb/usb/logger/LogUtil.java similarity index 99% rename from src/main/java/ch/ntb/inf/libusbJava/logger/LogUtil.java rename to src/main/java/ch/ntb/usb/logger/LogUtil.java index 32e204a..51fd7b4 100644 --- a/src/main/java/ch/ntb/inf/libusbJava/logger/LogUtil.java +++ b/src/main/java/ch/ntb/usb/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.inf.libusbJava.logger; +package ch.ntb.usb.logger; import java.io.InputStream; import java.util.Properties; diff --git a/src/main/java/ch/ntb/inf/libusbJava/logger/package.html b/src/main/java/ch/ntb/usb/logger/package.html similarity index 100% rename from src/main/java/ch/ntb/inf/libusbJava/logger/package.html rename to src/main/java/ch/ntb/usb/logger/package.html diff --git a/src/main/java/ch/ntb/inf/libusbJava/package.html b/src/main/java/ch/ntb/usb/package.html similarity index 100% rename from src/main/java/ch/ntb/inf/libusbJava/package.html rename to src/main/java/ch/ntb/usb/package.html diff --git a/src/main/resources/.configure b/src/main/resources/.configure new file mode 100644 index 0000000..57fdbe2 --- /dev/null +++ b/src/main/resources/.configure @@ -0,0 +1,6 @@ +# enable or disable logging +ch.ntb.inf.libusbJava/debug = true +# set and configure individual loggers here +# the format is: projectName/debug/ = / +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/src/test/java/ch/ntb/inf/libusbJava/test/DeviceTest.java b/src/test/java/ch/ntb/usb/test/DeviceTest.java similarity index 97% rename from src/test/java/ch/ntb/inf/libusbJava/test/DeviceTest.java rename to src/test/java/ch/ntb/usb/test/DeviceTest.java index 7830970..228f2b8 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/DeviceTest.java +++ b/src/test/java/ch/ntb/usb/test/DeviceTest.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test; +package ch.ntb.usb.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,16 +26,16 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -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; +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; @SuppressWarnings("deprecation") public class DeviceTest { diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/LibusbJava1Test.java b/src/test/java/ch/ntb/usb/test/LibusbJava1Test.java similarity index 97% rename from src/test/java/ch/ntb/inf/libusbJava/test/LibusbJava1Test.java rename to src/test/java/ch/ntb/usb/test/LibusbJava1Test.java index 1696b95..643c69d 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/LibusbJava1Test.java +++ b/src/test/java/ch/ntb/usb/test/LibusbJava1Test.java @@ -1,4 +1,4 @@ -package ch.ntb.inf.libusbJava.test; +package ch.ntb.usb.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -6,9 +6,9 @@ import static org.junit.Assert.fail; import org.junit.Test; -import ch.ntb.inf.libusbJava.LibusbJava1; -import ch.ntb.inf.libusbJava.Usb_Device; -import ch.ntb.inf.libusbJava.exceptions.LibusbError; +import ch.ntb.usb.LibusbJava1; +import ch.ntb.usb.Usb_Device; +import ch.ntb.usb.exceptions.LibusbError; public class LibusbJava1Test { /** diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/MemoryLeakTest.java b/src/test/java/ch/ntb/usb/test/MemoryLeakTest.java similarity index 92% rename from src/test/java/ch/ntb/inf/libusbJava/test/MemoryLeakTest.java rename to src/test/java/ch/ntb/usb/test/MemoryLeakTest.java index 3886583..727a423 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/MemoryLeakTest.java +++ b/src/test/java/ch/ntb/usb/test/MemoryLeakTest.java @@ -5,7 +5,7 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test; +package ch.ntb.usb.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,14 +21,14 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -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; +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; @SuppressWarnings("deprecation") public class MemoryLeakTest { diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/TestLibUsbJava.java b/src/test/java/ch/ntb/usb/test/TestLibUsbJava.java similarity index 94% rename from src/test/java/ch/ntb/inf/libusbJava/test/TestLibUsbJava.java rename to src/test/java/ch/ntb/usb/test/TestLibUsbJava.java index f1f807f..808afb9 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/TestLibUsbJava.java +++ b/src/test/java/ch/ntb/usb/test/TestLibUsbJava.java @@ -5,15 +5,15 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test; +package ch.ntb.usb.test; -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; +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; /** * This class replicates the code from testlibusb.c supplied in the diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/devices/AT90USB1287.java b/src/test/java/ch/ntb/usb/test/devices/AT90USB1287.java similarity index 84% rename from src/test/java/ch/ntb/inf/libusbJava/test/devices/AT90USB1287.java rename to src/test/java/ch/ntb/usb/test/devices/AT90USB1287.java index 7d2f36a..5ffec61 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/devices/AT90USB1287.java +++ b/src/test/java/ch/ntb/usb/test/devices/AT90USB1287.java @@ -5,10 +5,10 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test.devices; +package ch.ntb.usb.test.devices; -import ch.ntb.inf.libusbJava.USB; -import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; +import ch.ntb.usb.USB; +import ch.ntb.usb.testApp.AbstractDeviceInfo; public class AT90USB1287 extends AbstractDeviceInfo { diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/devices/CY7C68013A.java b/src/test/java/ch/ntb/usb/test/devices/CY7C68013A.java similarity index 82% rename from src/test/java/ch/ntb/inf/libusbJava/test/devices/CY7C68013A.java rename to src/test/java/ch/ntb/usb/test/devices/CY7C68013A.java index 3b8ee82..2649315 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/devices/CY7C68013A.java +++ b/src/test/java/ch/ntb/usb/test/devices/CY7C68013A.java @@ -5,10 +5,10 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test.devices; +package ch.ntb.usb.test.devices; -import ch.ntb.inf.libusbJava.USB; -import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; +import ch.ntb.usb.USB; +import ch.ntb.usb.testApp.AbstractDeviceInfo; public class CY7C68013A extends AbstractDeviceInfo { diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/devices/MX500.java b/src/test/java/ch/ntb/usb/test/devices/MX500.java similarity index 87% rename from src/test/java/ch/ntb/inf/libusbJava/test/devices/MX500.java rename to src/test/java/ch/ntb/usb/test/devices/MX500.java index 121dbb8..38e9fdc 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/devices/MX500.java +++ b/src/test/java/ch/ntb/usb/test/devices/MX500.java @@ -5,9 +5,9 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test.devices; +package ch.ntb.usb.test.devices; -import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; +import ch.ntb.usb.testApp.AbstractDeviceInfo; public class MX500 extends AbstractDeviceInfo { diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/devices/MousePlus.java b/src/test/java/ch/ntb/usb/test/devices/MousePlus.java similarity index 88% rename from src/test/java/ch/ntb/inf/libusbJava/test/devices/MousePlus.java rename to src/test/java/ch/ntb/usb/test/devices/MousePlus.java index 3697c5a..db9e92c 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/devices/MousePlus.java +++ b/src/test/java/ch/ntb/usb/test/devices/MousePlus.java @@ -5,9 +5,9 @@ * http://libusbjava.sourceforge.net * This library is covered by the LGPL, read LGPL.txt for details. */ -package ch.ntb.inf.libusbJava.test.devices; +package ch.ntb.usb.test.devices; -import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo; +import ch.ntb.usb.testApp.AbstractDeviceInfo; public class MousePlus extends AbstractDeviceInfo { diff --git a/src/test/java/ch/ntb/inf/libusbJava/test/exceptions/LibusbErrorTest.java b/src/test/java/ch/ntb/usb/test/exceptions/LibusbErrorTest.java similarity index 95% rename from src/test/java/ch/ntb/inf/libusbJava/test/exceptions/LibusbErrorTest.java rename to src/test/java/ch/ntb/usb/test/exceptions/LibusbErrorTest.java index c6f3157..f928c6a 100644 --- a/src/test/java/ch/ntb/inf/libusbJava/test/exceptions/LibusbErrorTest.java +++ b/src/test/java/ch/ntb/usb/test/exceptions/LibusbErrorTest.java @@ -1,4 +1,4 @@ -package ch.ntb.inf.libusbJava.test.exceptions; +package ch.ntb.usb.test.exceptions; import static org.junit.Assert.assertEquals; @@ -10,7 +10,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import ch.ntb.inf.libusbJava.exceptions.LibusbError; +import ch.ntb.usb.exceptions.LibusbError; @RunWith(Parameterized.class) public class LibusbErrorTest { diff --git a/java/testdevice.properties b/src/test/resources/testdevice.properties similarity index 97% rename from java/testdevice.properties rename to src/test/resources/testdevice.properties index 7c92baa..8eb508d 100644 --- a/java/testdevice.properties +++ b/src/test/resources/testdevice.properties @@ -1,13 +1,13 @@ -################################################################ -# 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.inf.libusbJava.test.devices.AT90USB1287 -# Cypress FX2 CY7C68013A -#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.CY7C68013A -# MX500 Mouse -#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.MX500 -# Logitech Notebook Mouse Plus -#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.MousePlus +################################################################ +# 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.inf.libusbJava.test.devices.AT90USB1287 +# Cypress FX2 CY7C68013A +#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.CY7C68013A +# MX500 Mouse +#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.MX500 +# Logitech Notebook Mouse Plus +#testdeviceInfo=ch.ntb.inf.libusbJava.test.devices.MousePlus diff --git a/java/uml/StarUML.url b/uml/StarUML.url similarity index 96% rename from java/uml/StarUML.url rename to uml/StarUML.url index d3103e6..d91e41b 100644 --- a/java/uml/StarUML.url +++ b/uml/StarUML.url @@ -1,3 +1,3 @@ -[InternetShortcut] -URL=http://staruml.sourceforge.net/ -Modified=7081E8FF540DC70101 +[InternetShortcut] +URL=http://staruml.sourceforge.net/ +Modified=7081E8FF540DC70101 diff --git a/java/uml/ch.ntb.usb.jpg b/uml/ch.ntb.usb.jpg similarity index 100% rename from java/uml/ch.ntb.usb.jpg rename to uml/ch.ntb.usb.jpg diff --git a/java/uml/ch.ntb.usb.uml b/uml/ch.ntb.usb.uml similarity index 98% rename from java/uml/ch.ntb.usb.uml rename to uml/ch.ntb.usb.uml index 4f55368..1ccc9e8 100644 --- a/java/uml/ch.ntb.usb.uml +++ b/uml/ch.ntb.usb.uml @@ -1,2023 +1,2023 @@ - - - - - - -UMLStandard - - - - -Untitled -5 - -Use Case Model -UMLStandard -useCaseModel -FtDtfOwik0OVQfE6ZPIIGQAA -1 - -Main -hbd/RrRc9EeCFFOhgTtNRQAA - -JzSJSx+4SUGBjb1zXBl8cQAA - - - - -Analysis Model -UMLStandard -analysisModel -FtDtfOwik0OVQfE6ZPIIGQAA -1 - -Main -True -RobustnessDiagram -CNPw4gYWoEG9/GGPCspCSAAA - -0DEch0URP06Bhr3ctOKuJQAA - - - - -Design Model -UMLStandard -designModel -FtDtfOwik0OVQfE6ZPIIGQAA -1 - -Main -True -+VhQCvPWpkq9N+U+GjchOQAA - -jGVxNbYj00Chrjdm4wEWXAAA -32 - -clMaroon -$00B9FFFF -56 -56 -713 -501 -BWFMxN62oEGNP+kKcODiEgAA - - -ch.ntb.inf.libusbJava - - -False - - -False - - - - -clMaroon -$00B9FFFF -448 -216 -113 -53 -Y0tGKOGA/UquqP1qaYDayQAA - - -1 -LibusbJava - - -False - - -False - - - -Y0tGKOGA/UquqP1qaYDayQAA - - -Y0tGKOGA/UquqP1qaYDayQAA - - -False -Y0tGKOGA/UquqP1qaYDayQAA - - - -clMaroon -$00B9FFFF -596 -272 -136 -68 -Native class to access -the LibusbJava.dll which -is a wrapper to the -LibUsb-Win32 API. - - - -clMaroon -$00B9FFFF -560,264;596,278 -kFuXbRCvX0OxyJYGXAJ2NwAA -bj7RYkSMO0qIEP8jkhRPkgAA - - -clMaroon -$00B9FFFF -440 -108 -140 -59 -NDp8e0ch10ST3dwxWPam4AAA - - -1 -Device - - -False - - -False - - - -NDp8e0ch10ST3dwxWPam4AAA - - -NDp8e0ch10ST3dwxWPam4AAA - - -False -NDp8e0ch10ST3dwxWPam4AAA - - - -clMaroon -$00B9FFFF -508,166;505,216 -bHBJ2iMT1Emo3/z1QruACAAA -bj7RYkSMO0qIEP8jkhRPkgAA -2BBmOZlXy0elqrvf1Pfb0QAA - -False -1.5707963267949 -15 -bHBJ2iMT1Emo3/z1QruACAAA - - -False -1.5707963267949 -30 -bHBJ2iMT1Emo3/z1QruACAAA - - -False --1.5707963267949 -15 -bHBJ2iMT1Emo3/z1QruACAAA - - -False --0.523598775598299 -30 -epHead -gBDIpZT7JEe5yWqm5udjswAA - - -False -0.523598775598299 -30 -epTail -9KWfrYr7HUmfL2Kub4NWjQAA - - -False -0.523598775598299 -25 -epHead -gBDIpZT7JEe5yWqm5udjswAA - - -False --0.523598775598299 -25 -epTail -9KWfrYr7HUmfL2Kub4NWjQAA - - -False --0.785398163397448 -40 -epHead -gBDIpZT7JEe5yWqm5udjswAA - - -False -0.785398163397448 -40 -epTail -9KWfrYr7HUmfL2Kub4NWjQAA - - -False --1000 --1000 -50 -8 -gBDIpZT7JEe5yWqm5udjswAA - - -False --1000 --1000 -50 -8 -9KWfrYr7HUmfL2Kub4NWjQAA - - - -clMaroon -$00B9FFFF -352 -308 -80 -43 -fKheOe+4606Ei/JrIdvAnwAA - - -1 -Usb_Bus - - -False - - -False - - - -fKheOe+4606Ei/JrIdvAnwAA - - -fKheOe+4606Ei/JrIdvAnwAA - - -False -fKheOe+4606Ei/JrIdvAnwAA - - - -clMaroon -$00B9FFFF -213 -308 -80 -43 -CYy/2ClqUUO8tWkJYxc3EwAA - - -1 -Usb_Device - - -False - - -False - - - -CYy/2ClqUUO8tWkJYxc3EwAA - - -CYy/2ClqUUO8tWkJYxc3EwAA - - -False -CYy/2ClqUUO8tWkJYxc3EwAA - - - -clMaroon -$00B9FFFF -352,329;292,329 -rRumqTzUKUikwPtpVUuuxQAA -EmkgqCDDHEeVmq/pvU4k2gAA -aFv0LI7ePk6WALpiWziNnAAA - -False -1.5707963267949 -15 -rRumqTzUKUikwPtpVUuuxQAA - - -False -1.5707963267949 -30 -rRumqTzUKUikwPtpVUuuxQAA - - -False --1.5707963267949 -15 -rRumqTzUKUikwPtpVUuuxQAA - - -False --0.523598775598299 -30 -epHead -fPb+E6EWw0SS68JSU1n2PQAA - - -False -0.523598775598299 -30 -epTail -Ktquk70tXEeWxRy5mE3lRQAA - - -0.523598775598299 -25 -epHead -0..* -fPb+E6EWw0SS68JSU1n2PQAA - - -False --0.523598775598299 -25 -epTail -Ktquk70tXEeWxRy5mE3lRQAA - - -False --0.785398163397448 -40 -epHead -fPb+E6EWw0SS68JSU1n2PQAA - - -False -0.785398163397448 -40 -epTail -Ktquk70tXEeWxRy5mE3lRQAA - - -False --1000 --1000 -50 -8 -fPb+E6EWw0SS68JSU1n2PQAA - - -False --1000 --1000 -50 -8 -Ktquk70tXEeWxRy5mE3lRQAA - - - -clMaroon -$00B9FFFF -68 -308 -97 -43 -BhOtKDs6x0a1MSfBURjV3wAA - - -1 -Usb_Descriptor - - -False - - -False - - - -BhOtKDs6x0a1MSfBURjV3wAA - - -BhOtKDs6x0a1MSfBURjV3wAA - - -False -BhOtKDs6x0a1MSfBURjV3wAA - - - -clMaroon -$00B9FFFF -213,329;164,329 -iOkg8RoFXkawUPB8gsL6/QAA -+ip26EaWW06hVyLJe7YYXgAA -EmkgqCDDHEeVmq/pvU4k2gAA - -False -1.5707963267949 -15 -iOkg8RoFXkawUPB8gsL6/QAA - - -False -1.5707963267949 -30 -iOkg8RoFXkawUPB8gsL6/QAA - - -False --1.5707963267949 -15 -iOkg8RoFXkawUPB8gsL6/QAA - - -False --0.523598775598299 -30 -epHead -i+tjppNl/0SEXFu6g5HCzwAA - - -False -0.523598775598299 -30 -epTail -L09q640bS0+0SD6RlutglgAA - - -0.523598775598299 -25 -epHead -1 -i+tjppNl/0SEXFu6g5HCzwAA - - -False --0.523598775598299 -25 -epTail -L09q640bS0+0SD6RlutglgAA - - -False --0.785398163397448 -40 -epHead -i+tjppNl/0SEXFu6g5HCzwAA - - -False -0.785398163397448 -40 -epTail -L09q640bS0+0SD6RlutglgAA - - -False --1000 --1000 -50 -8 -i+tjppNl/0SEXFu6g5HCzwAA - - -False --1000 --1000 -50 -8 -L09q640bS0+0SD6RlutglgAA - - - -clMaroon -$00B9FFFF -64 -396 -139 -43 -WnjxeWRoQE+dRj+3+FKmAAAA - - -1 -Usb_Config_Descriptor - - -False - - -False - - - -WnjxeWRoQE+dRj+3+FKmAAAA - - -WnjxeWRoQE+dRj+3+FKmAAAA - - -False -WnjxeWRoQE+dRj+3+FKmAAAA - - - -clMaroon -$00B9FFFF -224,350;162,396 -hSAawvsHfkmM8rOCrDJNqwAA -V/iR3pEvp0+E4vtLxulBFwAA -EmkgqCDDHEeVmq/pvU4k2gAA - -False -1.5707963267949 -15 -hSAawvsHfkmM8rOCrDJNqwAA - - -False -1.5707963267949 -30 -hSAawvsHfkmM8rOCrDJNqwAA - - -False --1.5707963267949 -15 -hSAawvsHfkmM8rOCrDJNqwAA - - -False --0.523598775598299 -30 -epHead -eYy3sCm5cU2qevI2XvqfOQAA - - -False -0.523598775598299 -30 -epTail -bi54YUBBk0OKg2sVhfeXsgAA - - -0.523598775598299 -25 -epHead -1..* -eYy3sCm5cU2qevI2XvqfOQAA - - -False --0.523598775598299 -25 -epTail -bi54YUBBk0OKg2sVhfeXsgAA - - -False --0.785398163397448 -40 -epHead -eYy3sCm5cU2qevI2XvqfOQAA - - -False -0.785398163397448 -40 -epTail -bi54YUBBk0OKg2sVhfeXsgAA - - -False --1000 --1000 -50 -8 -eYy3sCm5cU2qevI2XvqfOQAA - - -False --1000 --1000 -50 -8 -bi54YUBBk0OKg2sVhfeXsgAA - - - -clMaroon -$00B9FFFF -288 -396 -91 -43 -s3tyNjh10EOlP9fTFKCHzgAA - - -1 -Usb_Interface - - -False - - -False - - - -s3tyNjh10EOlP9fTFKCHzgAA - - -s3tyNjh10EOlP9fTFKCHzgAA - - -False -s3tyNjh10EOlP9fTFKCHzgAA - - - -clMaroon -$00B9FFFF -202,417;288,417 -mH3MSoB9/UmX+ZKIsczTmQAA -9cvRIAusL0q/WdlYUOTN0QAA -V/iR3pEvp0+E4vtLxulBFwAA - -False -1.5707963267949 -15 -mH3MSoB9/UmX+ZKIsczTmQAA - - -False -1.5707963267949 -30 -mH3MSoB9/UmX+ZKIsczTmQAA - - -False --1.5707963267949 -15 -mH3MSoB9/UmX+ZKIsczTmQAA - - -False --0.523598775598299 -30 -epHead -g9gIEMzm106FV2WEfzg/cgAA - - -False -0.523598775598299 -30 -epTail -ss4cvrGCjkas7SCXWHrzGwAA - - -0.523598775598299 -25 -epHead -1..* -g9gIEMzm106FV2WEfzg/cgAA - - -False --0.523598775598299 -25 -epTail -ss4cvrGCjkas7SCXWHrzGwAA - - -False --0.785398163397448 -40 -epHead -g9gIEMzm106FV2WEfzg/cgAA - - -False -0.785398163397448 -40 -epTail -ss4cvrGCjkas7SCXWHrzGwAA - - -False --1000 --1000 -50 -8 -g9gIEMzm106FV2WEfzg/cgAA - - -False --1000 --1000 -50 -8 -ss4cvrGCjkas7SCXWHrzGwAA - - - -clMaroon -$00B9FFFF -64 -500 -157 -43 -1ZxdCeSlnke1mOXmwZo44gAA - - -1 -Usb_Interface_Descriptor - - -False - - -False - - - -1ZxdCeSlnke1mOXmwZo44gAA - - -1ZxdCeSlnke1mOXmwZo44gAA - - -False -1ZxdCeSlnke1mOXmwZo44gAA - - - -clMaroon -$00B9FFFF -294,438;180,500 -PzrlQ1JpekCs4WZeZXoxzAAA -SDQcLhaItkO2CR3ujsiVQgAA -9cvRIAusL0q/WdlYUOTN0QAA - -False -1.5707963267949 -15 -PzrlQ1JpekCs4WZeZXoxzAAA - - -False -1.5707963267949 -30 -PzrlQ1JpekCs4WZeZXoxzAAA - - -False --1.5707963267949 -15 -PzrlQ1JpekCs4WZeZXoxzAAA - - -False --0.523598775598299 -30 -epHead -4CMW55+u4U+8jmDGtiId6QAA - - -False -0.523598775598299 -30 -epTail -tSa9Dc6pX06DqFwtod8w3wAA - - -0.523598775598299 -25 -epHead -1..* -4CMW55+u4U+8jmDGtiId6QAA - - -False --0.523598775598299 -25 -epTail -tSa9Dc6pX06DqFwtod8w3wAA - - -False --0.785398163397448 -40 -epHead -4CMW55+u4U+8jmDGtiId6QAA - - -False -0.785398163397448 -40 -epTail -tSa9Dc6pX06DqFwtod8w3wAA - - -False --1000 --1000 -50 -8 -4CMW55+u4U+8jmDGtiId6QAA - - -False --1000 --1000 -50 -8 -tSa9Dc6pX06DqFwtod8w3wAA - - - -clMaroon -$00B9FFFF -296 -500 -153 -43 -r8we3ZgdtE+PkC4ethr1xgAA - - -1 -Usb_Endpoint_Descriptor - - -False - - -False - - - -r8we3ZgdtE+PkC4ethr1xgAA - - -r8we3ZgdtE+PkC4ethr1xgAA - - -False -r8we3ZgdtE+PkC4ethr1xgAA - - - -clMaroon -$00B9FFFF -220,521;296,521 -zcRjiWnEb0igPnnJ6hWtBAAA -G7uniSci8UWnqaXbrSHwxQAA -SDQcLhaItkO2CR3ujsiVQgAA - -False -1.5707963267949 -15 -zcRjiWnEb0igPnnJ6hWtBAAA - - -False -1.5707963267949 -30 -zcRjiWnEb0igPnnJ6hWtBAAA - - -False --1.5707963267949 -15 -zcRjiWnEb0igPnnJ6hWtBAAA - - -False --0.523598775598299 -30 -epHead -otEuPscjc0GzY5FZ4edKDQAA - - -False -0.523598775598299 -30 -epTail -Y0+EzvEeiUOOez0CtW5HcQAA - - -0.523598775598299 -25 -epHead -1..* -otEuPscjc0GzY5FZ4edKDQAA - - -False --0.523598775598299 -25 -epTail -Y0+EzvEeiUOOez0CtW5HcQAA - - -False --0.785398163397448 -40 -epHead -otEuPscjc0GzY5FZ4edKDQAA - - -False -0.785398163397448 -40 -epTail -Y0+EzvEeiUOOez0CtW5HcQAA - - -False --1000 --1000 -50 -8 -otEuPscjc0GzY5FZ4edKDQAA - - -False --1000 --1000 -50 -8 -Y0+EzvEeiUOOez0CtW5HcQAA - - - -clMaroon -$00B9FFFF -80 -112 -253 -56 -uDTqegf/MkeBHojXFEOLGwAA - - -1 -USB - - -False - - -False - - - -uDTqegf/MkeBHojXFEOLGwAA - - -uDTqegf/MkeBHojXFEOLGwAA - - -False -uDTqegf/MkeBHojXFEOLGwAA - - - -clMaroon -$00B9FFFF -24 -200 -129 -57 -A device factory which -creates and manages -all device instances. - - - -clMaroon -$00B9FFFF -125,200;169,167 -6dw/hbnfL0KObRrJlTOaOAAA -QgnPJMfYfkKI63CxIbKrUQAA - - -clMaroon -$00B9FFFF -470,268;418,308 -CUdyl1aeZ0+5m6T7YR+ScwAA -aFv0LI7ePk6WALpiWziNnAAA -bj7RYkSMO0qIEP8jkhRPkgAA - -False -1.5707963267949 -15 -CUdyl1aeZ0+5m6T7YR+ScwAA - - -False -1.5707963267949 -30 -CUdyl1aeZ0+5m6T7YR+ScwAA - - -False --1.5707963267949 -15 -CUdyl1aeZ0+5m6T7YR+ScwAA - - -False --0.523598775598299 -30 -epHead -eMLC5J+HEUOU0BNl4xEgOQAA - - -False -0.523598775598299 -30 -epTail -yd1VA+Osg0auP1WmaHV/pAAA - - -0.523598775598299 -25 -epHead -1 -eMLC5J+HEUOU0BNl4xEgOQAA - - -False --0.523598775598299 -25 -epTail -yd1VA+Osg0auP1WmaHV/pAAA - - -False --0.785398163397448 -40 -epHead -eMLC5J+HEUOU0BNl4xEgOQAA - - -False -0.785398163397448 -40 -epTail -yd1VA+Osg0auP1WmaHV/pAAA - - -False --1000 --1000 -50 -8 -eMLC5J+HEUOU0BNl4xEgOQAA - - -False --1000 --1000 -50 -8 -yd1VA+Osg0auP1WmaHV/pAAA - - - -clMaroon -$00B9FFFF -448 -364 -86 -41 -Linked List of -type Usb_Bus - - - -clMaroon -$00B9FFFF -454,364;429,350 -aFv0LI7ePk6WALpiWziNnAAA -rLlcF+A5KkiU7WAvQnrBbgAA - - -clMaroon -$00B9FFFF -228 -244 -101 -41 -Linked List of -type Usb_Device - - - -clMaroon -$00B9FFFF -260,308;270,284 -Pv0Pt3qkZkmPtYeARmmwEAAA -EmkgqCDDHEeVmq/pvU4k2gAA - - -clMaroon -$00B9FFFF -332,138;440,137 -E/QwNfFGUEiitlqp99S36AAA -2BBmOZlXy0elqrvf1Pfb0QAA -6dw/hbnfL0KObRrJlTOaOAAA - -False -1.5707963267949 -15 -E/QwNfFGUEiitlqp99S36AAA - - -False -0.977411820724642 -48.0416485978573 -E/QwNfFGUEiitlqp99S36AAA - - -False --1.5707963267949 -15 -E/QwNfFGUEiitlqp99S36AAA - - -False --0.523598775598299 -30 -epHead -tXktVESMQUOZFggmJCAGDAAA - - -False -0.523598775598299 -30 -epTail -ym/t3t4KOkinRJAqyF+HwQAA - - -0.523598775598299 -25 -epHead -0..* -tXktVESMQUOZFggmJCAGDAAA - - -False --0.523598775598299 -25 -epTail -ym/t3t4KOkinRJAqyF+HwQAA - - -False --0.785398163397448 -40 -epHead -tXktVESMQUOZFggmJCAGDAAA - - -False -0.785398163397448 -40 -epTail -ym/t3t4KOkinRJAqyF+HwQAA - - -False --1000 --1000 -50 -8 -tXktVESMQUOZFggmJCAGDAAA - - -False --1000 --1000 -50 -8 -ym/t3t4KOkinRJAqyF+HwQAA - - - -clMaroon -$00B9FFFF -656 -92 -89 -56 -p/wk8BA7x0OTRXXHy0OJmgAA - - -1 -USBException - - -<<exception>> - - -False - - - -p/wk8BA7x0OTRXXHy0OJmgAA - - -p/wk8BA7x0OTRXXHy0OJmgAA - - - -clMaroon -$00B9FFFF -628 -168 -134 -56 -nCivixeClUeJ/8WDflvLoAAA - - -1 -USBTimeoutException - - -<<exception>> - - -False - - - -nCivixeClUeJ/8WDflvLoAAA - - -nCivixeClUeJ/8WDflvLoAAA - - - -clMaroon -$00B9FFFF -579,130;656,123 -3Xd7YkTVeUijpP0dxF3K9wAA -1cUBYeKUdUuMBdS17locfgAA -2BBmOZlXy0elqrvf1Pfb0QAA - -False -1.5707963267949 -15 -3Xd7YkTVeUijpP0dxF3K9wAA - - -False -1.5707963267949 -30 -3Xd7YkTVeUijpP0dxF3K9wAA - - -False --1.5707963267949 -15 -3Xd7YkTVeUijpP0dxF3K9wAA - - -False --0.523598775598299 -30 -epHead -PCKabEdsC0+42T+WCC0J+gAA - - -False -0.523598775598299 -30 -epTail -RwLaC/BiAE+6PNyQNM7DRwAA - - -False -0.523598775598299 -25 -epHead -PCKabEdsC0+42T+WCC0J+gAA - - -False --0.523598775598299 -25 -epTail -RwLaC/BiAE+6PNyQNM7DRwAA - - -False --0.785398163397448 -40 -epHead -PCKabEdsC0+42T+WCC0J+gAA - - -False -0.785398163397448 -40 -epTail -RwLaC/BiAE+6PNyQNM7DRwAA - - -False --1000 --1000 -50 -8 -PCKabEdsC0+42T+WCC0J+gAA - - -False --1000 --1000 -50 -8 -RwLaC/BiAE+6PNyQNM7DRwAA - - - -clMaroon -$00B9FFFF -579,159;628,174 -juy2GOZNhkq5f7cp9rQyWQAA -m44pRtEbJU63JQyFoCCxtAAA -2BBmOZlXy0elqrvf1Pfb0QAA - -False -1.5707963267949 -15 -juy2GOZNhkq5f7cp9rQyWQAA - - -False -1.5707963267949 -30 -juy2GOZNhkq5f7cp9rQyWQAA - - -False --1.5707963267949 -15 -juy2GOZNhkq5f7cp9rQyWQAA - - -False --0.523598775598299 -30 -epHead -cJakFa0mdEChcxEhYeDaKwAA - - -False -0.523598775598299 -30 -epTail -RJcA8VyDe0K2sWOwSOHLiwAA - - -False -0.523598775598299 -25 -epHead -cJakFa0mdEChcxEhYeDaKwAA - - -False --0.523598775598299 -25 -epTail -RJcA8VyDe0K2sWOwSOHLiwAA - - -False --0.785398163397448 -40 -epHead -cJakFa0mdEChcxEhYeDaKwAA - - -False -0.785398163397448 -40 -epTail -RJcA8VyDe0K2sWOwSOHLiwAA - - -False --1000 --1000 -50 -8 -cJakFa0mdEChcxEhYeDaKwAA - - -False --1000 --1000 -50 -8 -RJcA8VyDe0K2sWOwSOHLiwAA - - - - -16 - -ch.ntb.inf.libusbJava -+VhQCvPWpkq9N+U+GjchOQAA -1 -3aqcGmdQBU2yR8XWwbH6wgAA -10 - -LibusbJava -BWFMxN62oEGNP+kKcODiEgAA -4 -bj7RYkSMO0qIEP8jkhRPkgAA -pYdCcwUS1kuxFBcQBuXWhwAA -B8g6dO1SPUKmK3vZse8ykwAA -uhBTnkByp0aEHfbKvbAIRgAA -2 -gBDIpZT7JEe5yWqm5udjswAA -yd1VA+Osg0auP1WmaHV/pAAA - - -Device -BWFMxN62oEGNP+kKcODiEgAA -4 -2BBmOZlXy0elqrvf1Pfb0QAA -vtJgj9fKHUOv3MF6LiZuaQAA -hWPO+G2l6UamJ9XP1xsU6gAA -4gcdaLKmOESleWMoU/ITdgAA -2 - -USBException -NDp8e0ch10ST3dwxWPam4AAA -3 -1cUBYeKUdUuMBdS17locfgAA -xvrkkvaXsEyKlXkeArvn6gAA -9XjxPvkTzUW160zoJoXJIgAA -2 -jAq2OWym/0CBShdxKGVvTgAA -PCKabEdsC0+42T+WCC0J+gAA - - -USBTimeoutException -NDp8e0ch10ST3dwxWPam4AAA -3 -m44pRtEbJU63JQyFoCCxtAAA -8ptu2+IQEkiODfeNkzBbIAAA -NCd0z6hUJUKirt04Te6MmAAA -2 -jB8ocTwTXEuDjkXR5KY03QAA -cJakFa0mdEChcxEhYeDaKwAA - -1 -S86PfEMMVEitYamqNGrOKgAA -6 -9KWfrYr7HUmfL2Kub4NWjQAA -tXktVESMQUOZFggmJCAGDAAA -gnNEskLBlEGy68pKD58J3gAA -gMOdBarVEUi69aAllgtqSAAA -RwLaC/BiAE+6PNyQNM7DRwAA -RJcA8VyDe0K2sWOwSOHLiwAA - - -Usb_Bus -BWFMxN62oEGNP+kKcODiEgAA -4 -aFv0LI7ePk6WALpiWziNnAAA -4mnVev5sO06YjJQcHwAzNAAA -ApB+Ycn4QkCd4JiwYWOuogAA -BoqVLNosikui7Gvm79DqwAAA -4 -Ktquk70tXEeWxRy5mE3lRQAA -BM39AT1FtkCD5DXdvFUWGwAA -eMLC5J+HEUOU0BNl4xEgOQAA -zVVM8HoZZ0K4SLvruROwSQAA - - -Usb_Device -BWFMxN62oEGNP+kKcODiEgAA -4 -EmkgqCDDHEeVmq/pvU4k2gAA -PTdUVfhJcUasUJqV7DrnzwAA -BrLi1ywnW0yy33ZKZYFfAQAA -mAD2mqiGJUmcDDGj80NyFwAA -4 -fPb+E6EWw0SS68JSU1n2PQAA -QkO09pUTaUqUag/gnTQhMAAA -L09q640bS0+0SD6RlutglgAA -bi54YUBBk0OKg2sVhfeXsgAA - - -Usb_Descriptor -BWFMxN62oEGNP+kKcODiEgAA -4 -+ip26EaWW06hVyLJe7YYXgAA -HHzH4uen30eMjBMjRst2mgAA -mqiCxho4tUOAdpt4/UzG1AAA -k95O6pb/JUut+HXhcujAvQAA -1 -i+tjppNl/0SEXFu6g5HCzwAA - - -Usb_Config_Descriptor -BWFMxN62oEGNP+kKcODiEgAA -4 -V/iR3pEvp0+E4vtLxulBFwAA -rC/MaZnjZkmCGY1tqVmdDQAA -bP5ruvrDjkuOZy0aWHw5qAAA -Tp/ZRDMhiEiRwOJ8Dte+6AAA -2 -eYy3sCm5cU2qevI2XvqfOQAA -ss4cvrGCjkas7SCXWHrzGwAA - - -Usb_Interface -BWFMxN62oEGNP+kKcODiEgAA -4 -9cvRIAusL0q/WdlYUOTN0QAA -mHOFyGNhZ02On/3bYclCQgAA -S8sNFKpNX0CfvJz4xM2R8QAA -ZR4POMzRtkii7O0qcFXeagAA -2 -g9gIEMzm106FV2WEfzg/cgAA -tSa9Dc6pX06DqFwtod8w3wAA - - -Usb_Interface_Descriptor -BWFMxN62oEGNP+kKcODiEgAA -4 -SDQcLhaItkO2CR3ujsiVQgAA -niJtEkEAIE27g/VJLGKCeQAA -tEi8ncuIh0akDZbNdI0BXAAA -f6iRLfdj90KPJZTvam9xcgAA -2 -4CMW55+u4U+8jmDGtiId6QAA -Y0+EzvEeiUOOez0CtW5HcQAA - - -Usb_Endpoint_Descriptor -BWFMxN62oEGNP+kKcODiEgAA -4 -G7uniSci8UWnqaXbrSHwxQAA -oOH1WDfw5E+CPfQCtwl3lwAA -zVJ7FeURsUqHB/7bijkGSgAA -8xSZnRanKUS7ttTDyMY3XQAA -1 -otEuPscjc0GzY5FZ4edKDQAA - - -USB -BWFMxN62oEGNP+kKcODiEgAA -4 -6dw/hbnfL0KObRrJlTOaOAAA -9NxPBd7BGEmMZajXGsdmCgAA -ReCrM4NymEe6kNr17N/fLwAA -oUsxZCkyqU+EFKmB53hfIQAA -1 - -getDevice -uDTqegf/MkeBHojXFEOLGwAA -3 - -idVendor -int -4R8Nv262EEqwj5BpzEwnFAAA - - -idProduct -int -4R8Nv262EEqwj5BpzEwnFAAA - - -return -pdkReturn -Device -4R8Nv262EEqwj5BpzEwnFAAA -NDp8e0ch10ST3dwxWPam4AAA - - -1 -ym/t3t4KOkinRJAqyF+HwQAA - -1 -mUO4OyL7Z0inPl8NM4gOKQAA - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -K1jbk7tvDECb113o54KaCgAA -ewuWWER98U2X1/Gyqau2iQAA -ydzgGYT1JUqGBbRngdAkOwAA -kRDUUGf7YkG4X7f5D7Tu5QAA -2 - -False -bHBJ2iMT1Emo3/z1QruACAAA -NDp8e0ch10ST3dwxWPam4AAA -4 -HnV1GDlOlUiEzDCgg3OVnwAA -3vJXTt9Ud0+cklGb7VirjwAA -T54kLOtp70+07rCDysRoRgAA -ZmEyokBAfUuimbUqLhInLAAA - - -bHBJ2iMT1Emo3/z1QruACAAA -Y0tGKOGA/UquqP1qaYDayQAA -4 -nP4i5P/O2UWgSJEnuXrNGAAA -NbkMFiV5UUyU8V6ZyNh/ggAA -qnQYuly9P0ePfBPLyOhoUgAA -KiPq8wTTI02Bz5cifJGqSAAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -N+DG+sDQsU+dEVL0AtioTgAA -h4biD7IVaE2ULotQ37wNTAAA -juYsWZ7nVUuYfA9bXvsoRQAA -gVKvw0NHaUCC8LoVjlxEaQAA -2 - -False -rRumqTzUKUikwPtpVUuuxQAA -fKheOe+4606Ei/JrIdvAnwAA -4 -OYIH3ymdpUit+s9rXvgX4QAA -2cgp4vLw00iUpTcWm5nXagAA -tGs9/SOEbkuqTf609sd2uQAA -wlFJ5gxqB0W1JznjbhR82wAA - - -0..* -rRumqTzUKUikwPtpVUuuxQAA -CYy/2ClqUUO8tWkJYxc3EwAA -4 -tvTF0QXyTkOU+lco6nawpAAA -OlG/OTSXdkeeQhih0vfj2gAA -E2JhEcUXZkeaMU/vi7BgQwAA -Pgiug9F5sEm6RGjxSJwN0QAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -2 - -False -N1GWtLD2hke4QpWNj3VbPQAA -CYy/2ClqUUO8tWkJYxc3EwAA - - -1 -N1GWtLD2hke4QpWNj3VbPQAA -fKheOe+4606Ei/JrIdvAnwAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -tgaMJ8+zg0Sn4iEmoOIchwAA -rgg15Kcdr0mVUlnlnH9jIgAA -keuOun+wjE+QghwhaUSp7QAA -LDA6nTIXBkWsIuU2zIrtiAAA -2 - -False -iOkg8RoFXkawUPB8gsL6/QAA -CYy/2ClqUUO8tWkJYxc3EwAA -4 -VnH93Y/7IkaJYl+DPinjmwAA -J87I73G/nkuAKdCKS1ov3AAA -gX2CUgfdCki+IWGLlwLwBgAA -8AgdepV+YECTfuxJBIqCCwAA - - -1 -iOkg8RoFXkawUPB8gsL6/QAA -BhOtKDs6x0a1MSfBURjV3wAA -4 -1qxaXx2+hEq1Na+Bk3itGQAA -FePC/A0aMEGuAW8YyMNUfQAA -jbg1/Hojq0CDpZmGOngZ8gAA -XyLeWJl15kSVqLBfioHjpwAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -BkeBTT1wlUu9nQU0NNTXFAAA -Tj/mtG0ojUeUZaROPDr/HAAA -0MVCo5fIBUSXtmRyYABJcQAA -UVrEAk/Wbk2olhkdMQkz9wAA -2 - -False -hSAawvsHfkmM8rOCrDJNqwAA -CYy/2ClqUUO8tWkJYxc3EwAA -4 -uBprnnKYk0qBu9UZ9bv+5wAA -uUm65cZr+USoFHmg+9GOTAAA -21oCmtYmTk6I99TNGY+WmQAA -CEBGmwNSDE+W0wJ/aQr5ogAA - - -1..* -hSAawvsHfkmM8rOCrDJNqwAA -WnjxeWRoQE+dRj+3+FKmAAAA -4 -q/Tjz7MsSkCzN45MnaE+ygAA -Ct5Onzw2LES6ewhEa/3NWQAA -9Z0KUb7BbUO7F3MYIOiSrQAA -cY/H4Djf5kicM3tDZOwWkAAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -u2OPyc/1n0+QIGTThiMa3AAA -KLVJzL8T0EW4b4yH0XzDkgAA -OMzpA/ZwnEujuwqWpMDwIwAA -ed2kVo8InU6lewfrLcWA0wAA -2 - -False -mH3MSoB9/UmX+ZKIsczTmQAA -WnjxeWRoQE+dRj+3+FKmAAAA -4 -ElMIvqx9s0qrTOxejhsaSQAA -/avxLTDZe0qmoKyO79Gi7AAA -tjnuHlEOBk2grTlQ+kPGnQAA -oS91czwGhEKtYBANVGPPnwAA - - -1..* -mH3MSoB9/UmX+ZKIsczTmQAA -s3tyNjh10EOlP9fTFKCHzgAA -4 -YlWEGJVu1Eu9BEa5L9YqyQAA -upJz60gOiE2Y6jwQzzUoqQAA -PpS7OEegzUeBhCrBHXgkwAAA -XVazEpRSqkyH0zMCJgEnBAAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -h/CUffjgwUqCUDakMMJ7QQAA -ZnaPkKZFCEaRFYlVBh84uAAA -O1VlBtzO0EaAsu2MtMnYhQAA -S22NfH+9rUCXuvo2rsAWDgAA -2 - -False -PzrlQ1JpekCs4WZeZXoxzAAA -s3tyNjh10EOlP9fTFKCHzgAA -4 -lo8h2SqcoUeOOUPAe0EjdAAA -mv0gaJr3SUeuVY1xo1FdowAA -VQ4ysUxS306j02ouNykrpwAA -+GMHnNNOiEW2P4PaNnKcsgAA - - -1..* -PzrlQ1JpekCs4WZeZXoxzAAA -1ZxdCeSlnke1mOXmwZo44gAA -4 -/cDNFyyj1kKTrWJ1HeW7jwAA -T7Yrg8efIE2hhid6kOwp/AAA -eq+vp2GL9Ey4am7PZZZvYwAA -HB0H112qzU65avMG65s6+AAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -Qa9DlhrWuEyzlqeeW42vigAA -OOu7JCeVT06/I9zcCYxoMgAA -eXZQmjjOb0mgLqiKIEgNjgAA -Z54IgvzlG0+i0eC61Nul2QAA -2 - -False -zcRjiWnEb0igPnnJ6hWtBAAA -1ZxdCeSlnke1mOXmwZo44gAA -4 -Wf6tv7bE1kq7mrxCiOa+SQAA -3TeYQ+z3sUaWb3mqCq5ZswAA -e6lrE15aj0SZAg2c/y97hgAA -B4mF3KmBkEmmqPeQhru4awAA - - -1..* -zcRjiWnEb0igPnnJ6hWtBAAA -r8we3ZgdtE+PkC4ethr1xgAA -4 -lhChbObcCU2CcZDalktiVQAA -eX+Li7xw8Eu7Q+WVQJ7NWgAA -QIJa01TJ8UWewFDbze7RZwAA -z9YWV6a+CkmXxyniylWBegAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -3d03ZiQMEUyp/GDpSGjNdQAA -EnqlEABzrEyr7NnE3rXmXAAA -v5SF4iq4U0idtpnG9Es3XAAA -vmgfHAqH1kK8d0+ACOZ3LgAA -2 - -False -CUdyl1aeZ0+5m6T7YR+ScwAA -Y0tGKOGA/UquqP1qaYDayQAA -4 -cJO2BE8tMk6Vdt7DH7oXUgAA -ztnLte7rf0CX37ncwAxYbgAA -mEJVUc0onE+FHNS1qwcDygAA -dg0oZAkRp02LqrBKRlJGygAA - - -1 -CUdyl1aeZ0+5m6T7YR+ScwAA -fKheOe+4606Ei/JrIdvAnwAA -4 -ACS3R0vnCkiCG7/+fEq01gAA -6bLwfBAaDE6zqua+j7Jf+wAA -PvH2F0s2CU+u9nUzCb6FmwAA -+s+HLixVdk+3Jjh1dYo5NgAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -2 - -False -sq2Gf22XcUO8hotO+r/6swAA -fKheOe+4606Ei/JrIdvAnwAA - - -sq2Gf22XcUO8hotO+r/6swAA -BWFMxN62oEGNP+kKcODiEgAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -15TrBVceQkG56FTsqMwcxgAA -3Fgd7pnAA0+KRKisyFBaqwAA -hxuj8u8Y2EK8qsnGTaBOzQAA -znFoObTUEUOch9SPd7VBJAAA -2 - -False -E/QwNfFGUEiitlqp99S36AAA -uDTqegf/MkeBHojXFEOLGwAA -4 -k9T1VNzEo0ufuAB6TN2QRwAA -oiCIMGX8ik6YjhRQQxB8OQAA -Tu5aL5lgO0ut/RTBGjiKqAAA -iDNEYw6KL0uVCCKPtWa8bwAA - - -0..* -E/QwNfFGUEiitlqp99S36AAA -NDp8e0ch10ST3dwxWPam4AAA -4 -4Vg7xm7w902Ov8oTfg9PSAAA -DWRmEP/U1kOcrZnzyvRnXQAA -FngPhombp0y5VL3elyPMMgAA -ETXPzMurVEmlbvocuDXtVwAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -2 - -V1q5qLSIxEidFrrPCOFqIgAA -NDp8e0ch10ST3dwxWPam4AAA - - -V1q5qLSIxEidFrrPCOFqIgAA -p/wk8BA7x0OTRXXHy0OJmgAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -2 - -7Niy2MZhPUynlh2A2zVkEQAA -NDp8e0ch10ST3dwxWPam4AAA - - -7Niy2MZhPUynlh2A2zVkEQAA -nCivixeClUeJ/8WDflvLoAAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -Rk0gcRI5ikapDGR7M2bn5AAA -HXSRZ0W7C02e+CDSTe+vQgAA -39P+Jod7A0SpXNClHK/bIwAA -FOp7UHIFjUmRJarTRH6h3AAA -2 - -False -3Xd7YkTVeUijpP0dxF3K9wAA -NDp8e0ch10ST3dwxWPam4AAA -4 -IIOw3R07h0mYIbxgQNAvlgAA -6DAAoxE3gE6btQ3QR6zXSAAA -Ilbnf/apgU2JUqlCax0E0AAA -GWJjJWM040mgOfcnzTwGqgAA - - -3Xd7YkTVeUijpP0dxF3K9wAA -p/wk8BA7x0OTRXXHy0OJmgAA -4 -Mf6lj8hCekmAt8LSuv0gPQAA -roosZQXLT0uL9JG9OjvfIQAA -gZyJB5c8j0qqNEv58A7qkQAA -jGiYNVwhsUqy+u4GsecJkwAA - - - -+VhQCvPWpkq9N+U+GjchOQAA -4 -Mp4OVq4lq0Ot63a04V2k0AAA -gef03vYxbUeRLVhwDqSRtwAA -vk1lNcjPWk2tPqsfZgpaNgAA -1F1Ggg3l7kq2YUNbccrRzAAA -2 - -False -juy2GOZNhkq5f7cp9rQyWQAA -NDp8e0ch10ST3dwxWPam4AAA -4 -zO1s01kJIE6XkTjlSB6aywAA -W9sijr2Fr02bK6wbKT19/wAA -UxK4awc9BUaq32wB9ulIlQAA -62JK0r9fykSMDnmw3ZuktgAA - - -juy2GOZNhkq5f7cp9rQyWQAA -nCivixeClUeJ/8WDflvLoAAA -4 -NlVzv49r5EKp3NXgP9SJUgAA -2Q3xA4DACkm0S1EmjZ54IwAA -S2waQNcxi0SMzX3GtK14MwAA -hN0Adta+JUWLfSVgHKKVEgAA - - - - -Implementation Model -UMLStandard -implementationModel -FtDtfOwik0OVQfE6ZPIIGQAA -1 - -Main -RoG5Bh+N8kiY/NeIyRBD4wAA - -NN8Cz7nUpkWUBrC4fP0hnwAA - - - - -Deployment Model -UMLStandard -deploymentModel -FtDtfOwik0OVQfE6ZPIIGQAA -1 - -Main -xUneQ8+pSE+Bo7LqxpLuhQAA - -SXfsx2mnwUOegNnzMTcg/gAA - - - - - - + + + + + + +UMLStandard + + + + +Untitled +5 + +Use Case Model +UMLStandard +useCaseModel +FtDtfOwik0OVQfE6ZPIIGQAA +1 + +Main +hbd/RrRc9EeCFFOhgTtNRQAA + +JzSJSx+4SUGBjb1zXBl8cQAA + + + + +Analysis Model +UMLStandard +analysisModel +FtDtfOwik0OVQfE6ZPIIGQAA +1 + +Main +True +RobustnessDiagram +CNPw4gYWoEG9/GGPCspCSAAA + +0DEch0URP06Bhr3ctOKuJQAA + + + + +Design Model +UMLStandard +designModel +FtDtfOwik0OVQfE6ZPIIGQAA +1 + +Main +True ++VhQCvPWpkq9N+U+GjchOQAA + +jGVxNbYj00Chrjdm4wEWXAAA +32 + +clMaroon +$00B9FFFF +56 +56 +713 +501 +BWFMxN62oEGNP+kKcODiEgAA + + +ch.ntb.inf.libusbJava + + +False + + +False + + + + +clMaroon +$00B9FFFF +448 +216 +113 +53 +Y0tGKOGA/UquqP1qaYDayQAA + + +1 +LibusbJava + + +False + + +False + + + +Y0tGKOGA/UquqP1qaYDayQAA + + +Y0tGKOGA/UquqP1qaYDayQAA + + +False +Y0tGKOGA/UquqP1qaYDayQAA + + + +clMaroon +$00B9FFFF +596 +272 +136 +68 +Native class to access +the LibusbJava.dll which +is a wrapper to the +LibUsb-Win32 API. + + + +clMaroon +$00B9FFFF +560,264;596,278 +kFuXbRCvX0OxyJYGXAJ2NwAA +bj7RYkSMO0qIEP8jkhRPkgAA + + +clMaroon +$00B9FFFF +440 +108 +140 +59 +NDp8e0ch10ST3dwxWPam4AAA + + +1 +Device + + +False + + +False + + + +NDp8e0ch10ST3dwxWPam4AAA + + +NDp8e0ch10ST3dwxWPam4AAA + + +False +NDp8e0ch10ST3dwxWPam4AAA + + + +clMaroon +$00B9FFFF +508,166;505,216 +bHBJ2iMT1Emo3/z1QruACAAA +bj7RYkSMO0qIEP8jkhRPkgAA +2BBmOZlXy0elqrvf1Pfb0QAA + +False +1.5707963267949 +15 +bHBJ2iMT1Emo3/z1QruACAAA + + +False +1.5707963267949 +30 +bHBJ2iMT1Emo3/z1QruACAAA + + +False +-1.5707963267949 +15 +bHBJ2iMT1Emo3/z1QruACAAA + + +False +-0.523598775598299 +30 +epHead +gBDIpZT7JEe5yWqm5udjswAA + + +False +0.523598775598299 +30 +epTail +9KWfrYr7HUmfL2Kub4NWjQAA + + +False +0.523598775598299 +25 +epHead +gBDIpZT7JEe5yWqm5udjswAA + + +False +-0.523598775598299 +25 +epTail +9KWfrYr7HUmfL2Kub4NWjQAA + + +False +-0.785398163397448 +40 +epHead +gBDIpZT7JEe5yWqm5udjswAA + + +False +0.785398163397448 +40 +epTail +9KWfrYr7HUmfL2Kub4NWjQAA + + +False +-1000 +-1000 +50 +8 +gBDIpZT7JEe5yWqm5udjswAA + + +False +-1000 +-1000 +50 +8 +9KWfrYr7HUmfL2Kub4NWjQAA + + + +clMaroon +$00B9FFFF +352 +308 +80 +43 +fKheOe+4606Ei/JrIdvAnwAA + + +1 +Usb_Bus + + +False + + +False + + + +fKheOe+4606Ei/JrIdvAnwAA + + +fKheOe+4606Ei/JrIdvAnwAA + + +False +fKheOe+4606Ei/JrIdvAnwAA + + + +clMaroon +$00B9FFFF +213 +308 +80 +43 +CYy/2ClqUUO8tWkJYxc3EwAA + + +1 +Usb_Device + + +False + + +False + + + +CYy/2ClqUUO8tWkJYxc3EwAA + + +CYy/2ClqUUO8tWkJYxc3EwAA + + +False +CYy/2ClqUUO8tWkJYxc3EwAA + + + +clMaroon +$00B9FFFF +352,329;292,329 +rRumqTzUKUikwPtpVUuuxQAA +EmkgqCDDHEeVmq/pvU4k2gAA +aFv0LI7ePk6WALpiWziNnAAA + +False +1.5707963267949 +15 +rRumqTzUKUikwPtpVUuuxQAA + + +False +1.5707963267949 +30 +rRumqTzUKUikwPtpVUuuxQAA + + +False +-1.5707963267949 +15 +rRumqTzUKUikwPtpVUuuxQAA + + +False +-0.523598775598299 +30 +epHead +fPb+E6EWw0SS68JSU1n2PQAA + + +False +0.523598775598299 +30 +epTail +Ktquk70tXEeWxRy5mE3lRQAA + + +0.523598775598299 +25 +epHead +0..* +fPb+E6EWw0SS68JSU1n2PQAA + + +False +-0.523598775598299 +25 +epTail +Ktquk70tXEeWxRy5mE3lRQAA + + +False +-0.785398163397448 +40 +epHead +fPb+E6EWw0SS68JSU1n2PQAA + + +False +0.785398163397448 +40 +epTail +Ktquk70tXEeWxRy5mE3lRQAA + + +False +-1000 +-1000 +50 +8 +fPb+E6EWw0SS68JSU1n2PQAA + + +False +-1000 +-1000 +50 +8 +Ktquk70tXEeWxRy5mE3lRQAA + + + +clMaroon +$00B9FFFF +68 +308 +97 +43 +BhOtKDs6x0a1MSfBURjV3wAA + + +1 +Usb_Descriptor + + +False + + +False + + + +BhOtKDs6x0a1MSfBURjV3wAA + + +BhOtKDs6x0a1MSfBURjV3wAA + + +False +BhOtKDs6x0a1MSfBURjV3wAA + + + +clMaroon +$00B9FFFF +213,329;164,329 +iOkg8RoFXkawUPB8gsL6/QAA ++ip26EaWW06hVyLJe7YYXgAA +EmkgqCDDHEeVmq/pvU4k2gAA + +False +1.5707963267949 +15 +iOkg8RoFXkawUPB8gsL6/QAA + + +False +1.5707963267949 +30 +iOkg8RoFXkawUPB8gsL6/QAA + + +False +-1.5707963267949 +15 +iOkg8RoFXkawUPB8gsL6/QAA + + +False +-0.523598775598299 +30 +epHead +i+tjppNl/0SEXFu6g5HCzwAA + + +False +0.523598775598299 +30 +epTail +L09q640bS0+0SD6RlutglgAA + + +0.523598775598299 +25 +epHead +1 +i+tjppNl/0SEXFu6g5HCzwAA + + +False +-0.523598775598299 +25 +epTail +L09q640bS0+0SD6RlutglgAA + + +False +-0.785398163397448 +40 +epHead +i+tjppNl/0SEXFu6g5HCzwAA + + +False +0.785398163397448 +40 +epTail +L09q640bS0+0SD6RlutglgAA + + +False +-1000 +-1000 +50 +8 +i+tjppNl/0SEXFu6g5HCzwAA + + +False +-1000 +-1000 +50 +8 +L09q640bS0+0SD6RlutglgAA + + + +clMaroon +$00B9FFFF +64 +396 +139 +43 +WnjxeWRoQE+dRj+3+FKmAAAA + + +1 +Usb_Config_Descriptor + + +False + + +False + + + +WnjxeWRoQE+dRj+3+FKmAAAA + + +WnjxeWRoQE+dRj+3+FKmAAAA + + +False +WnjxeWRoQE+dRj+3+FKmAAAA + + + +clMaroon +$00B9FFFF +224,350;162,396 +hSAawvsHfkmM8rOCrDJNqwAA +V/iR3pEvp0+E4vtLxulBFwAA +EmkgqCDDHEeVmq/pvU4k2gAA + +False +1.5707963267949 +15 +hSAawvsHfkmM8rOCrDJNqwAA + + +False +1.5707963267949 +30 +hSAawvsHfkmM8rOCrDJNqwAA + + +False +-1.5707963267949 +15 +hSAawvsHfkmM8rOCrDJNqwAA + + +False +-0.523598775598299 +30 +epHead +eYy3sCm5cU2qevI2XvqfOQAA + + +False +0.523598775598299 +30 +epTail +bi54YUBBk0OKg2sVhfeXsgAA + + +0.523598775598299 +25 +epHead +1..* +eYy3sCm5cU2qevI2XvqfOQAA + + +False +-0.523598775598299 +25 +epTail +bi54YUBBk0OKg2sVhfeXsgAA + + +False +-0.785398163397448 +40 +epHead +eYy3sCm5cU2qevI2XvqfOQAA + + +False +0.785398163397448 +40 +epTail +bi54YUBBk0OKg2sVhfeXsgAA + + +False +-1000 +-1000 +50 +8 +eYy3sCm5cU2qevI2XvqfOQAA + + +False +-1000 +-1000 +50 +8 +bi54YUBBk0OKg2sVhfeXsgAA + + + +clMaroon +$00B9FFFF +288 +396 +91 +43 +s3tyNjh10EOlP9fTFKCHzgAA + + +1 +Usb_Interface + + +False + + +False + + + +s3tyNjh10EOlP9fTFKCHzgAA + + +s3tyNjh10EOlP9fTFKCHzgAA + + +False +s3tyNjh10EOlP9fTFKCHzgAA + + + +clMaroon +$00B9FFFF +202,417;288,417 +mH3MSoB9/UmX+ZKIsczTmQAA +9cvRIAusL0q/WdlYUOTN0QAA +V/iR3pEvp0+E4vtLxulBFwAA + +False +1.5707963267949 +15 +mH3MSoB9/UmX+ZKIsczTmQAA + + +False +1.5707963267949 +30 +mH3MSoB9/UmX+ZKIsczTmQAA + + +False +-1.5707963267949 +15 +mH3MSoB9/UmX+ZKIsczTmQAA + + +False +-0.523598775598299 +30 +epHead +g9gIEMzm106FV2WEfzg/cgAA + + +False +0.523598775598299 +30 +epTail +ss4cvrGCjkas7SCXWHrzGwAA + + +0.523598775598299 +25 +epHead +1..* +g9gIEMzm106FV2WEfzg/cgAA + + +False +-0.523598775598299 +25 +epTail +ss4cvrGCjkas7SCXWHrzGwAA + + +False +-0.785398163397448 +40 +epHead +g9gIEMzm106FV2WEfzg/cgAA + + +False +0.785398163397448 +40 +epTail +ss4cvrGCjkas7SCXWHrzGwAA + + +False +-1000 +-1000 +50 +8 +g9gIEMzm106FV2WEfzg/cgAA + + +False +-1000 +-1000 +50 +8 +ss4cvrGCjkas7SCXWHrzGwAA + + + +clMaroon +$00B9FFFF +64 +500 +157 +43 +1ZxdCeSlnke1mOXmwZo44gAA + + +1 +Usb_Interface_Descriptor + + +False + + +False + + + +1ZxdCeSlnke1mOXmwZo44gAA + + +1ZxdCeSlnke1mOXmwZo44gAA + + +False +1ZxdCeSlnke1mOXmwZo44gAA + + + +clMaroon +$00B9FFFF +294,438;180,500 +PzrlQ1JpekCs4WZeZXoxzAAA +SDQcLhaItkO2CR3ujsiVQgAA +9cvRIAusL0q/WdlYUOTN0QAA + +False +1.5707963267949 +15 +PzrlQ1JpekCs4WZeZXoxzAAA + + +False +1.5707963267949 +30 +PzrlQ1JpekCs4WZeZXoxzAAA + + +False +-1.5707963267949 +15 +PzrlQ1JpekCs4WZeZXoxzAAA + + +False +-0.523598775598299 +30 +epHead +4CMW55+u4U+8jmDGtiId6QAA + + +False +0.523598775598299 +30 +epTail +tSa9Dc6pX06DqFwtod8w3wAA + + +0.523598775598299 +25 +epHead +1..* +4CMW55+u4U+8jmDGtiId6QAA + + +False +-0.523598775598299 +25 +epTail +tSa9Dc6pX06DqFwtod8w3wAA + + +False +-0.785398163397448 +40 +epHead +4CMW55+u4U+8jmDGtiId6QAA + + +False +0.785398163397448 +40 +epTail +tSa9Dc6pX06DqFwtod8w3wAA + + +False +-1000 +-1000 +50 +8 +4CMW55+u4U+8jmDGtiId6QAA + + +False +-1000 +-1000 +50 +8 +tSa9Dc6pX06DqFwtod8w3wAA + + + +clMaroon +$00B9FFFF +296 +500 +153 +43 +r8we3ZgdtE+PkC4ethr1xgAA + + +1 +Usb_Endpoint_Descriptor + + +False + + +False + + + +r8we3ZgdtE+PkC4ethr1xgAA + + +r8we3ZgdtE+PkC4ethr1xgAA + + +False +r8we3ZgdtE+PkC4ethr1xgAA + + + +clMaroon +$00B9FFFF +220,521;296,521 +zcRjiWnEb0igPnnJ6hWtBAAA +G7uniSci8UWnqaXbrSHwxQAA +SDQcLhaItkO2CR3ujsiVQgAA + +False +1.5707963267949 +15 +zcRjiWnEb0igPnnJ6hWtBAAA + + +False +1.5707963267949 +30 +zcRjiWnEb0igPnnJ6hWtBAAA + + +False +-1.5707963267949 +15 +zcRjiWnEb0igPnnJ6hWtBAAA + + +False +-0.523598775598299 +30 +epHead +otEuPscjc0GzY5FZ4edKDQAA + + +False +0.523598775598299 +30 +epTail +Y0+EzvEeiUOOez0CtW5HcQAA + + +0.523598775598299 +25 +epHead +1..* +otEuPscjc0GzY5FZ4edKDQAA + + +False +-0.523598775598299 +25 +epTail +Y0+EzvEeiUOOez0CtW5HcQAA + + +False +-0.785398163397448 +40 +epHead +otEuPscjc0GzY5FZ4edKDQAA + + +False +0.785398163397448 +40 +epTail +Y0+EzvEeiUOOez0CtW5HcQAA + + +False +-1000 +-1000 +50 +8 +otEuPscjc0GzY5FZ4edKDQAA + + +False +-1000 +-1000 +50 +8 +Y0+EzvEeiUOOez0CtW5HcQAA + + + +clMaroon +$00B9FFFF +80 +112 +253 +56 +uDTqegf/MkeBHojXFEOLGwAA + + +1 +USB + + +False + + +False + + + +uDTqegf/MkeBHojXFEOLGwAA + + +uDTqegf/MkeBHojXFEOLGwAA + + +False +uDTqegf/MkeBHojXFEOLGwAA + + + +clMaroon +$00B9FFFF +24 +200 +129 +57 +A device factory which +creates and manages +all device instances. + + + +clMaroon +$00B9FFFF +125,200;169,167 +6dw/hbnfL0KObRrJlTOaOAAA +QgnPJMfYfkKI63CxIbKrUQAA + + +clMaroon +$00B9FFFF +470,268;418,308 +CUdyl1aeZ0+5m6T7YR+ScwAA +aFv0LI7ePk6WALpiWziNnAAA +bj7RYkSMO0qIEP8jkhRPkgAA + +False +1.5707963267949 +15 +CUdyl1aeZ0+5m6T7YR+ScwAA + + +False +1.5707963267949 +30 +CUdyl1aeZ0+5m6T7YR+ScwAA + + +False +-1.5707963267949 +15 +CUdyl1aeZ0+5m6T7YR+ScwAA + + +False +-0.523598775598299 +30 +epHead +eMLC5J+HEUOU0BNl4xEgOQAA + + +False +0.523598775598299 +30 +epTail +yd1VA+Osg0auP1WmaHV/pAAA + + +0.523598775598299 +25 +epHead +1 +eMLC5J+HEUOU0BNl4xEgOQAA + + +False +-0.523598775598299 +25 +epTail +yd1VA+Osg0auP1WmaHV/pAAA + + +False +-0.785398163397448 +40 +epHead +eMLC5J+HEUOU0BNl4xEgOQAA + + +False +0.785398163397448 +40 +epTail +yd1VA+Osg0auP1WmaHV/pAAA + + +False +-1000 +-1000 +50 +8 +eMLC5J+HEUOU0BNl4xEgOQAA + + +False +-1000 +-1000 +50 +8 +yd1VA+Osg0auP1WmaHV/pAAA + + + +clMaroon +$00B9FFFF +448 +364 +86 +41 +Linked List of +type Usb_Bus + + + +clMaroon +$00B9FFFF +454,364;429,350 +aFv0LI7ePk6WALpiWziNnAAA +rLlcF+A5KkiU7WAvQnrBbgAA + + +clMaroon +$00B9FFFF +228 +244 +101 +41 +Linked List of +type Usb_Device + + + +clMaroon +$00B9FFFF +260,308;270,284 +Pv0Pt3qkZkmPtYeARmmwEAAA +EmkgqCDDHEeVmq/pvU4k2gAA + + +clMaroon +$00B9FFFF +332,138;440,137 +E/QwNfFGUEiitlqp99S36AAA +2BBmOZlXy0elqrvf1Pfb0QAA +6dw/hbnfL0KObRrJlTOaOAAA + +False +1.5707963267949 +15 +E/QwNfFGUEiitlqp99S36AAA + + +False +0.977411820724642 +48.0416485978573 +E/QwNfFGUEiitlqp99S36AAA + + +False +-1.5707963267949 +15 +E/QwNfFGUEiitlqp99S36AAA + + +False +-0.523598775598299 +30 +epHead +tXktVESMQUOZFggmJCAGDAAA + + +False +0.523598775598299 +30 +epTail +ym/t3t4KOkinRJAqyF+HwQAA + + +0.523598775598299 +25 +epHead +0..* +tXktVESMQUOZFggmJCAGDAAA + + +False +-0.523598775598299 +25 +epTail +ym/t3t4KOkinRJAqyF+HwQAA + + +False +-0.785398163397448 +40 +epHead +tXktVESMQUOZFggmJCAGDAAA + + +False +0.785398163397448 +40 +epTail +ym/t3t4KOkinRJAqyF+HwQAA + + +False +-1000 +-1000 +50 +8 +tXktVESMQUOZFggmJCAGDAAA + + +False +-1000 +-1000 +50 +8 +ym/t3t4KOkinRJAqyF+HwQAA + + + +clMaroon +$00B9FFFF +656 +92 +89 +56 +p/wk8BA7x0OTRXXHy0OJmgAA + + +1 +USBException + + +<<exception>> + + +False + + + +p/wk8BA7x0OTRXXHy0OJmgAA + + +p/wk8BA7x0OTRXXHy0OJmgAA + + + +clMaroon +$00B9FFFF +628 +168 +134 +56 +nCivixeClUeJ/8WDflvLoAAA + + +1 +USBTimeoutException + + +<<exception>> + + +False + + + +nCivixeClUeJ/8WDflvLoAAA + + +nCivixeClUeJ/8WDflvLoAAA + + + +clMaroon +$00B9FFFF +579,130;656,123 +3Xd7YkTVeUijpP0dxF3K9wAA +1cUBYeKUdUuMBdS17locfgAA +2BBmOZlXy0elqrvf1Pfb0QAA + +False +1.5707963267949 +15 +3Xd7YkTVeUijpP0dxF3K9wAA + + +False +1.5707963267949 +30 +3Xd7YkTVeUijpP0dxF3K9wAA + + +False +-1.5707963267949 +15 +3Xd7YkTVeUijpP0dxF3K9wAA + + +False +-0.523598775598299 +30 +epHead +PCKabEdsC0+42T+WCC0J+gAA + + +False +0.523598775598299 +30 +epTail +RwLaC/BiAE+6PNyQNM7DRwAA + + +False +0.523598775598299 +25 +epHead +PCKabEdsC0+42T+WCC0J+gAA + + +False +-0.523598775598299 +25 +epTail +RwLaC/BiAE+6PNyQNM7DRwAA + + +False +-0.785398163397448 +40 +epHead +PCKabEdsC0+42T+WCC0J+gAA + + +False +0.785398163397448 +40 +epTail +RwLaC/BiAE+6PNyQNM7DRwAA + + +False +-1000 +-1000 +50 +8 +PCKabEdsC0+42T+WCC0J+gAA + + +False +-1000 +-1000 +50 +8 +RwLaC/BiAE+6PNyQNM7DRwAA + + + +clMaroon +$00B9FFFF +579,159;628,174 +juy2GOZNhkq5f7cp9rQyWQAA +m44pRtEbJU63JQyFoCCxtAAA +2BBmOZlXy0elqrvf1Pfb0QAA + +False +1.5707963267949 +15 +juy2GOZNhkq5f7cp9rQyWQAA + + +False +1.5707963267949 +30 +juy2GOZNhkq5f7cp9rQyWQAA + + +False +-1.5707963267949 +15 +juy2GOZNhkq5f7cp9rQyWQAA + + +False +-0.523598775598299 +30 +epHead +cJakFa0mdEChcxEhYeDaKwAA + + +False +0.523598775598299 +30 +epTail +RJcA8VyDe0K2sWOwSOHLiwAA + + +False +0.523598775598299 +25 +epHead +cJakFa0mdEChcxEhYeDaKwAA + + +False +-0.523598775598299 +25 +epTail +RJcA8VyDe0K2sWOwSOHLiwAA + + +False +-0.785398163397448 +40 +epHead +cJakFa0mdEChcxEhYeDaKwAA + + +False +0.785398163397448 +40 +epTail +RJcA8VyDe0K2sWOwSOHLiwAA + + +False +-1000 +-1000 +50 +8 +cJakFa0mdEChcxEhYeDaKwAA + + +False +-1000 +-1000 +50 +8 +RJcA8VyDe0K2sWOwSOHLiwAA + + + + +16 + +ch.ntb.inf.libusbJava ++VhQCvPWpkq9N+U+GjchOQAA +1 +3aqcGmdQBU2yR8XWwbH6wgAA +10 + +LibusbJava +BWFMxN62oEGNP+kKcODiEgAA +4 +bj7RYkSMO0qIEP8jkhRPkgAA +pYdCcwUS1kuxFBcQBuXWhwAA +B8g6dO1SPUKmK3vZse8ykwAA +uhBTnkByp0aEHfbKvbAIRgAA +2 +gBDIpZT7JEe5yWqm5udjswAA +yd1VA+Osg0auP1WmaHV/pAAA + + +Device +BWFMxN62oEGNP+kKcODiEgAA +4 +2BBmOZlXy0elqrvf1Pfb0QAA +vtJgj9fKHUOv3MF6LiZuaQAA +hWPO+G2l6UamJ9XP1xsU6gAA +4gcdaLKmOESleWMoU/ITdgAA +2 + +USBException +NDp8e0ch10ST3dwxWPam4AAA +3 +1cUBYeKUdUuMBdS17locfgAA +xvrkkvaXsEyKlXkeArvn6gAA +9XjxPvkTzUW160zoJoXJIgAA +2 +jAq2OWym/0CBShdxKGVvTgAA +PCKabEdsC0+42T+WCC0J+gAA + + +USBTimeoutException +NDp8e0ch10ST3dwxWPam4AAA +3 +m44pRtEbJU63JQyFoCCxtAAA +8ptu2+IQEkiODfeNkzBbIAAA +NCd0z6hUJUKirt04Te6MmAAA +2 +jB8ocTwTXEuDjkXR5KY03QAA +cJakFa0mdEChcxEhYeDaKwAA + +1 +S86PfEMMVEitYamqNGrOKgAA +6 +9KWfrYr7HUmfL2Kub4NWjQAA +tXktVESMQUOZFggmJCAGDAAA +gnNEskLBlEGy68pKD58J3gAA +gMOdBarVEUi69aAllgtqSAAA +RwLaC/BiAE+6PNyQNM7DRwAA +RJcA8VyDe0K2sWOwSOHLiwAA + + +Usb_Bus +BWFMxN62oEGNP+kKcODiEgAA +4 +aFv0LI7ePk6WALpiWziNnAAA +4mnVev5sO06YjJQcHwAzNAAA +ApB+Ycn4QkCd4JiwYWOuogAA +BoqVLNosikui7Gvm79DqwAAA +4 +Ktquk70tXEeWxRy5mE3lRQAA +BM39AT1FtkCD5DXdvFUWGwAA +eMLC5J+HEUOU0BNl4xEgOQAA +zVVM8HoZZ0K4SLvruROwSQAA + + +Usb_Device +BWFMxN62oEGNP+kKcODiEgAA +4 +EmkgqCDDHEeVmq/pvU4k2gAA +PTdUVfhJcUasUJqV7DrnzwAA +BrLi1ywnW0yy33ZKZYFfAQAA +mAD2mqiGJUmcDDGj80NyFwAA +4 +fPb+E6EWw0SS68JSU1n2PQAA +QkO09pUTaUqUag/gnTQhMAAA +L09q640bS0+0SD6RlutglgAA +bi54YUBBk0OKg2sVhfeXsgAA + + +Usb_Descriptor +BWFMxN62oEGNP+kKcODiEgAA +4 ++ip26EaWW06hVyLJe7YYXgAA +HHzH4uen30eMjBMjRst2mgAA +mqiCxho4tUOAdpt4/UzG1AAA +k95O6pb/JUut+HXhcujAvQAA +1 +i+tjppNl/0SEXFu6g5HCzwAA + + +Usb_Config_Descriptor +BWFMxN62oEGNP+kKcODiEgAA +4 +V/iR3pEvp0+E4vtLxulBFwAA +rC/MaZnjZkmCGY1tqVmdDQAA +bP5ruvrDjkuOZy0aWHw5qAAA +Tp/ZRDMhiEiRwOJ8Dte+6AAA +2 +eYy3sCm5cU2qevI2XvqfOQAA +ss4cvrGCjkas7SCXWHrzGwAA + + +Usb_Interface +BWFMxN62oEGNP+kKcODiEgAA +4 +9cvRIAusL0q/WdlYUOTN0QAA +mHOFyGNhZ02On/3bYclCQgAA +S8sNFKpNX0CfvJz4xM2R8QAA +ZR4POMzRtkii7O0qcFXeagAA +2 +g9gIEMzm106FV2WEfzg/cgAA +tSa9Dc6pX06DqFwtod8w3wAA + + +Usb_Interface_Descriptor +BWFMxN62oEGNP+kKcODiEgAA +4 +SDQcLhaItkO2CR3ujsiVQgAA +niJtEkEAIE27g/VJLGKCeQAA +tEi8ncuIh0akDZbNdI0BXAAA +f6iRLfdj90KPJZTvam9xcgAA +2 +4CMW55+u4U+8jmDGtiId6QAA +Y0+EzvEeiUOOez0CtW5HcQAA + + +Usb_Endpoint_Descriptor +BWFMxN62oEGNP+kKcODiEgAA +4 +G7uniSci8UWnqaXbrSHwxQAA +oOH1WDfw5E+CPfQCtwl3lwAA +zVJ7FeURsUqHB/7bijkGSgAA +8xSZnRanKUS7ttTDyMY3XQAA +1 +otEuPscjc0GzY5FZ4edKDQAA + + +USB +BWFMxN62oEGNP+kKcODiEgAA +4 +6dw/hbnfL0KObRrJlTOaOAAA +9NxPBd7BGEmMZajXGsdmCgAA +ReCrM4NymEe6kNr17N/fLwAA +oUsxZCkyqU+EFKmB53hfIQAA +1 + +getDevice +uDTqegf/MkeBHojXFEOLGwAA +3 + +idVendor +int +4R8Nv262EEqwj5BpzEwnFAAA + + +idProduct +int +4R8Nv262EEqwj5BpzEwnFAAA + + +return +pdkReturn +Device +4R8Nv262EEqwj5BpzEwnFAAA +NDp8e0ch10ST3dwxWPam4AAA + + +1 +ym/t3t4KOkinRJAqyF+HwQAA + +1 +mUO4OyL7Z0inPl8NM4gOKQAA + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +K1jbk7tvDECb113o54KaCgAA +ewuWWER98U2X1/Gyqau2iQAA +ydzgGYT1JUqGBbRngdAkOwAA +kRDUUGf7YkG4X7f5D7Tu5QAA +2 + +False +bHBJ2iMT1Emo3/z1QruACAAA +NDp8e0ch10ST3dwxWPam4AAA +4 +HnV1GDlOlUiEzDCgg3OVnwAA +3vJXTt9Ud0+cklGb7VirjwAA +T54kLOtp70+07rCDysRoRgAA +ZmEyokBAfUuimbUqLhInLAAA + + +bHBJ2iMT1Emo3/z1QruACAAA +Y0tGKOGA/UquqP1qaYDayQAA +4 +nP4i5P/O2UWgSJEnuXrNGAAA +NbkMFiV5UUyU8V6ZyNh/ggAA +qnQYuly9P0ePfBPLyOhoUgAA +KiPq8wTTI02Bz5cifJGqSAAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +N+DG+sDQsU+dEVL0AtioTgAA +h4biD7IVaE2ULotQ37wNTAAA +juYsWZ7nVUuYfA9bXvsoRQAA +gVKvw0NHaUCC8LoVjlxEaQAA +2 + +False +rRumqTzUKUikwPtpVUuuxQAA +fKheOe+4606Ei/JrIdvAnwAA +4 +OYIH3ymdpUit+s9rXvgX4QAA +2cgp4vLw00iUpTcWm5nXagAA +tGs9/SOEbkuqTf609sd2uQAA +wlFJ5gxqB0W1JznjbhR82wAA + + +0..* +rRumqTzUKUikwPtpVUuuxQAA +CYy/2ClqUUO8tWkJYxc3EwAA +4 +tvTF0QXyTkOU+lco6nawpAAA +OlG/OTSXdkeeQhih0vfj2gAA +E2JhEcUXZkeaMU/vi7BgQwAA +Pgiug9F5sEm6RGjxSJwN0QAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +2 + +False +N1GWtLD2hke4QpWNj3VbPQAA +CYy/2ClqUUO8tWkJYxc3EwAA + + +1 +N1GWtLD2hke4QpWNj3VbPQAA +fKheOe+4606Ei/JrIdvAnwAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +tgaMJ8+zg0Sn4iEmoOIchwAA +rgg15Kcdr0mVUlnlnH9jIgAA +keuOun+wjE+QghwhaUSp7QAA +LDA6nTIXBkWsIuU2zIrtiAAA +2 + +False +iOkg8RoFXkawUPB8gsL6/QAA +CYy/2ClqUUO8tWkJYxc3EwAA +4 +VnH93Y/7IkaJYl+DPinjmwAA +J87I73G/nkuAKdCKS1ov3AAA +gX2CUgfdCki+IWGLlwLwBgAA +8AgdepV+YECTfuxJBIqCCwAA + + +1 +iOkg8RoFXkawUPB8gsL6/QAA +BhOtKDs6x0a1MSfBURjV3wAA +4 +1qxaXx2+hEq1Na+Bk3itGQAA +FePC/A0aMEGuAW8YyMNUfQAA +jbg1/Hojq0CDpZmGOngZ8gAA +XyLeWJl15kSVqLBfioHjpwAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +BkeBTT1wlUu9nQU0NNTXFAAA +Tj/mtG0ojUeUZaROPDr/HAAA +0MVCo5fIBUSXtmRyYABJcQAA +UVrEAk/Wbk2olhkdMQkz9wAA +2 + +False +hSAawvsHfkmM8rOCrDJNqwAA +CYy/2ClqUUO8tWkJYxc3EwAA +4 +uBprnnKYk0qBu9UZ9bv+5wAA +uUm65cZr+USoFHmg+9GOTAAA +21oCmtYmTk6I99TNGY+WmQAA +CEBGmwNSDE+W0wJ/aQr5ogAA + + +1..* +hSAawvsHfkmM8rOCrDJNqwAA +WnjxeWRoQE+dRj+3+FKmAAAA +4 +q/Tjz7MsSkCzN45MnaE+ygAA +Ct5Onzw2LES6ewhEa/3NWQAA +9Z0KUb7BbUO7F3MYIOiSrQAA +cY/H4Djf5kicM3tDZOwWkAAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +u2OPyc/1n0+QIGTThiMa3AAA +KLVJzL8T0EW4b4yH0XzDkgAA +OMzpA/ZwnEujuwqWpMDwIwAA +ed2kVo8InU6lewfrLcWA0wAA +2 + +False +mH3MSoB9/UmX+ZKIsczTmQAA +WnjxeWRoQE+dRj+3+FKmAAAA +4 +ElMIvqx9s0qrTOxejhsaSQAA +/avxLTDZe0qmoKyO79Gi7AAA +tjnuHlEOBk2grTlQ+kPGnQAA +oS91czwGhEKtYBANVGPPnwAA + + +1..* +mH3MSoB9/UmX+ZKIsczTmQAA +s3tyNjh10EOlP9fTFKCHzgAA +4 +YlWEGJVu1Eu9BEa5L9YqyQAA +upJz60gOiE2Y6jwQzzUoqQAA +PpS7OEegzUeBhCrBHXgkwAAA +XVazEpRSqkyH0zMCJgEnBAAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +h/CUffjgwUqCUDakMMJ7QQAA +ZnaPkKZFCEaRFYlVBh84uAAA +O1VlBtzO0EaAsu2MtMnYhQAA +S22NfH+9rUCXuvo2rsAWDgAA +2 + +False +PzrlQ1JpekCs4WZeZXoxzAAA +s3tyNjh10EOlP9fTFKCHzgAA +4 +lo8h2SqcoUeOOUPAe0EjdAAA +mv0gaJr3SUeuVY1xo1FdowAA +VQ4ysUxS306j02ouNykrpwAA ++GMHnNNOiEW2P4PaNnKcsgAA + + +1..* +PzrlQ1JpekCs4WZeZXoxzAAA +1ZxdCeSlnke1mOXmwZo44gAA +4 +/cDNFyyj1kKTrWJ1HeW7jwAA +T7Yrg8efIE2hhid6kOwp/AAA +eq+vp2GL9Ey4am7PZZZvYwAA +HB0H112qzU65avMG65s6+AAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +Qa9DlhrWuEyzlqeeW42vigAA +OOu7JCeVT06/I9zcCYxoMgAA +eXZQmjjOb0mgLqiKIEgNjgAA +Z54IgvzlG0+i0eC61Nul2QAA +2 + +False +zcRjiWnEb0igPnnJ6hWtBAAA +1ZxdCeSlnke1mOXmwZo44gAA +4 +Wf6tv7bE1kq7mrxCiOa+SQAA +3TeYQ+z3sUaWb3mqCq5ZswAA +e6lrE15aj0SZAg2c/y97hgAA +B4mF3KmBkEmmqPeQhru4awAA + + +1..* +zcRjiWnEb0igPnnJ6hWtBAAA +r8we3ZgdtE+PkC4ethr1xgAA +4 +lhChbObcCU2CcZDalktiVQAA +eX+Li7xw8Eu7Q+WVQJ7NWgAA +QIJa01TJ8UWewFDbze7RZwAA +z9YWV6a+CkmXxyniylWBegAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +3d03ZiQMEUyp/GDpSGjNdQAA +EnqlEABzrEyr7NnE3rXmXAAA +v5SF4iq4U0idtpnG9Es3XAAA +vmgfHAqH1kK8d0+ACOZ3LgAA +2 + +False +CUdyl1aeZ0+5m6T7YR+ScwAA +Y0tGKOGA/UquqP1qaYDayQAA +4 +cJO2BE8tMk6Vdt7DH7oXUgAA +ztnLte7rf0CX37ncwAxYbgAA +mEJVUc0onE+FHNS1qwcDygAA +dg0oZAkRp02LqrBKRlJGygAA + + +1 +CUdyl1aeZ0+5m6T7YR+ScwAA +fKheOe+4606Ei/JrIdvAnwAA +4 +ACS3R0vnCkiCG7/+fEq01gAA +6bLwfBAaDE6zqua+j7Jf+wAA +PvH2F0s2CU+u9nUzCb6FmwAA ++s+HLixVdk+3Jjh1dYo5NgAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +2 + +False +sq2Gf22XcUO8hotO+r/6swAA +fKheOe+4606Ei/JrIdvAnwAA + + +sq2Gf22XcUO8hotO+r/6swAA +BWFMxN62oEGNP+kKcODiEgAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +15TrBVceQkG56FTsqMwcxgAA +3Fgd7pnAA0+KRKisyFBaqwAA +hxuj8u8Y2EK8qsnGTaBOzQAA +znFoObTUEUOch9SPd7VBJAAA +2 + +False +E/QwNfFGUEiitlqp99S36AAA +uDTqegf/MkeBHojXFEOLGwAA +4 +k9T1VNzEo0ufuAB6TN2QRwAA +oiCIMGX8ik6YjhRQQxB8OQAA +Tu5aL5lgO0ut/RTBGjiKqAAA +iDNEYw6KL0uVCCKPtWa8bwAA + + +0..* +E/QwNfFGUEiitlqp99S36AAA +NDp8e0ch10ST3dwxWPam4AAA +4 +4Vg7xm7w902Ov8oTfg9PSAAA +DWRmEP/U1kOcrZnzyvRnXQAA +FngPhombp0y5VL3elyPMMgAA +ETXPzMurVEmlbvocuDXtVwAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +2 + +V1q5qLSIxEidFrrPCOFqIgAA +NDp8e0ch10ST3dwxWPam4AAA + + +V1q5qLSIxEidFrrPCOFqIgAA +p/wk8BA7x0OTRXXHy0OJmgAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +2 + +7Niy2MZhPUynlh2A2zVkEQAA +NDp8e0ch10ST3dwxWPam4AAA + + +7Niy2MZhPUynlh2A2zVkEQAA +nCivixeClUeJ/8WDflvLoAAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +Rk0gcRI5ikapDGR7M2bn5AAA +HXSRZ0W7C02e+CDSTe+vQgAA +39P+Jod7A0SpXNClHK/bIwAA +FOp7UHIFjUmRJarTRH6h3AAA +2 + +False +3Xd7YkTVeUijpP0dxF3K9wAA +NDp8e0ch10ST3dwxWPam4AAA +4 +IIOw3R07h0mYIbxgQNAvlgAA +6DAAoxE3gE6btQ3QR6zXSAAA +Ilbnf/apgU2JUqlCax0E0AAA +GWJjJWM040mgOfcnzTwGqgAA + + +3Xd7YkTVeUijpP0dxF3K9wAA +p/wk8BA7x0OTRXXHy0OJmgAA +4 +Mf6lj8hCekmAt8LSuv0gPQAA +roosZQXLT0uL9JG9OjvfIQAA +gZyJB5c8j0qqNEv58A7qkQAA +jGiYNVwhsUqy+u4GsecJkwAA + + + ++VhQCvPWpkq9N+U+GjchOQAA +4 +Mp4OVq4lq0Ot63a04V2k0AAA +gef03vYxbUeRLVhwDqSRtwAA +vk1lNcjPWk2tPqsfZgpaNgAA +1F1Ggg3l7kq2YUNbccrRzAAA +2 + +False +juy2GOZNhkq5f7cp9rQyWQAA +NDp8e0ch10ST3dwxWPam4AAA +4 +zO1s01kJIE6XkTjlSB6aywAA +W9sijr2Fr02bK6wbKT19/wAA +UxK4awc9BUaq32wB9ulIlQAA +62JK0r9fykSMDnmw3ZuktgAA + + +juy2GOZNhkq5f7cp9rQyWQAA +nCivixeClUeJ/8WDflvLoAAA +4 +NlVzv49r5EKp3NXgP9SJUgAA +2Q3xA4DACkm0S1EmjZ54IwAA +S2waQNcxi0SMzX3GtK14MwAA +hN0Adta+JUWLfSVgHKKVEgAA + + + + +Implementation Model +UMLStandard +implementationModel +FtDtfOwik0OVQfE6ZPIIGQAA +1 + +Main +RoG5Bh+N8kiY/NeIyRBD4wAA + +NN8Cz7nUpkWUBrC4fP0hnwAA + + + + +Deployment Model +UMLStandard +deploymentModel +FtDtfOwik0OVQfE6ZPIIGQAA +1 + +Main +xUneQ8+pSE+Bo7LqxpLuhQAA + +SXfsx2mnwUOegNnzMTcg/gAA + + + + + +