Skip to content

Fix USB discovery on Windows in case there is no USB port #4996

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
wborn merged 2 commits into from
Aug 31, 2025
+37 −6
Merged

Fix USB discovery on Windows in case there is no USB port #4996

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad97c2a
Fix USB discovery on Windows in case there is no USB port
lolodomo Aug 30, 2025
3631403
Copilot suggestion: replace RuntimeException by Win32Exception
lolodomo Aug 31, 2025
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
42 changes: 36 additions & 6 deletions ...b/core/config/discovery/usbserial/windowsregistry/internal/WindowsUsbSerialDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,13 @@ public Set<UsbSerialDeviceInformation> scanAllUsbDevicesInformation() {
}

Set<UsbSerialDeviceInformation> result = new HashSet<>();
String[] deviceKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, USB_REGISTRY_ROOT);
String[] deviceKeys;
try {
deviceKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, USB_REGISTRY_ROOT);
} catch (RuntimeException e) {
Comment thread
lolodomo marked this conversation as resolved.
Outdated
logger.debug("registryGetKeys failed for {}", USB_REGISTRY_ROOT, e);
return result;
}

for (String deviceKey : deviceKeys) {
logger.trace("{}", deviceKey);
Expand Down Expand Up @@ -171,14 +177,26 @@ public Set<UsbSerialDeviceInformation> scanAllUsbDevicesInformation() {
String serialNumber = ids.length > 2 ? ids[2] : null;

String devicePath = USB_REGISTRY_ROOT + BACKSLASH + deviceKey;
String[] interfaceNames = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, devicePath);
String[] interfaceNames;
try {
interfaceNames = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, devicePath);
} catch (RuntimeException e) {
Comment thread
lolodomo marked this conversation as resolved.
Outdated
logger.debug("registryGetKeys failed for {}", devicePath, e);
continue;
}

int interfaceId = 0;
for (String interfaceName : interfaceNames) {
logger.trace(" interfaceId:{}, interfaceName:{}", interfaceId, interfaceName);

String interfacePath = devicePath + BACKSLASH + interfaceName;
TreeMap<String, Object> values = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE, interfacePath);
TreeMap<String, Object> values;
try {
values = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE, interfacePath);
} catch (RuntimeException e) {
Comment thread
lolodomo marked this conversation as resolved.
Outdated
logger.debug("registryGetValues failed for {}", interfacePath, e);
continue;
}

if (logger.isTraceEnabled()) {
for (Entry<String, Object> value : values.entrySet()) {
Expand Down Expand Up @@ -211,15 +229,27 @@ public Set<UsbSerialDeviceInformation> scanAllUsbDevicesInformation() {
}

String serialPort = "";
String[] interfaceSubKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, interfacePath);
String[] interfaceSubKeys;
try {
interfaceSubKeys = Advapi32Util.registryGetKeys(HKEY_LOCAL_MACHINE, interfacePath);
} catch (RuntimeException e) {
Comment thread
lolodomo marked this conversation as resolved.
Outdated
logger.debug("registryGetKeys failed for {}", interfacePath, e);
continue;
}

for (String interfaceSubKey : interfaceSubKeys) {
if (!KEY_DEVICE_PARAMETERS.equals(interfaceSubKey)) {
continue;
}
String deviceParametersPath = interfacePath + BACKSLASH + interfaceSubKey;
TreeMap<String, Object> deviceParameterValues = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE,
deviceParametersPath);
TreeMap<String, Object> deviceParameterValues;
try {
deviceParameterValues = Advapi32Util.registryGetValues(HKEY_LOCAL_MACHINE,
deviceParametersPath);
} catch (RuntimeException e) {
Comment thread
lolodomo marked this conversation as resolved.
Outdated
logger.debug("registryGetValues failed for {}", deviceParametersPath, e);
continue;
}
Object serialPortValue = deviceParameterValues.get(KEY_SERIAL_PORT);
if (serialPortValue instanceof String serialPortString) {
serialPort = serialPortString;
Expand Down