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

Commit 6dfe9911 authored by Olli Salonen's avatar Olli Salonen Committed by Mauro Carvalho Chehab
Browse files

[media] smipcie: add RC map into card configuration options 



Remove the if..else statement from smipcie-ir.c and add the remote
controller map as a configuration parameter for the card.

Signed-off-by: default avatarOlli Salonen <olli.salonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9b8537de

drivers/media/pci/smipcie/smipcie-ir.c

+1 −4
Original line number Diff line number Diff line
@@ -203,10 +203,7 @@ int smi_ir_init(struct smi_dev *dev) 
	rc_dev->dev.parent = &dev->pci_dev->dev;



	rc_dev->driver_type = RC_DRIVER_SCANCODE;

	if (dev->info->type == SMI_TECHNOTREND_S2_4200)

		rc_dev->map_name = RC_MAP_TT_1500;

	else

		rc_dev->map_name = RC_MAP_DVBSKY;

	rc_dev->map_name = dev->info->rc_map;



	ir->rc_dev = rc_dev;

	ir->dev = dev;

drivers/media/pci/smipcie/smipcie-main.c

+4 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,7 @@ static struct smi_cfg_info dvbsky_s950_cfg = { 
	.ts_1 = SMI_TS_DMA_BOTH,

	.fe_0 = DVBSKY_FE_NULL,

	.fe_1 = DVBSKY_FE_M88DS3103,

	.rc_map = RC_MAP_DVBSKY,

};



static struct smi_cfg_info dvbsky_s952_cfg = {
@@ -1076,6 +1077,7 @@ static struct smi_cfg_info dvbsky_s952_cfg = { 
	.ts_1 = SMI_TS_DMA_BOTH,

	.fe_0 = DVBSKY_FE_M88RS6000,

	.fe_1 = DVBSKY_FE_M88RS6000,

	.rc_map = RC_MAP_DVBSKY,

};



static struct smi_cfg_info dvbsky_t9580_cfg = {
@@ -1085,6 +1087,7 @@ static struct smi_cfg_info dvbsky_t9580_cfg = { 
	.ts_1 = SMI_TS_DMA_BOTH,

	.fe_0 = DVBSKY_FE_SIT2,

	.fe_1 = DVBSKY_FE_M88DS3103,

	.rc_map = RC_MAP_DVBSKY,

};



static struct smi_cfg_info technotrend_s2_4200_cfg = {
@@ -1094,6 +1097,7 @@ static struct smi_cfg_info technotrend_s2_4200_cfg = { 
	.ts_1 = SMI_TS_DMA_BOTH,

	.fe_0 = DVBSKY_FE_M88RS6000,

	.fe_1 = DVBSKY_FE_M88RS6000,

	.rc_map = RC_MAP_TT_1500,

};



/* PCI IDs */

drivers/media/pci/smipcie/smipcie.h

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ struct smi_cfg_info { 
#define DVBSKY_FE_SIT2          3

	int fe_0;

	int fe_1;

	char *rc_map;

};



struct smi_rc {