summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-11-22 13:08:53 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-11-22 13:08:53 -0200
commitc90ce9754c3f2052b5f05586074c6bbf10fafde5 (patch)
tree948f5089dbc844bfa11ee361aa9825ffda0a7ace /linux/drivers/media/video/em28xx
parentbdd18e571783ff031a46480596c182254c1c1835 (diff)
downloadmediapointer-dvb-s2-c90ce9754c3f2052b5f05586074c6bbf10fafde5.tar.gz
mediapointer-dvb-s2-c90ce9754c3f2052b5f05586074c6bbf10fafde5.tar.bz2
Convert MTS to bitfield
From: Mauro Carvalho Chehab <mchehab@infradead.org> Xc2028.3028 has two type of firmwares: audio-standard specific ones and baseband MTS firmwares. MTS firmwares provide stereo decoding for 6 MHz BTSC/EIAJ and for monoaural audio decoding on 8 MHz firmwares. It seems that the option to use MTS or a standard-specific audio decoding depends on the way xc2028/3028 is connected. Instead of wasting 32 (or 64 bits) to signalize if the driver needs to use MTS firmware, this patch converts it to a bitfield that can be shared with other proprieties of xc2028/3028. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index aa51a833b..d1840029f 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -155,7 +155,7 @@ struct em28xx_board em28xx_boards[] = {
.tda9887_conf = TDA9887_PRESENT,
.tuner_type = TUNER_XC2028,
.has_tuner = 1,
- .xc2028_type = XC2028_FIRM_MTS,
+ .mts_firmware = 1,
.decoder = EM28XX_TVP5150,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
@@ -477,7 +477,7 @@ static void em28xx_config_tuner (struct em28xx *dev)
ctl.fname = XC2028_DEFAULT_FIRMWARE;
ctl.max_len = 64;
- ctl.type = em28xx_boards[dev->model].xc2028_type;
+ ctl.mts = em28xx_boards[dev->model].mts_firmware;
xc2028_cfg.tuner = TUNER_XC2028;
xc2028_cfg.priv = &ctl;
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index efc7d25c3..5e5f4e7a9 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -179,9 +179,9 @@ struct em28xx_board {
unsigned int has_tuner:1;
unsigned int has_msp34xx:1;
+ unsigned int mts_firmware:1;
enum em28xx_decoder decoder;
- int xc2028_type;
struct em28xx_input input[MAX_EM28XX_INPUT];
};