Skip to content
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.

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

drivers/mge-hid.c: mge_claim(): test that VendorID==PHOENIXTEC 0x06da… #1357

Merged
merged 2 commits into from Apr 10, 2022

Conversation

jimklimov
Copy link
Member

@jimklimov jimklimov commented Apr 8, 2022

… has also Vendor or Product containing "AEG"

Follows up from investigation for #564 and #560 that we have a conflict for USB Vendor ID 0x06da in the upshid-ups subdrivers. This PR aims to separate the detection in a way that the mge-hid.c would only claim devices whose Vendor or Product strings contain "AEG", and so allow liebert-hid.c to still support the rest of devices with this chip.

This is an opportunistically proposed "logically meaningful" change as I have no such devices to really test against. Looking at existing code, I think that liebert-hid.c got shadowed after commit a08a229 (in 2016) and all devices with this VID were grabbed by mge-hid.c after NUT 2.7.4.

… has also Vendor or Product containing "AEG"
@jimklimov jimklimov added liebert MGE MGE branded devices and (USB) chipsets, now part of Eaton; mostly bcmxcp drivers Phoenixtec (USB 0x06DA/0xFFFF) This USB chip VID/PID is used in many devices, some with different protocols - detection may be hard labels Apr 8, 2022
Copy link
Member

@clepple clepple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but no AEG hardware to test, and unclear when I will be able to rebuild on the box with the MGE UPS.

@jimklimov jimklimov added the ready / gonna merge The PR is in final cycles leading to merge unless someone logs an objection before we hit the button label Apr 9, 2022
@jimklimov jimklimov merged commit de35674 into networkupstools:master Apr 10, 2022
jimklimov added a commit to jimklimov/nut that referenced this pull request Apr 10, 2022
@jimklimov jimklimov deleted the mge-liebert-hid branch August 20, 2022 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
liebert MGE MGE branded devices and (USB) chipsets, now part of Eaton; mostly bcmxcp drivers Phoenixtec (USB 0x06DA/0xFFFF) This USB chip VID/PID is used in many devices, some with different protocols - detection may be hard ready / gonna merge The PR is in final cycles leading to merge unless someone logs an objection before we hit the button
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants