rfkill
Subsystems (5)
cover rfkill
Hi Dmitry,
I have a few rfkill related patches for which I would prefer if you to could take a look at before I send them for inclusion.
Thanks. :)
Ivo
A message that is not in the archive (sent off-list or not yet received): 200709081710.56744.IvDoorn-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
RFC 1/3 rfkill: Remove IRDA
As Dmitry pointed out earlier, rfkill-input.c doesn't support irda because there are no users and we shouldn't add unrequired KEY_ defines.
However, RFKILL_TYPE_IRDA was defined in the rfkill.h header file and would confuse people about whether it is implemented or not.
This patch removes IRDA support completely, so it can be added whenever a driver wants the feature.
--- include/linux/rfkill.h | 8 +++----- net/rfkill/Kconfig | 2 +- net/rfkill/rfkill.c | 5 +---- 3 files changed, 5 insertions(+), 10 deletions(-)
include/linux/rfkill.h +3 -5
@@ -31,13 +31,11 @@* enum rfkill_type - type of rfkill switch. * RFKILL_TYPE_WLAN: switch is no a Wireless network devices. * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device. -* RFKILL_TYPE_IRDA: switch is on an infrared devices. */ enum rfkill_type { -RFKILL_TYPE_WLAN =0 , -RFKILL_TYPE_BLUETOOTH =1 , -RFKILL_TYPE_IRDA =2 , -RFKILL_TYPE_MAX =3 , +RFKILL_TYPE_WLAN , +RFKILL_TYPE_BLUETOOTH , +RFKILL_TYPE_MAX , };enum rfkill_state {
net/rfkill/Kconfig +1 -1
@@ -5,7 +5,7 @@ menuconfig RFKILL tristate "RF switch subsystem support" help Say Y here if you want to have control over RF switches - found on many WiFi, Bluetooth and IRDA cards. + found on many WiFi and Bluetooth cards. To compile this driver as a module, choose M here: the module will be called rfkill.
net/rfkill/rfkill.c +1 -4
@@ -106,9 +106,6 @@ static ssize_t rfkill_type_show(struct device *dev,case RFKILL_TYPE_BLUETOOTH : type ="bluetooth" ;break ; -case RFKILL_TYPE_IRDA : - type ="irda" ; -break ;default :BUG (); }
@@ -281,7 +278,7 @@ static void rfkill_remove_switch(struct rfkill *rfkill)/** * rfkill_allocate - allocate memory for rfkill structure. * @parent: device that has rf switch on it -* @type: type of the switch (wlan, bluetooth, irda) +* @type: type of the switch (RFKILL_TYPE_*) * * This function should be called by the network driver when it needs * rfkill structure. Once the structure is allocated the driver shoud
Signature · 1 line
1.5.3
RFC 2/3 rfkill: Add support for ultrawideband
In reply to a message not in the archiveThis patch will add support for UWB keys to rfkill, support for this has been requested by Inaky.
--- include/linux/input.h | 1 + include/linux/rfkill.h | 2 ++ net/rfkill/rfkill-input.c | 9 +++++++++ net/rfkill/rfkill.c | 3 +++ 4 files changed, 15 insertions(+), 0 deletions(-)
include/linux/input.h +1 -0
@@ -360,6 +360,7 @@ struct input_absinfo {#define KEY_BLUETOOTH 237#define KEY_WLAN 238 +#define KEY_UWB 239#define KEY_UNKNOWN 240
include/linux/rfkill.h +2 -0
@@ -31,10 +31,12 @@* enum rfkill_type - type of rfkill switch. * RFKILL_TYPE_WLAN: switch is no a Wireless network devices. * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device. +* RFKILL_TYPE_UWB: switch is on a Ultra wideband device. */ enum rfkill_type {RFKILL_TYPE_WLAN ,RFKILL_TYPE_BLUETOOTH , +RFKILL_TYPE_UWB ,RFKILL_TYPE_MAX , };
net/rfkill/rfkill-input.c +9 -0
@@ -81,6 +81,7 @@ static void rfkill_schedule_toggle(struct rfkill_task *task) static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN); static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH); +static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB);static void rfkill_event (struct input_handle *handle,unsigned int type,unsigned int code,int down)
@@ -93,6 +94,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,case KEY_BLUETOOTH :rfkill_schedule_toggle (&rfkill_bt);break ; +case KEY_UWB : +rfkill_schedule_toggle (&rfkill_uwb); +break ;default :break ; }
@@ -148,6 +152,11 @@ static const struct input_device_id rfkill_ids[] = { .evbit = { BIT(EV_KEY) }, .keybit = { [LONG(KEY_BLUETOOTH)] = BIT(KEY_BLUETOOTH) }, }, + { + .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT, + .evbit = { BIT(EV_KEY) }, + .keybit = { [LONG(KEY_UWB)] = BIT(KEY_UWB) }, + }, { } };
net/rfkill/rfkill.c +3 -0
@@ -106,6 +106,9 @@ static ssize_t rfkill_type_show(struct device *dev,case RFKILL_TYPE_BLUETOOTH : type ="bluetooth" ;break ; +case RFKILL_TYPE_UWB : + type ="ultrawideband" ; +break ;default :BUG (); }
Signature · 1 line
1.5.3
Re: [RFC 2/3] rfkill: Add support for ultrawideband
Quoted 5 lines · Ivo van Doorn
This patch will add support for UWB keys to rfkill, support for this has been requested by Inaky.
Signed-off-by Ivo van Doorn <[email protected]>CC Inaky Perez-Gonzalez <[email protected]>
Thanks so much
RFC 3/3 rfkill: Add rfkill documentation
In reply to a message not in the archiveAdd a documentation file which contains
a short description about rfkill with some
notes about drivers and the userspace interface.
--- Documentation/rfkill.txt | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) create mode 100644 Documentation/rfkill.txt
Documentation/rfkill.txt new file +88 -0
@@ -0,0 +1,88 @@ +rfkill - RF switch subsystem support +==================================== + +1 Implementation details +2 Driver support +3 Userspace support + +=============================================================================== +1: Implementation details + +The rfkill switch subsystem offers support for keys often found on laptops +to enable wireless devices like WiFi and Bluetooth. + +This is done by providing the user 3 possibilities: + - The rfkill system handles all events, userspace is not aware of events. + - The rfkill system handles all events, userspace is informed about the event. + - The rfkill system does not handle events, userspace handles all events. + +The buttons to enable and disable the wireless radios are important in +situations where the user is for example using his laptop on a location where +wireless radios _must_ be disabled (e.g airplanes). +Because of this requirement, userspace support for the keys should not be +made mandatory. Because userspace might want to perform some additional smarter +tasks when the key is pressed, rfkill still provides userspace the possibility +to take over the task to handle the key events. + +The system inside the kernel has been split into 2 seperate sections: + 1 - RFKILL + 2 - RFKILL_INPUT + +The first option enables rfkill support and will make sure userspace will +be notified of any events through the input device. It also creates several +sysfs entries which can be used by userspace. See section "Userspace support". + +The second option provides a rfkill input handler. This handler will +listen to all rfkill key events and will toggle the radio accordingly, +with this option enabled userspace could either do nothing or simply +perform monitoring tasks. + +==================================== +2: Driver support + +Drivers who wish to build in rfkill subsystem support should +make sure their driver depends of the Kconfig option RFKILL, it should +_not_ depend on RFKILL_INPUT. + +Unless key events trigger a interrupt to which the driver listens, polling +will be required to determine the key state changes. For this the input +layer providers the input-polldev handler. + +A driver should implement a few steps to correctly make use of the +rfkill subsystem. First for non-polling drivers: + + - rfkill_allocate() + - input_allocate_device() + - rfkill_register() + - input_register_device() + +For polling drivers: + + - rfkill_allocate() + - input_allocate_polled_device() + - rfkill_register() + - input_register_polled_device() + +When a key event has been detected, the correct event should be +send over the input device which has been registered by the driver. + +==================================== +3: Userspace support + +For each key a input device will be created which will send out the correct +key event when the rfkill key has been pressed. + +The following sysfs entries will be created: + + name: Name assigned by driver to this key (interface or driver name). + type: Name of the key type ("wlan", "bluetooth", etc). + state: Current state of the key. 1: On, 0: Off. + claim: 1: Userspace handles events, 0: Kernel handles events + +Both the "state" and "claim" entries are also writable. For the "state" entry +this means that when 1 or 0 is written all radios will be toggled accordingly. +For the "claim" entry writing 1 to it will mean that the kernel will no longer +handle key events even though RFKILL_INPUT input was enabled. When "claim" has +been set to 0, userspace should make sure it will listen for the input events +or check the sysfs "state" entry regularly to correctly perform the required +tasks when the rkfill key is pressed.
Signature · 1 line
1.5.3
Hi Ivo,
Quoted 5 lines · Ivo van Doorn
Hi Dmitry,
I have a few rfkill related patches for which I would prefer if you to could take a look at before I send them for inclusion.
Looks good, feel free to add
Thanks!
Signature · 1 line
Dmitry
A message that is not in the archive (sent off-list or not yet received): [email protected]
From: Dmitry Torokhov <[email protected]>
Date: Mon, 10 Sep 2007 00:04:55 -0400
Quoted 3 lines
Looks good, feel free to add
I've been loosely following these patches, they have gone through several revisions.
Please resubmit all of these patches if they are ready to go in right now, thanks.