Skip to content

fix(ctr2): scan only the known CTR2 VID:PIDs, not the whole HID bus (#6580) #6583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NF0T merged 1 commit into from
Oct 19, 2026
Merged

fix(ctr2): scan only the known CTR2 VID:PIDs, not the whole HID bus (#6580) #6583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions src/core/Ctr2HidapiPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,33 @@ QList<Ctr2HidPort::DeviceInfo> Ctr2HidapiPort::enumerate()
if (!ensureHidInit()) {
return out;
}
hid_device_info* list = hid_enumerate(0, 0);
for (hid_device_info* d = list; d; d = d->next) {
if (d->usage_page != kUsagePage || d->usage != kUsage) {
continue;
// Ask only for the known VID:PID pairs: hid_enumerate(0, 0) makes the
// Windows backend request strings and descriptors from every HID device
// on the machine, a GUI-thread stall on each rescan (#6256 has the detail).
QList<std::pair<quint16, quint16>> ids;
for (const Ctr2HidPort::KnownCtr2& known : Ctr2HidPort::knownCtr2Devices()) {
const std::pair<quint16, quint16> id{known.vendorId, known.productId};
if (!ids.contains(id)) {
ids.append(id);
}
Ctr2HidPort::DeviceInfo info;
info.path = QString::fromUtf8(d->path);
info.vendorId = d->vendor_id;
info.productId = d->product_id;
info.manufacturer = fromWide(d->manufacturer_string);
info.product = fromWide(d->product_string);
info.serial = fromWide(d->serial_number);
out.append(info);
}
hid_free_enumeration(list);
for (const auto& [vendorId, productId] : std::as_const(ids)) {
hid_device_info* list = hid_enumerate(vendorId, productId);
for (hid_device_info* d = list; d; d = d->next) {
if (d->usage_page != kUsagePage || d->usage != kUsage) {
continue;
}
Ctr2HidPort::DeviceInfo info;
info.path = QString::fromUtf8(d->path);
info.vendorId = d->vendor_id;
info.productId = d->product_id;
info.manufacturer = fromWide(d->manufacturer_string);
info.product = fromWide(d->product_string);
info.serial = fromWide(d->serial_number);
out.append(info);
}
hid_free_enumeration(list);
}
std::stable_sort(out.begin(), out.end(),
[](const Ctr2HidPort::DeviceInfo& a, const Ctr2HidPort::DeviceInfo& b) {
return !a.ctr2Model().isEmpty() && b.ctr2Model().isEmpty();
Expand Down
Loading