Disable build, keep using prebuilt libraries and include them in the artifacts

LGPL.txt

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

LICENSE

@@ -0,0 +1,619 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.

README.md

@@ -1,5 +1,3 @@
-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.
@@ -17,6 +15,9 @@ For more information about Java LibUsb-Win32 wrapper visit:
 
 License
 -------
+
+This project is now maintained under the GPLv3 license, for the orginal LGPL license statement, see:
+
 	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/.
@@ -24,4 +25,4 @@ For licensing information about LibUsb-Win32 see http://libusb-win32.sourceforge
 
 Authors
 -------
-Andreas Schläpfer	<spandi at users.sourceforge.net>
+Andreas Schläpfer <spandi at users.sourceforge.net>

build.gradle

@@ -17,8 +17,8 @@ dependencies {
 
 group = 'com.github.boukefalos'
 project.archivesBaseName = 'jlibusb'
-version = '0.5.7'
+version = '0.5.8'
-def jniVersion = '0.2.3.0'
+def jniVersion = '0.2.3.1'
 
 task wrapper(type: Wrapper) {
     gradleVersion = '1.12'
@@ -56,7 +56,7 @@ model {
         libs(PrebuiltLibraries) {
             usb { lib ->
                 binaries.withType(StaticLibraryBinary) {
-					staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll.a")
+                    staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll")
                 }
             }
         }
@@ -74,7 +74,7 @@ task jniHeaders(dependsOn: compileJava) {
         args '-o', outputFile
         args '-classpath', sourceSets.main.output.classesDir
         args '-classpath', file("$buildDir/../bin")
-		args 'ch.ntb.usb.LibusbJava1'
+        args 'ch.ntb.usb.LibusbJava'
     }
 }
 
@@ -89,9 +89,8 @@ libraries {
             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
+                task.dependsOn jniHeaders
             }
-			
             lib library: 'usb', linkage: 'static'
         }
     }
@@ -135,8 +134,11 @@ binaries.withType(SharedLibraryBinary) { binary ->
     }
     def builderTask = binary.tasks.builder
     def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" 
-	nativeJar.into(libraryDirectory) { from builderTask.outputFile }
+    nativeJar.into(libraryDirectory) {
-    nativeJar.dependsOn builderTask
+        from builderTask.outputFile
+        from file("lib/${targetPlatform.name}/libusb0.dll")
+    }
+    // nativeJar.dependsOn builderTask
 }
 
 def mainPom = uploadArchives.repositories.mavenDeployer.pom

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Sat Nov 29 20:00:39 GMT 2014
+#Sun Jul 10 22:54:12 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

src/main/java/ch/ntb/usb/Device.java

@@ -19,7 +19,7 @@ import ch.ntb.usb.logger.LogUtil;
  */
 public class Device {
 
-	private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava");
+    private static final Logger logger = LogUtil.getLogger("ch.ntb.usb");
 
     private int maxPacketSize;
 
@@ -545,11 +545,11 @@ public class Device {
      * 
      * @param requestType
      *            USB device request type (USB specification 9.3,
-	 *            bmRequestType). Use constants from {@link ch.ntb.inf.libusbJava.USB}
+     *            bmRequestType). Use constants from {@link ch.ntb.usb.USB}
      *            (REQ_TYPE_xxx).
      * @param request
      *            specific request (USB specification 9.4, bRequest). Use
-	 *            constants from {@link ch.ntb.inf.libusbJava.USB} (REQ_xxx).
+     *            constants from {@link ch.ntb.usb.USB} (REQ_xxx).
      * @param value
      *            field that varies according to request (USB specification 9.4,
      *            wValue)
@@ -743,20 +743,14 @@ public class Device {
     }
 
     /**
-	 * Check if the device is open, attached and work.<br>
+     * Check if the device is open.<br>
+     * This checks only for a valid device handle. It doesn't check if the
+     * device is still attached or working.
      * 
-	 * @return true if the device is open and work.
+     * @return true if the device is open
      */
     public boolean isOpen() {
-		if(usbDevHandle != 0){
+        return usbDevHandle != 0;
-			try {
-				updateDescriptors();
-			} catch (USBException e) {
-				return false;
-			}
-			return dev != null;
-		}
-		return false;
     }
 
     /**

src/main/java/ch/ntb/usb/LibusbJava.java

@@ -4,38 +4,43 @@
  *
  * http://libusbjava.sourceforge.net
  * This library is covered by the LGPL, read LGPL.txt for details.
- * 
- * Changes:
- * 12.04.2012 NTB / Ueli Niederer implemented exception handling
- * 18.10.2010 NTB / Roger Millischer change from native interface to compatibility layer
- * 
  */
 package ch.ntb.usb;
 
-import ch.ntb.usb.exceptions.LibusbError;
+import com.github.boukefalos.jlibloader.Native;
 
 /**
- * This class is used as compatibility layer for libusb 0.1 projects. 
+ * This class represents the Java Native Interface to the shared library which
+ * is (with some exceptions) a one-to-one representation of the libusb API.<br>
+ * <br>
+ * <h1>Project Description</h1>
+ * Java libusb is a Java wrapper for the libusb and libusb-win32 USB library.
+ * 
+ * <a href="http://libusb.sourceforge.net/">libusb</a> aim is to create a
+ * library for use by user level applications to access USB devices regardless
+ * of OS.<br>
+ * <a href="http://libusb-win32.sourceforge.net/">Libusb-win32</a> is a port of
+ * the USB library <a href="http://libusb.sourceforge.net/">libusb</a> 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.<br>
+ * <br>
+ * The API description of this class has been copied from the <a
+ * href="http://libusb.sourceforge.net/documentation.html">libusb documentation</a>
+ * and adapted where neccessary.<br>
  * 
- * @deprecated This class will not be subject to test anymore. Be aware that possible 
- *             modifications could always break the functionality. For new
- * 			   projects only use {@link LibusbJava1}. 
  */
 public class LibusbJava {
 
-	private static Usb_Bus busses = null;
-	private static long defaultCTX = 0;
     /**
      * System error codes.<br>
      * This list is not complete! For more error codes see the file 'errorno.h'
      * on your system.
      */
-	public static final int ERROR_SUCCESS = LibusbError.ERROR_NONE;
+    public static int ERROR_SUCCESS, ERROR_BAD_FILE_DESCRIPTOR,
-	public static final int ERROR_BUSY = LibusbError.ERROR_BUSY;
+            ERROR_NO_SUCH_DEVICE_OR_ADDRESS, ERROR_BUSY,
-	public static final int ERROR_INVALID_PARAMETER = LibusbError.ERROR_INVALID_PARAM;
+            ERROR_INVALID_PARAMETER, ERROR_TIMEDOUT, ERROR_IO_ERROR,
-	public static final int ERROR_TIMEDOUT = LibusbError.ERROR_TIMEOUT;
+            ERROR_NOT_ENOUGH_MEMORY;;
-	public static final int ERROR_IO_ERROR = LibusbError.ERROR_IO;
-	public static final int ERROR_NOT_ENOUGH_MEMORY = LibusbError.ERROR_NO_MEM;
 
     /**
      * Sets the debugging level of libusb.<br>
@@ -46,30 +51,15 @@ public class LibusbJava {
      * @param level
      *            0 to 255
      */
-	public static void usb_set_debug(int level) {
+    public static native void usb_set_debug(int level);
-		LibusbJava1.libusb_set_debug(0, level);
-	}
 
     // Core
     /**
      * Just like the name implies, <code>usb_init</code> sets up some internal
-	 * structures. <code>usb_init</code> must be called before any other libusb
+     * structures. <code>usb_init</code> must be called before any other
-	 * functions.
+     * libusb functions.
      */
-	public static void usb_init() {
+    public static native void usb_init();
-		if (defaultCTX != 0) {
-			return;
-		}
-		/*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);
-	}
 
     /**
      * <code>usb_find_busses</code> will find all of the busses on the system.
@@ -77,107 +67,7 @@ public class LibusbJava {
      * @return the number of changes since previous call to this function (total
      *         of new busses and busses removed).
      */
-	public static int usb_find_busses() {
+    public static native int usb_find_busses();
-		int changes = 0;
-		long tmpBusNumber;
-		Usb_Bus nbusses = null;
-		Usb_Bus bus = nbusses, tmp;
-		boolean found = false;
-		Usb_Device devices = null;
-		devices = LibusbJava1.libusb_get_device_list(0);
-
-		// no busses
-		if (devices.getDevnum() == -1) {
-			while (busses != null) {
-				changes++;
-				busses = busses.getNext();
-			}
-			return changes;
-		}
-		// find busses
-		while (devices != null) {
-			tmpBusNumber = (long) LibusbJava1.libusb_get_bus_number(devices);
-			while (bus != null) {
-				if (bus.getLocation() == tmpBusNumber) {
-					found = true;
-					break;
-				}
-				bus = bus.getNext();
-			}
-			if (found) {
-				devices = devices.getNext();
-				found = false;
-				continue;
-			}
-			if (nbusses == null) {
-				nbusses = new Usb_Bus(Long.toString(tmpBusNumber), tmpBusNumber);
-			} else {
-				tmp = new Usb_Bus(Long.toString(tmpBusNumber), tmpBusNumber);
-				bus = nbusses;
-				// append
-				while (bus.getNext() != null) {
-					bus = bus.getNext();
-				}
-				tmp.setPrev(bus);
-				bus.setNext(tmp);
-			}
-			bus = nbusses;
-			devices = devices.getNext();
-		}
-		// compare to existing bus-list
-		bus = busses;
-		tmp = nbusses;
-		found = false;
-		while (bus != null) {
-			tmpBusNumber = bus.getLocation();
-			while (tmp != null) {
-				if (tmpBusNumber == tmp.getLocation()) {
-					found = true;
-					// remove from nbusses list
-					if (tmp.getPrev() != null) {
-						tmp.getPrev().setNext(tmp.getNext());
-					} else {
-						nbusses = tmp.getNext();
-					}
-					if (tmp.getNext() != null) {
-						tmp.getNext().setPrev(tmp.getPrev());
-					}
-					break;
-				}
-				tmp = tmp.getNext();
-			}
-			if (!found) {
-				// remove from busses an increment changes
-				if (bus.getPrev() != null) {
-					bus.getPrev().setNext(bus.getNext());
-				} else {
-					busses = bus.getNext();
-				}
-				if (bus.getNext() != null) {
-					bus.getNext().setPrev(bus.getPrev());
-				}
-				changes++;
-			}
-			bus = bus.getNext();
-			tmp = nbusses;
-			found = false;
-		}
-		// add new busses
-		bus = busses;
-		while (tmp != null) {
-			tmp = tmp.getNext();
-			changes++;
-		}
-		if (busses != null) {
-			while (bus.getNext() != null) {
-				bus = bus.getNext();
-			}
-			bus.setNext(nbusses);
-		} else {
-			busses = nbusses;
-		}
-		return changes;
-	}
 
     /**
      * <code>usb_find_devices</code> will find all of the devices on each bus.
@@ -186,85 +76,7 @@ public class LibusbJava {
      * @return the number of changes since the previous call to this function
      *         (total of new device and devices removed).
      */
-	public static int usb_find_devices() {
+    public static native int usb_find_devices();
-		int changes = 0;
-		byte tmpDevnum;
-		long tmpBusNumber;
-		Usb_Bus bus = busses;
-		boolean found = false;
-		Usb_Device devices, dev, ndev;
-
-		devices = LibusbJava1.libusb_get_device_list(0);
-		// Compare to existing bus-structure and remove removed devices
-		while (bus != null) {
-			dev = bus.getDevices();
-			while (dev != null) {
-				tmpDevnum = dev.getDevnum();
-				ndev = devices;
-				while (ndev != null) {
-					// if dev already exist remove from ndev list
-					if (tmpDevnum == ndev.getDevnum()) {
-						found = true;
-						if (ndev.getPrev() != null) {
-							ndev.getPrev().setNext(ndev.getNext());
-						} else {
-							devices = ndev.getNext();
-						}
-						if (ndev.getNext() != null) {
-							ndev.getNext().setPrev(ndev.getPrev());
-						}
-						break;
-					}
-					ndev = ndev.getNext();
-				}
-				if (!found) {
-					// remove device from bus an increment changes
-					if (dev.getPrev() != null) {
-						dev.getPrev().setNext(dev.getNext());
-					} else {
-						bus.setDevices(dev.getNext());
-					}
-					if (dev.getNext() != null) {
-						dev.getNext().setPrev(dev.getPrev());
-					}
-					changes++;
-				} else {
-					found = false;
-				}
-				dev = dev.getNext();
-			}
-			bus = bus.getNext();
-		}
-		// Add new Devices
-		bus = busses;
-		while (devices != null) {
-			ndev = devices.getNext();
-			// find correct bus
-			tmpBusNumber = (long) LibusbJava1.libusb_get_bus_number(devices);
-			while (bus != null) {
-				if (bus.getLocation() == tmpBusNumber) {
-					break;
-				}
-				bus = bus.getNext();
-			}
-			// insert device
-			if (bus != null) {
-				if (bus.getDevices() == null) {
-					devices.setNext(null);
-				} else {
-					devices.setNext(bus.getDevices());
-					devices.getNext().setPrev(devices);
-				}
-				devices.setPrev(null);
-				bus.setDevices(devices);
-				devices.setBus(bus);
-				changes++;
-			}
-			devices = ndev;
-			bus = busses;
-		}
-		return changes;
-	}
 
     /**
      * <code>usb_get_busses</code> returns a tree of descriptor objects.<br>
@@ -277,9 +89,7 @@ public class LibusbJava {
      * @return the structure of all busses and devices. <code>Note:</code> The
      *         java objects are copies of the C structs.
      */
-	public static Usb_Bus usb_get_busses() {
+    public static native Usb_Bus usb_get_busses();
-		return busses;
-	}
 
     // Device Operations
     /**
@@ -292,33 +102,17 @@ public class LibusbJava {
      * @return a handle used in future communication with the device. 0 if an
      *         error has occurred.
      */
-	public static long usb_open(Usb_Device dev) {
+    public static native long usb_open(Usb_Device dev);
-		long handle = 0;
-		
-		try {
-			handle = LibusbJava1.libusb_open(dev);
-		}
-		catch (LibusbError e) {
-			System.err.println("LibusbJava-1.0 failed with errorcode: "
-					+ e.getMessage());
-			e.printStackTrace();
-			handle = 0;
-		}
-		
-		return handle;
-	}
 
     /**
-	 * <code>usb_close</code> closes a device opened with <code>usb_open</code>.
+     * <code>usb_close</code> closes a device opened with
+     * <code>usb_open</code>.
      * 
      * @param dev_handle
      *            The handle to the device.
-	 * @return 0
+     * @return 0 on success or < 0 on error.
      */
-	public static int usb_close(long dev_handle) {
+    public static native int usb_close(long dev_handle);
-		LibusbJava1.libusb_close(dev_handle);
-		return 0;
-	}
 
     /**
      * Sets the active configuration of a device
@@ -330,17 +124,8 @@ public class LibusbJava {
      *            bConfigurationValue.
      * @return 0 on success or < 0 on error.
      */
-	public static int usb_set_configuration(long dev_handle, int configuration) {
+    public static native int usb_set_configuration(long dev_handle,
-		int result = 0;
+            int configuration);
-		
-		try {
-			LibusbJava1.libusb_set_configuration(dev_handle, configuration);
-		} catch (LibusbError e) {
-			result = -1;
-		}
-		
-		return result;
-	}
 
     /**
      * Sets the active alternate setting of the current interface
@@ -352,42 +137,7 @@ public class LibusbJava {
      *            bAlternateSetting.
      * @return 0 on success or < 0 on error.
      */
-	public static int usb_set_altinterface(long dev_handle, int alternate) {
+    public static native int usb_set_altinterface(long dev_handle, int alternate);
-		Usb_Device dev = LibusbJava1.libusb_get_device(dev_handle);
-		int nofInterfaces = LibusbJava1
-				.libusb_get_active_config_descriptor(dev).getBNumInterfaces();
-		int interface_number, success = 0;
-		for (interface_number = 0; interface_number < nofInterfaces; interface_number++) {
-			try
-			{
-				LibusbJava1.libusb_release_interface(dev_handle, interface_number);
-				
-				try
-				{
-					LibusbJava1.libusb_claim_interface(dev_handle, interface_number);
-				}
-				catch (LibusbError e)
-				{
-					return e.getErrorCode();
-				}
-				break;
-			}
-			catch (LibusbError e)
-			{
-				/* Move ahead. */
-			}
-		}
-		
-		try {
-			LibusbJava1.libusb_set_interface_alt_setting(dev_handle, interface_number, alternate);
-			success = 0;
-		} 
-		catch (LibusbError e) {
-			success = -1;
-		}
-		
-		return success;
-	}
 
     /**
      * Clears any halt status on an endpoint.
@@ -398,56 +148,27 @@ public class LibusbJava {
      *            The value specified in the descriptor field bEndpointAddress.
      * @return 0 on success or < 0 on error.
      */
-	public static int usb_clear_halt(long dev_handle, int ep) {
+    public static native int usb_clear_halt(long dev_handle, int ep);
-		int result = 0;
-		
-		try {
-			LibusbJava1.libusb_clear_halt(dev_handle, (short) ep);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-		
-		return result;
-	}
 
     /**
      * Resets a device by sending a RESET down the port it is connected to.<br>
      * <br>
-	 * <b>Causes re-enumeration:</b> After calling <code>usb_reset</code>, the
+     * <b>Causes re-enumeration:</b> After calling <code>usb_reset</code>,
-	 * device will need to re-enumerate and thusly, requires you to find the new
+     * the device will need to re-enumerate and thusly, requires you to find the
-	 * device and open a new handle. The handle used to call
+     * new device and open a new handle. The handle used to call
      * <code>usb_reset</code> will no longer work.
      * 
      * @param dev_handle
      *            The handle to the device.
      * @return 0 on success or < 0 on error.
      */
-	public static int usb_reset(long dev_handle) {
+    public static native int usb_reset(long dev_handle);
-		int res = 0;
-		
-		try {
-			LibusbJava1.libusb_claim_interface(dev_handle, 0);
-			try {
-				LibusbJava1.libusb_reset_device(dev_handle);
-			}
-			catch (LibusbError e) {
-				res = e.getErrorCode();
-			}
-			LibusbJava1.libusb_release_interface(dev_handle, 0);
-			LibusbJava1.libusb_close(dev_handle);
-		} catch (LibusbError e) {
-			/* Ignore all errors of these calls */
-		}
-		
-		return res;
-
-	}
 
     /**
      * Claim an interface of a device.<br>
      * <br>
-	 * <b>Must be called!:</b> <code>usb_claim_interface</code> must be called
+     * <b>Must be called!:</b> <code>usb_claim_interface</code> must be
-	 * before you perform any operations related to this interface (like
+     * called before you perform any operations related to this interface (like
      * <code>usb_set_altinterface, usb_bulk_write</code>, etc).
      * 
      * @param dev_handle
@@ -457,17 +178,7 @@ public class LibusbJava {
      *            bInterfaceNumber.
      * @return 0 on success or < 0 on error.
      */
-	public static int usb_claim_interface(long dev_handle, int interface_) {
+    public static native int usb_claim_interface(long dev_handle, int interface_);
-		int result = 0;
-		
-		try {
-			LibusbJava1.libusb_claim_interface(dev_handle, interface_);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-		
-		return result;
-	}
 
     /**
      * Releases a previously claimed interface
@@ -479,17 +190,8 @@ public class LibusbJava {
      *            bInterfaceNumber.
      * @return 0 on success or < 0 on error.
      */
-	public static int usb_release_interface(long dev_handle, int interface_) {
+    public static native int usb_release_interface(long dev_handle,
-		int result = 0;
+            int interface_);
-		
-		try {
-			LibusbJava1.libusb_release_interface(dev_handle, interface_);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-		
-		return result;
-	}
 
     // Control Transfers
     /**
@@ -507,12 +209,9 @@ public class LibusbJava {
      * @param timeout
      * @return the number of bytes written/read or < 0 on error.
      */
-	public static int usb_control_msg(long dev_handle, int requesttype,
+    public static native int usb_control_msg(long dev_handle, int requesttype,
             int request, int value, int index, byte[] bytes, int size,
-			int timeout) {
+            int timeout);
-		return LibusbJava1.libusb_control_transfer(dev_handle, requesttype,
-				request, value, index, bytes, size, timeout);
-	}
 
     /**
      * Retrieves the string descriptor specified by index and langid from a
@@ -524,17 +223,8 @@ public class LibusbJava {
      * @param langid
      * @return the descriptor String or null
      */
-	public static String usb_get_string(long dev_handle, int index, int langid) {
+    public static native String usb_get_string(long dev_handle, int index,
-		String result;
+            int langid);
-		
-		try {
-			result = LibusbJava1.libusb_get_string_descriptor(dev_handle, (short) index, langid, 255);
-		} catch (LibusbError e) {
-			result = null;
-		}
-		
-		return result;
-	}
 
     /**
      * <code>usb_get_string_simple</code> is a wrapper around
@@ -546,17 +236,7 @@ public class LibusbJava {
      * @param index
      * @return the descriptor String or null
      */
-	public static String usb_get_string_simple(long dev_handle, int index) {
+    public static native String usb_get_string_simple(long dev_handle, int index);
-		String result = null;
-		
-		try {
-			result = LibusbJava1.libusb_get_string_descriptor_ascii(dev_handle,(short) index, 255);
-		} catch (LibusbError e) {
-			result = null;
-		}
-		
-		return result;
-	}
 
     /**
      * Retrieves a descriptor from the device identified by the type and index
@@ -574,18 +254,8 @@ public class LibusbJava {
      *            resulting String)
      * @return the descriptor String or null
      */
-	public static byte[] usb_get_descriptor(long dev_handle, byte type,
+    public static native String usb_get_descriptor(long dev_handle, byte type,
-			byte index, int size) {
+            byte index, int size);
-		byte[] result = null;
-		
-		try {
-			result = LibusbJava1.libusb_get_descriptor(dev_handle, type, index, size);
-		} catch (LibusbError e) {
-			e.printStackTrace();
-		}
-		
-		return result;
-	}
 
     /**
      * Retrieves a descriptor from the device identified by the type and index
@@ -601,24 +271,8 @@ public class LibusbJava {
      *            resulting String)
      * @return the descriptor String or null
      */
-	public static String usb_get_descriptor_by_endpoint(long dev_handle,
+    public static native String usb_get_descriptor_by_endpoint(long dev_handle,
-			int ep, byte type, byte index, int size) {
+            int ep, byte type, byte index, int size);
-
-		// We just send a control message directly;
-		byte data[] = new byte[size];
-		char string[] = new char[size];
-		int transfered;
-		transfered = LibusbJava1.libusb_control_transfer(dev_handle,
-				0x80 | (ep & 0xFF), 0x07, (type << 8) | index, 0, data, size,
-				1000);
-		if (transfered > 0) {
-			for (int i = 0; i < transfered; i++) {
-				string[i] = (char) data[i];
-			}
-			return String.valueOf(string);
-		}
-		return null;
-	}
 
     // Bulk Transfers
     /**
@@ -632,19 +286,8 @@ public class LibusbJava {
      * @param timeout
      * @return the number of bytes written on success or < 0 on error.
      */
-	public static int usb_bulk_write(long dev_handle, int ep, byte[] bytes,
+    public static native int usb_bulk_write(long dev_handle, int ep,
-			int size, int timeout) {
+            byte[] bytes, int size, int timeout);
-		int result = LibusbError.ERROR_OTHER;
-
-		try {
-			result = LibusbJava1.libusb_bulk_transfer(dev_handle, (byte) ep,
-					bytes, size, timeout);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-
-		return result;
-	}
 
     /**
      * Performs a bulk read request to the endpoint specified by ep.
@@ -657,19 +300,8 @@ public class LibusbJava {
      * @param timeout
      * @return the number of bytes read on success or < 0 on error.
      */
-	public static int usb_bulk_read(long dev_handle, int ep, byte[] bytes,
+    public static native int usb_bulk_read(long dev_handle, int ep,
-			int size, int timeout) {
+            byte[] bytes, int size, int timeout);
-		int result = LibusbError.ERROR_OTHER;
-
-		try {
-			result = LibusbJava1.libusb_bulk_transfer(dev_handle, (byte) ep,
-					bytes, size, timeout);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-
-		return result;
-	}
 
     // Interrupt Transfers
     /**
@@ -683,19 +315,8 @@ public class LibusbJava {
      * @param timeout
      * @return the number of bytes written on success or < 0 on error.
      */
-	public static int usb_interrupt_write(long dev_handle, int ep,
+    public static native int usb_interrupt_write(long dev_handle, int ep,
-			byte[] bytes, int size, int timeout) {
+            byte[] bytes, int size, int timeout);
-		int result = LibusbError.ERROR_OTHER;
-
-		try {
-			result = LibusbJava1.libusb_interrupt_transfer(dev_handle, (byte) ep, 
-					bytes, size, timeout);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-
-		return result;
-	}
 
     /**
      * Performs a interrupt read request to the endpoint specified by ep.
@@ -708,27 +329,49 @@ public class LibusbJava {
      * @param timeout
      * @return the number of bytes read on success or < 0 on error.
      */
-	public static int usb_interrupt_read(long dev_handle, int ep, byte[] bytes,
+    public static native int usb_interrupt_read(long dev_handle, int ep,
-			int size, int timeout) {
+            byte[] bytes, int size, int timeout);
-		int result = LibusbError.ERROR_OTHER;
-
-		try {
-			result = LibusbJava1.libusb_interrupt_transfer(dev_handle, (byte) ep, 
-					bytes, size, timeout);
-		} catch (LibusbError e) {
-			result = e.getErrorCode();
-		}
-
-		return result;
-	}
 
     /**
      * Returns the error string after an error occured.
      * 
      * @return the last error sring.
      */
-	public static String usb_strerror() {
+    public static native String usb_strerror();
-		return LibusbJava1.libusb_strerror();
-	}
 
+    /** **************************************************************** */
+
+    /**
+     * Maps the Java error code to the system error code.<br>
+     * <br>
+     * Note that not all error codes are be mapped by this method. For more
+     * error codes see the file 'errno.h' on your system.<br>
+     * <br>
+     * 1: EBADF: Bad file descriptor.<br>
+     * 2: ENXIO: No such device or address.<br>
+     * 3: EBUSY: Device or resource busy.<br>
+     * 4: EINVAL: Invalid argument.<br>
+     * 5: ETIMEDOUT: Connection timed out.<br>
+     * 6: EIO: I/O error.<br>
+     * 7: ENOMEM: Not enough memory.<br>
+     * 
+     * 
+     * @return the system error code or 100000 if no mapping has been found.
+     */
+    private static native int usb_error_no(int value);
+
+    static {
+    	Native.load("com.github.boukefalos", "jlibusb", "libusb0");
+    	Native.load("com.github.boukefalos", "jlibusb");
+
+        // define the error codes
+        ERROR_SUCCESS = 0;
+        ERROR_BAD_FILE_DESCRIPTOR = -usb_error_no(1);
+        ERROR_NO_SUCH_DEVICE_OR_ADDRESS = -usb_error_no(2);
+        ERROR_BUSY = -usb_error_no(3);
+        ERROR_INVALID_PARAMETER = -usb_error_no(4);
+        ERROR_TIMEDOUT = -usb_error_no(5);
+        ERROR_IO_ERROR = -usb_error_no(6);
+        ERROR_NOT_ENOUGH_MEMORY = -usb_error_no(7);
+    }
 }

src/main/java/ch/ntb/usb/Libusb_event.java

@@ -1,19 +0,0 @@
-package ch.ntb.usb;
-
-public class Libusb_event {
-	
-	public void transferCallback(){
-		
-	}
-	
-	public void fdAddedCallback(int fd){
-		System.out.println("addedCallback");
-		
-	}
-	
-	public void fdRemovedCallback(int fd){
-		System.out.println("removedCallback");
-		
-	}
-
-}

src/main/java/ch/ntb/usb/Libusb_pollfd.java

@@ -1,7 +0,0 @@
-package ch.ntb.usb;
-
-public class Libusb_pollfd {
-	int fd;
-	byte events;
-
-}

src/main/java/ch/ntb/usb/USB.java

@@ -23,7 +23,7 @@ public class USB {
     /**
      * This request returns status for the specified recipient (USB spec 9.4.5).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_GET_STATUS = 0x00;
@@ -31,7 +31,7 @@ public class USB {
      * This request is used to clear or disable a specific feature (USB spec
      * 9.4.1).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_CLEAR_FEATURE = 0x01;
@@ -40,7 +40,7 @@ public class USB {
      * This request is used to set or enable a specific feature (USB spec
      * 9.4.9).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_SET_FEATURE = 0x03;
@@ -49,7 +49,7 @@ public class USB {
      * This request sets the device address for all future device accesses (USB
      * spec 9.4.6).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_SET_ADDRESS = 0x05;
@@ -57,7 +57,7 @@ public class USB {
      * This request returns the specified descriptor if the descriptor exists
      * (USB spec 9.4.3).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_GET_DESCRIPTOR = 0x06;
@@ -65,7 +65,7 @@ public class USB {
      * This request is optional and may be used to update existing descriptors
      * or new descriptors may be added (USB spec 9.4.8).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_SET_DESCRIPTOR = 0x07;
@@ -73,14 +73,14 @@ public class USB {
      * This request returns the current device configuration value (USB spec
      * 9.4.2).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_GET_CONFIGURATION = 0x08;
     /**
      * This request sets the device configuration (USB spec 9.4.7).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_SET_CONFIGURATION = 0x09;
@@ -88,7 +88,7 @@ public class USB {
      * This request returns the selected alternate setting for the specified
      * interface (USB spec 9.4.4).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_GET_INTERFACE = 0x0A;
@@ -96,7 +96,7 @@ public class USB {
      * This request allows the host to select an alternate setting for the
      * specified interface (USB spec 9.4.10).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_SET_INTERFACE = 0x0B;
@@ -104,7 +104,7 @@ public class USB {
      * This request is used to set and then report an endpoint<6E>s synchronization
      * frame (USB spec 9.4.11).
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_SYNCH_FRAME = 0x0C;
@@ -117,7 +117,7 @@ public class USB {
      * signifying there is no Data stage.<br>
      * Specifies bit 7 of bmRequestType.
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_TYPE_DIR_HOST_TO_DEVICE = (0x00 << 7),
@@ -128,7 +128,7 @@ public class USB {
      * Specifies the type of the request.<br>
      * Specifies bits 6..5 of bmRequestType.
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_TYPE_TYPE_STANDARD = (0x00 << 5),
@@ -144,7 +144,7 @@ public class USB {
      * specified, the wIndex field identifies the interface or endpoint.<br>
      * Specifies bits 4..0 of bmRequestType.
      * 
-	 * @see ch.ntb.inf.libusbJava.Device#controlMsg(int, int, int, int, byte[], int, int,
+     * @see ch.ntb.usb.Device#controlMsg(int, int, int, int, byte[], int, int,
      *      boolean)
      */
     public static final int REQ_TYPE_RECIP_DEVICE = 0x00,
@@ -163,7 +163,7 @@ public class USB {
      */
     public static int FULLSPEED_MAX_BULK_PACKET_SIZE = 64;
 
-	private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava");
+    private static final Logger logger = LogUtil.getLogger("ch.ntb.usb");
 
     private static LinkedList<Device> devices = new LinkedList<Device>();
 

src/main/java/ch/ntb/usb/Usb_Bus.java

@@ -25,11 +25,6 @@ public class Usb_Bus {
 
     private Usb_Device root_dev;
 
-	public Usb_Bus(String dirname, long location) {
-		this.dirname = dirname;
-		this.location = location;
-	}
-
     /**
      * Get the first device ojects of the devices linked list.<br>
      * 
@@ -39,10 +34,6 @@ public class Usb_Bus {
         return devices;
     }
 
-	protected void setDevices(Usb_Device devices) {
-		this.devices = devices;
-	}
-
     /**
      * Returns the systems String representation of the bus.<br>
      * 
@@ -61,10 +52,6 @@ public class Usb_Bus {
         return next;
     }
 
-	protected void setNext(Usb_Bus bus) {
-		next = bus;
-	}
-
     /**
      * Returns the previous bus object.<br>
      * 
@@ -74,10 +61,6 @@ public class Usb_Bus {
         return prev;
     }
 
-	protected void setPrev(Usb_Bus bus) {
-		prev = bus;
-	}
-
     /**
      * Get the root device of this bus.<br>
      * 
@@ -96,10 +79,6 @@ public class Usb_Bus {
         return location;
     }
 
-	protected void setLocation(long busnumber) {
-		location = busnumber;
-	}
-
     @Override
     public String toString() {
         return "Usb_Bus " + dirname;

src/main/java/ch/ntb/usb/Usb_Config_Descriptor.java

@@ -12,8 +12,8 @@ package ch.ntb.usb;
  * A USB device can have several different configuration.<br>
  * <br>
  * The length of the configuration descriptor is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_CONFIG_SIZE} and the type is
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_CONFIG_SIZE} and the type is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_CONFIG}.
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_CONFIG}.
  * 
  */
 public class Usb_Config_Descriptor extends Usb_Descriptor {

src/main/java/ch/ntb/usb/Usb_Descriptor.java

@@ -23,9 +23,7 @@ public class Usb_Descriptor {
     /**
      * Descriptor types ({@link #bDescriptorType}).
      */
-	public static final int LIBUSB_DT_DEVICE = 0x01, LIBUSB_DT_CONFIG = 0x02,
+    public static final int USB_DT_HID = 0x21, USB_DT_REPORT = 0x22,
-			LIBUSB_DT_STRING = 0x03, LIBUSB_DT_INTERFACE = 0x04,
-			LIBUSB_DT_ENDPOINT = 0x05, USB_DT_HID = 0x21, USB_DT_REPORT = 0x22,
             USB_DT_PHYSICAL = 0x23, USB_DT_HUB = 0x29;
 
     /**

src/main/java/ch/ntb/usb/Usb_Device.java

@@ -45,9 +45,6 @@ public class Usb_Device {
     public Usb_Bus getBus() {
         return bus;
     }
-	protected void setBus(Usb_Bus bus){
-		this.bus = bus;
-	}
 
     /**
      * Returns a reference to the first child.<br>
@@ -103,40 +100,6 @@ public class Usb_Device {
         return next;
     }
 
-	protected void setNext(Usb_Device dev){
-		next = dev;
-	}
-
-	public static void freeDeviceList(Usb_Device device)
-	{
-		Usb_Device curr = device.getPrev();
-		
-		/* Detach the left part of the list */
-		device.setPrev(null);
-		
-		/* First walk to the left of the list and free all 
-		   devices on our way */
-		while (curr != null)
-		{
-			freeDevice(curr);
-			curr = curr.getPrev();
-		}
-		
-		curr = device;
-		/* Then walk to the right of the list and free all */
-		while (curr != null)
-		{
-			freeDevice(curr);
-			curr = curr.getNext();
-		}
-	}
-	
-	public static void freeDevice(Usb_Device device)
-	{
-		freeDeviceList(device.getChildren());
-		LibusbJava1.libusb_unref_device(device);		
-	}
-	
     /**
      * Returns the number of children of this device.<br>
      * 
@@ -154,9 +117,6 @@ public class Usb_Device {
     public Usb_Device getPrev() {
         return prev;
     }
-	protected void setPrev(Usb_Device dev){
-		prev = dev;
-	}
 
     @Override
     public String toString() {

src/main/java/ch/ntb/usb/Usb_Device_Descriptor.java

@@ -13,8 +13,8 @@ package ch.ntb.usb;
  * yet important information about the device.<br>
  * <br>
  * The length of the device descriptor is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_DEVICE_SIZE} and the type is
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_DEVICE_SIZE} and the type is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_DEVICE}.
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_DEVICE}.
  * 
  */
 public class Usb_Device_Descriptor extends Usb_Descriptor {
@@ -22,9 +22,8 @@ public class Usb_Device_Descriptor extends Usb_Descriptor {
      * Device and/or interface class codes.
      */
     public static final int USB_CLASS_PER_INTERFACE = 0, USB_CLASS_AUDIO = 1,
-			USB_CLASS_COMM = 2, USB_CLASS_HID = 3, LIBUSB_CLASS_PTP = 6,
+            USB_CLASS_COMM = 2, USB_CLASS_HID = 3, USB_CLASS_PRINTER = 7,
-			USB_CLASS_PRINTER = 7, USB_CLASS_MASS_STORAGE = 8,
+            USB_CLASS_MASS_STORAGE = 8, USB_CLASS_HUB = 9, USB_CLASS_DATA = 10,
-			USB_CLASS_HUB = 9, USB_CLASS_DATA = 10,
             USB_CLASS_VENDOR_SPEC = 0xff;
 
     private short bcdUSB;

src/main/java/ch/ntb/usb/Usb_Endpoint_Descriptor.java

@@ -16,8 +16,8 @@ package ch.ntb.usb;
  * the bus.<br>
  * <br>
  * The length of the configuration descriptor is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_ENDPOINT_SIZE} and the type is
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_ENDPOINT_SIZE} and the type is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_ENDPOINT}.
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_ENDPOINT}.
  * 
  */
 public class Usb_Endpoint_Descriptor extends Usb_Descriptor {
@@ -36,31 +36,14 @@ public class Usb_Endpoint_Descriptor extends Usb_Descriptor {
     /**
      * Endpoint type mask (in bmAttributes).
      */
-	public static final int USB_ENDPOINT_TRANSFER_TYPE_MASK = 0x03,
+    public static final int USB_ENDPOINT_TYPE_MASK = 0x03;
-			USB_ENDPOINT_ISO_SYNC_TYPE = 0x0C,
-			USB_ENDPOINT_ISO_USAGE_TYPE = 0x30;
 
     /**
      * Possible endpoint types (in bmAttributes).
      */
-	public static final int USB_ENDPOINT_TRANSFER_TYPE_CONTROL = 0,
+    public static final int USB_ENDPOINT_TYPE_CONTROL = 0,
-			USB_ENDPOINT_TRANSFER_TYPE_ISOCHRONOUS = 1,
+            USB_ENDPOINT_TYPE_ISOCHRONOUS = 1, USB_ENDPOINT_TYPE_BULK = 2,
-			USB_ENDPOINT_TRANSFER_TYPE_BULK = 2,
+            USB_ENDPOINT_TYPE_INTERRUPT = 3;
-			USB_ENDPOINT_TRANSFER_TYPE_INTERRUPT = 3;
-	/**
-	 * Possible synchronization types for isochronous endpoints.
-	 */
-	public static final int USB_ENDPOINT_ISO_SYNC_TYPE_NONE = 0,
-			USB_ENDPOINT_ISO_SYNC_TYPE_ASYNC = 1,
-			USB_ENDPOINT_ISO_SYNC_TYPE_ADAPTIVE = 2,
-			USB_ENDPOINT_ISO_SYNC_TYPE_SYNC = 3;
-
-	/**
-	 * Possible usage types for isochronous endpoints
-	 */
-	public static final int USB_ENDPOINT_ISO_USAGE_TYPE_DATA = 0,
-			USB_ENDPOINT_ISO_USAGE_TYPE_FEEDBACK = 1,
-			USB_ENDPOINT_ISO_USAGE_TYPE_IMPLICIT = 2;
 
     private byte bEndpointAddress;
 

src/main/java/ch/ntb/usb/Usb_Interface_Descriptor.java

@@ -13,8 +13,8 @@ package ch.ntb.usb;
  * endpoints into a functional group performing a single feature of the device.<br>
  * <br>
  * The length of the interface descriptor is
- * {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_INTERFACE_SIZE} and the
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_INTERFACE_SIZE} and the type is
- * type is {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_INTERFACE}.
+ * {@link ch.ntb.usb.Usb_Descriptor#USB_DT_INTERFACE}.
  * 
  */
 public class Usb_Interface_Descriptor extends Usb_Descriptor {
@@ -51,8 +51,7 @@ public class Usb_Interface_Descriptor extends Usb_Descriptor {
     }
 
     /**
-	 * Returns the value used to select the alternate setting (
+     * Returns the value used to select the alternate setting ({@link LibusbJava#usb_set_altinterface(long, int)}).<br>
-	 * {@link LibusbJava#usb_set_altinterface(long, int)}).<br>
      * 
      * @return the alternate setting
      */

src/main/java/ch/ntb/usb/logger/LogUtil.java

@@ -20,7 +20,7 @@ public class LogUtil {
     // debug this class
     private static final boolean debugLogUtil = false;
 
-	private static final String PLUGIN_ID = "ch.ntb.inf.libusbJava";
+    private static final String PLUGIN_ID = "ch.ntb.usb";
     private static final String PROPERTIES_FILE = ".configure";
     private static final String LOGGER_WARNING = "Warning in class "
             + LogUtil.class.getName()

src/test/java/ch/ntb/usb/test/DeviceTest.java

@@ -1,626 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-import junit.framework.Assert;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import ch.ntb.usb.Device;
-import ch.ntb.usb.LibusbJava;
-import ch.ntb.usb.USB;
-import ch.ntb.usb.USBException;
-import ch.ntb.usb.Usb_Bus;
-import ch.ntb.usb.Usb_Config_Descriptor;
-import ch.ntb.usb.Usb_Device_Descriptor;
-import ch.ntb.usb.Utils;
-import ch.ntb.usb.testApp.AbstractDeviceInfo;
-import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode;
-
-@SuppressWarnings("deprecation")
-public class DeviceTest {
-
-	private static final String testdevicePropertiesFile = "testdevice.properties";
-	private static final String deviceInfoKey = "testdeviceInfo";
-
-	private static AbstractDeviceInfo devinfo;
-
-	private static byte[] testData;
-
-	private static byte[] readData;
-
-	private static Device dev;
-
-	private static Logger log = Logger.getLogger(DeviceTest.class.getName());
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		// load the device info class with the key
-		// from 'testdevice.properties'
-		InputStream propInputStream = new FileInputStream(
-				testdevicePropertiesFile);
-		Properties devInfoProp = new Properties();
-		devInfoProp.load(propInputStream);
-		String devInfoClazzName = devInfoProp.getProperty(deviceInfoKey);
-		if (devInfoClazzName == null) {
-			throw new Exception("property " + deviceInfoKey
-					+ " not found in file " + testdevicePropertiesFile);
-		}
-		Class<?> devInfoClazz = Class.forName(devInfoClazzName);
-		devinfo = (AbstractDeviceInfo) devInfoClazz.newInstance();
-		// devinfo = new CY7C68013A();
-		// setup test data
-		testData = new byte[devinfo.getMaxDataSize()];
-		readData = new byte[testData.length];
-		// initialise the device
-		dev = USB.getDevice(devinfo.getIdVendor(), devinfo.getIdProduct(),
-				devinfo.getBusName(), devinfo.getFilename());
-		assertNotNull(dev);
-
-		// print the devices
-		LibusbJava.usb_init();
-//		LibusbJava.usb_set_debug(255);
-		LibusbJava.usb_find_busses();
-		LibusbJava.usb_find_devices();
-		Usb_Bus bus = LibusbJava.usb_get_busses();
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PrintStream ps = new PrintStream(baos);
-		Utils.logBus(bus, ps);
-		log.info(baos.toString());
-	}
-
-	@Test
-	public void getDescriptors() throws Exception {
-		dev.updateDescriptors();
-		Usb_Device_Descriptor devDescriptor = dev.getDeviceDescriptor();
-		assertNotNull(devDescriptor);
-		assertEquals(devinfo.getIdProduct(), devDescriptor.getIdProduct());
-		assertEquals(devinfo.getIdVendor(), devDescriptor.getIdVendor());
-		Usb_Config_Descriptor confDescriptors[] = dev.getConfigDescriptors();
-		assertNotNull(confDescriptors);
-		assertTrue(confDescriptors[0].getInterface().length > 0);
-	}
-
-	@Test
-	public void initalReset() throws Exception {
-		doOpen();
-		// this may change the bus and file name of the device
-		dev.reset();
-		timeout();
-	}
-
-	@Test(expected = USBException.class)
-	public void testClose() throws Exception {
-		try {
-			// this calls must not throw an exception
-			doOpen();
-			doClose();
-		} catch (USBException e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-		// this call must throw an exception, because the device is closed
-		dev.writeBulk(devinfo.getOutEPBulk(), testData, testData.length,
-				devinfo.getTimeout(), false);
-	}
-
-	@Test(expected = USBException.class)
-	public void testReset1() throws Exception {
-		try {
-			// this calls must not throw an exception
-			doOpen();
-			dev.reset();
-			timeout();
-		} catch (USBException e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-		// this call must throw an exception, because the device is closed
-		dev.writeBulk(devinfo.getOutEPBulk(), testData, testData.length,
-				devinfo.getTimeout(), false);
-	}
-
-	@Test(expected = USBException.class)
-	public void testReset2() throws Exception {
-		try {
-			// this calls must not throw an exception
-			doOpen();
-			dev.reset();
-			timeout();
-		} catch (USBException e) {
-			e.printStackTrace();
-			fail(e.getMessage());
-		}
-		// this call must throw an exception, because the device can't be closed
-		doClose();
-	}
-
-	@Test
-	public void open() throws Exception {
-		// get device by busname
-		doOpen();
-		assertNotNull(dev.getDevice());
-		String oldFilename = dev.getDevice().getFilename();
-		String oldBusName = dev.getDevice().getBus().getDirname();
-		assertNotNull(oldFilename);
-		assertNotNull(oldBusName);
-		log.info("filename: " + oldFilename + ", busName: " + oldBusName);
-		Device dev2 = USB.getDevice(devinfo.getIdVendor(), devinfo
-				.getIdProduct());
-		doClose();
-		assertEquals(dev, dev2);
-	}
-
-	@Test
-	public void openWithBusName() throws Exception {
-		// get device by busname
-		doOpen();
-		assertNotNull(dev.getDevice());
-		String oldFilename = dev.getDevice().getFilename();
-		String oldBusName = dev.getDevice().getBus().getDirname();
-		assertNotNull(oldFilename);
-		assertNotNull(oldBusName);
-		log.info("filename: " + oldFilename + ", busName: " + oldBusName);
-		Device dev2 = USB.getDevice(devinfo.getIdVendor(), devinfo
-				.getIdProduct(), oldBusName, null);
-		doClose();
-		assertEquals(dev, dev2);
-	}
-
-	@Test
-	public void openWithFilename() throws Exception {
-		// get device by busname
-		doOpen();
-		assertNotNull(dev.getDevice());
-		String oldFilename = dev.getDevice().getFilename();
-		String oldBusName = dev.getDevice().getBus().getDirname();
-		assertNotNull(oldFilename);
-		assertNotNull(oldBusName);
-		log.info("filename: " + oldFilename + ", busName: " + oldBusName);
-		Device dev2 = USB.getDevice(devinfo.getIdVendor(), devinfo
-				.getIdProduct(), null, oldFilename);
-		doClose();
-		assertEquals(dev, dev2);
-	}
-
-	@Test
-	public void openWithBusAndFilename() throws Exception {
-		// get device by busname and filename
-		doOpen();
-		assertNotNull(dev.getDevice());
-		String oldFilename = dev.getDevice().getFilename();
-		String oldBusName = dev.getDevice().getBus().getDirname();
-		assertNotNull(oldFilename);
-		assertNotNull(oldBusName);
-		log.info("filename: " + oldFilename + ", busName: " + oldBusName);
-		Device dev2 = USB.getDevice(devinfo.getIdVendor(), devinfo
-				.getIdProduct(), oldBusName, oldFilename);
-		doClose();
-		assertEquals(dev, dev2);
-	}
-	
-	@Test
-	public void bulkWriteRead() throws Exception {
-		checkBulkEndpoints();
-		devinfo.setMode(TransferMode.Bulk);
-		doOpenWriteReadClose();
-	}
-
-	private void checkBulkEndpoints() {
-		if (devinfo.getInEPBulk() == -1 && devinfo.getOutEPBulk() == -1) {
-			throw new UnsupportedOperationException(
-					"no bulk endpoints defined in test device definition");
-		}
-	}
-
-	@Test
-	public void interruptWriteRead() throws Exception {
-		checkInterruptEndpoints();
-		devinfo.setMode(TransferMode.Interrupt);
-		doOpenWriteReadClose();
-	}
-
-	private void checkInterruptEndpoints() {
-		if (devinfo.getInEPInt() == -1 && devinfo.getOutEPInt() == -1) {
-			throw new UnsupportedOperationException(
-					"no interrupt endpoints defined in test device definition");
-		}
-	}
-
-	@Test
-	public void bulkWriteReadMultiple() throws Exception {
-		final int NumberOfIterations = 100;
-
-		devinfo.setMode(TransferMode.Bulk);
-		doOpen();
-		for (int i = 0; i < NumberOfIterations; i++) {
-			doWriteRead();
-		}
-		doClose();
-	}
-
-	@Test
-	public void multipleOpenCloseWithBulkWrite() throws Exception {
-		devinfo.setMode(TransferMode.Bulk);
-		for (int i = 0; i < 5; i++) {
-			doOpen();
-			doClose();
-		}
-		doOpenWriteReadClose();
-		for (int i = 0; i < 10; i++) {
-			doOpen();
-			doWriteRead();
-			doClose();
-		}
-		doOpenWriteReadClose();
-		for (int i = 0; i < 5; i++) {
-			doOpen();
-			doClose();
-		}
-	}
-
-	@Test
-	public void bulkAndInterrupt() throws Exception {
-		doOpen();
-		// BULK
-		devinfo.setMode(TransferMode.Bulk);
-		doWriteRead();
-		// INTERRUPT
-		devinfo.setMode(TransferMode.Interrupt);
-		doWriteRead();
-		doClose();
-	}
-
-	@Test
-	public void bulkAndInterruptMultiple() throws Exception {
-		for (int i = 0; i < 20; i++) {
-			devinfo.setMode(TransferMode.Bulk);
-			doOpenWriteReadClose();
-			devinfo.setMode(TransferMode.Interrupt);
-			doOpenWriteReadClose();
-		}
-	}
-
-	@Test
-	public void controlMsg() throws Exception {
-		try {
-			dev.open(devinfo.getConfiguration(), devinfo.getInterface(),
-					devinfo.getAltinterface());
-			// GET STATUS (device)
-			byte[] data = getTestData(2);
-			int length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_DEVICE,
-					USB.REQ_GET_STATUS, 0, 0, data, data.length, devinfo
-							.getTimeout(), false);
-			assertTrue(length > 0);
-			assertEquals((byte) 0x01, data[0]);
-			assertEquals((byte) 0x00, data[1]);
-			// GET STATUS (interface)
-			data = getTestData(2);
-			length = dev.controlMsg(
-					USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-							| USB.REQ_TYPE_TYPE_STANDARD
-							| USB.REQ_TYPE_RECIP_INTERFACE, USB.REQ_GET_STATUS,
-					0, 0, data, data.length, devinfo.getTimeout(), false);
-			assertTrue(length > 0);
-			assertEquals((byte) 0x00, data[0]);
-			assertEquals((byte) 0x00, data[1]);
-			// GET STATUS (endpoint)
-			data = getTestData(2);
-			length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_ENDPOINT,
-					USB.REQ_GET_STATUS, 0, 0, data, data.length, devinfo
-							.getTimeout(), false);
-			assertTrue(length > 0);
-			assertEquals((byte) 0x00, data[0]);
-			assertEquals((byte) 0x00, data[1]);
-			// GET CONFIGURATION
-			data = getTestData(1);
-			length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_DEVICE,
-					USB.REQ_GET_CONFIGURATION, 0, 0, data, data.length, devinfo
-							.getTimeout(), false);
-			assertTrue(length > 0);
-			assertEquals((byte) devinfo.getConfiguration(), data[0]);
-			// // GET INTERFACE
-			// data = byte[1];
-			// length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-			// | USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_INTERFACE,
-			// USB.REQ_GET_INTERFACE, 0, devinfo.getInterface(), data,
-			// data.length,
-			// devinfo
-			// .getTimeout(), false);
-			// logData(data, length);
-			// GET DESCRIPTOR (device descriptor)
-			data = getTestData(128);
-			length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_DEVICE,
-					USB.REQ_GET_DESCRIPTOR, 1 << 8, 0, data, data.length,
-					devinfo.getTimeout(), false);
-			validateDeviceDescriptor(data, length);
-			// GET DESCRIPTOR (string descriptor (1))
-			data = getTestData(128);
-			length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_DEVICE,
-					USB.REQ_GET_DESCRIPTOR, (3 << 8) + 1, 0, data, data.length,
-					devinfo.getTimeout(), false);
-			String s = getString(data, length);
-			assertEquals(s, devinfo.getManufacturer());
-			// GET DESCRIPTOR (string descriptor (2))
-			data = getTestData(128);
-			length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_DEVICE,
-					USB.REQ_GET_DESCRIPTOR, (3 << 8) + 2, 0, data, data.length,
-					devinfo.getTimeout(), false);
-			s = getString(data, length);
-			assertEquals(s, devinfo.getProduct());
-			// GET DESCRIPTOR (string descriptor (3))
-			data = getTestData(128);
-			length = dev.controlMsg(USB.REQ_TYPE_DIR_DEVICE_TO_HOST
-					| USB.REQ_TYPE_TYPE_STANDARD | USB.REQ_TYPE_RECIP_DEVICE,
-					USB.REQ_GET_DESCRIPTOR, (3 << 8) + 3, 0, data, data.length,
-					devinfo.getTimeout(), false);
-			s = getString(data, length);
-			assertEquals(s, devinfo.getSerialVersion());
-			// close the device
-			dev.close();
-		} catch (Exception e) {
-			closeOnException();
-			throw e;
-		} catch (AssertionError e) {
-			closeOnException();
-			throw e;
-		}
-	}
-
-	private void closeOnException() {
-		try {
-			dev.close();
-		} catch (USBException e1) {
-			// ignore exceptions
-		}
-	}
-
-	private void validateDeviceDescriptor(byte[] data, int length) {
-		// length read
-		assertEquals(18, length);
-		// descriptor length
-		assertEquals((byte) 18, data[0]);
-		// descriptor type
-		assertEquals((byte) 1, data[1]);
-		// USB specification number LSB
-		assertEquals((byte) 0, data[2]);
-		// USB specification number MSB
-		assertEquals((byte) 0x02, data[3]);
-		// device class (vendor specific)
-		assertEquals((byte) 0xff, data[4]);
-		// device subclass (vendor specific)
-		assertEquals((byte) 0xff, data[5]);
-		// device protocol (vendor specific)
-		assertEquals((byte) 0xff, data[6]);
-		// maximum packet size for endpoint zero
-		assertEquals((byte) 64, data[7]);
-		// Vendor ID (NTB) LSB
-		assertEquals((byte) 0x35, data[8]);
-		// Vendor ID (NTB) MSB
-		assertEquals((byte) 0x82, data[9]);
-		// Product ID (JUnit test board) LSB
-		assertEquals((byte) 0x22, data[10]);
-		// Product ID (JUnit test board) MSB
-		assertEquals((byte) 0x02, data[11]);
-
-		// Device release number LSB
-		assertEquals((byte) 0x00, data[12]);
-		// Device release number MSB
-		assertEquals((byte) 0x10, data[13]);
-		// Index of manufacturer string descriptor
-		assertEquals((byte) 0x01, data[14]);
-		// Index of product string descriptor
-		assertEquals((byte) 0x02, data[15]);
-		// Index of serial number string descriptor
-		assertEquals((byte) 0x03, data[16]);
-		// Number of possible configurations
-		assertEquals((byte) 0x01, data[17]);
-	}
-
-	private byte[] getTestData(int length) {
-		byte[] b = new byte[length];
-		for (int i = 0; i < b.length; i++) {
-			b[i] = (byte) (Math.random() * 256);
-		}
-		return b;
-	}
-
-	@SuppressWarnings("unused")
-	private void logData(byte[] data, int length) {
-		if (length > 0) {
-			log.info("length: " + length);
-			String logData = "";
-			for (int i = 0; i < length; i++) {
-				logData += "0x" + Integer.toHexString(data[i] & 0xff) + "\t";
-			}
-			log.info(logData);
-		}
-	}
-
-	private String getString(byte[] data, int length)
-			throws UnsupportedEncodingException {
-		// data length
-		assertTrue(length > 2);
-		// string length
-		assertTrue(data[0] > 2);
-		// string descriptor ident
-		assertEquals((byte) 3, data[1]);
-		// create string from data
-		return new String(data, 2, length - 2, "UTF-16LE");
-	}
-
-	@Test
-	public void invalidConfig() throws Exception {
-		try {
-			dev.open(devinfo.getConfiguration() + 5, devinfo.getInterface(),
-					devinfo.getAltinterface());
-			fail("USBException expected");
-		} catch (USBException e) {
-			log.severe("could not set config "
-					+ (devinfo.getConfiguration() + 5));
-		}
-		doOpenWriteReadClose();
-	}
-
-	@Test
-	public void invalidInterface() throws Exception {
-		try {
-			dev.open(devinfo.getConfiguration(), devinfo.getInterface() + 5,
-					devinfo.getAltinterface());
-			fail("USBException expected");
-		} catch (USBException e) {
-			log.severe("could not claim interface "
-					+ (devinfo.getInterface() + 5));
-		}
-		doOpenWriteReadClose();
-	}
-
-	@Test
-	public void invalidAltinterface() throws Exception {
-		try {
-			dev.open(devinfo.getConfiguration(), devinfo.getInterface(),
-					devinfo.getAltinterface() + 5);
-			fail("USBException expected");
-		} catch (USBException e) {
-			log.severe("could not set alt interface "
-					+ (devinfo.getAltinterface() + 5));
-		}
-		doOpenWriteReadClose();
-	}
-
-	@Test
-	public void testGetIdProduct() {
-		Assert.assertEquals(devinfo.getIdProduct(), dev.getIdProduct());
-	}
-
-	@Test
-	public void testGetIdVendor() {
-		Assert.assertEquals(devinfo.getIdVendor(), dev.getIdVendor());
-	}
-
-	@Test
-	public void testGetAltinterface() {
-		Assert.assertEquals(devinfo.getAltinterface(), dev.getAltinterface());
-	}
-
-	@Test
-	public void testGetConfiguration() {
-		Assert.assertEquals(devinfo.getConfiguration(), dev.getConfiguration());
-	}
-
-	@Test
-	public void testGetInterface() {
-		Assert.assertEquals(devinfo.getInterface(), dev.getInterface());
-	}
-
-	@Test
-	public void testGetMaxPacketSize() throws USBException {
-		doOpen();
-		Assert.assertEquals(devinfo.getMaxDataSize(), dev.getMaxPacketSize());
-		doClose();
-	}
-
-	@AfterClass
-	public static void tearDown() throws Exception {
-		if (dev != null && dev.isOpen()) {
-			dev.close();
-		}
-	}
-
-	private void doOpen() throws USBException {
-		dev.open(devinfo.getConfiguration(), devinfo.getInterface(), devinfo
-				.getAltinterface());
-	}
-
-	private void doClose() throws USBException {
-		dev.close();
-	}
-
-	private void doOpenWriteReadClose() throws Exception {
-		doOpen();
-		doWriteRead();
-		doClose();
-	}
-
-	private void doWriteRead() throws Exception {
-		initTestData();
-		try {
-			if (devinfo.getMode().equals(TransferMode.Bulk)) {
-				if (devinfo.getOutEPBulk() != -1) {
-					dev.writeBulk(devinfo.getOutEPBulk(), testData,
-							testData.length, devinfo.getTimeout(), false);
-				}
-				if (devinfo.getInEPBulk() != -1) {
-					dev.readBulk(devinfo.getInEPBulk(), readData,
-							readData.length, devinfo.getTimeout(), false);
-				}
-			} else if (devinfo.getMode().equals(TransferMode.Interrupt)) {
-				if (devinfo.getOutEPInt() != -1) {
-					dev.writeInterrupt(devinfo.getOutEPInt(), testData,
-							testData.length, devinfo.getTimeout(), false);
-				}
-				if (devinfo.getInEPInt() != -1) {
-					dev.readInterrupt(devinfo.getInEPInt(), readData,
-							readData.length, devinfo.getTimeout(), false);
-				}
-			}
-			if (devinfo.doCompareData()) {
-				compare(testData, readData);
-			}
-		} catch (AssertionError e) {
-			closeOnException();
-			throw e;
-		} catch (Exception e) {
-			closeOnException();
-			throw e;
-		}
-	}
-
-	private static void compare(byte[] d1, byte[] d2) {
-		int minLength = Math.min(d1.length, d2.length);
-		for (int i = 0; i < minLength; i++) {
-			assertEquals(d1[i], d2[i]);
-		}
-	}
-
-	private static void timeout() {
-		try {
-			Thread.sleep(devinfo.getSleepTimeout());
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private static void initTestData() {
-		for (int i = 0; i < testData.length; i++) {
-			testData[i] = (byte) (Math.random() * 0xff);
-			readData[i] = 0;
-		}
-	}
-}

src/test/java/ch/ntb/usb/test/LibusbJava1Test.java

@@ -1,334 +0,0 @@
-package ch.ntb.usb.test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import org.junit.Test;
-
-import ch.ntb.usb.LibusbJava1;
-import ch.ntb.usb.Usb_Device;
-import ch.ntb.usb.exceptions.LibusbError;
-
-public class LibusbJava1Test {
-	/**
-	 * This method does not need to be tested. This test only exists to document
-	 * the fact that this function has not been forgotten.
-	 */
-	@Test
-	public void testLibusb_set_debug() {
-	}
-
-	@Test
-	public void testLibusb_init() {
-		try {
-			long handle = LibusbJava1.libusb_init();
-			LibusbJava1.libusb_exit(handle);
-		} catch (LibusbError e) {
-			fail("Initialization failed, Code: " + e.getErrorString());
-		}
-	}
-
-	/**
-	 * This method can not be tested (yet). This test only exists to document
-	 * the fact that this function has not been forgotten.
-	 */
-	@Test
-	public void testLibusb_exit() {
-	}
-
-	@Test
-	public void testLibusb_get_device_list() throws LibusbError {
-		long handle = LibusbJava1.libusb_init();
-		Usb_Device devices = LibusbJava1.libusb_get_device_list(handle);
-		assertNotNull("Got devices", devices);
-		System.out.println(devices.toString());
-		assertNull("Bus is null", devices.getBus());
-		LibusbJava1.libusb_exit(handle);
-	}
-
-	@Test
-	public void testLibusb_get_bus_number() throws LibusbError {
-		long handle = LibusbJava1.libusb_init();
-		Usb_Device devices = LibusbJava1.libusb_get_device_list(handle);
-		assertNotNull("Got devices", devices);
-		System.out.println(devices.getBus());
-		LibusbJava1.libusb_exit(handle);
-	}
-
-	@Test
-	public void testLibusb_get_max_iso_packet_size() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_ref_device() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_unref_device() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_open() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_open_device_with_vid_pid() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_close() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_device() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_configuration() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_set_configuration() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_claim_interface() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_release_interface() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_set_interface_alt_setting() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_clear_halt() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_reset_device() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_kernel_driver_active() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_detach_kernel_driver() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_attach_kernel_driver() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_active_config_descriptor() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_string_descriptor_ascii() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_descriptor() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_string_descriptor() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_alloc_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_free_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_submit_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_cancel_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_control_transfer_get_data() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_control_transfer_get_setup() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_fill_control_setup() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_fill_control_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_fill_bulk_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_fill_interrupt_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_fill_iso_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_set_iso_packet_lengths() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_iso_packet_buffer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_iso_packet_buffer_simple() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_try_lock_events() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_lock_events() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_unlock_events() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_event_handling_ok() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_event_handler_active() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_lock_event_waiters() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_unlock_event_waiters() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_wait_for_event() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_handle_events_timeout() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_handle_events() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_handle_events_locked() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_pollfds_handle_timeouts() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_next_timeout() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_set_pollfd_notifiers() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_get_pollfds() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_control_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_bulk_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_interrupt_transfer() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testLibusb_strerror() {
-		fail("Not yet implemented");
-	}
-
-	@Test
-	public void testIsHandleValid() {
-		fail("Not yet implemented");
-	}
-
-}

src/test/java/ch/ntb/usb/test/MemoryLeakTest.java

@@ -1,199 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2008 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import ch.ntb.usb.Device;
-import ch.ntb.usb.LibusbJava;
-import ch.ntb.usb.USB;
-import ch.ntb.usb.USBException;
-import ch.ntb.usb.Usb_Bus;
-import ch.ntb.usb.Utils;
-import ch.ntb.usb.testApp.AbstractDeviceInfo;
-import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode;
-
-@SuppressWarnings("deprecation")
-public class MemoryLeakTest {
-
-	private static final String testdevicePropertiesFile = "testdevice.properties";
-	private static final String deviceInfoKey = "testdeviceInfo";
-
-	private static AbstractDeviceInfo devinfo;
-
-	private static byte[] testData;
-
-	private static byte[] readData;
-
-	private static Device dev;
-
-	private static Logger log = Logger
-			.getLogger(MemoryLeakTest.class.getName());
-
-	@BeforeClass
-	public static void setUp() throws Exception {
-		// load the device info class with the key
-		// from 'testdevice.properties'
-		InputStream propInputStream = new FileInputStream(
-				testdevicePropertiesFile);
-		Properties devInfoProp = new Properties();
-		devInfoProp.load(propInputStream);
-		String devInfoClazzName = devInfoProp.getProperty(deviceInfoKey);
-		if (devInfoClazzName == null) {
-			throw new Exception("property " + deviceInfoKey
-					+ " not found in file " + testdevicePropertiesFile);
-		}
-		Class<?> devInfoClazz = Class.forName(devInfoClazzName);
-		devinfo = (AbstractDeviceInfo) devInfoClazz.newInstance();
-		// setup test data
-		testData = new byte[devinfo.getMaxDataSize()];
-		readData = new byte[testData.length];
-		// initialise the device
-		dev = USB.getDevice(devinfo.getIdVendor(), devinfo.getIdProduct());
-		assertNotNull(dev);
-
-		// print the devices
-		LibusbJava.usb_init();
-//		LibusbJava.usb_find_busses();
-		LibusbJava.usb_find_devices();
-		Usb_Bus bus = LibusbJava.usb_get_busses();
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		PrintStream ps = new PrintStream(baos);
-		Utils.logBus(bus, ps);
-		log.info(baos.toString());
-	}
-
-	@Test
-	public void initalReset() throws Exception {
-		doOpen();
-		dev.reset();
-		timeout();
-	}
-
-	@Test
-	public void bulkWriteReadMultiple() throws Exception {
-		final int NumberOfIterations = 3000;
-
-		devinfo.setMode(TransferMode.Bulk);
-		doOpen();
-		for (int i = 0; i < NumberOfIterations; i++) {
-			doWriteRead();
-			if (i % 1000 == 0) {
-				System.out.print(".");
-			}
-		}
-		doClose();
-	}
-
-	@Test
-	public void interruptWriteReadMultiple() throws Exception {
-		final int NumberOfIterations = 3000;
-
-		devinfo.setMode(TransferMode.Interrupt);
-		doOpen();
-		for (int i = 0; i < NumberOfIterations; i++) {
-			doWriteRead();
-			if (i % 1000 == 0) {
-				System.out.print(".");
-			}
-		}
-		doClose();
-	}
-
-	private void closeOnException() {
-		try {
-			dev.close();
-		} catch (USBException e1) {
-			// ignore exceptions
-		}
-	}
-
-	@AfterClass
-	public static void tearDown() throws Exception {
-		if (dev != null && dev.isOpen()) {
-			dev.close();
-		}
-	}
-
-	private void doOpen() throws USBException {
-		dev.open(devinfo.getConfiguration(), devinfo.getInterface(), devinfo
-				.getAltinterface());
-	}
-
-	private void doClose() throws USBException {
-		dev.close();
-	}
-
-	private void doWriteRead() throws Exception {
-		initTestData();
-		try {
-			if (devinfo.getMode().equals(TransferMode.Bulk)) {
-				if (devinfo.getOutEPBulk() != -1) {
-					dev.writeBulk(devinfo.getOutEPBulk(), testData,
-							testData.length, devinfo.getTimeout(), false);
-				}
-				if (devinfo.getInEPBulk() != -1) {
-					dev.readBulk(devinfo.getInEPBulk(), readData,
-							readData.length, devinfo.getTimeout(), false);
-				}
-			} else if (devinfo.getMode().equals(TransferMode.Interrupt)) {
-				if (devinfo.getOutEPInt() != -1) {
-					dev.writeInterrupt(devinfo.getOutEPInt(), testData,
-							testData.length, devinfo.getTimeout(), false);
-				}
-				if (devinfo.getInEPInt() != -1) {
-					dev.readInterrupt(devinfo.getInEPInt(), readData,
-							readData.length, devinfo.getTimeout(), false);
-				}
-			}
-			if (devinfo.doCompareData()) {
-				compare(testData, readData);
-			}
-		} catch (AssertionError e) {
-			closeOnException();
-			throw e;
-		} catch (Exception e) {
-			closeOnException();
-			throw e;
-		}
-	}
-
-	private static void compare(byte[] d1, byte[] d2) {
-		final int minLength = Math.min(d1.length, d2.length);
-		for (int i = 0; i < minLength; i++) {
-			assertEquals(d1[i], d2[i]);
-		}
-	}
-
-	private static void timeout() {
-		try {
-			Thread.sleep(devinfo.getSleepTimeout());
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private static void initTestData() {
-		for (int i = 0; i < testData.length; i++) {
-			testData[i] = (byte) (Math.random() * 0xff);
-			readData[i] = 0;
-		}
-	}
-}

src/test/java/ch/ntb/usb/test/TestLibUsbJava.java

@@ -1,239 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2007 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test;
-
-import ch.ntb.usb.LibusbJava;
-import ch.ntb.usb.Usb_Bus;
-import ch.ntb.usb.Usb_Config_Descriptor;
-import ch.ntb.usb.Usb_Device;
-import ch.ntb.usb.Usb_Endpoint_Descriptor;
-import ch.ntb.usb.Usb_Interface;
-import ch.ntb.usb.Usb_Interface_Descriptor;
-
-/**
- * This class replicates the code from testlibusb.c supplied in the
- * libusb-0.1.12 release.
- */
-@SuppressWarnings("deprecation")
-public class TestLibUsbJava {
-	static boolean verbose;
-
-	/**
-	 * prints out endpoint info
-	 * 
-	 * @param endpoint
-	 *            The end point.
-	 */
-	private static void printEndpoint(Usb_Endpoint_Descriptor endpoint) {
-		System.out.print(String.format("      bEndpointAddress: %02xh\n",
-				endpoint.getBEndpointAddress()));
-		System.out.print(String.format("      bmAttributes:     %02xh\n",
-				endpoint.getBmAttributes()));
-		System.out.print(String.format("      wMaxPacketSize:   %d\n", endpoint
-				.getWMaxPacketSize()));
-		System.out.print(String.format("      bInterval:        %d\n", endpoint
-				.getBInterval()));
-		System.out.print(String.format("      bRefresh:         %d\n", endpoint
-				.getBRefresh()));
-		System.out.print(String.format("      bSynchAddress:    %d\n", endpoint
-				.getBSynchAddress()));
-	}
-
-	/**
-	 * prints out the interface descriptor
-	 * 
-	 * @param interfaceDescript
-	 *            The interface descriptor.
-	 */
-	private static void printAltsetting(
-			Usb_Interface_Descriptor interfaceDescript) {
-		System.out.print(String.format("    bInterfaceNumber:   %d\n",
-				interfaceDescript.getBInterfaceNumber()));
-		System.out.print(String.format("    bAlternateSetting:  %d\n",
-				interfaceDescript.getBAlternateSetting()));
-		System.out.print(String.format("    bNumEndpoints:      %d\n",
-				interfaceDescript.getBNumEndpoints()));
-		System.out.print(String.format("    bInterfaceClass:    %d\n",
-				interfaceDescript.getBInterfaceClass()));
-		System.out.print(String.format("    bInterfaceSubClass: %d\n",
-				interfaceDescript.getBInterfaceSubClass()));
-		System.out.print(String.format("    bInterfaceProtocol: %d\n",
-				interfaceDescript.getBInterfaceProtocol()));
-		System.out.print(String.format("    iInterface:         %d\n",
-				interfaceDescript.getIInterface()));
-
-		for (int i = 0; i < interfaceDescript.getBNumEndpoints(); i++) {
-			printEndpoint(interfaceDescript.getEndpoint()[i]);
-		}
-	}
-
-	/**
-	 * prints out interface
-	 * 
-	 * @param usbInterface
-	 *            The interface.
-	 */
-	private static void printInterface(Usb_Interface usbInterface) {
-		for (int i = 0; i < usbInterface.getNumAltsetting(); i++) {
-			printAltsetting(usbInterface.getAltsetting()[i]);
-		}
-	}
-
-	/**
-	 * prints out configuration
-	 * 
-	 * @param config
-	 *            The configuration.
-	 */
-	private static void printConfiguration(Usb_Config_Descriptor config) {
-		System.out.print(String.format("  wTotalLength:         %d\n", config
-				.getWTotalLength()));
-		System.out.print(String.format("  bNumInterfaces:       %d\n", config
-				.getBNumInterfaces()));
-		System.out.print(String.format("  bConfigurationValue:  %d\n", config
-				.getBConfigurationValue()));
-		System.out.print(String.format("  iConfiguration:       %d\n", config
-				.getIConfiguration()));
-		System.out.print(String.format("  bmAttributes:         %02xh\n",
-				config.getBmAttributes()));
-		System.out.print(String.format("  MaxPower:             %d\n", config
-				.getMaxPower()));
-
-		for (int i = 0; i < config.getBNumInterfaces(); i++) {
-			printInterface(config.getInterface()[i]);
-		}
-	}
-
-	private static int printDevice(Usb_Device dev, int level) {
-		long udev;
-		String mfr;
-		String product;
-		String sn;
-		String spaces;
-		String descript;
-
-		spaces = "                                ";
-
-		udev = LibusbJava.usb_open(dev);
-
-		if (udev != 0) {
-			if (dev.getDescriptor().getIManufacturer() != 0) {
-				mfr = LibusbJava.usb_get_string_simple(udev, dev
-						.getDescriptor().getIManufacturer());
-
-				if (mfr != null) {
-					descript = String.format("%s - ", mfr);
-				} else {
-					descript = String.format("%04X - ", dev.getDescriptor()
-							.getIdVendor());
-				}
-			} else {
-				descript = String.format("%04X - ", dev.getDescriptor()
-						.getIdVendor());
-			}
-
-			if (dev.getDescriptor().getIProduct() != 0) {
-				product = LibusbJava.usb_get_string_simple(udev, dev
-						.getDescriptor().getIProduct());
-
-				if (product != null) {
-					descript = descript + String.format("%s", product);
-				} else {
-					descript = descript
-							+ String.format("%04X", dev.getDescriptor()
-									.getIdProduct());
-				}
-			} else {
-				descript = descript
-						+ String.format("%04X", dev.getDescriptor()
-								.getIdProduct());
-			}
-		} else {
-			descript = String.format("%04X - %04X", dev.getDescriptor()
-					.getIdVendor(), dev.getDescriptor().getIdProduct());
-		}
-
-		System.out.print(String.format("%sDev #%d: %s\n", spaces.substring(0,
-				level * 2), dev.getDevnum(), descript));
-
-		if ((udev != 0) && verbose) {
-			if (dev.getDescriptor().getISerialNumber() != 0) {
-				sn = LibusbJava.usb_get_string_simple(udev, dev.getDescriptor()
-						.getISerialNumber());
-
-				if (sn != null) {
-					System.out.print(String.format("%s  - Serial Number: %s\n",
-							spaces.substring(0, level * 2), sn));
-				}
-			}
-		}
-
-		if (udev != 0) {
-			LibusbJava.usb_close(udev);
-		}
-
-		if (verbose) {
-			if (dev.getConfig().length == 0) {
-				System.out.print("  Couldn't retrieve descriptors\n");
-
-				return 0;
-			}
-
-			for (int i = 0; i < dev.getDescriptor().getBNumConfigurations(); i++) {
-				printConfiguration(dev.getConfig()[i]);
-			}
-		} else {
-			Usb_Device childDev = null;
-
-			for (int i = 0; i < dev.getNumChildren(); i++) {
-				if (i == 0) {
-					childDev = dev.getChildren();
-				} else {
-					childDev = childDev.getNext();
-				}
-
-				printDevice(childDev, level + 1);
-			}
-		}
-
-		return 0;
-	} // end of printDevice method
-
-	/**
-	 * The main method.
-	 * 
-	 * @param args
-	 *            The command line arguments.
-	 */
-	public static void main(String args[]) throws Exception {
-		if ((args.length > 0) && (args[0].equals("-v"))) {
-			verbose = true;
-		} else {
-			verbose = false;
-		}
-
-		// used for debugging. 0 = no debugging, 255 = with debugging
-		LibusbJava.usb_init();
-		LibusbJava.usb_set_debug(255);
-
-		LibusbJava.usb_find_busses();
-		LibusbJava.usb_find_devices();
-
-		for (Usb_Bus bus = LibusbJava.usb_get_busses(); bus != null; bus = bus
-				.getNext()) {
-			if ((bus.getRootDev() != null) && !verbose) {
-				printDevice(bus.getRootDev(), 0);
-			} else {
-				for (Usb_Device dev = bus.getDevices(); dev != null; dev = dev
-						.getNext()) {
-					printDevice(dev, 0);
-				}
-			}
-		}
-	} // end main
-} // end of TestLibUsbJava class

src/test/java/ch/ntb/usb/test/devices/AT90USB1287.java

@@ -1,34 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test.devices;
-
-import ch.ntb.usb.USB;
-import ch.ntb.usb.testApp.AbstractDeviceInfo;
-
-public class AT90USB1287 extends AbstractDeviceInfo {
-
-	@Override
-	public void initValues() {
-		setIdVendor((short) 0x8235);
-		setIdProduct((short) 0x0200);
-		setTimeout(2000);
-		setConfiguration(1);
-		setInterface(0);
-		setAltinterface(-1);
-		setOutEPBulk(0x01);
-		setInEPBulk(0x82);
-		setOutEPInt(0x01);
-		setInEPInt(0x82);
-		setSleepTimeout(2000);
-		setMaxDataSize(USB.FULLSPEED_MAX_BULK_PACKET_SIZE);
-		setMode(TransferMode.Bulk);
-		setManufacturer("inf.ntb.ch");
-		setProduct("JUnit Test Board");
-		setSerialVersion("00.10.00");
-	}
-}

src/test/java/ch/ntb/usb/test/devices/CY7C68013A.java

@@ -1,31 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test.devices;
-
-import ch.ntb.usb.USB;
-import ch.ntb.usb.testApp.AbstractDeviceInfo;
-
-public class CY7C68013A extends AbstractDeviceInfo {
-
-	@Override
-	public void initValues() {
-		setIdVendor((short) 0x8235);
-		setIdProduct((short) 0x0222);
-		setTimeout(2000);
-		setConfiguration(1);
-		setInterface(0);
-		setAltinterface(-1);
-		setOutEPInt(0x02);
-		setInEPInt(0x86);
-		setOutEPBulk(0x04);
-		setInEPBulk(0x88);
-		setSleepTimeout(2000);
-		setMaxDataSize(USB.HIGHSPEED_MAX_BULK_PACKET_SIZE);
-		setMode(TransferMode.Bulk);
-	}
-}

src/test/java/ch/ntb/usb/test/devices/MX500.java

@@ -1,32 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test.devices;
-
-import ch.ntb.usb.testApp.AbstractDeviceInfo;
-
-public class MX500 extends AbstractDeviceInfo {
-
-	@Override
-	public void initValues() {
-		setIdVendor((short) 0x046d);
-		setIdProduct((short) 0xc025);
-		setTimeout(2000);
-		setConfiguration(1);
-		setInterface(0);
-		setAltinterface(0);
-		setOutEPInt(-1);
-		setInEPInt(0x81);
-		setOutEPBulk(-1);
-		setInEPBulk(-1);
-		setSleepTimeout(5000);
-		setMaxDataSize(5);
-		setMode(TransferMode.Interrupt);
-		// we only read data -> don't compare
-		setDoCompareData(false);
-	}
-}

src/test/java/ch/ntb/usb/test/devices/MousePlus.java

@@ -1,34 +0,0 @@
-/* 
- * Java libusb wrapper
- * Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
- *
- * http://libusbjava.sourceforge.net
- * This library is covered by the LGPL, read LGPL.txt for details.
- */
-package ch.ntb.usb.test.devices;
-
-import ch.ntb.usb.testApp.AbstractDeviceInfo;
-
-public class MousePlus extends AbstractDeviceInfo {
-
-	@Override
-	public void initValues() {
-		setIdVendor((short) 0x046d);
-		setIdProduct((short) 0xc016);
-		setBusName("bus-0");
-		setFilename("\\\\.\\libusb0-0001--0x046d-0xc016");
-		setTimeout(2000);
-		setConfiguration(1);
-		setInterface(0);
-		setAltinterface(0);
-		setOutEPInt(-1);
-		setInEPInt(0x81);
-		setOutEPBulk(-1);
-		setInEPBulk(-1);
-		setSleepTimeout(5000);
-		setMaxDataSize(4);
-		setMode(TransferMode.Interrupt);
-		// we only read data -> don't compare
-		setDoCompareData(false);
-	}
-}

src/test/java/ch/ntb/usb/test/exceptions/LibusbErrorTest.java

@@ -1,76 +0,0 @@
-package ch.ntb.usb.test.exceptions;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import ch.ntb.usb.exceptions.LibusbError;
-
-@RunWith(Parameterized.class)
-public class LibusbErrorTest {
-	@Parameters
-	public static Collection<Object[]> codesToTest() {
-		return Arrays.asList(new Object[][] {	{"ERROR_UNKNWON (0)", 0 }, 
-											 	{"ERROR_IO", -1 },
-												{"ERROR_INVALID_PARAM", -2},
-												{"ERROR_ACCESS", -3},
-												{"ERROR_NO_DEVICE", -4},
-												{"ERROR_NOT_FOUND", -5},
-												{"ERROR_BUSY", -6},
-												{"ERROR_TIMEOUT", -7},
-												{"ERROR_OVERFLOW", -8},
-												{"ERROR_PIPE", -9},
-												{"ERROR_INTERRUPTED", -10},
-												{"ERROR_NO_MEM", -11},
-												{"ERROR_NOT_SUPPORTED", -12},
-												{"ERROR_UNKNWON (-13)", -13},
-												{"ERROR_UNKNWON (-98)", -98},
-												{"ERROR_JAVA_REFERENCES_NOT_LOADED", -100},
-												{"ERROR_JAVA_WRONG_ENVIRONMENT", -101},
-												{"ERROR_JAVA_ILEGAL_DEVICE_HANDLE", -102},
-												{"ERROR_UNKNWON (-103)", -103},
-												{"ERROR_OTHER", -99} });
-	}
-	
-	private String exp_desc;
-	private int    code;
-	private LibusbError e;
-	
-	public LibusbErrorTest(String exp_desc, int code) {
-		this.exp_desc = exp_desc;
-		this.code = code;
-		try {
-			throw new LibusbError(code);
-		} catch (LibusbError e) {
-			this.e = e;
-		}
-	}
-	
-	@Test
-	public void testGetErrorCode() {
-		assertEquals("Error code is correct", e.getErrorCode(), code);
-	}
-
-	@Test
-	public void testGetStringFromCode() {
-		String gen_desc = LibusbError.getStringFromCode(code);
-		assertEquals("Correct error description for " + code, exp_desc, gen_desc);
-	}
-
-	@Test
-	public void testGetErrorString() {
-		assertEquals("Correct error string for " + code, e.getErrorString(), exp_desc);
-	}
-
-
-	@Test
-	public void testGetMessage() {
-		assertEquals("Correct error string for " + code, e.getMessage(), "libusb result: " + exp_desc);
-	}
-}

src/test/resources/testdevice.properties

@@ -1,13 +0,0 @@
-################################################################
-# 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