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

[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
...@@ -203,10 +203,7 @@ int smi_ir_init(struct smi_dev *dev) ...@@ -203,10 +203,7 @@ int smi_ir_init(struct smi_dev *dev)
rc_dev->dev.parent = &dev->pci_dev->dev; rc_dev->dev.parent = &dev->pci_dev->dev;
rc_dev->driver_type = RC_DRIVER_SCANCODE; rc_dev->driver_type = RC_DRIVER_SCANCODE;
if (dev->info->type == SMI_TECHNOTREND_S2_4200) rc_dev->map_name = dev->info->rc_map;
rc_dev->map_name = RC_MAP_TT_1500;
else
rc_dev->map_name = RC_MAP_DVBSKY;
ir->rc_dev = rc_dev; ir->rc_dev = rc_dev;
ir->dev = dev; ir->dev = dev;
......
...@@ -1067,6 +1067,7 @@ static struct smi_cfg_info dvbsky_s950_cfg = { ...@@ -1067,6 +1067,7 @@ static struct smi_cfg_info dvbsky_s950_cfg = {
.ts_1 = SMI_TS_DMA_BOTH, .ts_1 = SMI_TS_DMA_BOTH,
.fe_0 = DVBSKY_FE_NULL, .fe_0 = DVBSKY_FE_NULL,
.fe_1 = DVBSKY_FE_M88DS3103, .fe_1 = DVBSKY_FE_M88DS3103,
.rc_map = RC_MAP_DVBSKY,
}; };
static struct smi_cfg_info dvbsky_s952_cfg = { static struct smi_cfg_info dvbsky_s952_cfg = {
...@@ -1076,6 +1077,7 @@ 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, .ts_1 = SMI_TS_DMA_BOTH,
.fe_0 = DVBSKY_FE_M88RS6000, .fe_0 = DVBSKY_FE_M88RS6000,
.fe_1 = DVBSKY_FE_M88RS6000, .fe_1 = DVBSKY_FE_M88RS6000,
.rc_map = RC_MAP_DVBSKY,
}; };
static struct smi_cfg_info dvbsky_t9580_cfg = { static struct smi_cfg_info dvbsky_t9580_cfg = {
...@@ -1085,6 +1087,7 @@ 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, .ts_1 = SMI_TS_DMA_BOTH,
.fe_0 = DVBSKY_FE_SIT2, .fe_0 = DVBSKY_FE_SIT2,
.fe_1 = DVBSKY_FE_M88DS3103, .fe_1 = DVBSKY_FE_M88DS3103,
.rc_map = RC_MAP_DVBSKY,
}; };
static struct smi_cfg_info technotrend_s2_4200_cfg = { static struct smi_cfg_info technotrend_s2_4200_cfg = {
...@@ -1094,6 +1097,7 @@ 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, .ts_1 = SMI_TS_DMA_BOTH,
.fe_0 = DVBSKY_FE_M88RS6000, .fe_0 = DVBSKY_FE_M88RS6000,
.fe_1 = DVBSKY_FE_M88RS6000, .fe_1 = DVBSKY_FE_M88RS6000,
.rc_map = RC_MAP_TT_1500,
}; };
/* PCI IDs */ /* PCI IDs */
......
...@@ -233,6 +233,7 @@ struct smi_cfg_info { ...@@ -233,6 +233,7 @@ struct smi_cfg_info {
#define DVBSKY_FE_SIT2 3 #define DVBSKY_FE_SIT2 3
int fe_0; int fe_0;
int fe_1; int fe_1;
char *rc_map;
}; };
struct smi_rc { struct smi_rc {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment