diff --git a/src/main/java/Test.java b/src/main/java/Test.java deleted file mode 100644 index 74e5f52..0000000 --- a/src/main/java/Test.java +++ /dev/null @@ -1,168 +0,0 @@ -import javax.usb.UsbConst; -import javax.usb.UsbDevice; -import javax.usb.UsbDeviceDescriptor; -import javax.usb.UsbHostManager; -import javax.usb.UsbHub; -import javax.usb.UsbPort; -import javax.usb.UsbServices; - -/* - * Copyright (C) 2011 Klaus Reimer - * See LICENSE.txt for licensing information. - */ - - -/** - * Test - * - * @author k - */ - -public class Test -{ - private static int indentLevel = 0; - - public static String indent() - { - final StringBuilder str = new StringBuilder(); - for (int i = 0; i < indentLevel; i++) str.append(" "); - return str.toString(); - } - - public static String getSpeedString(final Object speed) - { - if (speed == UsbConst.DEVICE_SPEED_FULL) - return "Full"; - else if (speed == UsbConst.DEVICE_SPEED_LOW) - return "Low"; - else if (speed == UsbConst.DEVICE_SPEED_UNKNOWN) - return "Unknown"; - else - throw new RuntimeException("Unknown speed object: " + speed); - } - - public static void dumpHub(final UsbHub hub) throws Exception - { - System.out.println(indent() + "Manufacturer: " + hub.getManufacturerString()); - System.out.println(indent() + "Product: " + hub.getProductString()); - System.out.println(indent() + "Serial number: " + hub.getSerialNumberString()); - System.out.println(indent() + "Speed: " + getSpeedString(hub.getSpeed())); - System.out.println(indent() + "Devices: " + hub.getAttachedUsbDevices().size()); - System.exit(1); - - indentLevel++; - for (byte i = 0; i < hub.getAttachedUsbDevices().size(); i++) - { - System.out.println(indent() + "Device " + i + ":"); - indentLevel++; - final UsbDevice device = (UsbDevice) hub.getAttachedUsbDevices().get(i); - dumpDevice(device); - indentLevel--; - } - indentLevel--; - - /* - System.out.println(indent() + "Ports: " + hub.getUsbPorts().size()); - - indentLevel++; - for (byte i = 1; i <= hub.getNumberOfPorts(); i++) - { - System.out.println(indent() + "Port " + i + ":"); - indentLevel++; - final UsbPort port = hub.getUsbPort(i); - dumpPort(port); - indentLevel--; - } - indentLevel--; - */ - } - - public static void dumpPort(final UsbPort port) throws Exception - { - System.out.println(indent() + "Port number: " + port.getPortNumber()); - final UsbDevice device = port.getUsbDevice(); - if (device != null) dumpDevice(device); - } - - public static void dumpDevice(final UsbDevice device) throws Exception - { - System.out.println(indent() + "Configured: " + device.isConfigured()); - System.out.println(indent() + "Is Hub: " + device.isUsbHub()); - if (device.isUsbHub()) - { - // dumpHub((UsbHub) device); - } - else - { - System.out.println(indent() + "Manufacturer: " + device.getManufacturerString()); - System.out.println(indent() + "Product: " + device.getProductString()); - System.out.println(indent() + "Serial number: " + device.getSerialNumberString()); - System.out.println(indent() + "Speed: " + getSpeedString(device.getSpeed())); - } - final UsbDeviceDescriptor descriptor = device.getUsbDeviceDescriptor(); - System.out.println(indent() + "VendorId: " + String.format("%04x", descriptor.idVendor())); - System.out.println(indent() + "ProductId: " + String.format("%04x", descriptor.idProduct())); - } - - public static void main(final String args[]) throws Exception - { - final UsbServices services = UsbHostManager.getUsbServices(); - -// System.out.println("Implementation Description: "); -// System.out.println(services.getImpDescription()); -// System.out.println("Implementation version: " + services.getImpVersion()); -// System.out.println("API version: " + services.getApiVersion()); - final UsbHub rootUsbHub = services.getRootUsbHub(); - if (rootUsbHub != null) - { - System.out.println("Root hub:"); - //indentLevel++; - System.out.println("POrts:" + rootUsbHub.getNumberOfPorts()); - for (final Object item: rootUsbHub.getUsbPorts()) - { - final UsbPort port = (UsbPort) item; - System.out.println(port.getUsbDevice().getSerialNumberString()); - System.out.println(port.getPortNumber()); - } - //dumpHub(rootUsbHub); - //indentLevel--; - } - - /* - services.addUsbServicesListener(new UsbServicesListener() - { - - @Override - public void usbDeviceDetached(final UsbServicesEvent event) - { - try - { - System.out.println("Detached: " +event.getUsbDevice().getProductString()); - } - catch (final Exception e) - { - throw new RuntimeException(e); - } - } - - @Override - public void usbDeviceAttached(final UsbServicesEvent event) - { - try - { - System.out.println("Attached: " +event.getUsbDevice().getProductString()); - } - catch (final Exception e) - { - throw new RuntimeException(e); - } - } - }); - */ - -// while (true) -// { -// Thread.sleep(100); -// } - } -} diff --git a/src/main/java/de/ailis/usb4java/jni/USB.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB.java similarity index 99% rename from src/main/java/de/ailis/usb4java/jni/USB.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB.java index b215f50..a09d309 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Bus.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Bus.java similarity index 97% rename from src/main/java/de/ailis/usb4java/jni/USB_Bus.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Bus.java index 5d85e5c..61ea105 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Bus.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Bus.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java similarity index 96% rename from src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java index 4379329..a7222b0 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Config_Descriptor.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Device.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Device.java similarity index 98% rename from src/main/java/de/ailis/usb4java/jni/USB_Device.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Device.java index 32074bf..e96cb50 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Device.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Device.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java similarity index 97% rename from src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java index 9d8e640..3803732 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Device_Descriptor.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java similarity index 96% rename from src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java index 30681bd..c58c096 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Endpoint_Descriptor.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Handle.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Handle.java similarity index 94% rename from src/main/java/de/ailis/usb4java/jni/USB_Handle.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Handle.java index fa0950d..060b235 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Handle.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Handle.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Interface.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Interface.java similarity index 95% rename from src/main/java/de/ailis/usb4java/jni/USB_Interface.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Interface.java index b961e67..e79d6d4 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Interface.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Interface.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java similarity index 97% rename from src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java rename to usb4java-jni/src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java index 611f797..85a78a2 100644 --- a/src/main/java/de/ailis/usb4java/jni/USB_Interface_Descriptor.java +++ b/usb4java-jni/src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java @@ -3,7 +3,7 @@ * See LICENSE.txt for licensing information. */ -package de.ailis.usb4java.jni; +package de.ailis.usb4java; /** diff --git a/src/test/java/de/ailis/usb4java/Dump.java b/usb4java-jni/src/test/java/de/ailis/usb4java/Dump.java similarity index 95% rename from src/test/java/de/ailis/usb4java/Dump.java rename to usb4java-jni/src/test/java/de/ailis/usb4java/Dump.java index 3c1d3ad..1b73939 100644 --- a/src/test/java/de/ailis/usb4java/Dump.java +++ b/usb4java-jni/src/test/java/de/ailis/usb4java/Dump.java @@ -5,15 +5,6 @@ package de.ailis.usb4java; -import de.ailis.usb4java.jni.USB; -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; /** diff --git a/src/main/resources/javax.usb.properties b/usb4java-jni/src/test/resources/javax.usb.properties similarity index 100% rename from src/main/resources/javax.usb.properties rename to usb4java-jni/src/test/resources/javax.usb.properties diff --git a/usb4java-jsr80/pom.xml b/usb4java-jsr80/pom.xml new file mode 100644 index 0000000..82331a2 --- /dev/null +++ b/usb4java-jsr80/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + + usb4java + de.ailis.usb4java + 1.0.0-SNAPSHOT + + + de.ailis.usb4java + usb4java-jsr80 + jar + usb4java-jsr80 + The usb4java JSR80 implementation. + + + + de.ailis.usb4java + usb4java-jni + + + javax.usb + usb + + + + diff --git a/src/main/java/de/ailis/usb4java/EventListenerList.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/EventListenerList.java similarity index 100% rename from src/main/java/de/ailis/usb4java/EventListenerList.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/EventListenerList.java diff --git a/src/main/java/de/ailis/usb4java/UsbConfigurationDescriptorImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbConfigurationDescriptorImpl.java similarity index 97% rename from src/main/java/de/ailis/usb4java/UsbConfigurationDescriptorImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbConfigurationDescriptorImpl.java index c66eecd..56e547e 100644 --- a/src/main/java/de/ailis/usb4java/UsbConfigurationDescriptorImpl.java +++ b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbConfigurationDescriptorImpl.java @@ -7,8 +7,6 @@ package de.ailis.usb4java; import javax.usb.UsbConfigurationDescriptor; -import de.ailis.usb4java.jni.USB_Config_Descriptor; - /** * UsbConfigurationDescriptor implementation of usb4java. diff --git a/src/main/java/de/ailis/usb4java/UsbConfigurationImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbConfigurationImpl.java similarity index 100% rename from src/main/java/de/ailis/usb4java/UsbConfigurationImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbConfigurationImpl.java diff --git a/src/main/java/de/ailis/usb4java/UsbDeviceImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbDeviceImpl.java similarity index 99% rename from src/main/java/de/ailis/usb4java/UsbDeviceImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbDeviceImpl.java index 4b09a10..511caf7 100644 --- a/src/main/java/de/ailis/usb4java/UsbDeviceImpl.java +++ b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbDeviceImpl.java @@ -20,8 +20,6 @@ import javax.usb.UsbPort; import javax.usb.UsbStringDescriptor; import javax.usb.event.UsbDeviceListener; -import de.ailis.usb4java.jni.USB_Device; - /** * UsbDevice implementation of usb4java. diff --git a/src/main/java/de/ailis/usb4java/UsbHubImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbHubImpl.java similarity index 97% rename from src/main/java/de/ailis/usb4java/UsbHubImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbHubImpl.java index 55cf8ba..658f9b0 100644 --- a/src/main/java/de/ailis/usb4java/UsbHubImpl.java +++ b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbHubImpl.java @@ -11,8 +11,6 @@ import javax.usb.UsbDevice; import javax.usb.UsbHub; import javax.usb.UsbPort; -import de.ailis.usb4java.jni.USB_Device; - /** * UsbHub implementation of usb4java. diff --git a/src/main/java/de/ailis/usb4java/UsbInterfaceDescriptorImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbInterfaceDescriptorImpl.java similarity index 97% rename from src/main/java/de/ailis/usb4java/UsbInterfaceDescriptorImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbInterfaceDescriptorImpl.java index 94e9cca..d290222 100644 --- a/src/main/java/de/ailis/usb4java/UsbInterfaceDescriptorImpl.java +++ b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbInterfaceDescriptorImpl.java @@ -7,8 +7,6 @@ package de.ailis.usb4java; import javax.usb.UsbInterfaceDescriptor; -import de.ailis.usb4java.jni.USB_Interface_Descriptor; - /** * UsbInterfaceDescriptor implementation of usb4java. diff --git a/src/main/java/de/ailis/usb4java/UsbInterfaceImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbInterfaceImpl.java similarity index 100% rename from src/main/java/de/ailis/usb4java/UsbInterfaceImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbInterfaceImpl.java diff --git a/src/main/java/de/ailis/usb4java/UsbServicesImpl.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbServicesImpl.java similarity index 95% rename from src/main/java/de/ailis/usb4java/UsbServicesImpl.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbServicesImpl.java index 18174c5..4b2bef6 100644 --- a/src/main/java/de/ailis/usb4java/UsbServicesImpl.java +++ b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbServicesImpl.java @@ -15,13 +15,6 @@ import javax.usb.UsbInterfaceDescriptor; import javax.usb.UsbServices; import javax.usb.event.UsbServicesListener; -import de.ailis.usb4java.jni.USB; -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; /** diff --git a/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java similarity index 100% rename from src/main/java/de/ailis/usb4java/UsbServicesListenerList.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java diff --git a/src/main/java/de/ailis/usb4java/VirtualRootUsbHub.java b/usb4java-jsr80/src/main/java/de/ailis/usb4java/VirtualRootUsbHub.java similarity index 69% rename from src/main/java/de/ailis/usb4java/VirtualRootUsbHub.java rename to usb4java-jsr80/src/main/java/de/ailis/usb4java/VirtualRootUsbHub.java index a23590b..bfedfe8 100644 --- a/src/main/java/de/ailis/usb4java/VirtualRootUsbHub.java +++ b/usb4java-jsr80/src/main/java/de/ailis/usb4java/VirtualRootUsbHub.java @@ -14,5 +14,16 @@ package de.ailis.usb4java; public class VirtualRootUsbHub extends UsbHubImpl { + + /** + * Constructor + * + * @param device + */ + + public VirtualRootUsbHub() + { + super(null); + } // TODO Implement me } diff --git a/src/main/c/AUTHORS b/usb4java-lib/AUTHORS similarity index 100% rename from src/main/c/AUTHORS rename to usb4java-lib/AUTHORS diff --git a/src/main/c/COPYING b/usb4java-lib/COPYING similarity index 100% rename from src/main/c/COPYING rename to usb4java-lib/COPYING diff --git a/src/main/c/ChangeLog b/usb4java-lib/ChangeLog similarity index 100% rename from src/main/c/ChangeLog rename to usb4java-lib/ChangeLog diff --git a/src/main/c/INSTALL b/usb4java-lib/INSTALL similarity index 100% rename from src/main/c/INSTALL rename to usb4java-lib/INSTALL diff --git a/src/main/c/Makefile.am b/usb4java-lib/Makefile.am similarity index 100% rename from src/main/c/Makefile.am rename to usb4java-lib/Makefile.am diff --git a/src/main/c/Makefile.scm b/usb4java-lib/Makefile.scm similarity index 100% rename from src/main/c/Makefile.scm rename to usb4java-lib/Makefile.scm diff --git a/src/main/c/NEWS b/usb4java-lib/NEWS similarity index 100% rename from src/main/c/NEWS rename to usb4java-lib/NEWS diff --git a/src/main/c/README b/usb4java-lib/README similarity index 100% rename from src/main/c/README rename to usb4java-lib/README diff --git a/src/main/c/acinclude.m4 b/usb4java-lib/acinclude.m4 similarity index 100% rename from src/main/c/acinclude.m4 rename to usb4java-lib/acinclude.m4 diff --git a/src/main/c/configure.ac b/usb4java-lib/configure.ac similarity index 100% rename from src/main/c/configure.ac rename to usb4java-lib/configure.ac diff --git a/src/main/c/src/Makefile.am b/usb4java-lib/src/main/c/Makefile.am similarity index 100% rename from src/main/c/src/Makefile.am rename to usb4java-lib/src/main/c/Makefile.am diff --git a/src/main/c/src/USB.c b/usb4java-lib/src/main/c/USB.c similarity index 98% rename from src/main/c/src/USB.c rename to usb4java-lib/src/main/c/USB.c index b836e13..de27659 100644 --- a/src/main/c/src/USB.c +++ b/usb4java-lib/src/main/c/USB.c @@ -10,14 +10,13 @@ * Native methods for the USB class. * * @author Klaus Reimer - * @version 0.1 */ #include #include -#include "USBBus.h" -#include "USBDevice.h" -#include "USBDevHandle.h" +#include "USB_Bus.h" +#include "USB_Device.h" +#include "USB_Handle.h" /** diff --git a/src/main/c/src/USB_Bus.c b/usb4java-lib/src/main/c/USB_Bus.c similarity index 99% rename from src/main/c/src/USB_Bus.c rename to usb4java-lib/src/main/c/USB_Bus.c index 32a9a87..53327ad 100644 --- a/src/main/c/src/USB_Bus.c +++ b/usb4java-lib/src/main/c/USB_Bus.c @@ -15,7 +15,7 @@ #include #include -#include "USBDevice.h" +#include "USB_Device.h" /** diff --git a/src/main/c/src/USB_Bus.h b/usb4java-lib/src/main/c/USB_Bus.h similarity index 96% rename from src/main/c/src/USB_Bus.h rename to usb4java-lib/src/main/c/USB_Bus.h index 57db4ca..e3b4dd9 100644 --- a/src/main/c/src/USB_Bus.h +++ b/usb4java-lib/src/main/c/USB_Bus.h @@ -7,4 +7,4 @@ extern jobject wrap_usb_bus(JNIEnv *env, struct usb_bus *bus); extern struct usb_bus *unwrap_usb_bus(JNIEnv *env, jobject obj); -#endif \ No newline at end of file +#endif diff --git a/src/main/c/src/USB_Config_Descriptor.c b/usb4java-lib/src/main/c/USB_Config_Descriptor.c similarity index 100% rename from src/main/c/src/USB_Config_Descriptor.c rename to usb4java-lib/src/main/c/USB_Config_Descriptor.c diff --git a/src/main/c/src/USB_Config_Descriptor.h b/usb4java-lib/src/main/c/USB_Config_Descriptor.h similarity index 100% rename from src/main/c/src/USB_Config_Descriptor.h rename to usb4java-lib/src/main/c/USB_Config_Descriptor.h diff --git a/src/main/c/src/USB_Device.c b/usb4java-lib/src/main/c/USB_Device.c similarity index 98% rename from src/main/c/src/USB_Device.c rename to usb4java-lib/src/main/c/USB_Device.c index 48f5308..1f01040 100644 --- a/src/main/c/src/USB_Device.c +++ b/usb4java-lib/src/main/c/USB_Device.c @@ -15,9 +15,9 @@ #include #include -#include "USBBus.h" -#include "USBDeviceDescriptor.h" -#include "USBConfigDescriptor.h" +#include "USB_Bus.h" +#include "USB_Device_Descriptor.h" +#include "USB_Config_Descriptor.h" /** diff --git a/src/main/c/src/USB_Device.h b/usb4java-lib/src/main/c/USB_Device.h similarity index 100% rename from src/main/c/src/USB_Device.h rename to usb4java-lib/src/main/c/USB_Device.h diff --git a/src/main/c/src/USB_Device_Descriptor.c b/usb4java-lib/src/main/c/USB_Device_Descriptor.c similarity index 99% rename from src/main/c/src/USB_Device_Descriptor.c rename to usb4java-lib/src/main/c/USB_Device_Descriptor.c index 9c012d5..b7b0b78 100644 --- a/src/main/c/src/USB_Device_Descriptor.c +++ b/usb4java-lib/src/main/c/USB_Device_Descriptor.c @@ -15,7 +15,7 @@ #include #include -#include "USBBus.h" +#include "USB_Bus.h" /** diff --git a/src/main/c/src/USB_Device_Descriptor.h b/usb4java-lib/src/main/c/USB_Device_Descriptor.h similarity index 100% rename from src/main/c/src/USB_Device_Descriptor.h rename to usb4java-lib/src/main/c/USB_Device_Descriptor.h diff --git a/src/main/c/src/USB_Handle.c b/usb4java-lib/src/main/c/USB_Handle.c similarity index 100% rename from src/main/c/src/USB_Handle.c rename to usb4java-lib/src/main/c/USB_Handle.c diff --git a/src/main/c/src/USB_Handle.h b/usb4java-lib/src/main/c/USB_Handle.h similarity index 100% rename from src/main/c/src/USB_Handle.h rename to usb4java-lib/src/main/c/USB_Handle.h diff --git a/src/test/comparison/Makefile b/usb4java-lib/src/test/c/Makefile similarity index 100% rename from src/test/comparison/Makefile rename to usb4java-lib/src/test/c/Makefile diff --git a/src/test/comparison/dump.c b/usb4java-lib/src/test/c/dump.c similarity index 100% rename from src/test/comparison/dump.c rename to usb4java-lib/src/test/c/dump.c