Added some missing files.
Renamed native classes.
This commit is contained in:
Klaus Reimer
parent
321b1c9e20
commit
03cef5357b
43
.hgignore
43
.hgignore
@ -3,3 +3,46 @@ target
|
||||
.settings
|
||||
.classpath
|
||||
.project
|
||||
|
||||
syntax: regexp
|
||||
^src/main/c/src/Makefile$
|
||||
syntax: glob
|
||||
|
||||
syntax: regexp
|
||||
^src/main/c/src/Makefile\.in$
|
||||
syntax: regexp
|
||||
^src/main/c/aclocal\.m4$
|
||||
syntax: regexp
|
||||
^src/main/c/config\.guess$
|
||||
syntax: regexp
|
||||
^src/main/c/config\.h$
|
||||
syntax: regexp
|
||||
^src/main/c/config\.h\.in$
|
||||
syntax: regexp
|
||||
^src/main/c/config\.status$
|
||||
syntax: regexp
|
||||
^src/main/c/config\.sub$
|
||||
syntax: regexp
|
||||
^src/main/c/configure$
|
||||
syntax: regexp
|
||||
^src/main/c/depcomp$
|
||||
syntax: regexp
|
||||
^src/main/c/missing$
|
||||
syntax: regexp
|
||||
^src/main/c/stamp-h1$
|
||||
syntax: regexp
|
||||
^src/main/c/Makefile$
|
||||
syntax: regexp
|
||||
^src/main/c/Makefile\.in$
|
||||
syntax: regexp
|
||||
^src/main/c/ltmain\.sh$
|
||||
syntax: regexp
|
||||
^src/main/c/libtool$
|
||||
syntax: regexp
|
||||
^src/main/c/install-sh$
|
||||
syntax: regexp
|
||||
^src/main/c/src/\.deps$
|
||||
syntax: regexp
|
||||
^src/main/c/m4$
|
||||
syntax: regexp
|
||||
^src/main/c/autom4te\.cache$
|
||||
365
src/main/c/INSTALL
Normal file
365
src/main/c/INSTALL
Normal file
@ -0,0 +1,365 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||
|
||||
Copying and distribution of this file, with or without modification,
|
||||
are permitted in any medium without royalty provided the copyright
|
||||
notice and this notice are preserved. This file is offered as-is,
|
||||
without warranty of any kind.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package. Some packages provide this
|
||||
`INSTALL' file but do not implement all of the features documented
|
||||
below. The lack of an optional feature in a given package is not
|
||||
necessarily a bug. More recommendations for GNU packages can be found
|
||||
in *note Makefile Conventions: (standards)Makefile Conventions.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, and a
|
||||
file `config.log' containing compiler output (useful mainly for
|
||||
debugging `configure').
|
||||
|
||||
It can also use an optional file (typically called `config.cache'
|
||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||
the results of its tests to speed up reconfiguring. Caching is
|
||||
disabled by default to prevent problems with accidental use of stale
|
||||
cache files.
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If you are using the cache, and at
|
||||
some point `config.cache' contains results you don't want to keep, you
|
||||
may remove or edit it.
|
||||
|
||||
The file `configure.ac' (or `configure.in') is used to create
|
||||
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
|
||||
Running `configure' might take a while. While running, it prints
|
||||
some messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package, generally using the just-built uninstalled binaries.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation. When installing into a prefix owned by root, it is
|
||||
recommended that the package be configured and built as a regular
|
||||
user, and only the `make install' phase executed with root
|
||||
privileges.
|
||||
|
||||
5. Optionally, type `make installcheck' to repeat any self-tests, but
|
||||
this time using the binaries in their final installed location.
|
||||
This target does not install anything. Running this target as a
|
||||
regular user, particularly if the prior `make install' required
|
||||
root privileges, verifies that the installation completed
|
||||
correctly.
|
||||
|
||||
6. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
also a `make maintainer-clean' target, but that is intended mainly
|
||||
for the package's developers. If you use it, you may have to get
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
7. Often, you can also type `make uninstall' to remove the installed
|
||||
files again. In practice, not all packages have tested that
|
||||
uninstallation works correctly, even though it is required by the
|
||||
GNU Coding Standards.
|
||||
|
||||
8. Some packages, particularly those that use Automake, provide `make
|
||||
distcheck', which can by used by developers to test that all other
|
||||
targets like `make install' and `make uninstall' work correctly.
|
||||
This target is generally not run by end users.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. Run `./configure --help'
|
||||
for details on some of the pertinent environment variables.
|
||||
|
||||
You can give `configure' initial values for configuration parameters
|
||||
by setting variables in the command line or in the environment. Here
|
||||
is an example:
|
||||
|
||||
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||
|
||||
*Note Defining Variables::, for more details.
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'. This
|
||||
is known as a "VPATH" build.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
installed the package for one architecture, use `make distclean' before
|
||||
reconfiguring for another architecture.
|
||||
|
||||
On MacOS X 10.5 and later systems, you can create libraries and
|
||||
executables that work on multiple system types--known as "fat" or
|
||||
"universal" binaries--by specifying multiple `-arch' options to the
|
||||
compiler but only a single `-arch' option to the preprocessor. Like
|
||||
this:
|
||||
|
||||
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CPP="gcc -E" CXXCPP="g++ -E"
|
||||
|
||||
This is not guaranteed to produce working output in all cases, you
|
||||
may have to build one architecture at a time and combine the results
|
||||
using the `lipo' tool if you have problems.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX', where PREFIX must be an
|
||||
absolute file name.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||
PREFIX as the prefix for installing programs and libraries.
|
||||
Documentation and other data files still use the regular prefix.
|
||||
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them. In general, the
|
||||
default for these options is expressed in terms of `${prefix}', so that
|
||||
specifying just `--prefix' will affect all of the other directory
|
||||
specifications that were not explicitly provided.
|
||||
|
||||
The most portable way to affect installation locations is to pass the
|
||||
correct locations to `configure'; however, many packages provide one or
|
||||
both of the following shortcuts of passing variable assignments to the
|
||||
`make install' command line to change installation locations without
|
||||
having to reconfigure or recompile.
|
||||
|
||||
The first method involves providing an override variable for each
|
||||
affected directory. For example, `make install
|
||||
prefix=/alternate/directory' will choose an alternate location for all
|
||||
directory configuration variables that were expressed in terms of
|
||||
`${prefix}'. Any directories that were specified during `configure',
|
||||
but not in terms of `${prefix}', must each be overridden at install
|
||||
time for the entire installation to be relocated. The approach of
|
||||
makefile variable overrides for each directory variable is required by
|
||||
the GNU Coding Standards, and ideally causes no recompilation.
|
||||
However, some platforms have known limitations with the semantics of
|
||||
shared libraries that end up requiring recompilation when using this
|
||||
method, particularly noticeable in packages that use GNU Libtool.
|
||||
|
||||
The second method involves providing the `DESTDIR' variable. For
|
||||
example, `make install DESTDIR=/alternate/directory' will prepend
|
||||
`/alternate/directory' before all installation names. The approach of
|
||||
`DESTDIR' overrides is not required by the GNU Coding Standards, and
|
||||
does not work on platforms that have drive letters. On the other hand,
|
||||
it does better at avoiding recompilation issues, and works well even
|
||||
when some directory options were not specified in terms of `${prefix}'
|
||||
at `configure' time.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Some packages offer the ability to configure how verbose the
|
||||
execution of `make' will be. For these packages, running `./configure
|
||||
--enable-silent-rules' sets the default to minimal output, which can be
|
||||
overridden with `make V=1'; while running `./configure
|
||||
--disable-silent-rules' sets the default to verbose, which can be
|
||||
overridden with `make V=0'.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
to try
|
||||
|
||||
./configure CC="cc"
|
||||
|
||||
and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
|
||||
directory contains several dysfunctional programs; working variants of
|
||||
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
|
||||
in your `PATH', put it _after_ `/usr/bin'.
|
||||
|
||||
On Haiku, software installed for all users goes in `/boot/common',
|
||||
not `/usr/local'. It is recommended to use the following options:
|
||||
|
||||
./configure --prefix=/boot/common
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' cannot figure out
|
||||
automatically, but needs to determine by the type of machine the package
|
||||
will run on. Usually, assuming the package is built to be run on the
|
||||
_same_ architectures, `configure' can figure that out, but if it prints
|
||||
a message saying it cannot guess the machine type, give it the
|
||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS
|
||||
KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the machine type.
|
||||
|
||||
If you are _building_ compiler tools for cross-compiling, you should
|
||||
use the option `--target=TYPE' to select the type of system they will
|
||||
produce code for.
|
||||
|
||||
If you want to _use_ a cross compiler, that generates code for a
|
||||
platform different from the build platform, you should specify the
|
||||
"host" platform (i.e., that on which the generated programs will
|
||||
eventually be run) with `--host=TYPE'.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Defining Variables
|
||||
==================
|
||||
|
||||
Variables not defined in a site shell script can be set in the
|
||||
environment passed to `configure'. However, some packages may run
|
||||
configure again during the build, and the customized values of these
|
||||
variables may be lost. In order to avoid this problem, you should set
|
||||
them in the `configure' command line, using `VAR=value'. For example:
|
||||
|
||||
./configure CC=/usr/local2/bin/gcc
|
||||
|
||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||
overridden in the site shell script).
|
||||
|
||||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||
|
||||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||
|
||||
`configure' Invocation
|
||||
======================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--help'
|
||||
`-h'
|
||||
Print a summary of all of the options to `configure', and exit.
|
||||
|
||||
`--help=short'
|
||||
`--help=recursive'
|
||||
Print a summary of the options unique to this package's
|
||||
`configure', and exit. The `short' variant lists options used
|
||||
only in the top level, while the `recursive' variant lists options
|
||||
also present in any nested packages.
|
||||
|
||||
`--version'
|
||||
`-V'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Enable the cache: use and save the results of the tests in FILE,
|
||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||
disable caching.
|
||||
|
||||
`--config-cache'
|
||||
`-C'
|
||||
Alias for `--cache-file=config.cache'.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made. To
|
||||
suppress all normal output, redirect it to `/dev/null' (any error
|
||||
messages will still be shown).
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
`--no-create'
|
||||
`-n'
|
||||
Run the configure checks, but stop before creating any output
|
||||
files.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options. Run
|
||||
`configure --help' for more details.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
AC_INIT(configure.ac)
|
||||
AM_INIT_AUTOMAKE(usb4java, 1.0.0)
|
||||
AM_INIT_AUTOMAKE(libusb4java, 1.0.0)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
lib_LTLIBRARIES = usb4java.la
|
||||
lib_LTLIBRARIES = libusb4java.la
|
||||
libusb4java_la_CFLAGS = -fPIC -Wall -Werror -O2 -ansi
|
||||
libusb4java_la_LIBADD = -lusb
|
||||
libusb4java_la_LDFLAGS = -version-info 1:0:0 -no-undefined -lusb
|
||||
|
||||
@ -7,7 +7,7 @@ package de.ailis.usb4java;
|
||||
|
||||
import javax.usb.UsbConfigurationDescriptor;
|
||||
|
||||
import de.ailis.usb4java.jni.USBConfigDescriptor;
|
||||
import de.ailis.usb4java.jni.USB_Config_Descriptor;
|
||||
|
||||
|
||||
/**
|
||||
@ -20,7 +20,7 @@ public class UsbConfigurationDescriptorImpl implements
|
||||
UsbConfigurationDescriptor
|
||||
{
|
||||
/** The low-level USB config desciptor. */
|
||||
private final USBConfigDescriptor configDescriptor;
|
||||
private final USB_Config_Descriptor configDescriptor;
|
||||
|
||||
|
||||
/**
|
||||
@ -30,7 +30,7 @@ public class UsbConfigurationDescriptorImpl implements
|
||||
* The low-level config descriptor.
|
||||
*/
|
||||
|
||||
UsbConfigurationDescriptorImpl(final USBConfigDescriptor configDescriptor)
|
||||
UsbConfigurationDescriptorImpl(final USB_Config_Descriptor configDescriptor)
|
||||
{
|
||||
this.configDescriptor = configDescriptor;
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ import javax.usb.UsbPort;
|
||||
import javax.usb.UsbStringDescriptor;
|
||||
import javax.usb.event.UsbDeviceListener;
|
||||
|
||||
import de.ailis.usb4java.jni.USBDevice;
|
||||
import de.ailis.usb4java.jni.USB_Device;
|
||||
|
||||
|
||||
/**
|
||||
@ -45,7 +45,7 @@ public class UsbDeviceImpl implements UsbDevice
|
||||
* The low-level USB device.
|
||||
*/
|
||||
|
||||
public UsbDeviceImpl(final USBDevice device)
|
||||
public UsbDeviceImpl(final USB_Device device)
|
||||
{
|
||||
// TODO Implement me!
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ import javax.usb.UsbDevice;
|
||||
import javax.usb.UsbHub;
|
||||
import javax.usb.UsbPort;
|
||||
|
||||
import de.ailis.usb4java.jni.USBDevice;
|
||||
import de.ailis.usb4java.jni.USB_Device;
|
||||
|
||||
|
||||
/**
|
||||
@ -29,7 +29,7 @@ public class UsbHubImpl extends UsbDeviceImpl implements UsbHub
|
||||
* The low-level USB device.
|
||||
*/
|
||||
|
||||
public UsbHubImpl(final USBDevice device)
|
||||
public UsbHubImpl(final USB_Device device)
|
||||
{
|
||||
super(device);
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ package de.ailis.usb4java;
|
||||
|
||||
import javax.usb.UsbInterfaceDescriptor;
|
||||
|
||||
import de.ailis.usb4java.jni.USBInterfaceDescriptor;
|
||||
import de.ailis.usb4java.jni.USB_Interface_Descriptor;
|
||||
|
||||
|
||||
/**
|
||||
@ -19,7 +19,7 @@ import de.ailis.usb4java.jni.USBInterfaceDescriptor;
|
||||
public class UsbInterfaceDescriptorImpl implements UsbInterfaceDescriptor
|
||||
{
|
||||
/** The low-level USB interface descriptor. */
|
||||
private final USBInterfaceDescriptor descriptor;
|
||||
private final USB_Interface_Descriptor descriptor;
|
||||
|
||||
|
||||
/**
|
||||
@ -29,7 +29,7 @@ public class UsbInterfaceDescriptorImpl implements UsbInterfaceDescriptor
|
||||
* The low-level USB interface descriptor.
|
||||
*/
|
||||
|
||||
UsbInterfaceDescriptorImpl(final USBInterfaceDescriptor descriptor)
|
||||
UsbInterfaceDescriptorImpl(final USB_Interface_Descriptor descriptor)
|
||||
{
|
||||
this.descriptor = descriptor;
|
||||
}
|
||||
|
||||
@ -16,12 +16,12 @@ import javax.usb.UsbServices;
|
||||
import javax.usb.event.UsbServicesListener;
|
||||
|
||||
import de.ailis.usb4java.jni.USB;
|
||||
import de.ailis.usb4java.jni.USBBus;
|
||||
import de.ailis.usb4java.jni.USBConfigDescriptor;
|
||||
import de.ailis.usb4java.jni.USBDevice;
|
||||
import de.ailis.usb4java.jni.USBDeviceDescriptor;
|
||||
import de.ailis.usb4java.jni.USBInterface;
|
||||
import de.ailis.usb4java.jni.USBInterfaceDescriptor;
|
||||
import de.ailis.usb4java.jni.USB_Bus;
|
||||
import de.ailis.usb4java.jni.USB_Config_Descriptor;
|
||||
import de.ailis.usb4java.jni.USB_Device;
|
||||
import de.ailis.usb4java.jni.USB_Device_Descriptor;
|
||||
import de.ailis.usb4java.jni.USB_Interface;
|
||||
import de.ailis.usb4java.jni.USB_Interface_Descriptor;
|
||||
|
||||
|
||||
/**
|
||||
@ -107,11 +107,11 @@ public class UsbServicesImpl implements UsbServices
|
||||
if (busCount + deviceCount == 0) return;
|
||||
|
||||
// Iterate over all USB busses
|
||||
USBBus bus = USB.usb_get_busses();
|
||||
USB_Bus bus = USB.usb_get_busses();
|
||||
while (bus != null)
|
||||
{
|
||||
// Iterate over all USB devices of current bus
|
||||
USBDevice device = bus.devices();
|
||||
USB_Device device = bus.devices();
|
||||
while (device != null)
|
||||
{
|
||||
if (device.config() != null)
|
||||
@ -133,9 +133,9 @@ public class UsbServicesImpl implements UsbServices
|
||||
* @return The JSR80 USB device.
|
||||
*/
|
||||
|
||||
private UsbDevice createDevice(final USBDevice device)
|
||||
private UsbDevice createDevice(final USB_Device device)
|
||||
{
|
||||
final USBDeviceDescriptor descriptor = device.descriptor();
|
||||
final USB_Device_Descriptor descriptor = device.descriptor();
|
||||
if (descriptor.bDeviceClass() == USB.USB_CLASS_HUB)
|
||||
{
|
||||
return new UsbHubImpl(device);
|
||||
@ -160,7 +160,7 @@ public class UsbServicesImpl implements UsbServices
|
||||
* @return The JSR80 USB configuration.
|
||||
*/
|
||||
|
||||
private UsbConfiguration createConfig(final USBConfigDescriptor config)
|
||||
private UsbConfiguration createConfig(final USB_Config_Descriptor config)
|
||||
{
|
||||
final UsbConfigurationDescriptor descriptor = new UsbConfigurationDescriptorImpl(
|
||||
config);
|
||||
@ -169,10 +169,10 @@ public class UsbServicesImpl implements UsbServices
|
||||
|
||||
for (int i = 0, iMax = config.bNumInterfaces(); i < iMax; i++)
|
||||
{
|
||||
final USBInterface iface = config.interface_()[i];
|
||||
final USB_Interface iface = config.interface_()[i];
|
||||
for (int j = 0, jMax = iface.num_altsetting(); j < jMax; j++)
|
||||
{
|
||||
final USBInterfaceDescriptor ifaceDescriptor = iface
|
||||
final USB_Interface_Descriptor ifaceDescriptor = iface
|
||||
.altsetting()[j];
|
||||
usbConfig.addUsbInterface(createInterface(ifaceDescriptor));
|
||||
}
|
||||
@ -191,7 +191,7 @@ public class UsbServicesImpl implements UsbServices
|
||||
* @return The JSR80 USB interface.
|
||||
*/
|
||||
|
||||
private UsbInterface createInterface(final USBInterfaceDescriptor descriptor)
|
||||
private UsbInterface createInterface(final USB_Interface_Descriptor descriptor)
|
||||
{
|
||||
final UsbInterfaceDescriptor ifaceDescriptor = new UsbInterfaceDescriptorImpl(
|
||||
descriptor);
|
||||
|
||||
@ -7,13 +7,13 @@ package de.ailis.usb4java.jni;
|
||||
|
||||
|
||||
/**
|
||||
* This is the main class of the usb4java JNI wrapper. It wraps the necessary
|
||||
* global functions of libusb 0.x as static methods. Usage is the same as
|
||||
* This is the main class of the usb4java JNI wrapper. It wraps the global
|
||||
* functions of libusb 0.x and defines all the constants. Usage is the same as
|
||||
* documented by libusb.
|
||||
*
|
||||
* You can use these classes to access USB at a low level but it is recommended
|
||||
* to use javax.usb (JSR80) instead which usb4java implements. To do this put
|
||||
* the file javax.usb.resources into the classpath with the following content:
|
||||
* the file javax.usb.resources into the class path with the following content:
|
||||
*
|
||||
* javax.usb.services = de.ailis.usb4java.UsbServicesImpl
|
||||
*
|
||||
@ -52,16 +52,15 @@ public class USB
|
||||
/** USB_CLASS_VENDOR_SPEC constant. */
|
||||
public static final short USB_CLASS_VENDOR_SPEC = 0xff;
|
||||
|
||||
|
||||
static
|
||||
{
|
||||
try
|
||||
{
|
||||
System.loadLibrary("libusb-java");
|
||||
System.loadLibrary("libusb4java");
|
||||
}
|
||||
catch (final UnsatisfiedLinkError e)
|
||||
{
|
||||
System.loadLibrary("usb-java");
|
||||
System.loadLibrary("usb4java");
|
||||
}
|
||||
}
|
||||
|
||||
@ -113,7 +112,7 @@ public class USB
|
||||
* @return The list of USB busses found.
|
||||
*/
|
||||
|
||||
public static native USBBus usb_get_busses();
|
||||
public static native USB_Bus usb_get_busses();
|
||||
|
||||
|
||||
/**
|
||||
@ -128,7 +127,7 @@ public class USB
|
||||
* @return The USB device handle.
|
||||
*/
|
||||
|
||||
public static native USBDevHandle usb_open(USBDevice device);
|
||||
public static native USB_Handle usb_open(USB_Device device);
|
||||
|
||||
|
||||
/**
|
||||
@ -143,7 +142,7 @@ public class USB
|
||||
* @return 0 on success or < 0 on error.
|
||||
*/
|
||||
|
||||
public static native int usb_close(USBDevHandle handle);
|
||||
public static native int usb_close(USB_Handle handle);
|
||||
|
||||
|
||||
/**
|
||||
@ -167,7 +166,7 @@ public class USB
|
||||
* @return The number of bytes read or < 0 on error.
|
||||
*/
|
||||
|
||||
public static native int usb_get_string(USBDevHandle handle,
|
||||
public static native int usb_get_string(USB_Handle handle,
|
||||
int index, int langid, byte[] buffer, int buflen);
|
||||
|
||||
|
||||
@ -190,6 +189,6 @@ public class USB
|
||||
* @return The number of bytes read or < 0 on error.
|
||||
*/
|
||||
|
||||
public static native int usb_get_string_simple(USBDevHandle handle,
|
||||
public static native int usb_get_string_simple(USB_Handle handle,
|
||||
int index, byte[] buffer, int buflen);
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBBus
|
||||
public class USB_Bus
|
||||
{
|
||||
/** Pointer to low-level C structure. */
|
||||
final long pointer;
|
||||
@ -24,7 +24,7 @@ public class USBBus
|
||||
* The low-level C structure pointer.
|
||||
*/
|
||||
|
||||
USBBus(final long pointer)
|
||||
USB_Bus(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -45,7 +45,7 @@ public class USBBus
|
||||
* @return The next USB bus or null if none.
|
||||
*/
|
||||
|
||||
public native USBBus next();
|
||||
public native USB_Bus next();
|
||||
|
||||
|
||||
/**
|
||||
@ -54,7 +54,7 @@ public class USBBus
|
||||
* @return The previous USB bus or null if none.
|
||||
*/
|
||||
|
||||
public native USBBus prev();
|
||||
public native USB_Bus prev();
|
||||
|
||||
|
||||
/**
|
||||
@ -72,7 +72,7 @@ public class USBBus
|
||||
* @return The USB devices or null if none.
|
||||
*/
|
||||
|
||||
public native USBDevice devices();
|
||||
public native USB_Device devices();
|
||||
|
||||
|
||||
/**
|
||||
@ -81,7 +81,7 @@ public class USBBus
|
||||
* @return The USB root device or null if none.
|
||||
*/
|
||||
|
||||
public native USBDevice root_dev();
|
||||
public native USB_Device root_dev();
|
||||
|
||||
|
||||
/**
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBConfigDescriptor
|
||||
public class USB_Config_Descriptor
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,7 +25,7 @@ public class USBConfigDescriptor
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBConfigDescriptor(final long pointer)
|
||||
USB_Config_Descriptor(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -50,5 +50,5 @@ public class USBConfigDescriptor
|
||||
|
||||
public native byte[] extra();
|
||||
|
||||
public native USBInterface[] interface_();
|
||||
public native USB_Interface[] interface_();
|
||||
}
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBDevice
|
||||
public class USB_Device
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,7 +25,7 @@ public class USBDevice
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBDevice(final long pointer)
|
||||
USB_Device(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -46,7 +46,7 @@ public class USBDevice
|
||||
* @return The next USB device or null if none.
|
||||
*/
|
||||
|
||||
public native USBDevice next();
|
||||
public native USB_Device next();
|
||||
|
||||
|
||||
/**
|
||||
@ -55,7 +55,7 @@ public class USBDevice
|
||||
* @return The child devices.
|
||||
*/
|
||||
|
||||
public native USBDevice[] children();
|
||||
public native USB_Device[] children();
|
||||
|
||||
|
||||
/**
|
||||
@ -64,7 +64,7 @@ public class USBDevice
|
||||
* @return The previous USB device or null if none.
|
||||
*/
|
||||
|
||||
public native USBDevice prev();
|
||||
public native USB_Device prev();
|
||||
|
||||
|
||||
/**
|
||||
@ -91,7 +91,7 @@ public class USBDevice
|
||||
* @return The USB bus.
|
||||
*/
|
||||
|
||||
public native USBBus bus();
|
||||
public native USB_Bus bus();
|
||||
|
||||
|
||||
/**
|
||||
@ -100,7 +100,7 @@ public class USBDevice
|
||||
* @return The USB device descriptor.
|
||||
*/
|
||||
|
||||
public native USBDeviceDescriptor descriptor();
|
||||
public native USB_Device_Descriptor descriptor();
|
||||
|
||||
|
||||
/**
|
||||
@ -109,7 +109,7 @@ public class USBDevice
|
||||
* @return The USB config descriptor.
|
||||
*/
|
||||
|
||||
public native USBConfigDescriptor[] config();
|
||||
public native USB_Config_Descriptor[] config();
|
||||
|
||||
|
||||
/**
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBDeviceDescriptor
|
||||
public class USB_Device_Descriptor
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,7 +25,7 @@ public class USBDeviceDescriptor
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBDeviceDescriptor(final long pointer)
|
||||
USB_Device_Descriptor(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBEndpointDescriptor
|
||||
public class USB_Endpoint_Descriptor
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,7 +25,7 @@ public class USBEndpointDescriptor
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBEndpointDescriptor(final long pointer)
|
||||
USB_Endpoint_Descriptor(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBDevHandle
|
||||
public class USB_Handle
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,7 +25,7 @@ public class USBDevHandle
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBDevHandle(final long pointer)
|
||||
USB_Handle(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBInterface
|
||||
public class USB_Interface
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,12 +25,12 @@ public class USBInterface
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBInterface(final long pointer)
|
||||
USB_Interface(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
|
||||
public native USBInterfaceDescriptor[] altsetting();
|
||||
public native USB_Interface_Descriptor[] altsetting();
|
||||
|
||||
public native int num_altsetting();
|
||||
}
|
||||
@ -12,7 +12,7 @@ package de.ailis.usb4java.jni;
|
||||
* @author Klaus Reimer (k@ailis.de)
|
||||
*/
|
||||
|
||||
public class USBInterfaceDescriptor
|
||||
public class USB_Interface_Descriptor
|
||||
{
|
||||
/** The low-level pointer to the C structure. */
|
||||
final long pointer;
|
||||
@ -25,7 +25,7 @@ public class USBInterfaceDescriptor
|
||||
* The low-level pointer to the C structure.
|
||||
*/
|
||||
|
||||
USBInterfaceDescriptor(final long pointer)
|
||||
USB_Interface_Descriptor(final long pointer)
|
||||
{
|
||||
this.pointer = pointer;
|
||||
}
|
||||
@ -48,7 +48,7 @@ public class USBInterfaceDescriptor
|
||||
|
||||
public native byte iInterface();
|
||||
|
||||
public native USBEndpointDescriptor[] endpoint();
|
||||
public native USB_Endpoint_Descriptor[] endpoint();
|
||||
|
||||
public native byte[] extra();
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
package de.ailis.usb4java;
|
||||
|
||||
import de.ailis.usb4java.jni.USB;
|
||||
import de.ailis.usb4java.jni.USBBus;
|
||||
import de.ailis.usb4java.jni.USBConfigDescriptor;
|
||||
import de.ailis.usb4java.jni.USBDevHandle;
|
||||
import de.ailis.usb4java.jni.USBDevice;
|
||||
import de.ailis.usb4java.jni.USBDeviceDescriptor;
|
||||
import de.ailis.usb4java.jni.USBEndpointDescriptor;
|
||||
import de.ailis.usb4java.jni.USBInterface;
|
||||
import de.ailis.usb4java.jni.USBInterfaceDescriptor;
|
||||
import de.ailis.usb4java.jni.USB_Bus;
|
||||
import de.ailis.usb4java.jni.USB_Config_Descriptor;
|
||||
import de.ailis.usb4java.jni.USB_Handle;
|
||||
import de.ailis.usb4java.jni.USB_Device;
|
||||
import de.ailis.usb4java.jni.USB_Device_Descriptor;
|
||||
import de.ailis.usb4java.jni.USB_Endpoint_Descriptor;
|
||||
import de.ailis.usb4java.jni.USB_Interface;
|
||||
import de.ailis.usb4java.jni.USB_Interface_Descriptor;
|
||||
|
||||
|
||||
/**
|
||||
@ -33,7 +33,7 @@ public class Dump
|
||||
for (i = 0; i < level; i++) System.out.format(" ");
|
||||
}
|
||||
|
||||
private static void dump_device_descriptor(final USBDeviceDescriptor descriptor)
|
||||
private static void dump_device_descriptor(final USB_Device_Descriptor descriptor)
|
||||
{
|
||||
indent(); System.out.format("bLength: 0x%02x\n", descriptor.bLength());
|
||||
indent(); System.out.format("bDescriptorType: 0x%02x\n", descriptor.bDescriptorType());
|
||||
@ -51,7 +51,7 @@ public class Dump
|
||||
indent(); System.out.format("bNumConfigurations: 0x%02x\n", descriptor.bNumConfigurations());
|
||||
}
|
||||
|
||||
private static void dump_endpoint_descriptor(final USBEndpointDescriptor descriptor)
|
||||
private static void dump_endpoint_descriptor(final USB_Endpoint_Descriptor descriptor)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -73,7 +73,7 @@ public class Dump
|
||||
level--;
|
||||
}
|
||||
|
||||
private static void dump_interface_descriptor(final USBInterfaceDescriptor descriptor)
|
||||
private static void dump_interface_descriptor(final USB_Interface_Descriptor descriptor)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -101,7 +101,7 @@ public class Dump
|
||||
level--;
|
||||
}
|
||||
|
||||
private static void dump_interface(final USBInterface iface)
|
||||
private static void dump_interface(final USB_Interface iface)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -116,7 +116,7 @@ public class Dump
|
||||
level--;
|
||||
}
|
||||
|
||||
private static void dump_config_descriptor(final USBConfigDescriptor config)
|
||||
private static void dump_config_descriptor(final USB_Config_Descriptor config)
|
||||
{
|
||||
int i;
|
||||
final int max;
|
||||
@ -144,7 +144,7 @@ public class Dump
|
||||
level--;
|
||||
}
|
||||
|
||||
private static void dump_device(final USBDevice device)
|
||||
private static void dump_device(final USB_Device device)
|
||||
{
|
||||
int i;
|
||||
final byte[] buffer = new byte[256];
|
||||
@ -160,7 +160,7 @@ public class Dump
|
||||
dump_device_descriptor(device.descriptor());
|
||||
level--;
|
||||
// Rename me to USBHandle
|
||||
final USBDevHandle handle = USB.usb_open(device);
|
||||
final USB_Handle handle = USB.usb_open(device);
|
||||
i = USB.usb_get_string_simple(handle, device.descriptor().iManufacturer(), buffer, 255);
|
||||
indent(); System.out.format("Manufacturer: %s\n", i > 0 ? buffer : "Unknown");
|
||||
i = USB.usb_get_string_simple(handle, device.descriptor().iProduct(), buffer, 255);
|
||||
@ -210,7 +210,7 @@ public class Dump
|
||||
final int dev_count = USB.usb_find_devices();
|
||||
System.out.format("Found %i devices\n", dev_count);
|
||||
|
||||
USBBus bus = USB.usb_get_busses();
|
||||
USB_Bus bus = USB.usb_get_busses();
|
||||
while (bus != null)
|
||||
{
|
||||
System.out.format("Bus:\n");
|
||||
@ -227,7 +227,7 @@ public class Dump
|
||||
level--;
|
||||
indent(); System.out.format("devices: \n");
|
||||
level++;
|
||||
USBDevice device = bus.devices();
|
||||
USB_Device device = bus.devices();
|
||||
while (device != null)
|
||||
{
|
||||
dump_device(device);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user