Commit 303d9bf6 authored by Iñaky Pérez-González's avatar Iñaky Pérez-González Committed by David S. Miller

rfkill: add the WiMAX radio type

Teach rfkill about wimax radios.

Had to define a KEY_WIMAX as a 'key for disabling only wimax radios',
as other radio technologies have. This makes sense as hardware has
specific keys for disabling specific radios.

The RFKILL enabling part is, otherwise, a copy and paste of any other
radio technology.
Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09552ccd
...@@ -371,6 +371,8 @@ struct input_absinfo { ...@@ -371,6 +371,8 @@ struct input_absinfo {
#define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */
#define KEY_DISPLAY_OFF 245 /* display device to off state */ #define KEY_DISPLAY_OFF 245 /* display device to off state */
#define KEY_WIMAX 246
#define BTN_MISC 0x100 #define BTN_MISC 0x100
#define BTN_0 0x100 #define BTN_0 0x100
#define BTN_1 0x101 #define BTN_1 0x101
......
...@@ -33,11 +33,13 @@ ...@@ -33,11 +33,13 @@
* RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device. * RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
* RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device. * RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
* RFKILL_TYPE_UWB: switch is on a ultra wideband device. * RFKILL_TYPE_UWB: switch is on a ultra wideband device.
* RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
*/ */
enum rfkill_type { enum rfkill_type {
RFKILL_TYPE_WLAN , RFKILL_TYPE_WLAN ,
RFKILL_TYPE_BLUETOOTH, RFKILL_TYPE_BLUETOOTH,
RFKILL_TYPE_UWB, RFKILL_TYPE_UWB,
RFKILL_TYPE_WIMAX,
RFKILL_TYPE_MAX, RFKILL_TYPE_MAX,
}; };
......
...@@ -84,6 +84,7 @@ static void rfkill_schedule_toggle(struct rfkill_task *task) ...@@ -84,6 +84,7 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN); static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN);
static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH); static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH);
static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB); static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB);
static DEFINE_RFKILL_TASK(rfkill_wimax, RFKILL_TYPE_WIMAX);
static void rfkill_event(struct input_handle *handle, unsigned int type, static void rfkill_event(struct input_handle *handle, unsigned int type,
unsigned int code, int down) unsigned int code, int down)
...@@ -99,6 +100,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type, ...@@ -99,6 +100,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
case KEY_UWB: case KEY_UWB:
rfkill_schedule_toggle(&rfkill_uwb); rfkill_schedule_toggle(&rfkill_uwb);
break; break;
case KEY_WIMAX:
rfkill_schedule_toggle(&rfkill_wimax);
break;
default: default:
break; break;
} }
...@@ -159,6 +163,11 @@ static const struct input_device_id rfkill_ids[] = { ...@@ -159,6 +163,11 @@ static const struct input_device_id rfkill_ids[] = {
.evbit = { BIT_MASK(EV_KEY) }, .evbit = { BIT_MASK(EV_KEY) },
.keybit = { [BIT_WORD(KEY_UWB)] = BIT_MASK(KEY_UWB) }, .keybit = { [BIT_WORD(KEY_UWB)] = BIT_MASK(KEY_UWB) },
}, },
{
.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
.evbit = { BIT_MASK(EV_KEY) },
.keybit = { [BIT_WORD(KEY_WIMAX)] = BIT_MASK(KEY_WIMAX) },
},
{ } { }
}; };
......
...@@ -126,6 +126,9 @@ static ssize_t rfkill_type_show(struct device *dev, ...@@ -126,6 +126,9 @@ static ssize_t rfkill_type_show(struct device *dev,
case RFKILL_TYPE_UWB: case RFKILL_TYPE_UWB:
type = "ultrawideband"; type = "ultrawideband";
break; break;
case RFKILL_TYPE_WIMAX:
type = "wimax";
break;
default: default:
BUG(); BUG();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment