rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Changed the project name according to the new naming convention

Browse Source 
- Changed package names according to the new naming convention


git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@277 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
uniederer
2012-03-16 12:17:47 +00:00
parent 8b297fd01e
commit 5ef50110e7
43 changed files with 362 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/.configure
View File

@@ -1,6 +1,6 @@
# enable or disable logging
ch.ntb.usb/debug = true
ch.ntb.inf.libusbJava/debug = true
# set and configure individual loggers here
# the format is: projectName/debug/<loggerX> = <logger name>/<log level>
ch.ntb.usb/debug/logger0 = ch.ntb.usb/OFF
ch.ntb.usb/debug/logger1 = ch.ntb.usb.test/INFO
ch.ntb.inf.libusbJava/debug/logger0 = ch.ntb.inf.libusbJava/OFF
ch.ntb.inf.libusbJava/debug/logger1 = ch.ntb.inf.libusbJava.test/INFO

10
java/src/ch/ntb/usb/Device.java → java/src/ch/ntb/inf/libusbJava/Device.java
View File

@@ -5,12 +5,12 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
import java.util.logging.Level;
import java.util.logging.Logger;
import ch.ntb.usb.logger.LogUtil;
import ch.ntb.inf.libusbJava.logger.LogUtil;
/**
* This class represents an USB device.<br>
@@ -19,7 +19,7 @@ import ch.ntb.usb.logger.LogUtil;
*/
public class Device {
private static final Logger logger = LogUtil.getLogger("ch.ntb.usb");
private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava");
private int maxPacketSize;
@@ -545,11 +545,11 @@ public class Device {
*
* @param requestType
* USB device request type (USB specification 9.3,
* bmRequestType). Use constants from {@link ch.ntb.usb.USB}
* bmRequestType). Use constants from {@link ch.ntb.inf.libusbJava.USB}
* (REQ_TYPE_xxx).
* @param request
* specific request (USB specification 9.4, bRequest). Use
* constants from {@link ch.ntb.usb.USB} (REQ_xxx).
* constants from {@link ch.ntb.inf.libusbJava.USB} (REQ_xxx).
* @param value
* field that varies according to request (USB specification 9.4,
* wValue)

2
java/src/ch/ntb/usb/LibusbJava.java → java/src/ch/ntb/inf/libusbJava/LibusbJava.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* This class represents the Java Native Interface to the shared library which

34
java/src/ch/ntb/usb/USB.java → java/src/ch/ntb/inf/libusbJava/USB.java
View File

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

2
java/src/ch/ntb/usb/USBException.java → java/src/ch/ntb/inf/libusbJava/USBException.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
import java.io.IOException;

2
java/src/ch/ntb/usb/USBTimeoutException.java → java/src/ch/ntb/inf/libusbJava/USBTimeoutException.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
public class USBTimeoutException extends USBException {

2
java/src/ch/ntb/usb/Usb_Bus.java → java/src/ch/ntb/inf/libusbJava/Usb_Bus.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents an USB bus.<br>

6
java/src/ch/ntb/usb/Usb_Config_Descriptor.java → java/src/ch/ntb/inf/libusbJava/Usb_Config_Descriptor.java
View File

@@ -5,15 +5,15 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents the descriptor of a USB configuration.<br>
* A USB device can have several different configuration.<br>
* <br>
* The length of the configuration descriptor is
* {@link ch.ntb.usb.Usb_Descriptor#USB_DT_CONFIG_SIZE} and the type is
* {@link ch.ntb.usb.Usb_Descriptor#USB_DT_CONFIG}.
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_CONFIG_SIZE} and the type is
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_CONFIG}.
*
*/
public class Usb_Config_Descriptor extends Usb_Descriptor {

2
java/src/ch/ntb/usb/Usb_Descriptor.java → java/src/ch/ntb/inf/libusbJava/Usb_Descriptor.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Common USB descriptor values.<br>

2
java/src/ch/ntb/usb/Usb_Device.java → java/src/ch/ntb/inf/libusbJava/Usb_Device.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents an USB device.<br>

6
java/src/ch/ntb/usb/Usb_Device_Descriptor.java → java/src/ch/ntb/inf/libusbJava/Usb_Device_Descriptor.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents the descriptor of a USB device.<br>
@@ -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.usb.Usb_Descriptor#USB_DT_DEVICE_SIZE} and the type is
* {@link ch.ntb.usb.Usb_Descriptor#USB_DT_DEVICE}.
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_DEVICE_SIZE} and the type is
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_DEVICE}.
*
*/
public class Usb_Device_Descriptor extends Usb_Descriptor {

6
java/src/ch/ntb/usb/Usb_Endpoint_Descriptor.java → java/src/ch/ntb/inf/libusbJava/Usb_Endpoint_Descriptor.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents the descriptor of an USB endpoint.<br>
@@ -16,8 +16,8 @@ package ch.ntb.usb;
* the bus.<br>
* <br>
* The length of the configuration descriptor is
* {@link ch.ntb.usb.Usb_Descriptor#USB_DT_ENDPOINT_SIZE} and the type is
* {@link ch.ntb.usb.Usb_Descriptor#USB_DT_ENDPOINT}.
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_ENDPOINT_SIZE} and the type is
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_ENDPOINT}.
*
*/
public class Usb_Endpoint_Descriptor extends Usb_Descriptor {

2
java/src/ch/ntb/usb/Usb_Interface.java → java/src/ch/ntb/inf/libusbJava/Usb_Interface.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents an USB interface.<br>

6
java/src/ch/ntb/usb/Usb_Interface_Descriptor.java → java/src/ch/ntb/inf/libusbJava/Usb_Interface_Descriptor.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
/**
* Represents the descriptor of a USB interface.<br>
@@ -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.usb.Usb_Descriptor#USB_DT_INTERFACE_SIZE} and the type is
* {@link ch.ntb.usb.Usb_Descriptor#USB_DT_INTERFACE}.
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_INTERFACE_SIZE} and the type is
* {@link ch.ntb.inf.libusbJava.Usb_Descriptor#USB_DT_INTERFACE}.
*
*/
public class Usb_Interface_Descriptor extends Usb_Descriptor {

2
java/src/ch/ntb/usb/Utils.java → java/src/ch/ntb/inf/libusbJava/Utils.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb;
package ch.ntb.inf.libusbJava;
import java.io.PrintStream;

4
java/src/ch/ntb/usb/logger/LogUtil.java → java/src/ch/ntb/inf/libusbJava/logger/LogUtil.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb.logger;
package ch.ntb.inf.libusbJava.logger;
import java.io.InputStream;
import java.util.Properties;
@@ -20,7 +20,7 @@ public class LogUtil {
// debug this class
private static final boolean debugLogUtil = false;
private static final String PLUGIN_ID = "ch.ntb.usb";
private static final String PLUGIN_ID = "ch.ntb.inf.libusbJava";
private static final String PROPERTIES_FILE = ".configure";
private static final String LOGGER_WARNING = "Warning in class "
+ LogUtil.class.getName()

0
java/src/ch/ntb/usb/logger/package.html → java/src/ch/ntb/inf/libusbJava/logger/package.html
View File

0
java/src/ch/ntb/usb/package.html → java/src/ch/ntb/inf/libusbJava/package.html
View File

2
java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java → java/src/ch/ntb/inf/libusbJava/testApp/AbstractDeviceInfo.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb.testApp;
package ch.ntb.inf.libusbJava.testApp;
public abstract class AbstractDeviceInfo {

2
java/src/ch/ntb/usb/testApp/TestApp.java → java/src/ch/ntb/inf/libusbJava/testApp/TestApp.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb.testApp;
package ch.ntb.inf.libusbJava.testApp;
import java.awt.BorderLayout;
import java.awt.Color;

12
java/src/ch/ntb/usb/testApp/TestDevice.java → java/src/ch/ntb/inf/libusbJava/testApp/TestDevice.java
View File

@@ -5,20 +5,20 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb.testApp;
package ch.ntb.inf.libusbJava.testApp;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
import ch.ntb.usb.Device;
import ch.ntb.usb.USB;
import ch.ntb.usb.USBException;
import ch.ntb.usb.logger.LogUtil;
import ch.ntb.inf.libusbJava.Device;
import ch.ntb.inf.libusbJava.USB;
import ch.ntb.inf.libusbJava.USBException;
import ch.ntb.inf.libusbJava.logger.LogUtil;
public class TestDevice extends AbstractDeviceInfo {
private static final Logger logger = LogUtil.getLogger("ch.ntb.usb.test");
private static final Logger logger = LogUtil.getLogger("ch.ntb.inf.libusbJava.test");
private String sendData = "0x5b 0x02 0x01 0x00 0x03 0x03 0xf0 0xf0 0x1f";

0
java/src/ch/ntb/usb/testApp/package.html → java/src/ch/ntb/inf/libusbJava/testApp/package.html
View File

18
java/src/ch/ntb/usb/usbView/UsbTreeModel.java → java/src/ch/ntb/inf/libusbJava/usbView/UsbTreeModel.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb.usbView;
package ch.ntb.inf.libusbJava.usbView;
import java.util.Vector;
@@ -18,14 +18,14 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import ch.ntb.usb.LibusbJava;
import ch.ntb.usb.Usb_Bus;
import ch.ntb.usb.Usb_Config_Descriptor;
import ch.ntb.usb.Usb_Device;
import ch.ntb.usb.Usb_Device_Descriptor;
import ch.ntb.usb.Usb_Endpoint_Descriptor;
import ch.ntb.usb.Usb_Interface;
import ch.ntb.usb.Usb_Interface_Descriptor;
import ch.ntb.inf.libusbJava.LibusbJava;
import ch.ntb.inf.libusbJava.Usb_Bus;
import ch.ntb.inf.libusbJava.Usb_Config_Descriptor;
import ch.ntb.inf.libusbJava.Usb_Device;
import ch.ntb.inf.libusbJava.Usb_Device_Descriptor;
import ch.ntb.inf.libusbJava.Usb_Endpoint_Descriptor;
import ch.ntb.inf.libusbJava.Usb_Interface;
import ch.ntb.inf.libusbJava.Usb_Interface_Descriptor;
public class UsbTreeModel implements TreeModel, TreeSelectionListener {

22
java/src/ch/ntb/usb/usbView/UsbView.java → java/src/ch/ntb/inf/libusbJava/usbView/UsbView.java
View File

@@ -5,7 +5,7 @@
* http://libusbjava.sourceforge.net
* This library is covered by the LGPL, read LGPL.txt for details.
*/
package ch.ntb.usb.usbView;
package ch.ntb.inf.libusbJava.usbView;
import java.awt.BorderLayout;
import java.awt.Component;
@@ -28,16 +28,16 @@ import javax.swing.JTree;
import javax.swing.KeyStroke;
import javax.swing.tree.TreePath;
import ch.ntb.usb.LibusbJava;
import ch.ntb.usb.Usb_Bus;
import ch.ntb.usb.Usb_Config_Descriptor;
import ch.ntb.usb.Usb_Device;
import ch.ntb.usb.Usb_Device_Descriptor;
import ch.ntb.usb.Usb_Endpoint_Descriptor;
import ch.ntb.usb.Usb_Interface_Descriptor;
import ch.ntb.usb.testApp.TestApp;
import ch.ntb.usb.testApp.TestDevice;
import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode;
import ch.ntb.inf.libusbJava.LibusbJava;
import ch.ntb.inf.libusbJava.Usb_Bus;
import ch.ntb.inf.libusbJava.Usb_Config_Descriptor;
import ch.ntb.inf.libusbJava.Usb_Device;
import ch.ntb.inf.libusbJava.Usb_Device_Descriptor;
import ch.ntb.inf.libusbJava.Usb_Endpoint_Descriptor;
import ch.ntb.inf.libusbJava.Usb_Interface_Descriptor;
import ch.ntb.inf.libusbJava.testApp.TestApp;
import ch.ntb.inf.libusbJava.testApp.TestDevice;
import ch.ntb.inf.libusbJava.testApp.AbstractDeviceInfo.TransferMode;
public class UsbView extends JFrame {

0
java/src/ch/ntb/usb/usbView/package.html → java/src/ch/ntb/inf/libusbJava/usbView/package.html
View File