All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Udi Atar <udia@siano-ms.com>
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH 4/6] V4L/DVB: standardize names at rc-dib0700 tables
Date: Sun, 1 Aug 2010 17:21:10 -0300	[thread overview]
Message-ID: <20100801172110.3c1da080@pedra> (raw)
In-Reply-To: <cover.1280693675.git.mchehab@redhat.com>

Use a more standard way to name those tables, as they're currently used
by the script that coverts those tables to be loaded via userspace.

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

diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/IR/keymaps/rc-dib0700-nec.c
index f5809f4..ae18320 100644
--- a/drivers/media/IR/keymaps/rc-dib0700-nec.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-nec.c
@@ -17,7 +17,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode dib0700_table[] = {
+static struct ir_scancode dib0700_nec_table[] = {
 	/* Key codes for the Pixelview SBTVD remote */
 	{ 0x8613, KEY_MUTE },
 	{ 0x8612, KEY_POWER },
@@ -98,10 +98,10 @@ static struct ir_scancode dib0700_table[] = {
 	{ 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
 };
 
-static struct rc_keymap dib0700_map = {
+static struct rc_keymap dib0700_nec_map = {
 	.map = {
-		.scan    = dib0700_table,
-		.size    = ARRAY_SIZE(dib0700_table),
+		.scan    = dib0700_nec_table,
+		.size    = ARRAY_SIZE(dib0700_nec_table),
 		.ir_type = IR_TYPE_NEC,
 		.name    = RC_MAP_DIB0700_NEC_TABLE,
 	}
@@ -109,12 +109,12 @@ static struct rc_keymap dib0700_map = {
 
 static int __init init_rc_map(void)
 {
-	return ir_register_map(&dib0700_map);
+	return ir_register_map(&dib0700_nec_map);
 }
 
 static void __exit exit_rc_map(void)
 {
-	ir_unregister_map(&dib0700_map);
+	ir_unregister_map(&dib0700_nec_map);
 }
 
 module_init(init_rc_map)
diff --git a/drivers/media/IR/keymaps/rc-dib0700-rc5.c b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
index e2d0fd2..4a4797c 100644
--- a/drivers/media/IR/keymaps/rc-dib0700-rc5.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
@@ -17,7 +17,7 @@
 
 #include <media/rc-map.h>
 
-static struct ir_scancode dib0700_table[] = {
+static struct ir_scancode dib0700_rc5_table[] = {
 	/* Key codes for the tiny Pinnacle remote*/
 	{ 0x0700, KEY_MUTE },
 	{ 0x0701, KEY_MENU }, /* Pinnacle logo */
@@ -209,10 +209,10 @@ static struct ir_scancode dib0700_table[] = {
 	{ 0x1d3d, KEY_POWER },
 };
 
-static struct rc_keymap dib0700_map = {
+static struct rc_keymap dib0700_rc5_map = {
 	.map = {
-		.scan    = dib0700_table,
-		.size    = ARRAY_SIZE(dib0700_table),
+		.scan    = dib0700_rc5_table,
+		.size    = ARRAY_SIZE(dib0700_rc5_table),
 		.ir_type = IR_TYPE_RC5,
 		.name    = RC_MAP_DIB0700_RC5_TABLE,
 	}
@@ -220,12 +220,12 @@ static struct rc_keymap dib0700_map = {
 
 static int __init init_rc_map(void)
 {
-	return ir_register_map(&dib0700_map);
+	return ir_register_map(&dib0700_rc5_map);
 }
 
 static void __exit exit_rc_map(void)
 {
-	ir_unregister_map(&dib0700_map);
+	ir_unregister_map(&dib0700_rc5_map);
 }
 
 module_init(init_rc_map)
-- 
1.7.1



  parent reply	other threads:[~2010-08-01 20:20 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1280693675.git.mchehab@redhat.com>
2010-08-01 20:17 ` [PATCH 1/6] V4L/DVB: dib0700: properly implement IR change_protocol Mauro Carvalho Chehab
2010-08-01 20:17 ` [PATCH 2/6] V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5 Mauro Carvalho Chehab
2010-08-01 20:17 ` [PATCH 3/6] V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick Mauro Carvalho Chehab
2010-08-02  7:27   ` Richard Zidlicky
2010-08-03  2:01     ` Mauro Carvalho Chehab
2010-08-03 13:05       ` Richard Zidlicky
2010-08-03 13:32         ` Mauro Carvalho Chehab
2010-08-03 14:21           ` Jarod Wilson
2010-08-03 14:46           ` Richard Zidlicky
2010-08-03 15:23             ` Mauro Carvalho Chehab
2010-08-04  7:30           ` Richard Zidlicky
2010-08-01 20:21 ` Mauro Carvalho Chehab [this message]
2010-08-01 20:21 ` [PATCH 5/6] V4L/DVB: sms: properly initialize IR phys and IR name Mauro Carvalho Chehab
2010-08-01 20:21 ` [PATCH 6/6] V4L/DVB: sms: Convert IR support to use the Remote Controller core 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=20100801172110.3c1da080@pedra \
    --to=mchehab@redhat.com \
    --cc=linux-media@vger.kernel.org \
    --cc=udia@siano-ms.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.