examples: reformat testlibusb.c
authorLudovic Rousseau <ludovic.rousseau@free.fr>
Wed, 12 Jul 2017 14:54:44 +0000 (16:54 +0200)
committerLudovic Rousseau <ludovic.rousseau@free.fr>
Wed, 12 Jul 2017 15:10:55 +0000 (17:10 +0200)
convert from DOS to Unix text format
remove extra spaces at end of line

examples/testlibusb.c
libusb/version_nano.h

index b7068c9..df5bb84 100755 (executable)
-/*\r
-* Test suite program based of libusb-0.1-compat testlibusb\r
-* Copyright (c) 2013 Nathan Hjelm <hjelmn@mac.ccom>\r
-*\r
-* This library is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU Lesser General Public\r
-* License as published by the Free Software Foundation; either\r
-* version 2.1 of the License, or (at your option) any later version.\r
-*\r
-* This library is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-* Lesser General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU Lesser General Public\r
-* License along with this library; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\r
-*/\r
-\r
-#include <stdio.h>\r
-#include <string.h>\r
-#include "libusb.h"\r
-\r
-int verbose = 0;\r
-\r
-static void print_endpoint_comp(const struct libusb_ss_endpoint_companion_descriptor *ep_comp)\r
-{\r
-       printf("      USB 3.0 Endpoint Companion:\n");\r
-       printf("        bMaxBurst:        %d\n", ep_comp->bMaxBurst);\r
-       printf("        bmAttributes:     0x%02x\n", ep_comp->bmAttributes);\r
-       printf("        wBytesPerInterval: %d\n", ep_comp->wBytesPerInterval);\r
-}\r
-\r
-static void print_endpoint(const struct libusb_endpoint_descriptor *endpoint)\r
-{\r
-       int i, ret;\r
-\r
-       printf("      Endpoint:\n");\r
-       printf("        bEndpointAddress: %02xh\n", endpoint->bEndpointAddress);\r
-       printf("        bmAttributes:     %02xh\n", endpoint->bmAttributes);\r
-       printf("        wMaxPacketSize:   %d\n", endpoint->wMaxPacketSize);\r
-       printf("        bInterval:        %d\n", endpoint->bInterval);\r
-       printf("        bRefresh:         %d\n", endpoint->bRefresh);\r
-       printf("        bSynchAddress:    %d\n", endpoint->bSynchAddress);\r
-\r
-       for (i = 0; i < endpoint->extra_length;) {\r
-               if (LIBUSB_DT_SS_ENDPOINT_COMPANION == endpoint->extra[i + 1]) {\r
-                       struct libusb_ss_endpoint_companion_descriptor *ep_comp;\r
-\r
-                       ret = libusb_get_ss_endpoint_companion_descriptor(NULL, endpoint, &ep_comp);\r
-                       if (LIBUSB_SUCCESS != ret) {\r
-                               continue;\r
-                       }\r
-\r
-                       print_endpoint_comp(ep_comp);\r
-\r
-                       libusb_free_ss_endpoint_companion_descriptor(ep_comp);\r
-               }\r
-\r
-               i += endpoint->extra[i];\r
-       }\r
-}\r
-\r
-static void print_altsetting(const struct libusb_interface_descriptor *interface)\r
-{\r
-       int i;\r
-\r
-       printf("    Interface:\n");\r
-       printf("      bInterfaceNumber:   %d\n", interface->bInterfaceNumber);\r
-       printf("      bAlternateSetting:  %d\n", interface->bAlternateSetting);\r
-       printf("      bNumEndpoints:      %d\n", interface->bNumEndpoints);\r
-       printf("      bInterfaceClass:    %d\n", interface->bInterfaceClass);\r
-       printf("      bInterfaceSubClass: %d\n", interface->bInterfaceSubClass);\r
-       printf("      bInterfaceProtocol: %d\n", interface->bInterfaceProtocol);\r
-       printf("      iInterface:         %d\n", interface->iInterface);\r
-\r
-       for (i = 0; i < interface->bNumEndpoints; i++)\r
-               print_endpoint(&interface->endpoint[i]);\r
-}\r
-\r
-static void print_2_0_ext_cap(struct libusb_usb_2_0_extension_descriptor *usb_2_0_ext_cap)\r
-{\r
-       printf("    USB 2.0 Extension Capabilities:\n");\r
-       printf("      bDevCapabilityType: %d\n", usb_2_0_ext_cap->bDevCapabilityType);\r
-       printf("      bmAttributes:       0x%x\n", usb_2_0_ext_cap->bmAttributes);\r
-}\r
-\r
-static void print_ss_usb_cap(struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap)\r
-{\r
-       printf("    USB 3.0 Capabilities:\n");\r
-       printf("      bDevCapabilityType: %d\n", ss_usb_cap->bDevCapabilityType);\r
-       printf("      bmAttributes:       0x%x\n", ss_usb_cap->bmAttributes);\r
-       printf("      wSpeedSupported:    0x%x\n", ss_usb_cap->wSpeedSupported);\r
-       printf("      bFunctionalitySupport: %d\n", ss_usb_cap->bFunctionalitySupport);\r
-       printf("      bU1devExitLat:      %d\n", ss_usb_cap->bU1DevExitLat);\r
-       printf("      bU2devExitLat:      %d\n", ss_usb_cap->bU2DevExitLat);\r
-}\r
-\r
-static void print_bos(libusb_device_handle *handle)\r
-{\r
-       struct libusb_bos_descriptor *bos;\r
-       int ret;\r
-\r
-       ret = libusb_get_bos_descriptor(handle, &bos);\r
-       if (0 > ret) {\r
-               return;\r
-       }\r
-       \r
-       printf("  Binary Object Store (BOS):\n");\r
-       printf("    wTotalLength:       %d\n", bos->wTotalLength);\r
-       printf("    bNumDeviceCaps:     %d\n", bos->bNumDeviceCaps);\r
-               \r
-       if(bos->dev_capability[0]->bDevCapabilityType == LIBUSB_BT_USB_2_0_EXTENSION) {\r
-       \r
-               struct libusb_usb_2_0_extension_descriptor *usb_2_0_extension;\r
-               ret =  libusb_get_usb_2_0_extension_descriptor(NULL, bos->dev_capability[0],&usb_2_0_extension);\r
-               if (0 > ret) {\r
-                       return;\r
-               }\r
-               \r
-                print_2_0_ext_cap(usb_2_0_extension);\r
-                libusb_free_usb_2_0_extension_descriptor(usb_2_0_extension);\r
-        }\r
-       \r
-       if(bos->dev_capability[0]->bDevCapabilityType == LIBUSB_BT_SS_USB_DEVICE_CAPABILITY) {\r
-       \r
-               struct libusb_ss_usb_device_capability_descriptor *dev_cap;\r
-               ret = libusb_get_ss_usb_device_capability_descriptor(NULL, bos->dev_capability[0],&dev_cap);\r
-               if (0 > ret) {\r
-                       return;\r
-               }\r
-               \r
-               print_ss_usb_cap(dev_cap);\r
-               libusb_free_ss_usb_device_capability_descriptor(dev_cap);\r
-        }\r
-        \r
-       libusb_free_bos_descriptor(bos);\r
-}\r
-\r
-static void print_interface(const struct libusb_interface *interface)\r
-{\r
-       int i;\r
-\r
-       for (i = 0; i < interface->num_altsetting; i++)\r
-               print_altsetting(&interface->altsetting[i]);\r
-}\r
-\r
-static void print_configuration(struct libusb_config_descriptor *config)\r
-{\r
-       int i;\r
-\r
-       printf("  Configuration:\n");\r
-       printf("    wTotalLength:         %d\n", config->wTotalLength);\r
-       printf("    bNumInterfaces:       %d\n", config->bNumInterfaces);\r
-       printf("    bConfigurationValue:  %d\n", config->bConfigurationValue);\r
-       printf("    iConfiguration:       %d\n", config->iConfiguration);\r
-       printf("    bmAttributes:         %02xh\n", config->bmAttributes);\r
-       printf("    MaxPower:             %d\n", config->MaxPower);\r
-\r
-       for (i = 0; i < config->bNumInterfaces; i++)\r
-               print_interface(&config->interface[i]);\r
-}\r
-\r
-static int print_device(libusb_device *dev, int level)\r
-{\r
-       struct libusb_device_descriptor desc;\r
-       libusb_device_handle *handle = NULL;\r
-       char description[256];\r
-       char string[256];\r
-       int ret, i;\r
-\r
-       ret = libusb_get_device_descriptor(dev, &desc);\r
-       if (ret < 0) {\r
-               fprintf(stderr, "failed to get device descriptor");\r
-               return -1;\r
-       }\r
-\r
-       ret = libusb_open(dev, &handle);\r
-       if (LIBUSB_SUCCESS == ret) {\r
-               if (desc.iManufacturer) {\r
-                       ret = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer, string, sizeof(string));\r
-                       if (ret > 0)\r
-                               snprintf(description, sizeof(description), "%s - ", string);\r
-                       else\r
-                               snprintf(description, sizeof(description), "%04X - ",\r
-                               desc.idVendor);\r
-               }\r
-               else\r
-                       snprintf(description, sizeof(description), "%04X - ",\r
-                       desc.idVendor);\r
-\r
-               if (desc.iProduct) {\r
-                       ret = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string, sizeof(string));\r
-                       if (ret > 0)\r
-                               snprintf(description + strlen(description), sizeof(description) -\r
-                               strlen(description), "%s", string);\r
-                       else\r
-                               snprintf(description + strlen(description), sizeof(description) -\r
-                               strlen(description), "%04X", desc.idProduct);\r
-               }\r
-               else\r
-                       snprintf(description + strlen(description), sizeof(description) -\r
-                       strlen(description), "%04X", desc.idProduct);\r
-       }\r
-       else {\r
-               snprintf(description, sizeof(description), "%04X - %04X",\r
-                       desc.idVendor, desc.idProduct);\r
-       }\r
-\r
-       printf("%.*sDev (bus %d, device %d): %s\n", level * 2, "                    ",\r
-               libusb_get_bus_number(dev), libusb_get_device_address(dev), description);\r
-\r
-       if (handle && verbose) {\r
-               if (desc.iSerialNumber) {\r
-                       ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, string, sizeof(string));\r
-                       if (ret > 0)\r
-                               printf("%.*s  - Serial Number: %s\n", level * 2,\r
-                               "                    ", string);\r
-               }\r
-       }\r
-\r
-       if (verbose) {\r
-               for (i = 0; i < desc.bNumConfigurations; i++) {\r
-                       struct libusb_config_descriptor *config;\r
-                       ret = libusb_get_config_descriptor(dev, i, &config);\r
-                       if (LIBUSB_SUCCESS != ret) {\r
-                               printf("  Couldn't retrieve descriptors\n");\r
-                               continue;\r
-                       }\r
-\r
-                       print_configuration(config);\r
-\r
-                       libusb_free_config_descriptor(config);\r
-               }\r
-\r
-                \r
-               if (handle && desc.bcdUSB >= 0x0201) {\r
-                       print_bos(handle);\r
-               }\r
-       }\r
-\r
-       if (handle)\r
-               libusb_close(handle);\r
-\r
-       return 0;\r
-}\r
-\r
-int main(int argc, char *argv[])\r
-{\r
-       libusb_device **devs;\r
-       ssize_t cnt;\r
-       int r, i;\r
-\r
-       if (argc > 1 && !strcmp(argv[1], "-v"))\r
-               verbose = 1;\r
-\r
-       r = libusb_init(NULL);\r
-       if (r < 0)\r
-               return r;\r
-\r
-       cnt = libusb_get_device_list(NULL, &devs);\r
-       if (cnt < 0)\r
-               return (int)cnt;\r
-\r
-       for (i = 0; devs[i]; ++i) {\r
-               print_device(devs[i], 0);\r
-       }\r
-\r
-       libusb_free_device_list(devs, 1);\r
-\r
-       libusb_exit(NULL);\r
-       return 0;\r
-}\r
+/*
+* Test suite program based of libusb-0.1-compat testlibusb
+* Copyright (c) 2013 Nathan Hjelm <hjelmn@mac.ccom>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "libusb.h"
+
+int verbose = 0;
+
+static void print_endpoint_comp(const struct libusb_ss_endpoint_companion_descriptor *ep_comp)
+{
+       printf("      USB 3.0 Endpoint Companion:\n");
+       printf("        bMaxBurst:        %d\n", ep_comp->bMaxBurst);
+       printf("        bmAttributes:     0x%02x\n", ep_comp->bmAttributes);
+       printf("        wBytesPerInterval: %d\n", ep_comp->wBytesPerInterval);
+}
+
+static void print_endpoint(const struct libusb_endpoint_descriptor *endpoint)
+{
+       int i, ret;
+
+       printf("      Endpoint:\n");
+       printf("        bEndpointAddress: %02xh\n", endpoint->bEndpointAddress);
+       printf("        bmAttributes:     %02xh\n", endpoint->bmAttributes);
+       printf("        wMaxPacketSize:   %d\n", endpoint->wMaxPacketSize);
+       printf("        bInterval:        %d\n", endpoint->bInterval);
+       printf("        bRefresh:         %d\n", endpoint->bRefresh);
+       printf("        bSynchAddress:    %d\n", endpoint->bSynchAddress);
+
+       for (i = 0; i < endpoint->extra_length;) {
+               if (LIBUSB_DT_SS_ENDPOINT_COMPANION == endpoint->extra[i + 1]) {
+                       struct libusb_ss_endpoint_companion_descriptor *ep_comp;
+
+                       ret = libusb_get_ss_endpoint_companion_descriptor(NULL, endpoint, &ep_comp);
+                       if (LIBUSB_SUCCESS != ret) {
+                               continue;
+                       }
+
+                       print_endpoint_comp(ep_comp);
+
+                       libusb_free_ss_endpoint_companion_descriptor(ep_comp);
+               }
+
+               i += endpoint->extra[i];
+       }
+}
+
+static void print_altsetting(const struct libusb_interface_descriptor *interface)
+{
+       int i;
+
+       printf("    Interface:\n");
+       printf("      bInterfaceNumber:   %d\n", interface->bInterfaceNumber);
+       printf("      bAlternateSetting:  %d\n", interface->bAlternateSetting);
+       printf("      bNumEndpoints:      %d\n", interface->bNumEndpoints);
+       printf("      bInterfaceClass:    %d\n", interface->bInterfaceClass);
+       printf("      bInterfaceSubClass: %d\n", interface->bInterfaceSubClass);
+       printf("      bInterfaceProtocol: %d\n", interface->bInterfaceProtocol);
+       printf("      iInterface:         %d\n", interface->iInterface);
+
+       for (i = 0; i < interface->bNumEndpoints; i++)
+               print_endpoint(&interface->endpoint[i]);
+}
+
+static void print_2_0_ext_cap(struct libusb_usb_2_0_extension_descriptor *usb_2_0_ext_cap)
+{
+       printf("    USB 2.0 Extension Capabilities:\n");
+       printf("      bDevCapabilityType: %d\n", usb_2_0_ext_cap->bDevCapabilityType);
+       printf("      bmAttributes:       0x%x\n", usb_2_0_ext_cap->bmAttributes);
+}
+
+static void print_ss_usb_cap(struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap)
+{
+       printf("    USB 3.0 Capabilities:\n");
+       printf("      bDevCapabilityType: %d\n", ss_usb_cap->bDevCapabilityType);
+       printf("      bmAttributes:       0x%x\n", ss_usb_cap->bmAttributes);
+       printf("      wSpeedSupported:    0x%x\n", ss_usb_cap->wSpeedSupported);
+       printf("      bFunctionalitySupport: %d\n", ss_usb_cap->bFunctionalitySupport);
+       printf("      bU1devExitLat:      %d\n", ss_usb_cap->bU1DevExitLat);
+       printf("      bU2devExitLat:      %d\n", ss_usb_cap->bU2DevExitLat);
+}
+
+static void print_bos(libusb_device_handle *handle)
+{
+       struct libusb_bos_descriptor *bos;
+       int ret;
+
+       ret = libusb_get_bos_descriptor(handle, &bos);
+       if (0 > ret) {
+               return;
+       }
+
+       printf("  Binary Object Store (BOS):\n");
+       printf("    wTotalLength:       %d\n", bos->wTotalLength);
+       printf("    bNumDeviceCaps:     %d\n", bos->bNumDeviceCaps);
+
+       if(bos->dev_capability[0]->bDevCapabilityType == LIBUSB_BT_USB_2_0_EXTENSION) {
+
+               struct libusb_usb_2_0_extension_descriptor *usb_2_0_extension;
+               ret =  libusb_get_usb_2_0_extension_descriptor(NULL, bos->dev_capability[0],&usb_2_0_extension);
+               if (0 > ret) {
+                       return;
+               }
+
+                print_2_0_ext_cap(usb_2_0_extension);
+                libusb_free_usb_2_0_extension_descriptor(usb_2_0_extension);
+        }
+
+       if(bos->dev_capability[0]->bDevCapabilityType == LIBUSB_BT_SS_USB_DEVICE_CAPABILITY) {
+
+               struct libusb_ss_usb_device_capability_descriptor *dev_cap;
+               ret = libusb_get_ss_usb_device_capability_descriptor(NULL, bos->dev_capability[0],&dev_cap);
+               if (0 > ret) {
+                       return;
+               }
+
+               print_ss_usb_cap(dev_cap);
+               libusb_free_ss_usb_device_capability_descriptor(dev_cap);
+        }
+
+       libusb_free_bos_descriptor(bos);
+}
+
+static void print_interface(const struct libusb_interface *interface)
+{
+       int i;
+
+       for (i = 0; i < interface->num_altsetting; i++)
+               print_altsetting(&interface->altsetting[i]);
+}
+
+static void print_configuration(struct libusb_config_descriptor *config)
+{
+       int i;
+
+       printf("  Configuration:\n");
+       printf("    wTotalLength:         %d\n", config->wTotalLength);
+       printf("    bNumInterfaces:       %d\n", config->bNumInterfaces);
+       printf("    bConfigurationValue:  %d\n", config->bConfigurationValue);
+       printf("    iConfiguration:       %d\n", config->iConfiguration);
+       printf("    bmAttributes:         %02xh\n", config->bmAttributes);
+       printf("    MaxPower:             %d\n", config->MaxPower);
+
+       for (i = 0; i < config->bNumInterfaces; i++)
+               print_interface(&config->interface[i]);
+}
+
+static int print_device(libusb_device *dev, int level)
+{
+       struct libusb_device_descriptor desc;
+       libusb_device_handle *handle = NULL;
+       char description[256];
+       char string[256];
+       int ret, i;
+
+       ret = libusb_get_device_descriptor(dev, &desc);
+       if (ret < 0) {
+               fprintf(stderr, "failed to get device descriptor");
+               return -1;
+       }
+
+       ret = libusb_open(dev, &handle);
+       if (LIBUSB_SUCCESS == ret) {
+               if (desc.iManufacturer) {
+                       ret = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer, string, sizeof(string));
+                       if (ret > 0)
+                               snprintf(description, sizeof(description), "%s - ", string);
+                       else
+                               snprintf(description, sizeof(description), "%04X - ",
+                               desc.idVendor);
+               }
+               else
+                       snprintf(description, sizeof(description), "%04X - ",
+                       desc.idVendor);
+
+               if (desc.iProduct) {
+                       ret = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string, sizeof(string));
+                       if (ret > 0)
+                               snprintf(description + strlen(description), sizeof(description) -
+                               strlen(description), "%s", string);
+                       else
+                               snprintf(description + strlen(description), sizeof(description) -
+                               strlen(description), "%04X", desc.idProduct);
+               }
+               else
+                       snprintf(description + strlen(description), sizeof(description) -
+                       strlen(description), "%04X", desc.idProduct);
+       }
+       else {
+               snprintf(description, sizeof(description), "%04X - %04X",
+                       desc.idVendor, desc.idProduct);
+       }
+
+       printf("%.*sDev (bus %d, device %d): %s\n", level * 2, "                    ",
+               libusb_get_bus_number(dev), libusb_get_device_address(dev), description);
+
+       if (handle && verbose) {
+               if (desc.iSerialNumber) {
+                       ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, string, sizeof(string));
+                       if (ret > 0)
+                               printf("%.*s  - Serial Number: %s\n", level * 2,
+                               "                    ", string);
+               }
+       }
+
+       if (verbose) {
+               for (i = 0; i < desc.bNumConfigurations; i++) {
+                       struct libusb_config_descriptor *config;
+                       ret = libusb_get_config_descriptor(dev, i, &config);
+                       if (LIBUSB_SUCCESS != ret) {
+                               printf("  Couldn't retrieve descriptors\n");
+                               continue;
+                       }
+
+                       print_configuration(config);
+
+                       libusb_free_config_descriptor(config);
+               }
+
+               if (handle && desc.bcdUSB >= 0x0201) {
+                       print_bos(handle);
+               }
+       }
+
+       if (handle)
+               libusb_close(handle);
+
+       return 0;
+}
+
+int main(int argc, char *argv[])
+{
+       libusb_device **devs;
+       ssize_t cnt;
+       int r, i;
+
+       if (argc > 1 && !strcmp(argv[1], "-v"))
+               verbose = 1;
+
+       r = libusb_init(NULL);
+       if (r < 0)
+               return r;
+
+       cnt = libusb_get_device_list(NULL, &devs);
+       if (cnt < 0)
+               return (int)cnt;
+
+       for (i = 0; devs[i]; ++i) {
+               print_device(devs[i], 0);
+       }
+
+       libusb_free_device_list(devs, 1);
+
+       libusb_exit(NULL);
+       return 0;
+}
index 1862589..e245291 100644 (file)
@@ -1 +1 @@
-#define LIBUSB_NANO 11208
+#define LIBUSB_NANO 11209