diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 6 | ||||
| -rw-r--r-- | v4l/or51132.c | 9 |
5 files changed, 25 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index d9c19d51a..9bc1c1df7 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.64 2005/02/16 13:11:55 kraxel Exp $ + * $Id: cx88-cards.c,v 1.65 2005/02/22 09:56:28 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -769,6 +769,7 @@ static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee) } printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d\n", core->name, model, tuner); + return 0; } /* ----------------------------------------------------------------------- */ diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index 0fdfd7710..1d4faabf1 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -1,5 +1,5 @@ /* - $Id: cx88-tvaudio.c,v 1.32 2005/02/15 10:51:54 kraxel Exp $ + $Id: cx88-tvaudio.c,v 1.33 2005/02/22 09:56:29 kraxel Exp $ cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver @@ -142,6 +142,13 @@ static void set_audio_finish(struct cx88_core *core) { u32 volume; + if (cx88_boards[core->board].blackbird) { + // 'pass-thru mode': this enables the i2s output to the mpeg encoder + cx_set(AUD_CTL, 0x2000); + cx_write(AUD_I2SOUTPUTCNTL, 1); + //cx_write(AUD_APB_IN_RATE_ADJ, 0); + } + // finish programming cx_write(AUD_SOFT_RESET, 0x0000); diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 6625ff2d3..6591f6011 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.27 2005/02/21 13:57:59 kraxel Exp $ + * $Id: saa7134-core.c,v 1.28 2005/02/22 09:56:29 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -246,13 +246,9 @@ static int need_dvb; static int pending_call(struct notifier_block *self, unsigned long state, void *module) { - struct module *m = module; - - printk("%s #1 %s %ld\n",__FUNCTION__,m->name,state); if (module != THIS_MODULE || state != MODULE_STATE_LIVE) return NOTIFY_DONE; - printk("%s #2 %d %d\n",__FUNCTION__,need_empress,need_dvb); if (need_empress) request_module("saa7134-empress"); if (need_dvb) diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index 0fabdea9d..01ec88816 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.4 2005/02/15 15:59:35 kraxel Exp $ + * $Id: tuner-simple.c,v 1.5 2005/02/22 09:56:29 kraxel Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -204,7 +204,11 @@ static struct tunertype tuners[] = { 16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested { "tda8290+75", Philips,PAL|NTSC, /* see tda8290.c for details */ }, + { "LG PAL (TAPE series, pvr150)", LGINNOTEK, PAL, + 16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623}, + { "Philips PAL/SECAM multi (FM1216ME pvr150)", Philips, PAL, + 16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 }, }; unsigned const int tuner_count = ARRAY_SIZE(tuners); diff --git a/v4l/or51132.c b/v4l/or51132.c index 4ebf1321b..5789b4960 100644 --- a/v4l/or51132.c +++ b/v4l/or51132.c @@ -31,6 +31,7 @@ #define OR51132_VSB_FIRMWARE "dvb-fe-or51132-vsb.fw" #define OR51132_QAM_FIRMWARE "dvb-fe-or51132-qam.fw" +#include <linux/version.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -254,10 +255,12 @@ static int or51132_setmode(struct dvb_frontend* fe) /* Auto-deinterleave; MPEG ser, MPEG2tr, phase noise-high*/ cmd_buf[2] = 0x5F; break; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) case VSB_8: /* Auto CH, Auto NTSC rej, MPEGser, MPEG2tr, phase noise-high*/ cmd_buf[2] = 0x50; break; +#endif default: printk("setmode:Modulation set to unsupported value\n"); }; @@ -290,12 +293,14 @@ static int or51132_setmode(struct dvb_frontend* fe) /* Channel MODE QAM64 */ cmd_buf[2] = 0x43; break; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) case VSB_8: /* REC MODE inv IF spectrum, Normal */ cmd_buf[1] = 0x03; /* Channel MODE ATSC/VSB8 */ cmd_buf[2] = 0x06; break; +#endif default: printk("setmode: Modulation set to unsupported value\n"); }; @@ -319,6 +324,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe, struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv; const struct firmware *fw; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) /* Change only if we are actually changing the modulation */ if (state->current_modulation != param->u.vsb.modulation) { switch(param->u.vsb.modulation) { @@ -369,6 +375,9 @@ static int or51132_set_parameters(struct dvb_frontend* fe, state->current_modulation = param->u.vsb.modulation; or51132_setmode(fe); } +#else + printk("%s: you need a newer kernel for this, sorry\n",__FUNCTION__); +#endif /* Change only if we are actually changing the channel */ if (state->current_frequency != param->frequency) { |