summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-02-23 17:05:27 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-02-23 17:05:27 +0100
commitf68fadda81d0e107d904a08db30bd8cccbbd1a21 (patch)
treefeee3828db9fa660802467bf36e7a63813647bba
parent3192a72a465d6e5051ab77a43e75716bb641441c (diff)
downloadtdelibs-f68fadda81d0e107d904a08db30bd8cccbbd1a21.tar.gz
tdelibs-f68fadda81d0e107d904a08db30bd8cccbbd1a21.zip
tdehwlib: Add event device classification according to the provided switches.
This will resolve event device detection on special hardware, for example, the LID switch on Pinebook Pro. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index cde5e3bcb..b700ac3ab 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -3501,13 +3501,19 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
if (device->type() == TDEGenericDeviceType::Event) {
// Try to obtain as much type information about this event device as possible
TDEEventDevice* edevice = dynamic_cast<TDEEventDevice*>(device);
- if (edevice->systemPath().contains("PNP0C0D")) {
+ TDESwitchType::TDESwitchType edevice_switches = edevice->providedSwitches();
+ if (edevice->systemPath().contains("PNP0C0D")
+ || (edevice_switches & TDESwitchType::Lid)) {
edevice->internalSetEventType(TDEEventDeviceType::ACPILidSwitch);
}
- else if (edevice->systemPath().contains("PNP0C0E") || edevice->systemPath().contains("/LNXSLPBN")) {
+ else if (edevice->systemPath().contains("PNP0C0E")
+ || edevice->systemPath().contains("/LNXSLPBN")
+ || (edevice_switches & TDESwitchType::SleepButton)) {
edevice->internalSetEventType(TDEEventDeviceType::ACPISleepButton);
}
- else if (edevice->systemPath().contains("PNP0C0C") || edevice->systemPath().contains("/LNXPWRBN")) {
+ else if (edevice->systemPath().contains("PNP0C0C")
+ || edevice->systemPath().contains("/LNXPWRBN")
+ || (edevice_switches & TDESwitchType::PowerButton)) {
edevice->internalSetEventType(TDEEventDeviceType::ACPIPowerButton);
}
else if (edevice->systemPath().contains("_acpi")) {