salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make libusbp build, at least on Linux; port fluxengineusb to use it.

Browse Source
This commit is contained in:
David Given
2021-12-12 16:29:51 +01:00
parent b6dbe26c7e
commit 08615a5954
8 changed files with 192 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/usb/usbfinder.cc
View File

@@ -4,52 +4,38 @@
#include "bytes.h"
#include "fmt/format.h"
#include "usbfinder.h"
#include <libusb.h>
#include "libusbp.hpp"
static const std::string get_serial_number(libusb_device* device, libusb_device_descriptor* desc)
static const std::string get_serial_number(const libusbp::device& device)
{
std::string serial;
libusb_device_handle* handle;
if (libusb_open(device, &handle) == 0)
try
{
unsigned char buffer[64];
libusb_get_string_descriptor_ascii(handle, desc->iSerialNumber, buffer, sizeof(buffer));
serial = (const char*) buffer;
libusb_close(handle);
return device.get_serial_number();
}
catch (const libusbp::error& e)
{
if (e.has_code(LIBUSBP_ERROR_NO_SERIAL_NUMBER))
return "n/a";
throw;
}
return serial;
}
std::vector<std::unique_ptr<CandidateDevice>> findUsbDevices(uint32_t candidateId)
{
int i = libusb_init(NULL);
if (i < 0)
Error() << "could not start libusb: " << libusb_strerror((libusb_error) i);
libusb_device** devices;
int numdevices = libusb_get_device_list(NULL, &devices);
if (numdevices < 0)
Error() << "could not enumerate USB bus: " << libusb_strerror((libusb_error) numdevices);
std::vector<std::unique_ptr<CandidateDevice>> candidates;
for (int i=0; i<numdevices; i++)
for (const auto& it : libusbp::list_connected_devices())
{
std::unique_ptr<CandidateDevice> candidate(new CandidateDevice());
candidate->device = devices[i];
(void) libusb_get_device_descriptor(candidate->device, &candidate->desc);
auto candidate = std::make_unique<CandidateDevice>();
candidate->device = it;
uint32_t id = (candidate->desc.idVendor << 16) | candidate->desc.idProduct;
uint32_t id = (it.get_vendor_id() << 16) | it.get_product_id();
if (id == candidateId)
{
libusb_ref_device(candidate->device);
candidate->id = candidateId;
candidate->serial = get_serial_number(candidate->device, &candidate->desc);
candidate->serial = get_serial_number(it);
candidates.push_back(std::move(candidate));
}
}
libusb_free_device_list(devices, true);
return candidates;
}