lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rfkill: add the WWAN radio type

Browse Source 
Unfortunately, instead of adding a generic Wireless WAN type, a technology-
specific type (WiMAX) was added.  That's useless for other WWAN devices,
such as EDGE, UMTS, X-RTT and other such radios.

Add a WWAN rfkill type for generic wireless WAN devices.  No keys are added
as most devices really want to use KEY_WLAN for WWAN control (in a cycle of
none, WLAN, WWAN, WLAN+WWAN) and need no specific keycode added.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Iñaky Pérez-González <inaky.perez-gonzalez@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Henrique de Moraes Holschuh
2008-06-23 17:23:01 -03:00
committed by John W. Linville
parent 801e49af4c
commit 477576a073
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/rfkill.h
View File

@ -34,12 +34,14 @@
* 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. * RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
* RFKILL_TYPE_WWAN: switch is on a wireless WAN 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_WIMAX,
RFKILL_TYPE_WWAN,
RFKILL_TYPE_MAX, RFKILL_TYPE_MAX,
}; };

4
net/rfkill/rfkill-input.c
View File

@ -101,6 +101,7 @@ 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 DEFINE_RFKILL_TASK(rfkill_wimax, RFKILL_TYPE_WIMAX);
static DEFINE_RFKILL_TASK(rfkill_wwan, RFKILL_TYPE_WWAN);
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 data) unsigned int code, int data)
@ -126,6 +127,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
switch (code) { switch (code) {
case SW_RFKILL_ALL: case SW_RFKILL_ALL:
/* EVERY radio type. data != 0 means radios ON */ /* EVERY radio type. data != 0 means radios ON */
rfkill_schedule_set(&rfkill_wwan,
(data)? RFKILL_STATE_ON:
RFKILL_STATE_OFF);
rfkill_schedule_set(&rfkill_wimax, rfkill_schedule_set(&rfkill_wimax,
(data)? RFKILL_STATE_ON: (data)? RFKILL_STATE_ON:
RFKILL_STATE_OFF); RFKILL_STATE_OFF);

3
net/rfkill/rfkill.c
View File

@ -180,6 +180,9 @@ static ssize_t rfkill_type_show(struct device *dev,
case RFKILL_TYPE_WIMAX: case RFKILL_TYPE_WIMAX:
type = "wimax"; type = "wimax";
break; break;
case RFKILL_TYPE_WWAN:
type = "wwan";
break;
default: default:
BUG(); BUG();
} }