diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 6 | ||||
| -rw-r--r-- | v4l/.bp/2.6/tveeprom | 2 |
5 files changed, 26 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 2e246e8c7..be0351c54 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.21 2004/12/10 12:33:39 kraxel Exp $ + * $Id: cx88-core.c,v 1.22 2004/12/17 11:51:37 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -69,6 +69,10 @@ static unsigned int nicam = 0; module_param(nicam,int,0644); MODULE_PARM_DESC(nicam,"tv audio is nicam"); +static unsigned int nocomb = 0; +module_param(nocomb,int,0644); +MODULE_PARM_DESC(nicam,"disable comb filter"); + #define dprintk(level,fmt, arg...) if (core_debug >= level) \ printk(KERN_DEBUG "%s: " fmt, core->name , ## arg) @@ -818,6 +822,8 @@ int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int heig value |= (1 << 0); // 3-tap interpolation if (width < 193) value |= (1 << 1); // 5-tap interpolation + if (nocomb) + value |= (3 << 5); // disable comb filter cx_write(MO_FILTER_EVEN, value); cx_write(MO_FILTER_ODD, value); diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index b9b7dc238..42b9ec14c 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -1204,7 +1204,7 @@ static void msp34xxg_set_source(struct i2c_client *client, int source); static int msp34xxg_init(struct i2c_client *client) { struct msp3400c *msp = i2c_get_clientdata(client); - int modus; + int modus,std; if (msp3400c_reset(client)) return -1; @@ -1218,6 +1218,7 @@ static int msp34xxg_init(struct i2c_client *client) /* step-by-step initialisation, as described in the manual */ modus = msp34xx_modus(msp->norm); + std = msp34xx_standard(msp->norm); modus &= ~0x03; /* STATUS_CHANGE=0 */ modus |= 0x01; /* AUTOMATIC_SOUND_DETECTION=1 */ if (msp3400c_write(client, @@ -1225,6 +1226,11 @@ static int msp34xxg_init(struct i2c_client *client) 0x30/*MODUS*/, modus)) return -1; + if (msp3400c_write(client, + I2C_MSP3400C_DEM, + 0x20/*stanard*/, + std)) + return -1; /* write the dfps that may have an influence on standard/audio autodetection right now */ diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index b9b7dc238..42b9ec14c 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -1204,7 +1204,7 @@ static void msp34xxg_set_source(struct i2c_client *client, int source); static int msp34xxg_init(struct i2c_client *client) { struct msp3400c *msp = i2c_get_clientdata(client); - int modus; + int modus,std; if (msp3400c_reset(client)) return -1; @@ -1218,6 +1218,7 @@ static int msp34xxg_init(struct i2c_client *client) /* step-by-step initialisation, as described in the manual */ modus = msp34xx_modus(msp->norm); + std = msp34xx_standard(msp->norm); modus &= ~0x03; /* STATUS_CHANGE=0 */ modus |= 0x01; /* AUTOMATIC_SOUND_DETECTION=1 */ if (msp3400c_write(client, @@ -1225,6 +1226,11 @@ static int msp34xxg_init(struct i2c_client *client) 0x30/*MODUS*/, modus)) return -1; + if (msp3400c_write(client, + I2C_MSP3400C_DEM, + 0x20/*stanard*/, + std)) + return -1; /* write the dfps that may have an influence on standard/audio autodetection right now */ diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index a5dba717a..7ac3532e3 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -37,13 +37,13 @@ #include <linux/types.h> #include <linux/i2c.h> +#include <media/tuner.h> +#include <media/tveeprom.h> + MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver"); MODULE_AUTHOR("John Klar"); MODULE_LICENSE("GPL"); -#include "tuner.h" -#include "tveeprom.h" - static int debug = 0; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Debug level (0-2)"); diff --git a/v4l/.bp/2.6/tveeprom b/v4l/.bp/2.6/tveeprom new file mode 100644 index 000000000..f148b1ae8 --- /dev/null +++ b/v4l/.bp/2.6/tveeprom @@ -0,0 +1,2 @@ +srcdiff tveeprom.h include/media/tveeprom.h +srcdiff tveeprom.c drivers/media/video/tveeprom.c |