From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756897Ab2INOPx (ORCPT ); Fri, 14 Sep 2012 10:15:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41740 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756634Ab2INOPu (ORCPT ); Fri, 14 Sep 2012 10:15:50 -0400 Message-ID: <50533C09.1020809@redhat.com> Date: Fri, 14 Sep 2012 11:15:37 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120828 Thunderbird/15.0 MIME-Version: 1.0 To: =?UTF-8?B?QnJ1bm8gUHLDqW1vbnQ=?= CC: Jiri Kosina , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [PATCH 3/6] HID: picoLCD: Add support for CIR References: <20120819192859.74136bb0@neptune.home> <20120819193254.6a48348d@neptune.home> In-Reply-To: <20120819193254.6a48348d@neptune.home> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em 19-08-2012 14:32, Bruno Prémont escreveu: > Implement support for picoLCD's CIR header using RC_CORE for decoding > the IR event stream. > > Signed-off-by: Bruno Prémont Sorry for a late answer. I'm with a huge backlog due to KS/2012 workshop. Acked-by: Mauro Carvalho Chehab > --- > drivers/hid/hid-picolcd.h | 5 ++- > drivers/hid/hid-picolcd_cir.c | 95 +++++++++++++++++++++++++++++++++++++++- > drivers/hid/hid-picolcd_core.c | 3 +- > 3 files changed, 98 insertions(+), 5 deletions(-) > > diff --git a/drivers/hid/hid-picolcd.h b/drivers/hid/hid-picolcd.h > index dc4c795..240eb1c 100644 > --- a/drivers/hid/hid-picolcd.h > +++ b/drivers/hid/hid-picolcd.h > @@ -85,7 +85,9 @@ struct picolcd_data { > /* input stuff */ > u8 pressed_keys[2]; > struct input_dev *input_keys; > - struct input_dev *input_cir; > +#ifdef CONFIG_HID_PICOLCD_CIR > + struct rc_dev *rc_dev; > +#endif > unsigned short keycode[PICOLCD_KEYS]; > > #ifdef CONFIG_HID_PICOLCD_FB > @@ -114,6 +116,7 @@ struct picolcd_data { > int status; > #define PICOLCD_BOOTLOADER 1 > #define PICOLCD_FAILED 2 > +#define PICOLCD_CIR_SHUN 4 > }; > > #ifdef CONFIG_HID_PICOLCD_FB > diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c > index dc632c3..f38af30 100644 > --- a/drivers/hid/hid-picolcd_cir.c > +++ b/drivers/hid/hid-picolcd_cir.c > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > > #include "hid-picolcd.h" > > @@ -44,18 +45,108 @@ > int picolcd_raw_cir(struct picolcd_data *data, > struct hid_report *report, u8 *raw_data, int size) > { > - /* Need understanding of CIR data format to implement ... */ > + unsigned long flags; > + int i, w, sz; > + DEFINE_IR_RAW_EVENT(rawir); > + > + /* ignore if rc_dev is NULL or status is shunned */ > + spin_lock_irqsave(&data->lock, flags); > + if (data->rc_dev && (data->status & PICOLCD_CIR_SHUN)) { > + spin_unlock_irqrestore(&data->lock, flags); > + return 1; > + } > + spin_unlock_irqrestore(&data->lock, flags); > + > + /* PicoLCD USB packets contain 16-bit intervals in network order, > + * with value negated for pulse. Intervals are in microseconds. > + * > + * Note: some userspace LIRC code for PicoLCD says negated values > + * for space - is it a matter of IR chip? (pulse for my TSOP2236) > + * > + * In addition, the first interval seems to be around 15000 + base > + * interval for non-first report of IR data - thus the quirk below > + * to get RC_CODE to understand Sony and JVC remotes I have at hand > + */ > + sz = size > 0 ? min((int)raw_data[0], size-1) : 0; > + for (i = 0; i+1 < sz; i += 2) { > + init_ir_raw_event(&rawir); > + w = (raw_data[i] << 8) | (raw_data[i+1]); > + rawir.pulse = !!(w & 0x8000); > + rawir.duration = US_TO_NS(rawir.pulse ? (65536 - w) : w); > + /* Quirk!! - see above */ > + if (i == 0 && rawir.duration > 15000000) > + rawir.duration -= 15000000; > + ir_raw_event_store(data->rc_dev, &rawir); > + } > + ir_raw_event_handle(data->rc_dev); > + > return 1; > } > > +static int picolcd_cir_open(struct rc_dev *dev) > +{ > + struct picolcd_data *data = dev->priv; > + unsigned long flags; > + > + spin_lock_irqsave(&data->lock, flags); > + data->status &= ~PICOLCD_CIR_SHUN; > + spin_unlock_irqrestore(&data->lock, flags); > + return 0; > +} > + > +static void picolcd_cir_close(struct rc_dev *dev) > +{ > + struct picolcd_data *data = dev->priv; > + unsigned long flags; > + > + spin_lock_irqsave(&data->lock, flags); > + data->status |= PICOLCD_CIR_SHUN; > + spin_unlock_irqrestore(&data->lock, flags); > +} > + > /* initialize CIR input device */ > int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report) > { > - /* support not implemented yet */ > + struct rc_dev *rdev; > + int ret = 0; > + > + rdev = rc_allocate_device(); > + if (!rdev) > + return -ENOMEM; > + > + rdev->priv = data; > + rdev->driver_type = RC_DRIVER_IR_RAW; > + rdev->allowed_protos = RC_TYPE_ALL; > + rdev->open = picolcd_cir_open; > + rdev->close = picolcd_cir_close; > + rdev->input_name = data->hdev->name; > + rdev->input_phys = data->hdev->phys; > + rdev->input_id.bustype = data->hdev->bus; > + rdev->input_id.vendor = data->hdev->vendor; > + rdev->input_id.product = data->hdev->product; > + rdev->input_id.version = data->hdev->version; > + rdev->dev.parent = &data->hdev->dev; > + rdev->driver_name = PICOLCD_NAME; > + rdev->map_name = RC_MAP_RC6_MCE; > + rdev->timeout = MS_TO_NS(100); > + rdev->rx_resolution = US_TO_NS(1); > + > + ret = rc_register_device(rdev); > + if (ret) > + goto err; > + data->rc_dev = rdev; > return 0; > + > +err: > + rc_free_device(rdev); > + return ret; > } > > void picolcd_exit_cir(struct picolcd_data *data) > { > + struct rc_dev *rdev = data->rc_dev; > + > + data->rc_dev = NULL; > + rc_unregister_device(rdev); > } > > diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c > index 76ab173..580269b 100644 > --- a/drivers/hid/hid-picolcd_core.c > +++ b/drivers/hid/hid-picolcd_core.c > @@ -356,8 +356,7 @@ static int picolcd_raw_event(struct hid_device *hdev, > if (data->input_keys) > ret = picolcd_raw_keypad(data, report, raw_data+1, size-1); > } else if (report->id == REPORT_IR_DATA) { > - if (data->input_cir) > - ret = picolcd_raw_cir(data, report, raw_data+1, size-1); > + ret = picolcd_raw_cir(data, report, raw_data+1, size-1); > } else { > spin_lock_irqsave(&data->lock, flags); > /* >