RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

udev: report hidraw node in debugging messages

This commit is contained in:
Peter F. Patel-Schneider 2024-01-20 11:20:08 -05:00
parent 9b32a1b195
commit 05ec439ec0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hidapi/udev.py
View File

@ -123,7 +123,9 @@ def _match(action, device, filterfn):
return return
except Exception as e: # if can't process report descriptor fall back to old scheme except Exception as e: # if can't process report descriptor fall back to old scheme
hidpp_short = hidpp_long = None hidpp_short = hidpp_long = None
_log.warn('Report Descriptor not processed for BID %s VID %s PID %s: %s', bid, vid, pid, e) _log.warn(
'Report Descriptor not processed for DEVICE %s BID %s VID %s PID %s: %s', device.device_node, bid, vid, pid, e
)
filter = filterfn(int(bid, 16), int(vid, 16), int(pid, 16), hidpp_short, hidpp_long) filter = filterfn(int(bid, 16), int(vid, 16), int(pid, 16), hidpp_short, hidpp_long)
if not filter: if not filter:
@ -147,8 +149,8 @@ def _match(action, device, filterfn):
# print('*** usb interface', action, device, 'usb_interface:', intf_device, usb_interface, interface_number) # print('*** usb interface', action, device, 'usb_interface:', intf_device, usb_interface, interface_number)
if _log.isEnabledFor(_INFO): if _log.isEnabledFor(_INFO):
_log.info( _log.info(
'Found device BID %s VID %s PID %s HID++ %s %s USB %s %s', bid, vid, pid, hidpp_short, hidpp_long, 'Found device %s BID %s VID %s PID %s HID++ %s %s USB %s %s', device.device_node, bid, vid, pid, hidpp_short,
usb_interface, interface_number hidpp_long, usb_interface, interface_number
) )
if not (hidpp_short or hidpp_long or interface_number is None or interface_number == usb_interface): if not (hidpp_short or hidpp_long or interface_number is None or interface_number == usb_interface):
return return
@ -200,7 +202,7 @@ def find_paired_node(receiver_path, index, timeout):
if not receiver_phys: if not receiver_phys:
return None return None
phys = f'{receiver_phys}:{index}' phys = f'{receiver_phys}:{index}' # noqa: E231
timeout += _timestamp() timeout += _timestamp()
delta = _timestamp() delta = _timestamp()
while delta < timeout: while delta < timeout:
@ -221,7 +223,7 @@ def find_paired_node_wpid(receiver_path, index):
if not receiver_phys: if not receiver_phys:
return None return None
phys = f'{receiver_phys}:{index}' phys = f'{receiver_phys}:{index}' # noqa: E231
for dev in context.list_devices(subsystem='hidraw'): for dev in context.list_devices(subsystem='hidraw'):
dev_phys = dev.find_parent('hid').get('HID_PHYS') dev_phys = dev.find_parent('hid').get('HID_PHYS')
if dev_phys and dev_phys == phys: if dev_phys and dev_phys == phys: