From patchwork Wed Sep 29 21:03:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 218252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8TL3uCL000336 for ; Wed, 29 Sep 2010 21:03:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752948Ab0I2VDz (ORCPT ); Wed, 29 Sep 2010 17:03:55 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:51332 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015Ab0I2VDy (ORCPT ); Wed, 29 Sep 2010 17:03:54 -0400 Received: by yxp4 with SMTP id 4so407174yxp.19 for ; Wed, 29 Sep 2010 14:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=IvtzfaijuRa9FuFJZQOf5wIi0sm73VJKgI/0K4t8vns=; b=VKgdavXoqmuqLquSR24M4pg0W2wtS8nygSPmSp7Bo9gninUTa5zXVm2LHFAa5IJua/ CoZm/23XrWWfy0TUoxhEd7/18v1I8nDVBNuq2X89P/6/TodgQSvJwKTyzi5zl7aSP1MF WqscuGIs78WTlrxV3C0Wbahq3ygtidZADQ+jE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=obt17rgI4RyMx+5/1JzLnlK3q9d3sEra6AtDTFdvoDtakZ5gu5j8aJCaKgEl78efo7 s2HD9o/UiGKidmvTHs/fj8Zwp6WX5G0lOCdkXd6D0i/Ar8/NkyvXrQLZ6Px+/Sk/aSuM ARVHmqOBCquVo5x7NXvSTpLdukfRQrBusAu+E= Received: by 10.220.171.211 with SMTP id i19mr560153vcz.112.1285794233391; Wed, 29 Sep 2010 14:03:53 -0700 (PDT) Received: from [192.168.30.170] (201-26-160-60.dial-up.telesp.net.br [201.26.160.60]) by mx.google.com with ESMTPS id m10sm6069436vbp.3.2010.09.29.14.03.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 29 Sep 2010 14:03:52 -0700 (PDT) Message-ID: <4CA3A9B3.6080703@gmail.com> Date: Wed, 29 Sep 2010 18:03:47 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100827 Red Hat/3.1.3-1.el6 Lightning/1.0b2 Thunderbird/3.1.3 MIME-Version: 1.0 To: Giorgio CC: linux-media@vger.kernel.org Subject: Re: ASUS My Cinema-P7131 Hybrid (saa7134) and slow IR References: <4CA37755.5060608@redhat.com> In-Reply-To: <4CA37755.5060608@redhat.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 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Sep 2010 21:03:57 +0000 (UTC) diff --git a/drivers/media/IR/keymaps/rc-asus-pc39.c b/drivers/media/IR/keymaps/rc-asus-pc39.c index 2aa068c..c39c892 100644 --- a/drivers/media/IR/keymaps/rc-asus-pc39.c +++ b/drivers/media/IR/keymaps/rc-asus-pc39.c @@ -20,56 +20,56 @@ static struct ir_scancode asus_pc39[] = { /* Keys 0 to 9 */ - { 0x15, KEY_0 }, - { 0x29, KEY_1 }, - { 0x2d, KEY_2 }, - { 0x2b, KEY_3 }, - { 0x09, KEY_4 }, - { 0x0d, KEY_5 }, - { 0x0b, KEY_6 }, - { 0x31, KEY_7 }, - { 0x35, KEY_8 }, - { 0x33, KEY_9 }, + { 0x0815, KEY_0 }, + { 0x0829, KEY_1 }, + { 0x082d, KEY_2 }, + { 0x082b, KEY_3 }, + { 0x0809, KEY_4 }, + { 0x080d, KEY_5 }, + { 0x080b, KEY_6 }, + { 0x0831, KEY_7 }, + { 0x0835, KEY_8 }, + { 0x0833, KEY_9 }, - { 0x3e, KEY_RADIO }, /* radio */ - { 0x03, KEY_MENU }, /* dvd/menu */ - { 0x2a, KEY_VOLUMEUP }, - { 0x19, KEY_VOLUMEDOWN }, - { 0x37, KEY_UP }, - { 0x3b, KEY_DOWN }, - { 0x27, KEY_LEFT }, - { 0x2f, KEY_RIGHT }, - { 0x25, KEY_VIDEO }, /* video */ - { 0x39, KEY_AUDIO }, /* music */ + { 0x083e, KEY_RADIO }, /* radio */ + { 0x0803, KEY_MENU }, /* dvd/menu */ + { 0x082a, KEY_VOLUMEUP }, + { 0x0819, KEY_VOLUMEDOWN }, + { 0x0837, KEY_UP }, + { 0x083b, KEY_DOWN }, + { 0x0827, KEY_LEFT }, + { 0x082f, KEY_RIGHT }, + { 0x0825, KEY_VIDEO }, /* video */ + { 0x0839, KEY_AUDIO }, /* music */ - { 0x21, KEY_TV }, /* tv */ - { 0x1d, KEY_EXIT }, /* back */ - { 0x0a, KEY_CHANNELUP }, /* channel / program + */ - { 0x1b, KEY_CHANNELDOWN }, /* channel / program - */ - { 0x1a, KEY_ENTER }, /* enter */ + { 0x0821, KEY_TV }, /* tv */ + { 0x081d, KEY_EXIT }, /* back */ + { 0x080a, KEY_CHANNELUP }, /* channel / program + */ + { 0x081b, KEY_CHANNELDOWN }, /* channel / program - */ + { 0x081a, KEY_ENTER }, /* enter */ - { 0x06, KEY_PAUSE }, /* play/pause */ - { 0x1e, KEY_PREVIOUS }, /* rew */ - { 0x26, KEY_NEXT }, /* forward */ - { 0x0e, KEY_REWIND }, /* backward << */ - { 0x3a, KEY_FASTFORWARD }, /* forward >> */ - { 0x36, KEY_STOP }, - { 0x2e, KEY_RECORD }, /* recording */ - { 0x16, KEY_POWER }, /* the button that reads "close" */ + { 0x0806, KEY_PAUSE }, /* play/pause */ + { 0x081e, KEY_PREVIOUS }, /* rew */ + { 0x0826, KEY_NEXT }, /* forward */ + { 0x080e, KEY_REWIND }, /* backward << */ + { 0x083a, KEY_FASTFORWARD }, /* forward >> */ + { 0x0836, KEY_STOP }, + { 0x082e, KEY_RECORD }, /* recording */ + { 0x0816, KEY_POWER }, /* the button that reads "close" */ - { 0x11, KEY_ZOOM }, /* full screen */ - { 0x13, KEY_MACRO }, /* recall */ - { 0x23, KEY_HOME }, /* home */ - { 0x05, KEY_PVR }, /* picture */ - { 0x3d, KEY_MUTE }, /* mute */ - { 0x01, KEY_DVD }, /* dvd */ + { 0x0811, KEY_ZOOM }, /* full screen */ + { 0x0813, KEY_MACRO }, /* recall */ + { 0x0823, KEY_HOME }, /* home */ + { 0x0805, KEY_PVR }, /* picture */ + { 0x083d, KEY_MUTE }, /* mute */ + { 0x0801, KEY_DVD }, /* dvd */ }; static struct rc_keymap asus_pc39_map = { .map = { .scan = asus_pc39, .size = ARRAY_SIZE(asus_pc39), - .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ + .ir_type = IR_TYPE_RC5, .name = RC_MAP_ASUS_PC39, } }; diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index a6ac462..e3a4395 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c @@ -772,8 +772,10 @@ int saa7134_input_init1(struct saa7134_dev *dev) case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: case SAA7134_BOARD_ASUSTeK_P7131_ANALOG: ir_codes = RC_MAP_ASUS_PC39; - mask_keydown = 0x0040000; - rc5_gpio = 1; + mask_keydown = 0x0040000; /* Enable GPIO18 line on both edges */ + mask_keyup = 0x0040000; + mask_keycode = 0xffff; + raw_decode = 1; break; case SAA7134_BOARD_ENCORE_ENLTV: case SAA7134_BOARD_ENCORE_ENLTV_FM: