public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: unlisted-recipients:; (no To-header on input)@casper.infradead.org
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH 05/13] [media] dw2102: Use multimedia keys instead of an app-specific mapping
Date: Mon, 24 Jan 2011 13:18:40 -0200	[thread overview]
Message-ID: <20110124131840.28802d35@pedra> (raw)
In-Reply-To: <cover.1295882104.git.mchehab@redhat.com>

This driver uses an app-specific keymap for one of the tables. This
is wrong. Instead, use the standard keycodes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index 2c307ba..3544dff 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -949,8 +949,8 @@ static int dw3101_tuner_attach(struct dvb_usb_adapter *adap)
 }
 
 static struct rc_map_table rc_map_dw210x_table[] = {
-	{ 0xf80a, KEY_Q },		/*power*/
-	{ 0xf80c, KEY_M },		/*mute*/
+	{ 0xf80a, KEY_POWER2 },		/*power*/
+	{ 0xf80c, KEY_MUTE },		/*mute*/
 	{ 0xf811, KEY_1 },
 	{ 0xf812, KEY_2 },
 	{ 0xf813, KEY_3 },
@@ -961,25 +961,25 @@ static struct rc_map_table rc_map_dw210x_table[] = {
 	{ 0xf818, KEY_8 },
 	{ 0xf819, KEY_9 },
 	{ 0xf810, KEY_0 },
-	{ 0xf81c, KEY_PAGEUP },	/*ch+*/
-	{ 0xf80f, KEY_PAGEDOWN },	/*ch-*/
-	{ 0xf81a, KEY_O },		/*vol+*/
-	{ 0xf80e, KEY_Z },		/*vol-*/
-	{ 0xf804, KEY_R },		/*rec*/
-	{ 0xf809, KEY_D },		/*fav*/
-	{ 0xf808, KEY_BACKSPACE },	/*rewind*/
-	{ 0xf807, KEY_A },		/*fast*/
-	{ 0xf80b, KEY_P },		/*pause*/
-	{ 0xf802, KEY_ESC },	/*cancel*/
-	{ 0xf803, KEY_G },		/*tab*/
+	{ 0xf81c, KEY_CHANNELUP },	/*ch+*/
+	{ 0xf80f, KEY_CHANNELDOWN },	/*ch-*/
+	{ 0xf81a, KEY_VOLUMEUP },	/*vol+*/
+	{ 0xf80e, KEY_VOLUMEDOWN },	/*vol-*/
+	{ 0xf804, KEY_RECORD },		/*rec*/
+	{ 0xf809, KEY_FAVORITES },	/*fav*/
+	{ 0xf808, KEY_REWIND },		/*rewind*/
+	{ 0xf807, KEY_FASTFORWARD },	/*fast*/
+	{ 0xf80b, KEY_PAUSE },		/*pause*/
+	{ 0xf802, KEY_ESC },		/*cancel*/
+	{ 0xf803, KEY_TAB },		/*tab*/
 	{ 0xf800, KEY_UP },		/*up*/
-	{ 0xf81f, KEY_ENTER },	/*ok*/
-	{ 0xf801, KEY_DOWN },	/*down*/
-	{ 0xf805, KEY_C },		/*cap*/
-	{ 0xf806, KEY_S },		/*stop*/
-	{ 0xf840, KEY_F },		/*full*/
-	{ 0xf81e, KEY_W },		/*tvmode*/
-	{ 0xf81b, KEY_B },		/*recall*/
+	{ 0xf81f, KEY_OK },		/*ok*/
+	{ 0xf801, KEY_DOWN },		/*down*/
+	{ 0xf805, KEY_CAMERA },		/*cap*/
+	{ 0xf806, KEY_STOP },		/*stop*/
+	{ 0xf840, KEY_ZOOM },		/*full*/
+	{ 0xf81e, KEY_TV },		/*tvmode*/
+	{ 0xf81b, KEY_LAST },		/*recall*/
 };
 
 static struct rc_map_table rc_map_tevii_table[] = {
-- 
1.7.1



  parent reply	other threads:[~2011-01-24 15:27 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1295882104.git.mchehab@redhat.com>
2011-01-24 15:18 ` [PATCH 01/13] [media] rc/keymaps: use KEY_CAMERA for snapshots Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 02/13] [media] rc/keymaps: Use KEY_VIDEO for Video Source Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 03/13] [media] rc/keymaps: Fix most KEY_PROG[n] keycodes Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 04/13] [media] rc/keymaps: Use KEY_LEFTMETA were pertinent Mauro Carvalho Chehab
2011-01-24 15:45   ` Jarod Wilson
2011-01-24 16:08     ` Mauro Carvalho Chehab
2011-01-24 19:11       ` Jarod Wilson
2011-01-24 15:18 ` Mauro Carvalho Chehab [this message]
2011-01-24 15:18 ` [PATCH 06/13] [media] opera1: Use multimedia keys instead of an app-specific mapping Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 07/13] [media] a800: Fix a few wrong IR key assignments Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 09/13] [media] rc-rc5-hauppauge-new: Add the old control to the table Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 08/13] [media] rc-winfast: Fix the keycode tables Mauro Carvalho Chehab
2011-05-22  0:19   ` Balint Marton
2011-05-22  0:24     ` Balint Marton
2011-01-24 15:18 ` [PATCH 10/13] [media] rc-rc5-hauppauge-new: Add support for the old Black RC Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 11/13] [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 12/13] [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge Mauro Carvalho Chehab
2011-01-25  0:22   ` Andy Walls
2011-01-25  1:14     ` Mauro Carvalho Chehab
2011-01-24 15:18 ` [PATCH 13/13] [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map Mauro Carvalho Chehab
2011-01-25  0:32   ` Andy Walls
2011-01-25  1:23     ` Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110124131840.28802d35@pedra \
    --to=mchehab@redhat.com \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox