From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764612AbYETJy3 (ORCPT ); Tue, 20 May 2008 05:54:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760121AbYETJxp (ORCPT ); Tue, 20 May 2008 05:53:45 -0400 Received: from fg-out-1718.google.com ([72.14.220.154]:58439 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762207AbYETJxV (ORCPT ); Tue, 20 May 2008 05:53:21 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=to:subject:date:user-agent:cc:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id:from; b=bbTpY2cgI4tYL+MEapr0rFCnJym0QL5SitOUNJPpEKWYi+zdI2LaX/kA4uTS0UOKLhQGopQIYZobnMtrPS3OzgRXYL1vp1rGOhVJojIRnFHHHI4zblyuYqJ2u5tL15Mc0PivF7196pX66ccccpHAAgPUC4afxOw0S3m6XkDtTbc= To: Henrique de Moraes Holschuh Subject: Re: [PATCH 06/15] rfkill: handle SW_RFKILL_ALL events Date: Tue, 20 May 2008 12:08:42 +0200 User-Agent: KMail/1.9.9 Cc: linux-kernel@vger.kernel.org, Thomas Renninger , Dmitry Torokhov References: <1211136485-19878-1-git-send-email-hmh@hmh.eng.br> <1211136485-19878-7-git-send-email-hmh@hmh.eng.br> In-Reply-To: <1211136485-19878-7-git-send-email-hmh@hmh.eng.br> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200805201208.42702.IvDoorn@gmail.com> From: Ivo van Doorn Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sunday 18 May 2008, Henrique de Moraes Holschuh wrote: > Teach rfkill-input how to handle SW_RFKILL_ALL events (new name for the > SW_RADIO event). > > SW_RFKILL_ALL is an absolute enable-or-disable command that is tied to all > radios in a system. > > Signed-off-by: Henrique de Moraes Holschuh Acked-by: Ivo van Doorn > Cc: Ivo van Doorn > Cc: Dmitry Torokhov > --- > net/rfkill/rfkill-input.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 43 insertions(+), 2 deletions(-) > > diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c > index e4b051d..9d6c925 100644 > --- a/net/rfkill/rfkill-input.c > +++ b/net/rfkill/rfkill-input.c > @@ -55,6 +55,22 @@ static void rfkill_task_handler(struct work_struct *work) > mutex_unlock(&task->mutex); > } > > +static void rfkill_schedule_set(struct rfkill_task *task, > + enum rfkill_state desired_state) > +{ > + unsigned long flags; > + > + spin_lock_irqsave(&task->lock, flags); > + > + if (time_after(jiffies, task->last + msecs_to_jiffies(200))) { > + task->desired_state = desired_state; > + task->last = jiffies; > + schedule_work(&task->work); > + } > + > + spin_unlock_irqrestore(&task->lock, flags); > +} > + > static void rfkill_schedule_toggle(struct rfkill_task *task) > { > unsigned long flags; > @@ -87,9 +103,9 @@ 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, > - unsigned int code, int down) > + unsigned int code, int data) > { > - if (type == EV_KEY && down == 1) { > + if (type == EV_KEY && data == 1) { > switch (code) { > case KEY_WLAN: > rfkill_schedule_toggle(&rfkill_wlan); > @@ -106,6 +122,26 @@ static void rfkill_event(struct input_handle *handle, unsigned int type, > default: > break; > } > + } else if (type == EV_SW) { > + switch (code) { > + case SW_RFKILL_ALL: > + /* EVERY radio type. data != 0 means radios ON */ > + rfkill_schedule_set(&rfkill_wimax, > + (data)? RFKILL_STATE_ON: > + RFKILL_STATE_OFF); > + rfkill_schedule_set(&rfkill_uwb, > + (data)? RFKILL_STATE_ON: > + RFKILL_STATE_OFF); > + rfkill_schedule_set(&rfkill_bt, > + (data)? RFKILL_STATE_ON: > + RFKILL_STATE_OFF); > + rfkill_schedule_set(&rfkill_wlan, > + (data)? RFKILL_STATE_ON: > + RFKILL_STATE_OFF); > + break; > + default: > + break; > + } > } > } > > @@ -168,6 +204,11 @@ static const struct input_device_id rfkill_ids[] = { > .evbit = { BIT_MASK(EV_KEY) }, > .keybit = { [BIT_WORD(KEY_WIMAX)] = BIT_MASK(KEY_WIMAX) }, > }, > + { > + .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT, > + .evbit = { BIT(EV_SW) }, > + .swbit = { [BIT_WORD(SW_RFKILL_ALL)] = BIT_MASK(SW_RFKILL_ALL) }, > + }, > { } > }; >