From patchwork Fri Jan 21 04:30:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 5647 Return-path: Envelope-to: mchehab@pedra Delivery-date: Fri, 21 Jan 2011 08:03:20 -0200 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1PgDpv-0000gv-PV for mchehab@pedra; Fri, 21 Jan 2011 08:03:20 -0200 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Fri, 21 Jan 2011 08:03:19 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1Pg8f9-000839-TS; Fri, 21 Jan 2011 04:31:52 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753593Ab1AUEbu (ORCPT + 1 other); Thu, 20 Jan 2011 23:31:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8756 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752582Ab1AUEbu (ORCPT ); Thu, 20 Jan 2011 23:31:50 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0L4VKVe022087 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 20 Jan 2011 23:31:47 -0500 Received: from hades.wilsonet.com.com (vpn-236-56.phx2.redhat.com [10.3.236.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p0L4UdL7005963; Thu, 20 Jan 2011 23:31:06 -0500 From: Jarod Wilson To: linux-media@vger.kernel.org Cc: Jarod Wilson , Andy Walls , Mike Isley Subject: [PATCH 3/3] ir-kbd-i2c: improve remote behavior with z8 behind usb Date: Thu, 20 Jan 2011 23:30:25 -0500 Message-Id: <1295584225-21210-4-git-send-email-jarod@redhat.com> In-Reply-To: <1295584225-21210-1-git-send-email-jarod@redhat.com> References: <1295584225-21210-1-git-send-email-jarod@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Add the same "are you ready?" i2c_master_send() poll command to get_key_haup_xvr found in lirc_zilog, which is apparently seen in the Windows driver for the PVR-150 w/a z8. This stabilizes what is received from both the HD-PVR and HVR-1950, even with their polling intervals at the default of 100, thus the removal of the custom 260ms polling_interval in pvrusb2-i2c-core.c. CC: Andy Walls CC: Mike Isley Signed-off-by: Jarod Wilson Acked-by: Andy Walls Acked-By: Mike Isely --- drivers/media/video/ir-kbd-i2c.c | 13 +++++++++++++ drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index d2b20ad..a221ad6 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -128,6 +128,19 @@ static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) static int get_key_haup_xvr(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) { + int ret; + unsigned char buf[1] = { 0 }; + + /* + * This is the same apparent "are you ready?" poll command observed + * watching Windows driver traffic and implemented in lirc_zilog. With + * this added, we get far saner remote behavior with z8 chips on usb + * connected devices, even with the default polling interval of 100ms. + */ + ret = i2c_master_send(ir->c, buf, 1); + if (ret != 1) + return (ret < 0) ? ret : -EINVAL; + return get_key_haup_common (ir, ir_key, ir_raw, 6, 3); } diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index ccc8849..451ecd4 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c @@ -597,7 +597,6 @@ static void pvr2_i2c_register_ir(struct pvr2_hdw *hdw) init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; init_data->type = RC_TYPE_RC5; init_data->name = hdw->hdw_desc->description; - init_data->polling_interval = 260; /* ms From lirc_zilog */ /* IR Receiver */ info.addr = 0x71; info.platform_data = init_data;