Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63fc31e8 authored by Herton Ronaldo Krzesinski's avatar Herton Ronaldo Krzesinski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: saa7134: add RM-K6 remote control support for Avermedia M135A 



This change adds support for one more remote control type for Avermedia
M135A (model RM-K6), shipped with Positivo machines.

Signed-off-by: default avatarHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7e2d9820

drivers/media/IR/keymaps/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ 
			rc-avermedia.o \

			rc-avermedia-cardbus.o \

			rc-avermedia-dvbt.o \

			rc-avermedia-m135a-rm-jx.o \

			rc-avermedia-m135a.o \

			rc-avermedia-m733a-rm-k6.o \

			rc-avertv-303.o \

			rc-behold.o \

drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c→drivers/media/IR/keymaps/rc-avermedia-m135a.c

+147 −0
Original line number Diff line number Diff line 
/* avermedia-m135a-rm-jx.h - Keytable for avermedia_m135a_rm_jx Remote Controller

 *

 * keymap imported from ir-keymaps.c

/* avermedia-m135a.c - Keytable for Avermedia M135A Remote Controllers

 *

 * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>

 * Copyright (c) 2010 by Herton Ronaldo Krzesinski <herton@mandriva.com.br>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -13,12 +12,18 @@ 
#include <media/rc-map.h>



/*

 * Avermedia M135A with IR model RM-JX

 * The same codes exist on both Positivo (BR) and original IR

 * Mauro Carvalho Chehab <mchehab@infradead.org>

 * Avermedia M135A with RM-JX and RM-K6 remote controls

 *

 * On Avermedia M135A with IR model RM-JX, the same codes exist on both

 * Positivo (BR) and original IR, initial version and remote control codes

 * added by Mauro Carvalho Chehab <mchehab@infradead.org>

 *

 * Positivo also ships Avermedia M135A with model RM-K6, extra control

 * codes added by Herton Ronaldo Krzesinski <herton@mandriva.com.br>

 */



static struct ir_scancode avermedia_m135a_rm_jx[] = {

static struct ir_scancode avermedia_m135a[] = {

	/* RM-JX */

	{ 0x0200, KEY_POWER2 },

	{ 0x022e, KEY_DOT },		/* '.' */

	{ 0x0201, KEY_MODE },		/* TV/FM or SOURCE */
@@ -62,29 +67,81 @@ static struct ir_scancode avermedia_m135a_rm_jx[] = { 
	{ 0x0219, KEY_RECORD },

	{ 0x0218, KEY_PLAY },

	{ 0x021b, KEY_STOP },



	/* RM-K6 */

	{ 0x0401, KEY_POWER2 },

	{ 0x0406, KEY_MUTE },

	{ 0x0408, KEY_MODE },     /* TV/FM */



	{ 0x0409, KEY_1 },

	{ 0x040a, KEY_2 },

	{ 0x040b, KEY_3 },

	{ 0x040c, KEY_4 },

	{ 0x040d, KEY_5 },

	{ 0x040e, KEY_6 },

	{ 0x040f, KEY_7 },

	{ 0x0410, KEY_8 },

	{ 0x0411, KEY_9 },

	{ 0x044c, KEY_DOT },      /* '.' */

	{ 0x0412, KEY_0 },

	{ 0x0407, KEY_REFRESH },  /* Refresh/Reload */



	{ 0x0413, KEY_AUDIO },

	{ 0x0440, KEY_SCREEN },   /* Full Screen toggle */

	{ 0x0441, KEY_HOME },

	{ 0x0442, KEY_BACK },

	{ 0x0447, KEY_UP },

	{ 0x0448, KEY_DOWN },

	{ 0x0449, KEY_LEFT },

	{ 0x044a, KEY_RIGHT },

	{ 0x044b, KEY_OK },

	{ 0x0404, KEY_VOLUMEUP },

	{ 0x0405, KEY_VOLUMEDOWN },

	{ 0x0402, KEY_CHANNELUP },

	{ 0x0403, KEY_CHANNELDOWN },



	{ 0x0443, KEY_RED },

	{ 0x0444, KEY_GREEN },

	{ 0x0445, KEY_YELLOW },

	{ 0x0446, KEY_BLUE },



	{ 0x0414, KEY_TEXT },

	{ 0x0415, KEY_EPG },

	{ 0x041a, KEY_TV2 },      /* PIP */

	{ 0x041b, KEY_MHP },      /* Snapshot */



	{ 0x0417, KEY_RECORD },

	{ 0x0416, KEY_PLAYPAUSE },

	{ 0x0418, KEY_STOP },

	{ 0x0419, KEY_PAUSE },



	{ 0x041f, KEY_PREVIOUS },

	{ 0x041c, KEY_REWIND },

	{ 0x041d, KEY_FORWARD },

	{ 0x041e, KEY_NEXT },

};



static struct rc_keymap avermedia_m135a_rm_jx_map = {

static struct rc_keymap avermedia_m135a_map = {

	.map = {

		.scan    = avermedia_m135a_rm_jx,

		.size    = ARRAY_SIZE(avermedia_m135a_rm_jx),

		.scan    = avermedia_m135a,

		.size    = ARRAY_SIZE(avermedia_m135a),

		.ir_type = IR_TYPE_NEC,

		.name    = RC_MAP_AVERMEDIA_M135A_RM_JX,

		.name    = RC_MAP_AVERMEDIA_M135A,

	}

};



static int __init init_rc_map_avermedia_m135a_rm_jx(void)

static int __init init_rc_map_avermedia_m135a(void)

{

	return ir_register_map(&avermedia_m135a_rm_jx_map);

	return ir_register_map(&avermedia_m135a_map);

}



static void __exit exit_rc_map_avermedia_m135a_rm_jx(void)

static void __exit exit_rc_map_avermedia_m135a(void)

{

	ir_unregister_map(&avermedia_m135a_rm_jx_map);

	ir_unregister_map(&avermedia_m135a_map);

}



module_init(init_rc_map_avermedia_m135a_rm_jx)

module_exit(exit_rc_map_avermedia_m135a_rm_jx)

module_init(init_rc_map_avermedia_m135a)

module_exit(exit_rc_map_avermedia_m135a)



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");

drivers/media/video/saa7134/saa7134-input.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
		saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4);

		break;

	case SAA7134_BOARD_AVERMEDIA_M135A:

		ir_codes     = RC_MAP_AVERMEDIA_M135A_RM_JX;

		ir_codes     = RC_MAP_AVERMEDIA_M135A;

		mask_keydown = 0x0040000;	/* Enable GPIO18 line on both edges */

		mask_keyup   = 0x0040000;

		mask_keycode = 0xffff;

include/media/rc-map.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void rc_map_init(void); 
#define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"

#define RC_MAP_AVERMEDIA_CARDBUS         "rc-avermedia-cardbus"

#define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"

#define RC_MAP_AVERMEDIA_M135A_RM_JX     "rc-avermedia-m135a-rm-jx"

#define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"

#define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"

#define RC_MAP_AVERMEDIA                 "rc-avermedia"

#define RC_MAP_AVERTV_303                "rc-avertv-303"