x6500: Provide manuf/product/serial to cgpu interface

driver-x6500.c

@@ -138,6 +138,7 @@ static bool x6500_foundusb(libusb_device *dev, const char *product, const char *
 	x6500->name = strdup(product);
 	x6500->cutofftemp = 85;
 	x6500->device_data = dev;
+	cgpu_copy_libusb_strings(x6500, dev);
 
 	return add_cgpu(x6500);
 }

fpgautils.c

@@ -24,6 +24,10 @@
 #include <dirent.h>
 #include <string.h>
 
+#ifdef HAVE_LIBUSB
+#include <libusb.h>
+#endif
+
 #include "miner.h"
 
 #ifndef WIN32
@@ -629,6 +633,27 @@ struct device_drv *bfg_claim_usb(struct device_drv * const api, const bool verbo
 	return bfg_claim_any(api, desc, &dev);
 }
 
+#ifdef HAVE_LIBUSB
+void cgpu_copy_libusb_strings(struct cgpu_info *cgpu, libusb_device *usb)
+{
+	unsigned char buf[0x20];
+	libusb_device_handle *h;
+	struct libusb_device_descriptor desc;
+	
+	if (LIBUSB_SUCCESS != libusb_open(usb, &h))
+		return;
+	if (libusb_get_device_descriptor(usb, &desc))
+		return;
+	
+	if ((!cgpu->dev_manufacturer) && libusb_get_string_descriptor_ascii(h, desc.iManufacturer, buf, sizeof(buf)) >= 0)
+		cgpu->dev_manufacturer = strdup((void *)buf);
+	if ((!cgpu->dev_product) && libusb_get_string_descriptor_ascii(h, desc.iProduct, buf, sizeof(buf)) >= 0)
+		cgpu->dev_product = strdup((void *)buf);
+	if ((!cgpu->dev_serial) && libusb_get_string_descriptor_ascii(h, desc.iSerialNumber, buf, sizeof(buf)) >= 0)
+		cgpu->dev_serial = strdup((void *)buf);
+}
+#endif
+
 // This code is purely for debugging but is very useful for that
 // It also took quite a bit of effort so I left it in
 // #define TERMIOS_DEBUG 1

fpgautils.h

@@ -6,6 +6,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifdef HAVE_LIBUSB
+#include <libusb.h>
+#endif
+
 struct device_drv;
 struct cgpu_info;
 
@@ -45,6 +49,10 @@ extern struct device_drv *bfg_claim_serial(struct device_drv * const, const bool
 extern struct device_drv *bfg_claim_usb(struct device_drv * const, const bool verbose, const uint8_t usbbus, const uint8_t usbaddr);
 #define bfg_claim_libusb(api, verbose, dev)  bfg_claim_usb(api, verbose, libusb_get_bus_number(dev), libusb_get_device_address(dev))
 
+#ifdef HAVE_LIBUSB
+extern void cgpu_copy_libusb_strings(struct cgpu_info *, libusb_device *);
+#endif
+
 extern int serial_open(const char *devpath, unsigned long baud, uint8_t timeout, bool purge);
 extern ssize_t _serial_read(int fd, char *buf, size_t buflen, char *eol);
 #define serial_read(fd, buf, count)  \