From patchwork Fri Jul 30 02:17:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 115372 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6U2HsjK006596 for ; Fri, 30 Jul 2010 02:17:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758395Ab0G3CRw (ORCPT ); Thu, 29 Jul 2010 22:17:52 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:53717 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758379Ab0G3CRv (ORCPT ); Thu, 29 Jul 2010 22:17:51 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so202286bwz.19 for ; Thu, 29 Jul 2010 19:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=HJbZc15nLaiG+UK/O40zK3vEiqzHMRWzcZLjYiU0QAY=; b=QfExBOQJmBwJs9zQR3YxktV8wfFnv4EZj4nXjeQtGd6Qq9FXL3Mr9KLQ+bXakNRR2U 676720JeyOtnPND2jl7v4WJpzy9UcbRoDdzHrjkKSLdDmCwsuX5vys5CePDKeXg9nWtd 2mo9oyFMrxHObvqFyIkmSK3eKIwKI1qblQVfE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=kw3pW9eOvyAkljKuL0nDVQAsQF5OjPkyNhEbzVIJe/gPd1QZr4074EK1MbMj9oqorH igg2Ld6iuTyPh82qmiUNLr+1JpkJEkrWYcXcuatZUNCXCOvS577Oln2vXZ3PeKpt0U1w tuAzDUqOMz7VnaIyTaFw3YIqiFCyBJWqU/2NE= Received: by 10.204.69.200 with SMTP id a8mr715907bkj.36.1280456270221; Thu, 29 Jul 2010 19:17:50 -0700 (PDT) Received: from localhost.localdomain (IGLD-84-228-148-137.inter.net.il [84.228.148.137]) by mx.google.com with ESMTPS id f10sm1110122bkl.17.2010.07.29.19.17.47 (version=SSLv3 cipher=RC4-MD5); Thu, 29 Jul 2010 19:17:48 -0700 (PDT) From: Maxim Levitsky To: lirc-list@lists.sourceforge.net Cc: Jarod Wilson , linux-input@vger.kernel.org, linux-media@vger.kernel.org, Mauro Carvalho Chehab , Christoph Bartelmus , Maxim Levitsky Subject: [PATCH 07/13] IR: NECX: support repeat Date: Fri, 30 Jul 2010 05:17:09 +0300 Message-Id: <1280456235-2024-8-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1280456235-2024-1-git-send-email-maximlevitsky@gmail.com> References: <1280456235-2024-1-git-send-email-maximlevitsky@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 30 Jul 2010 02:17:54 +0000 (UTC) diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/IR/ir-core-priv.h index dc26e2b..494e1f8 100644 --- a/drivers/media/IR/ir-core-priv.h +++ b/drivers/media/IR/ir-core-priv.h @@ -45,6 +45,7 @@ struct ir_raw_event_ctrl { int state; unsigned count; u32 bits; + bool is_nec_x; } nec; struct rc5_dec { int state; diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c index 1c0cf03..59127b1 100644 --- a/drivers/media/IR/ir-nec-decoder.c +++ b/drivers/media/IR/ir-nec-decoder.c @@ -26,6 +26,7 @@ #define NEC_BIT_1_SPACE (3 * NEC_UNIT) #define NEC_TRAILER_PULSE (1 * NEC_UNIT) #define NEC_TRAILER_SPACE (10 * NEC_UNIT) /* even longer in reality */ +#define NECX_REPEAT_BITS 1 enum nec_state { STATE_INACTIVE, @@ -67,8 +68,11 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev) if (!ev.pulse) break; - if (!eq_margin(ev.duration, NEC_HEADER_PULSE, NEC_UNIT / 2) && - !eq_margin(ev.duration, NECX_HEADER_PULSE, NEC_UNIT / 2)) + if (eq_margin(ev.duration, NEC_HEADER_PULSE, NEC_UNIT / 2)) + data->is_nec_x = false; + else if (eq_margin(ev.duration, NECX_HEADER_PULSE, NEC_UNIT / 2)) + data->is_nec_x = true; + else break; data->count = 0; @@ -105,6 +109,14 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev) if (ev.pulse) break; + if (geq_margin(ev.duration, NEC_TRAILER_SPACE, NEC_UNIT / 2) && + data->is_nec_x && data->count == NECX_REPEAT_BITS) { + IR_dprintk(1, "Repeat last key\n"); + ir_repeat(input_dev); + data->state = STATE_INACTIVE; + return 0; + } + data->bits <<= 1; if (eq_margin(ev.duration, NEC_BIT_1_SPACE, NEC_UNIT / 2)) data->bits |= 1;