Don't define names ending with _t (POSIX reserved).

[libsigrok.git] / hardware / common / usb.c

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index 8d4224d1e35545579e5ab5c7c6b2c5b94f99defb..62db385b273015dda825d44ddb25ff829f21a6d4 100644 (file)
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -29,10 +29,6 @@
 #define CONN_USB_VIDPID  "^([0-9a-z]{4})\\.([0-9a-z]{4})$"
 #define CONN_USB_BUSADDR "^(\\d+)\\.(\\d+)$"
 
-/* Some USBTMC-specific enums, as defined in the USBTMC standard. */
-#define SUBCLASS_USBTMC 0x03
-#define USBTMC_USB488   0x01
-
 #define LOG_PREFIX "usb"
 
 /**
@@ -135,63 +131,6 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
        return devices;
 }
 
-/**
- * Find USB devices supporting the USBTMC class
- *
- * @param usb_ctx libusb context to use while scanning.
- *
- * @return A GSList of struct sr_usb_dev_inst, with bus and address fields
- * indicating devices with USBTMC support.
- */
-SR_PRIV GSList *sr_usb_find_usbtmc(libusb_context *usb_ctx)
-{
-       struct sr_usb_dev_inst *usb;
-       struct libusb_device **devlist;
-       struct libusb_device_descriptor des;
-       struct libusb_config_descriptor *confdes;
-       const struct libusb_interface_descriptor *intfdes;
-       GSList *devices;
-       int confidx, intfidx, ret, i;
-
-       devices = NULL;
-       libusb_get_device_list(usb_ctx, &devlist);
-       for (i = 0; devlist[i]; i++) {
-               if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
-                       sr_err("Failed to get device descriptor: %s.",
-                              libusb_error_name(ret));
-                       continue;
-               }
-
-               for (confidx = 0; confidx < des.bNumConfigurations; confidx++) {
-                       if (libusb_get_config_descriptor(devlist[i], confidx, &confdes) != 0) {
-                               sr_err("Failed to get configuration descriptor.");
-                               break;
-                       }
-                       for (intfidx = 0; intfidx < confdes->bNumInterfaces; intfidx++) {
-                               intfdes = confdes->interface[intfidx].altsetting;
-                               if (intfdes->bInterfaceClass != LIBUSB_CLASS_APPLICATION
-                                               || intfdes->bInterfaceSubClass != SUBCLASS_USBTMC
-                                               || intfdes->bInterfaceProtocol != USBTMC_USB488)
-                                       continue;
-                               sr_dbg("Found USBTMC device (VID:PID = %04x:%04x, bus.address = "
-                                          "%d.%d).", des.idVendor, des.idProduct,
-                                          libusb_get_bus_number(devlist[i]),
-                                          libusb_get_device_address(devlist[i]));
-
-                               usb = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
-                                               libusb_get_device_address(devlist[i]), NULL);
-                               devices = g_slist_append(devices, usb);
-                       }
-                       libusb_free_config_descriptor(confdes);
-               }
-       }
-       libusb_free_device_list(devlist, 1);
-
-       sr_dbg("Found %d device(s).", g_slist_length(devices));
-
-       return devices;
-}
-
 SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb)
 {
        struct libusb_device **devlist;
@@ -271,7 +210,7 @@ static int usb_callback(int fd, int revents, void *cb_data)
 #endif
 
 SR_PRIV int usb_source_add(struct sr_context *ctx, int timeout,
-               sr_receive_data_callback_t cb, void *cb_data)
+               sr_receive_data_callback cb, void *cb_data)
 {
        if (ctx->usb_source_present) {
                sr_err("A USB event source is already present.");