diff --git a/libusb4java/pom.xml b/libusb4java/pom.xml deleted file mode 100644 index 0df8ee5..0000000 --- a/libusb4java/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 4.0.0 - - - usb4java-parent - de.ailis.usb4java - 0.1.12-1-SNAPSHOT - - - de.ailis.usb4java - libusb4java - pom - libusb4java - The native JNI library of usb4java - - \ No newline at end of file diff --git a/libusb4java/src/Makefile.am b/libusb4java/src/Makefile.am deleted file mode 100644 index 4840ad7..0000000 --- a/libusb4java/src/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = main diff --git a/libusb4java/src/main/Makefile.am b/libusb4java/src/main/Makefile.am deleted file mode 100644 index 6f20b92..0000000 --- a/libusb4java/src/main/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = c diff --git a/libusb4java/src/test/c/Makefile b/libusb4java/src/test/c/Makefile deleted file mode 100644 index 92c6b8a..0000000 --- a/libusb4java/src/test/c/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -all: dump - -dump: dump.c - gcc -lusb -o dump dump.c - -clean: - rm dump - \ No newline at end of file diff --git a/libusb4java/src/test/c/dump.c b/libusb4java/src/test/c/dump.c deleted file mode 100644 index 988717b..0000000 --- a/libusb4java/src/test/c/dump.c +++ /dev/null @@ -1,213 +0,0 @@ -#include -#include - -int level = 0; - -void indent() -{ - int i; - - for (i = 0; i < level; i++) printf(" "); -} - -void dump_device_descriptor(struct usb_device_descriptor descriptor) -{ - indent(); printf("bLength: 0x%02x\n", descriptor.bLength); - indent(); printf("bDescriptorType: 0x%02x\n", descriptor.bDescriptorType); - indent(); printf("bcdUSB: 0x%04x\n", descriptor.bcdUSB); - indent(); printf("bDeviceClass: 0x%02x\n", descriptor.bDeviceClass); - indent(); printf("bDeviceSubClass: 0x%02x\n", descriptor.bDeviceSubClass); - indent(); printf("bDeviceProtocol: 0x%02x\n", descriptor.bDeviceProtocol); - indent(); printf("bMaxPacketSize0: 0x%02x\n", descriptor.bMaxPacketSize0); - indent(); printf("idVendor: 0x%04x\n", descriptor.idVendor); - indent(); printf("idProduct: 0x%04x\n", descriptor.idProduct); - indent(); printf("bcdDevice: 0x%04x\n", descriptor.bcdDevice); - indent(); printf("iManufacturer: 0x%02x\n", descriptor.iManufacturer); - indent(); printf("iProduct: 0x%02x\n", descriptor.iProduct); - indent(); printf("iSerialNumber: 0x%02x\n", descriptor.iSerialNumber); - indent(); printf("bNumConfigurations: 0x%02x\n", descriptor.bNumConfigurations); -} - -void dump_endpoint_descriptor(struct usb_endpoint_descriptor descriptor) -{ - int i; - - indent(); printf("Endpoint\n"); - level++; - indent(); printf("bLength: 0x%02x\n", descriptor.bLength); - indent(); printf("bDescriptorType: 0x%02x\n", descriptor.bDescriptorType); - indent(); printf("bEndpointAddress: 0x%02x\n", descriptor.bEndpointAddress); - indent(); printf("bmAttributes: 0x%02x\n", descriptor.bmAttributes); - indent(); printf("wMaxPacketSize: 0x%04x\n", descriptor.wMaxPacketSize); - indent(); printf("bInterval: 0x%02x\n", descriptor.bInterval); - indent(); printf("bRefresh: 0x%02x\n", descriptor.bRefresh); - indent(); printf("bSynchAddress: 0x%02x\n", descriptor.bSynchAddress); - indent(); printf("extralen: 0x%08x\n", descriptor.extralen); - indent(); printf("extra:"); - for (i = 0; i < descriptor.extralen; i++) - printf(" %02x", descriptor.extra[i]); - printf("\n"); - level--; -} - -void dump_interface_descriptor(struct usb_interface_descriptor descriptor) -{ - int i; - - indent(); printf("Interface descriptor:\n"); - level++; - indent(); printf("bLength: 0x%02x\n", descriptor.bLength); - indent(); printf("bDescriptorType: 0x%02x\n", descriptor.bDescriptorType); - indent(); printf("bInterfaceNumber: 0x%02x\n", descriptor.bInterfaceNumber); - indent(); printf("bAlternateSetting: 0x%02x\n", descriptor.bAlternateSetting); - indent(); printf("bNumEndpoints: 0x%02x\n", descriptor.bNumEndpoints); - indent(); printf("bInterfaceClass: 0x%02x\n", descriptor.bInterfaceClass); - indent(); printf("bInterfaceSubClass: 0x%02x\n", descriptor.bInterfaceSubClass); - indent(); printf("bInterfaceProtocol: 0x%02x\n", descriptor.bInterfaceProtocol); - indent(); printf("iInterface: 0x%02x\n", descriptor.iInterface); - indent(); printf("extralen: 0x%08x\n", descriptor.extralen); - indent(); printf("extra:"); - for (i = 0; i < descriptor.extralen; i++) - printf(" %02x", descriptor.extra[i]); - printf("\n"); - indent(); printf("Endpoints:\n"); - level++; - for (i = 0; i < descriptor.bNumEndpoints; i++) - dump_endpoint_descriptor(descriptor.endpoint[i]); - level--; - level--; -} - -void dump_interface(struct usb_interface iface) -{ - int i; - - indent(); printf("Interface:\n"); - level++; - indent(); printf("num_altsetting: 0x%08x\n", iface.num_altsetting); - indent(); printf("altsetting:\n"); - level++; - for (i = 0; i < iface.num_altsetting; i++) - dump_interface_descriptor(iface.altsetting[i]); - level--; - level--; -} - -void dump_config_descriptor(struct usb_config_descriptor config) -{ - int i; - - indent(); printf("Config Descriptor:\n"); - level++; - indent(); printf("bLength: 0x%02x\n", config.bLength); - indent(); printf("bDescriptorType: 0x%02x\n", config.bDescriptorType); - indent(); printf("wTotalLength: 0x%04x\n", config.wTotalLength); - indent(); printf("bNumInterfaces: 0x%02x\n", config.bNumInterfaces); - indent(); printf("bConfigurationValue: 0x%02x\n", config.bConfigurationValue); - indent(); printf("iConfiguration: 0x%02x\n", config.iConfiguration); - indent(); printf("bmAttributes: 0x%02x\n", config.bmAttributes); - indent(); printf("MaxPower: 0x%02x\n", config.MaxPower); - indent(); printf("extralen: 0x%08x\n", config.extralen); - indent(); printf("extra:"); - for (i = 0; i < config.extralen; i++) - printf(" %02x", config.extra[i]); - printf("\n"); - indent(); printf("Interfaces:\n"); - level++; - for (i = 0; i < config.bNumInterfaces; i++) - dump_interface(config.interface[i]); - level--; - level--; -} - -void dump_device(struct usb_device *device) -{ - int i; - char buffer[256]; - - indent(); printf("Device:\n"); - level++; - indent(); printf("filename: %s\n", device->filename); - indent(); printf("bus: %s\n", device->bus->dirname); - indent(); printf("devnum: %i\n", device->devnum); - indent(); printf("num_children: %i\n", device->num_children); - indent(); printf("descriptor:\n"); - level++; - dump_device_descriptor(device->descriptor); - level--; - struct usb_dev_handle *handle = usb_open(device); - i = usb_get_string_simple(handle, device->descriptor.iManufacturer, buffer, 255); - indent(); printf("Manufacturer: %s\n", i > 0 ? buffer : "Unknown"); - i = usb_get_string_simple(handle, device->descriptor.iProduct, buffer, 255); - indent(); printf("Product: %s\n", i > 0 ? buffer : "Unknown"); - i = usb_get_string_simple(handle, device->descriptor.iSerialNumber, buffer, 255); - indent(); printf("Serial: %s\n", i > 0 ? buffer : "Unknown"); - usb_close(handle); - indent(); printf("config descriptors:\n"); - level++; - int max = device->descriptor.bNumConfigurations; - if (max == 0) - { - indent(); printf("None\n"); - } - else - { - for (i = 0; i < max; i++) - { - dump_config_descriptor(device->config[i]); - } - } - level--; - indent(); printf("children:\n"); - level++; - if (device->num_children == 0) - { - indent(); printf("None\n"); - } - else - { - for (i = 0; i< device->num_children; i++) - dump_device(device->children[i]); - } - level--; - level--; -} - -int main(int argc, char *argv[]) -{ - usb_init(); - int bus_count = usb_find_busses(); - printf("Found %i busses\n", bus_count); - int dev_count = usb_find_devices(); - printf("Found %i devices\n", dev_count); - - struct usb_bus *bus = usb_get_busses(); - while (bus) - { - printf("Bus:\n"); - level++; - indent(); printf("dirname: %s\n", bus->dirname); - indent(); printf("location: %i\n", bus->location); - indent(); printf("Root device: "); - level++; - if (bus->root_dev) - printf("%s/%s\n", bus->root_dev->bus->dirname, - bus->root_dev->filename); - else - printf("None\n"); - level--; - indent(); printf("devices: \n"); - level++; - struct usb_device *device = bus->devices; - while (device) - { - dump_device(device); - device = device->next; - } - level--; - level--; - - printf("\n"); - bus = bus->next; - } -} diff --git a/pom.xml b/pom.xml index 029eb91..f7214e7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ maven-java de.ailis.maven - 2 + 8 de.ailis.usb4java - usb4java-parent - pom + usb4java + jar usb4java 0.1.12-1-SNAPSHOT http://www.ailis.de/~k/projects/usb4java @@ -51,6 +51,22 @@ scm:hg:ssh://k@ailis.de/hg/java/usb4java + + + + org.apache.maven.plugins + maven-site-plugin + 2.2 + + false + en + ${project.build.sourceEncoding} + ${project.build.sourceEncoding} + + + + + ailis-releases @@ -75,29 +91,12 @@ - - - - de.ailis.usb4java - libusb4java - ${project.version} - - - de.ailis.usb4java - usb4java - ${project.version} - - - junit - junit - 4.8.1 - - - - - - libusb4java - usb4java - - + + + junit + junit + 4.8.1 + + + diff --git a/libusb4java/AUTHORS b/src/main/c/AUTHORS similarity index 100% rename from libusb4java/AUTHORS rename to src/main/c/AUTHORS diff --git a/libusb4java/COPYING b/src/main/c/COPYING similarity index 100% rename from libusb4java/COPYING rename to src/main/c/COPYING diff --git a/libusb4java/ChangeLog b/src/main/c/ChangeLog similarity index 100% rename from libusb4java/ChangeLog rename to src/main/c/ChangeLog diff --git a/libusb4java/Makefile.am b/src/main/c/Makefile.am similarity index 100% rename from libusb4java/Makefile.am rename to src/main/c/Makefile.am diff --git a/libusb4java/Makefile.scm b/src/main/c/Makefile.scm similarity index 100% rename from libusb4java/Makefile.scm rename to src/main/c/Makefile.scm diff --git a/libusb4java/NEWS b/src/main/c/NEWS similarity index 100% rename from libusb4java/NEWS rename to src/main/c/NEWS diff --git a/libusb4java/README b/src/main/c/README similarity index 100% rename from libusb4java/README rename to src/main/c/README diff --git a/libusb4java/acinclude.m4 b/src/main/c/acinclude.m4 similarity index 100% rename from libusb4java/acinclude.m4 rename to src/main/c/acinclude.m4 diff --git a/libusb4java/configure.ac b/src/main/c/configure.ac similarity index 100% rename from libusb4java/configure.ac rename to src/main/c/configure.ac diff --git a/libusb4java/src/main/c/Makefile.am b/src/main/c/src/Makefile.am similarity index 100% rename from libusb4java/src/main/c/Makefile.am rename to src/main/c/src/Makefile.am diff --git a/libusb4java/src/main/c/USB.c b/src/main/c/src/USB.c similarity index 100% rename from libusb4java/src/main/c/USB.c rename to src/main/c/src/USB.c diff --git a/libusb4java/src/main/c/USB_Bus.c b/src/main/c/src/USB_Bus.c similarity index 100% rename from libusb4java/src/main/c/USB_Bus.c rename to src/main/c/src/USB_Bus.c diff --git a/libusb4java/src/main/c/USB_Bus.h b/src/main/c/src/USB_Bus.h similarity index 100% rename from libusb4java/src/main/c/USB_Bus.h rename to src/main/c/src/USB_Bus.h diff --git a/libusb4java/src/main/c/USB_Config_Descriptor.c b/src/main/c/src/USB_Config_Descriptor.c similarity index 100% rename from libusb4java/src/main/c/USB_Config_Descriptor.c rename to src/main/c/src/USB_Config_Descriptor.c diff --git a/libusb4java/src/main/c/USB_Config_Descriptor.h b/src/main/c/src/USB_Config_Descriptor.h similarity index 100% rename from libusb4java/src/main/c/USB_Config_Descriptor.h rename to src/main/c/src/USB_Config_Descriptor.h diff --git a/libusb4java/src/main/c/USB_Dev_Handle.c b/src/main/c/src/USB_Dev_Handle.c similarity index 100% rename from libusb4java/src/main/c/USB_Dev_Handle.c rename to src/main/c/src/USB_Dev_Handle.c diff --git a/libusb4java/src/main/c/USB_Dev_Handle.h b/src/main/c/src/USB_Dev_Handle.h similarity index 100% rename from libusb4java/src/main/c/USB_Dev_Handle.h rename to src/main/c/src/USB_Dev_Handle.h diff --git a/libusb4java/src/main/c/USB_Device.c b/src/main/c/src/USB_Device.c similarity index 100% rename from libusb4java/src/main/c/USB_Device.c rename to src/main/c/src/USB_Device.c diff --git a/libusb4java/src/main/c/USB_Device.h b/src/main/c/src/USB_Device.h similarity index 100% rename from libusb4java/src/main/c/USB_Device.h rename to src/main/c/src/USB_Device.h diff --git a/libusb4java/src/main/c/USB_Device_Descriptor.c b/src/main/c/src/USB_Device_Descriptor.c similarity index 100% rename from libusb4java/src/main/c/USB_Device_Descriptor.c rename to src/main/c/src/USB_Device_Descriptor.c diff --git a/libusb4java/src/main/c/USB_Device_Descriptor.h b/src/main/c/src/USB_Device_Descriptor.h similarity index 100% rename from libusb4java/src/main/c/USB_Device_Descriptor.h rename to src/main/c/src/USB_Device_Descriptor.h diff --git a/libusb4java/src/main/c/USB_Endpoint_Descriptor.c b/src/main/c/src/USB_Endpoint_Descriptor.c similarity index 100% rename from libusb4java/src/main/c/USB_Endpoint_Descriptor.c rename to src/main/c/src/USB_Endpoint_Descriptor.c diff --git a/libusb4java/src/main/c/USB_Endpoint_Descriptor.h b/src/main/c/src/USB_Endpoint_Descriptor.h similarity index 100% rename from libusb4java/src/main/c/USB_Endpoint_Descriptor.h rename to src/main/c/src/USB_Endpoint_Descriptor.h diff --git a/libusb4java/src/main/c/USB_Interface.c b/src/main/c/src/USB_Interface.c similarity index 100% rename from libusb4java/src/main/c/USB_Interface.c rename to src/main/c/src/USB_Interface.c diff --git a/libusb4java/src/main/c/USB_Interface.h b/src/main/c/src/USB_Interface.h similarity index 100% rename from libusb4java/src/main/c/USB_Interface.h rename to src/main/c/src/USB_Interface.h diff --git a/libusb4java/src/main/c/USB_Interface_Descriptor.c b/src/main/c/src/USB_Interface_Descriptor.c similarity index 100% rename from libusb4java/src/main/c/USB_Interface_Descriptor.c rename to src/main/c/src/USB_Interface_Descriptor.c diff --git a/libusb4java/src/main/c/USB_Interface_Descriptor.h b/src/main/c/src/USB_Interface_Descriptor.h similarity index 100% rename from libusb4java/src/main/c/USB_Interface_Descriptor.h rename to src/main/c/src/USB_Interface_Descriptor.h diff --git a/libusb4java/src/main/c/usb4java.h b/src/main/c/src/usb4java.h similarity index 100% rename from libusb4java/src/main/c/usb4java.h rename to src/main/c/src/usb4java.h diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB.java b/src/main/java/de/ailis/usb4java/USB.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB.java rename to src/main/java/de/ailis/usb4java/USB.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Bus.java b/src/main/java/de/ailis/usb4java/USB_Bus.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Bus.java rename to src/main/java/de/ailis/usb4java/USB_Bus.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java b/src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java rename to src/main/java/de/ailis/usb4java/USB_Config_Descriptor.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Descriptor_Header.java b/src/main/java/de/ailis/usb4java/USB_Descriptor_Header.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Descriptor_Header.java rename to src/main/java/de/ailis/usb4java/USB_Descriptor_Header.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Dev_Handle.java b/src/main/java/de/ailis/usb4java/USB_Dev_Handle.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Dev_Handle.java rename to src/main/java/de/ailis/usb4java/USB_Dev_Handle.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Device.java b/src/main/java/de/ailis/usb4java/USB_Device.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Device.java rename to src/main/java/de/ailis/usb4java/USB_Device.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java b/src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java rename to src/main/java/de/ailis/usb4java/USB_Device_Descriptor.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java b/src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java rename to src/main/java/de/ailis/usb4java/USB_Endpoint_Descriptor.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Interface.java b/src/main/java/de/ailis/usb4java/USB_Interface.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Interface.java rename to src/main/java/de/ailis/usb4java/USB_Interface.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java b/src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java rename to src/main/java/de/ailis/usb4java/USB_Interface_Descriptor.java diff --git a/usb4java/src/main/java/de/ailis/usb4java/USB_String_Descriptor.java b/src/main/java/de/ailis/usb4java/USB_String_Descriptor.java similarity index 100% rename from usb4java/src/main/java/de/ailis/usb4java/USB_String_Descriptor.java rename to src/main/java/de/ailis/usb4java/USB_String_Descriptor.java diff --git a/usb4java/src/test/java/de/ailis/usb4java/Dump.java b/src/test/java/de/ailis/usb4java/Dump.java similarity index 100% rename from usb4java/src/test/java/de/ailis/usb4java/Dump.java rename to src/test/java/de/ailis/usb4java/Dump.java diff --git a/usb4java/src/test/resources/javax.usb.properties b/src/test/resources/javax.usb.properties similarity index 100% rename from usb4java/src/test/resources/javax.usb.properties rename to src/test/resources/javax.usb.properties diff --git a/usb4java/pom.xml b/usb4java/pom.xml deleted file mode 100644 index 34963ab..0000000 --- a/usb4java/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 4.0.0 - - - usb4java-parent - de.ailis.usb4java - 0.1.12-1-SNAPSHOT - - - de.ailis.usb4java - usb4java - jar - usb4java - The usb4java library - - \ No newline at end of file