Split into org.libusb4java and org.usb4java in Java source code.
This commit is contained in:
parent
50d4de5f5e
commit
2a02a95d28
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A generic representation of a BOS Device Capability descriptor.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
@ -25,7 +25,7 @@ import javax.usb.UsbConfigurationDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB configuration descriptor.
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the Container ID descriptor.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Structure representing a libusb session. The concept of individual libusb
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
import org.libusb4java.utils.BufferUtils;
|
||||
|
||||
/**
|
||||
* Setup packet for control transfers.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Structure representing a USB device detected on the system.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
@ -25,8 +25,8 @@ import javax.usb.UsbDeviceDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.BufferUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB device descriptor.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Structure representing a handle on a USB device.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
@ -25,7 +25,7 @@ import javax.usb.UsbEndpointDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB endpoint descriptor.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Hotplug callback..
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Hotplug Callback Handle.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
@ -25,7 +25,7 @@ import javax.usb.UsbInterfaceDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB interface descriptor.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Isochronous packet descriptor.
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.io.FileDescriptor;
|
||||
import java.nio.ByteBuffer;
|
||||
@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentMap;
|
||||
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
import org.libusb4java.utils.BufferUtils;
|
||||
|
||||
/**
|
||||
* Static class providing the constants and functions of libusb.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import javax.usb.UsbException;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Thrown when JNI library could not be loaded.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.io.FileDescriptor;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
/**
|
||||
* Asynchronous transfer callback.
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* Copyright 2012-2013 Toby Gray <toby.gray@realvnc.com>
|
||||
*/
|
||||
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
import org.apache.commons.lang3.builder.CompareToBuilder;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
|
||||
@ -6,5 +6,5 @@
|
||||
/**
|
||||
* Low-Level classes based on the native libusb library.
|
||||
*/
|
||||
package org.usb4java.libusb;
|
||||
package org.libusb4java;
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.utils;
|
||||
package org.libusb4java.utils;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.utils;
|
||||
package org.libusb4java.utils;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.HashMap;
|
||||
@ -14,7 +14,7 @@ import javax.usb.UsbDeviceDescriptor;
|
||||
import javax.usb.UsbEndpointDescriptor;
|
||||
import javax.usb.UsbInterfaceDescriptor;
|
||||
|
||||
import org.usb4java.libusb.LibUsb;
|
||||
import org.libusb4java.LibUsb;
|
||||
|
||||
/**
|
||||
* Utility methods used for descriptor dumps.
|
||||
|
||||
@ -6,4 +6,4 @@
|
||||
/**
|
||||
* Utility classes providing static helper methods.
|
||||
*/
|
||||
package org.usb4java.utils;
|
||||
package org.libusb4java.utils;
|
||||
|
||||
@ -28,11 +28,11 @@ import javax.usb.event.UsbDeviceListener;
|
||||
import javax.usb.util.DefaultUsbControlIrp;
|
||||
|
||||
import org.usb4java.descriptors.SimpleUsbStringDescriptor;
|
||||
import org.usb4java.libusb.ConfigDescriptor;
|
||||
import org.usb4java.libusb.Device;
|
||||
import org.usb4java.libusb.DeviceHandle;
|
||||
import org.usb4java.libusb.LibUsb;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.ConfigDescriptor;
|
||||
import org.libusb4java.Device;
|
||||
import org.libusb4java.DeviceHandle;
|
||||
import org.libusb4java.LibUsb;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
/**
|
||||
* A Usb device.
|
||||
|
||||
@ -14,9 +14,9 @@ import javax.usb.UsbException;
|
||||
import javax.usb.UsbIrp;
|
||||
import javax.usb.UsbShortPacketException;
|
||||
|
||||
import org.usb4java.libusb.DeviceHandle;
|
||||
import org.usb4java.libusb.LibUsb;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.DeviceHandle;
|
||||
import org.libusb4java.LibUsb;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -18,10 +18,10 @@ import javax.usb.UsbDisconnectedException;
|
||||
import javax.usb.UsbException;
|
||||
|
||||
import org.usb4java.descriptors.SimpleUsbConfigurationDescriptor;
|
||||
import org.usb4java.libusb.ConfigDescriptor;
|
||||
import org.usb4java.libusb.InterfaceDescriptor;
|
||||
import org.usb4java.libusb.LibUsb;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.ConfigDescriptor;
|
||||
import org.libusb4java.InterfaceDescriptor;
|
||||
import org.libusb4java.LibUsb;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
/**
|
||||
* usb4java implementation of JSR-80 UsbConfiguration.
|
||||
@ -60,7 +60,7 @@ final class Configuration implements UsbConfiguration
|
||||
{
|
||||
this.device = device;
|
||||
this.descriptor = new SimpleUsbConfigurationDescriptor(descriptor);
|
||||
for (org.usb4java.libusb.Interface iface: descriptor.iface())
|
||||
for (org.libusb4java.Interface iface: descriptor.iface())
|
||||
{
|
||||
for (InterfaceDescriptor ifaceDescriptor: iface.altsetting())
|
||||
{
|
||||
|
||||
@ -15,12 +15,12 @@ import javax.usb.UsbException;
|
||||
import javax.usb.UsbHub;
|
||||
|
||||
import org.usb4java.descriptors.SimpleUsbDeviceDescriptor;
|
||||
import org.usb4java.libusb.Context;
|
||||
import org.usb4java.libusb.Device;
|
||||
import org.usb4java.libusb.DeviceDescriptor;
|
||||
import org.usb4java.libusb.DeviceList;
|
||||
import org.usb4java.libusb.LibUsb;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.Context;
|
||||
import org.libusb4java.Device;
|
||||
import org.libusb4java.DeviceDescriptor;
|
||||
import org.libusb4java.DeviceList;
|
||||
import org.libusb4java.LibUsb;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
/**
|
||||
* Manages the USB devices.
|
||||
|
||||
@ -11,7 +11,7 @@ import javax.usb.UsbEndpointDescriptor;
|
||||
import javax.usb.UsbPipe;
|
||||
|
||||
import org.usb4java.descriptors.SimpleUsbEndpointDescriptor;
|
||||
import org.usb4java.libusb.EndpointDescriptor;
|
||||
import org.libusb4java.EndpointDescriptor;
|
||||
|
||||
/**
|
||||
* usb4java implementation of UsbEndpoint.
|
||||
|
||||
@ -9,8 +9,8 @@ import java.util.List;
|
||||
|
||||
import javax.usb.UsbHub;
|
||||
|
||||
import org.usb4java.libusb.Device;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.Device;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
/**
|
||||
* usb4java implementation of JSR-80 UsbHub.
|
||||
|
||||
@ -20,8 +20,8 @@ import javax.usb.UsbInterfacePolicy;
|
||||
import javax.usb.UsbNotActiveException;
|
||||
|
||||
import org.usb4java.descriptors.SimpleUsbInterfaceDescriptor;
|
||||
import org.usb4java.libusb.EndpointDescriptor;
|
||||
import org.usb4java.libusb.InterfaceDescriptor;
|
||||
import org.libusb4java.EndpointDescriptor;
|
||||
import org.libusb4java.InterfaceDescriptor;
|
||||
|
||||
/**
|
||||
* usb4java implementation of UsbInterface.
|
||||
|
||||
@ -16,9 +16,9 @@ import javax.usb.UsbException;
|
||||
import javax.usb.UsbIrp;
|
||||
import javax.usb.UsbShortPacketException;
|
||||
|
||||
import org.usb4java.libusb.DeviceHandle;
|
||||
import org.usb4java.libusb.LibUsb;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.DeviceHandle;
|
||||
import org.libusb4java.LibUsb;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
/**
|
||||
* A queue for USB I/O request packets.
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
package org.usb4java;
|
||||
|
||||
import org.usb4java.libusb.Device;
|
||||
import org.usb4java.libusb.LibUsbException;
|
||||
import org.libusb4java.Device;
|
||||
import org.libusb4java.LibUsbException;
|
||||
|
||||
/**
|
||||
* A non-hub USB device.
|
||||
|
||||
@ -13,8 +13,8 @@ import javax.usb.UsbServices;
|
||||
import javax.usb.event.UsbServicesEvent;
|
||||
import javax.usb.event.UsbServicesListener;
|
||||
|
||||
import org.usb4java.libusb.Loader;
|
||||
import org.usb4java.libusb.LoaderException;
|
||||
import org.libusb4java.Loader;
|
||||
import org.libusb4java.LoaderException;
|
||||
|
||||
/**
|
||||
* usb4java implementation of JSR-80 UsbServices.
|
||||
|
||||
@ -10,7 +10,7 @@ import javax.usb.UsbConfigurationDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* Simple USB configuration descriptor.
|
||||
|
||||
@ -10,7 +10,7 @@ import javax.usb.UsbDeviceDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* Simple USB device descriptor.
|
||||
|
||||
@ -10,7 +10,7 @@ import javax.usb.UsbEndpointDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* Simple USB endpoint descriptor.
|
||||
|
||||
@ -10,7 +10,7 @@ import javax.usb.UsbInterfaceDescriptor;
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
import org.libusb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* Simple USB interface descriptor.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user