tdecore/tdehw: disable SW_RADIO switch if it's the same as SW_RFKILL_ALL

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
pull/124/head
Alexander Golubev 4 years ago committed by Slávek Banko
parent d25548e1fa
commit ce09b7d5e8

@ -120,9 +120,11 @@ void TDEEventDevice::internalReadProvidedSwitches() {
if (BIT_IS_SET(switches, SW_RFKILL_ALL)) { if (BIT_IS_SET(switches, SW_RFKILL_ALL)) {
supportedSwitches = supportedSwitches | TDESwitchType::RFKill; supportedSwitches = supportedSwitches | TDESwitchType::RFKill;
} }
# if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL
if (BIT_IS_SET(switches, SW_RADIO)) { if (BIT_IS_SET(switches, SW_RADIO)) {
supportedSwitches = supportedSwitches | TDESwitchType::Radio; supportedSwitches = supportedSwitches | TDESwitchType::Radio;
} }
# endif
if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) { if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) {
supportedSwitches = supportedSwitches | TDESwitchType::MicrophoneInsert; supportedSwitches = supportedSwitches | TDESwitchType::MicrophoneInsert;
} }
@ -229,9 +231,11 @@ void TDEEventDevice::internalReadActiveSwitches() {
if (BIT_IS_SET(switches, SW_RFKILL_ALL)) { if (BIT_IS_SET(switches, SW_RFKILL_ALL)) {
activeSwitches = activeSwitches | TDESwitchType::RFKill; activeSwitches = activeSwitches | TDESwitchType::RFKill;
} }
# if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL
if (BIT_IS_SET(switches, SW_RADIO)) { if (BIT_IS_SET(switches, SW_RADIO)) {
activeSwitches = activeSwitches | TDESwitchType::Radio; activeSwitches = activeSwitches | TDESwitchType::Radio;
} }
# endif
if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) { if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) {
activeSwitches = activeSwitches | TDESwitchType::MicrophoneInsert; activeSwitches = activeSwitches | TDESwitchType::MicrophoneInsert;
} }

Loading…
Cancel
Save