Input: rename SW_RADIO to SW_RFKILL_ALL (v2)
Subsystems (3)
The SW_RADIO code for EV_SW events has a name that is not descriptive enough of its intended function, and could induce someone to think KEY_RADIO is its EV_KEY counterpart, which is false.
Rename it to SW_RFKILL_ALL, and document what this event is for. Keep the old name around, to avoid userspace ABI breaks.
The SW_RFKILL_ALL event is meant to be used by rfkill master switches. It is not bound to a particular radio switch type, and usually applies to all types. It is semantically tied to master rfkill switches that enable or disable every radio in a system.
Signed-off-by Henrique de Moraes Holschuh <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Ivo van Doorn <[email protected]>
--- Documentation/laptops/thinkpad-acpi.txt | 2 +- drivers/misc/thinkpad_acpi.c | 4 ++-- include/linux/input.h | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-)
Documentation/laptops/thinkpad-acpi.txt +1 -1
@@ -498,7 +498,7 @@ generate input device EV_KEY events. In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW events for switches: -SW_RADIO T60 and later hardare rfkill rocker switch +SW_RFKILL_ALL T60 and later hardare rfkill rocker switch SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A Non hot-key ACPI HKEY event map:
drivers/misc/thinkpad_acpi.c +2 -2
@@ -1180,7 +1180,7 @@ static void tpacpi_input_send_radiosw(void)mutex_lock (&tpacpi_inputdev_send_mutex);input_report_switch (tpacpi_inputdev, -SW_RADIO , !!wlsw); +SW_RFKILL_ALL , !!wlsw);input_sync (tpacpi_inputdev);mutex_unlock (&tpacpi_inputdev_send_mutex);
@@ -2084,7 +2084,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)if (tp_features.hotkey_wlsw) {set_bit (EV_SW , tpacpi_inputdev->evbit); -set_bit (SW_RADIO , tpacpi_inputdev->swbit); +set_bit (SW_RFKILL_ALL , tpacpi_inputdev->swbit); }if (tp_features.hotkey_tablet) {set_bit (EV_SW , tpacpi_inputdev->evbit);
include/linux/input.h +3 -1
@@ -637,7 +637,9 @@ struct input_absinfo {#define SW_LID 0x00/* set = lid shut */ #define SW_TABLET_MODE 0x01/* set = tablet mode */ #define SW_HEADPHONE_INSERT 0x02/* set = inserted */ -#define SW_RADIO 0x03/* set = radio enabled */ +#define SW_RFKILL_ALL 0x03/* rfkill master switch, type "any" +set = radio enabled */ +#define SW_RADIO SW_RFKILL_ALL/* deprecated */ #define SW_MAX 0x0f#define SW_CNT (SW_MAX+1)
Signature · 1 line
1.5.4.4