* [PATCH 04/13] Upstream sync - make 2 structs static
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 02/13] Drivers/media/dvb/frontends/mt312.c: cleanups mchehab
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Adrian Bunk, Mauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de>
Date: 1141009675 \-0300
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/bt8xx/dst.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 3a2ff1c..0310e3d 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -602,7 +602,7 @@ static int dst_type_print(u8 type)
*/
-struct dst_types dst_tlist[] = {
+static struct dst_types dst_tlist[] = {
{
.device_id = "200103A",
.offset = 0,
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 02/13] Drivers/media/dvb/frontends/mt312.c: cleanups
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
2006-03-01 12:05 ` [PATCH 04/13] Upstream sync - make 2 structs static mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 01/13] Bt8xx documentation authors fix mchehab
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Adrian Bunk, Michael Krufky, Mauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de>
Date: 1141009669 \-0300
This patch contains the following possible cleanups:
- update the Kconfig help to mention the VP310
- merge vp310_attach and mt312_attach into a new vp310_mt312_attach
to remove some code duplication
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 -
drivers/media/dvb/frontends/Kconfig | 2 -
drivers/media/dvb/frontends/mt312.c | 116 +++++++++++------------------
drivers/media/dvb/frontends/mt312.h | 6 +-
4 files changed, 48 insertions(+), 78 deletions(-)
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 390cc3a..9c7f122 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -526,7 +526,7 @@ int flexcop_frontend_init(struct flexcop
info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
} else
/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
- if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
+ if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
ops = fc->fe->ops;
ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 76b6a2a..c676b1e 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -29,7 +29,7 @@ config DVB_TDA8083
A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_MT312
- tristate "Zarlink MT312 based"
+ tristate "Zarlink VP310/MT312 based"
depends on DVB_CORE
help
A DVB-S tuner module. Say Y when you want to support this frontend.
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index ec4e641..d3aea83 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -612,76 +612,6 @@ static void mt312_release(struct dvb_fro
kfree(state);
}
-static struct dvb_frontend_ops vp310_mt312_ops;
-
-struct dvb_frontend* vp310_attach(const struct mt312_config* config,
- struct i2c_adapter* i2c)
-{
- struct mt312_state* state = NULL;
-
- /* allocate memory for the internal state */
- state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
- if (state == NULL)
- goto error;
-
- /* setup the state */
- state->config = config;
- state->i2c = i2c;
- memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
- strcpy(state->ops.info.name, "Zarlink VP310 DVB-S");
-
- /* check if the demod is there */
- if (mt312_readreg(state, ID, &state->id) < 0)
- goto error;
- if (state->id != ID_VP310) {
- goto error;
- }
-
- /* create dvb_frontend */
- state->frequency = 90;
- state->frontend.ops = &state->ops;
- state->frontend.demodulator_priv = state;
- return &state->frontend;
-
-error:
- kfree(state);
- return NULL;
-}
-
-struct dvb_frontend* mt312_attach(const struct mt312_config* config,
- struct i2c_adapter* i2c)
-{
- struct mt312_state* state = NULL;
-
- /* allocate memory for the internal state */
- state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
- if (state == NULL)
- goto error;
-
- /* setup the state */
- state->config = config;
- state->i2c = i2c;
- memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
- strcpy(state->ops.info.name, "Zarlink MT312 DVB-S");
-
- /* check if the demod is there */
- if (mt312_readreg(state, ID, &state->id) < 0)
- goto error;
- if (state->id != ID_MT312) {
- goto error;
- }
-
- /* create dvb_frontend */
- state->frequency = 60;
- state->frontend.ops = &state->ops;
- state->frontend.demodulator_priv = state;
- return &state->frontend;
-
-error:
- kfree(state);
- return NULL;
-}
-
static struct dvb_frontend_ops vp310_mt312_ops = {
.info = {
@@ -720,6 +650,49 @@ static struct dvb_frontend_ops vp310_mt3
.set_voltage = mt312_set_voltage,
};
+struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
+ struct i2c_adapter* i2c)
+{
+ struct mt312_state* state = NULL;
+
+ /* allocate memory for the internal state */
+ state = kmalloc(sizeof(struct mt312_state), GFP_KERNEL);
+ if (state == NULL)
+ goto error;
+
+ /* setup the state */
+ state->config = config;
+ state->i2c = i2c;
+ memcpy(&state->ops, &vp310_mt312_ops, sizeof(struct dvb_frontend_ops));
+
+ /* check if the demod is there */
+ if (mt312_readreg(state, ID, &state->id) < 0)
+ goto error;
+
+ switch (state->id) {
+ case ID_VP310:
+ strcpy(state->ops.info.name, "Zarlink VP310 DVB-S");
+ state->frequency = 90;
+ break;
+ case ID_MT312:
+ strcpy(state->ops.info.name, "Zarlink MT312 DVB-S");
+ state->frequency = 60;
+ break;
+ default:
+ printk (KERN_WARNING "Only Zarlink VP310/MT312 are supported chips.\n");
+ goto error;
+ }
+
+ /* create dvb_frontend */
+ state->frontend.ops = &state->ops;
+ state->frontend.demodulator_priv = state;
+ return &state->frontend;
+
+error:
+ kfree(state);
+ return NULL;
+}
+
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
@@ -727,5 +700,4 @@ MODULE_DESCRIPTION("Zarlink VP310/MT312
MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");
MODULE_LICENSE("GPL");
-EXPORT_SYMBOL(mt312_attach);
-EXPORT_SYMBOL(vp310_attach);
+EXPORT_SYMBOL(vp310_mt312_attach);
diff --git a/drivers/media/dvb/frontends/mt312.h b/drivers/media/dvb/frontends/mt312.h
index b3a53a7..074d844 100644
--- a/drivers/media/dvb/frontends/mt312.h
+++ b/drivers/media/dvb/frontends/mt312.h
@@ -38,10 +38,8 @@ struct mt312_config
int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
};
-extern struct dvb_frontend* mt312_attach(const struct mt312_config* config,
- struct i2c_adapter* i2c);
+struct dvb_frontend* vp310_mt312_attach(const struct mt312_config* config,
+ struct i2c_adapter* i2c);
-extern struct dvb_frontend* vp310_attach(const struct mt312_config* config,
- struct i2c_adapter* i2c);
#endif // MT312_H
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 01/13] Bt8xx documentation authors fix
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
2006-03-01 12:05 ` [PATCH 04/13] Upstream sync - make 2 structs static mchehab
2006-03-01 12:05 ` [PATCH 02/13] Drivers/media/dvb/frontends/mt312.c: cleanups mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 03/13] Make a struct static mchehab
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Michael Krufky, Mauro Carvalho Chehab
From: Michael Krufky <mkrufky@linuxtv.org>
Date: 1141009666 \-0300
- use one Author per line, which allows us to add more
authors later without creating a mess.
- Add Michael Krufky due to -git commit
2cbeddc976645262dbe036d6ec0825f96af70da3
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
Documentation/dvb/bt8xx.txt | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt
index df6c054..52ed462 100644
--- a/Documentation/dvb/bt8xx.txt
+++ b/Documentation/dvb/bt8xx.txt
@@ -111,4 +111,8 @@ source: linux/Documentation/video4linux
If you have problems with this please do ask on the mailing list.
--
-Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham
+Authors: Richard Walker,
+ Jamie Honan,
+ Michael Hunold,
+ Manu Abraham,
+ Michael Krufky
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 03/13] Make a struct static
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (2 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 01/13] Bt8xx documentation authors fix mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 05/13] Pinnacle PCTV 40i: add filtered Composite2 input mchehab
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Manu Abraham, Mauro Carvalho Chehab
From: Manu Abraham <manu@linuxtv.org>
Date: 1141009672 \-0300
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/bt8xx/bt878.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 34c3189..356f447 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, u
EXPORT_SYMBOL(bt878_device_control);
-struct cards card_list[] __devinitdata = {
+static struct cards card_list[] __devinitdata = {
{ 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" },
{ 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" },
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 05/13] Pinnacle PCTV 40i: add filtered Composite2 input
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (3 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 03/13] Make a struct static mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 07/13] Cxusb: fix lgdt3303 naming mchehab
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Karsten Suehring, Michael Krufky,
Mauro Carvalho Chehab
From: Karsten Suehring <ksuehring@gmx.net>
Date: 1141009688 \-0300
This patch adds another composite input to the Pinnacle PCTV 100i
definition which filters the chrominace signal from the luma input. This
improves video quality for Composite signals on the S-Video connector of
the card.
In addition the name string of the card is changed to include PCTV 40i
and 50i since these cards are identical.
Signed-off-by: Karsten Suehring <ksuehring@gmx.net>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
Documentation/video4linux/CARDLIST.saa7134 | 2 +-
drivers/media/video/saa7134/saa7134-cards.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 8a35259..9d48fb3 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -75,7 +75,7 @@
74 -> LifeView FlyTV Platinum Mini2 [14c0:1212]
75 -> AVerMedia AVerTVHD MCE A180 [1461:1044]
76 -> SKNet MonsterTV Mobile [1131:4ee9]
- 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e]
+ 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e]
78 -> ASUSTeK P7131 Dual [1043:4862]
79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
80 -> ASUS Digimatrix TV [1043:0210]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 5a35d3b..dcffd8c 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2392,7 +2392,7 @@ struct saa7134_board saa7134_boards[] =
}},
},
[SAA7134_BOARD_PINNACLE_PCTV_110i] = {
- .name = "Pinnacle PCTV 110i (saa7133)",
+ .name = "Pinnacle PCTV 40i/50i/110i (saa7133)",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET,
@@ -2407,6 +2407,10 @@ struct saa7134_board saa7134_boards[] =
},{
.name = name_comp1,
.vmux = 1,
+ .amux = LINE2,
+ },{
+ .name = name_comp2,
+ .vmux = 0,
.amux = LINE2,
},{
.name = name_svideo,
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 07/13] Cxusb: fix lgdt3303 naming
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (4 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 05/13] Pinnacle PCTV 40i: add filtered Composite2 input mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 06/13] Fixed saa7134 ALSA initialization with multiple cards mchehab
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Michael Krufky, Mauro Carvalho Chehab
From: Michael Krufky <mkrufky@linuxtv.org>
Date: 1141009697 \-0300
The following are specific to lgdt3303, and are being renamed to reflect this.
- cxusb_lgdt330x_config renamed to cxusb_lgdt3303_config.
- cxusb_lgdt330x_frontend_attach renamed to cxusb_lgdt3303_frontend_attach.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/dvb-usb/cxusb.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index f327fac..162f979 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -282,7 +282,7 @@ static struct cx22702_config cxusb_cx227
.pll_set = dvb_usb_pll_set_i2c,
};
-static struct lgdt330x_config cxusb_lgdt330x_config = {
+static struct lgdt330x_config cxusb_lgdt3303_config = {
.demod_address = 0x0e,
.demod_chip = LGDT3303,
.pll_set = dvb_usb_pll_set_i2c,
@@ -357,14 +357,14 @@ static int cxusb_cx22702_frontend_attach
return -EIO;
}
-static int cxusb_lgdt330x_frontend_attach(struct dvb_usb_device *d)
+static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_device *d)
{
if (usb_set_interface(d->udev,0,7) < 0)
err("set interface failed");
cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
- if ((d->fe = lgdt330x_attach(&cxusb_lgdt330x_config, &d->i2c_adap)) != NULL)
+ if ((d->fe = lgdt330x_attach(&cxusb_lgdt3303_config, &d->i2c_adap)) != NULL)
return 0;
return -EIO;
@@ -506,7 +506,7 @@ static struct dvb_usb_properties cxusb_b
.streaming_ctrl = cxusb_streaming_ctrl,
.power_ctrl = cxusb_power_ctrl,
- .frontend_attach = cxusb_lgdt330x_frontend_attach,
+ .frontend_attach = cxusb_lgdt3303_frontend_attach,
.tuner_attach = cxusb_lgh064f_tuner_attach,
.i2c_algo = &cxusb_i2c_algo,
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 06/13] Fixed saa7134 ALSA initialization with multiple cards
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (5 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 07/13] Cxusb: fix lgdt3303 naming mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 10/13] Dvb: fix __init/__exit section references in av7110 driver mchehab
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Ricardo Cerqueira, Mauro Carvalho Chehab
From: Ricardo Cerqueira <v4l@cerqueira.org>
Date: 1141009691 \-0300
When multiple cards were installed, only the first card would have
audio initialized, because only the first position in the array parameter
defaulted to "1"
To make things worse, the "enable" parameter wasn't enabled, so there
was no workaround.
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/saa7134/saa7134-alsa.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index a7a6ab9..7df5e08 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -54,10 +54,12 @@ MODULE_PARM_DESC(debug,"enable debug mes
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
-static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
module_param_array(index, int, NULL, 0444);
+module_param_array(enable, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
+MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");
#define dprintk(fmt, arg...) if (debug) \
printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 10/13] Dvb: fix __init/__exit section references in av7110 driver
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (6 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 06/13] Fixed saa7134 ALSA initialization with multiple cards mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 08/13] Fix maximum for the saturation and contrast controls mchehab
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Johannes Stezenbach, Mauro Carvalho Chehab
From: Johannes Stezenbach <js@linuxtv.org>
Date: 1141009760 \-0300
use __devinit/__devexit/__devexit_p() where appropriate
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/ttpci/av7110.c | 7 ++++---
drivers/media/dvb/ttpci/av7110_ir.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index d36369e..cdf7b2c 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2477,7 +2477,8 @@ static int frontend_init(struct av7110 *
* The same behaviour of missing VSYNC can be duplicated on budget
* cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
*/
-static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
+static int __devinit av7110_attach(struct saa7146_dev* dev,
+ struct saa7146_pci_extension_data *pci_ext)
{
const int length = TS_WIDTH * TS_HEIGHT;
struct pci_dev *pdev = dev->pci;
@@ -2827,7 +2828,7 @@ err_kfree_0:
goto out;
}
-static int av7110_detach(struct saa7146_dev* saa)
+static int __devexit av7110_detach(struct saa7146_dev* saa)
{
struct av7110 *av7110 = saa->ext_priv;
dprintk(4, "%p\n", av7110);
@@ -2974,7 +2975,7 @@ static struct saa7146_extension av7110_e
.module = THIS_MODULE,
.pci_tbl = &pci_tbl[0],
.attach = av7110_attach,
- .detach = av7110_detach,
+ .detach = __devexit_p(av7110_detach),
.irq_mask = MASK_19 | MASK_03 | MASK_10,
.irq_func = av7110_irq,
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index 617e4f6..d54bbcd 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av
}
-int __init av7110_ir_init(struct av7110 *av7110)
+int __devinit av7110_ir_init(struct av7110 *av7110)
{
static struct proc_dir_entry *e;
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110
}
-void __exit av7110_ir_exit(struct av7110 *av7110)
+void __devexit av7110_ir_exit(struct av7110 *av7110)
{
int i;
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 08/13] Fix maximum for the saturation and contrast controls.
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (7 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 10/13] Dvb: fix __init/__exit section references in av7110 driver mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 09/13] Restore power on defaults of tda9887 after tda8290 probe mchehab
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Hans Verkuil, Mauro Carvalho Chehab
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: 1141009700 \-0300
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/cx25840/cx25840-core.c | 4 ++--
drivers/media/video/saa7115.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 08ffd1f..5588b9a 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -567,7 +567,7 @@ static struct v4l2_queryctrl cx25840_qct
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Contrast",
.minimum = 0,
- .maximum = 255,
+ .maximum = 127,
.step = 1,
.default_value = 64,
.flags = 0,
@@ -576,7 +576,7 @@ static struct v4l2_queryctrl cx25840_qct
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Saturation",
.minimum = 0,
- .maximum = 255,
+ .maximum = 127,
.step = 1,
.default_value = 64,
.flags = 0,
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 048d000..ffd87ce 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1027,7 +1027,7 @@ static struct v4l2_queryctrl saa7115_qct
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Contrast",
.minimum = 0,
- .maximum = 255,
+ .maximum = 127,
.step = 1,
.default_value = 64,
.flags = 0,
@@ -1036,7 +1036,7 @@ static struct v4l2_queryctrl saa7115_qct
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Saturation",
.minimum = 0,
- .maximum = 255,
+ .maximum = 127,
.step = 1,
.default_value = 64,
.flags = 0,
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 09/13] Restore power on defaults of tda9887 after tda8290 probe
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (8 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 08/13] Fix maximum for the saturation and contrast controls mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 13/13] ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID mchehab
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Hartmut Hackmann, Mauro Carvalho Chehab
From: Hartmut Hackmann <hartmut.hackmann@t\-online.de>
Date: 1141009751 \-0300
The probing code for tda8290 changes the state of the tda9887 GP ports.
The patch assumes that if probing for tda8290 failed, this must be a
tda9887 and restores its power on defaults.
This should solve the module load order issue with some pinnacle cards.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/saa7134/saa7134-cards.c | 4 ++--
drivers/media/video/tda8290.c | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index dcffd8c..cd37880 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2187,7 +2187,7 @@ struct saa7134_board saa7134_boards[] =
.radio_type = UNSET,
.tuner_addr = 0x61,
.radio_addr = ADDR_UNSET,
- .tda9887_conf = TDA9887_PRESENT,
+ .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_tv,
@@ -2211,7 +2211,7 @@ struct saa7134_board saa7134_boards[] =
.radio_type = UNSET,
.tuner_addr = 0x61,
.radio_addr = ADDR_UNSET,
- .tda9887_conf = TDA9887_PRESENT,
+ .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_tv,
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index 7b4fb28..a796a4e 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -580,9 +580,10 @@ int tda8290_init(struct i2c_client *c)
int tda8290_probe(struct i2c_client *c)
{
- unsigned char soft_reset[] = { 0x00, 0x00 };
- unsigned char easy_mode_b[] = { 0x01, 0x02 };
- unsigned char easy_mode_g[] = { 0x01, 0x04 };
+ unsigned char soft_reset[] = { 0x00, 0x00 };
+ unsigned char easy_mode_b[] = { 0x01, 0x02 };
+ unsigned char easy_mode_g[] = { 0x01, 0x04 };
+ unsigned char restore_9886[] = { 0x00, 0xd6, 0x30 };
unsigned char addr_dto_lsb = 0x07;
unsigned char data;
@@ -599,6 +600,7 @@ int tda8290_probe(struct i2c_client *c)
return 0;
}
}
+ i2c_master_send(c, restore_9886, 3);
return -1;
}
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 13/13] ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (9 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 09/13] Restore power on defaults of tda9887 after tda8290 probe mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 12/13] Fix stv0297 for qam128 on tt c1500 (saa7146) mchehab
2006-03-01 12:05 ` [PATCH 11/13] Removing personal email from DVB maintainers mchehab
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Michael Krufky, Mauro Carvalho Chehab
From: Michael Krufky <mkrufky@linuxtv.org>
Date: 1141064569 \-0300
- ELSA EX-VISION 500TV was incorrectly programmed to have the same
subsystem ID as ELSA EX-VISION 300TV, (1048:226b)
- This changeset replaces the incorrect subsystem ID (1048:226b)
with the correct one (1048:226a) for the ELSA EX-VISION 500TV.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
Documentation/video4linux/CARDLIST.saa7134 | 2 +-
drivers/media/video/saa7134/saa7134-cards.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 9d48fb3..da4fb89 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -13,7 +13,7 @@
12 -> Medion 7134 [16be:0003]
13 -> Typhoon TV+Radio 90031
14 -> ELSA EX-VISION 300TV [1048:226b]
- 15 -> ELSA EX-VISION 500TV [1048:226b]
+ 15 -> ELSA EX-VISION 500TV [1048:226a]
16 -> ASUS TV-FM 7134 [1043:4842,1043:4830,1043:4840]
17 -> AOPEN VA1000 POWER [1131:7133]
18 -> BMK MPEX No Tuner
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index cd37880..479b010 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2749,7 +2749,7 @@ struct pci_device_id saa7134_pci_tbl[] =
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
.subvendor = 0x1048,
- .subdevice = 0x226b,
+ .subdevice = 0x226a,
.driver_data = SAA7134_BOARD_ELSA_500TV,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 12/13] Fix stv0297 for qam128 on tt c1500 (saa7146)
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (10 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 13/13] ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID mchehab
@ 2006-03-01 12:05 ` mchehab
2006-03-01 12:05 ` [PATCH 11/13] Removing personal email from DVB maintainers mchehab
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Mattias Nordstrom, Michael Krufky,
Mauro Carvalho Chehab
From: Mattias Nordstrom <nordstrom@realnode.com>
Date: 1141009757 \-0300
I have a TT C1500 card (saa7146, STV0297) which had problems tuning
channels at QAM128 (like the ones in the Finnish HTV / Welho network).
A fix which seems to work perfectly so far is to change the delay for
QAM128 to the same values as for QAM256 in stv0297_set_frontend(),
Signed-off-by: Mattias Nordstrom <nordstrom@realnode.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/frontends/stv0297.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 6122ba7..eb15676 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -393,10 +393,6 @@ static int stv0297_set_frontend(struct d
break;
case QAM_128:
- delay = 150;
- sweeprate = 1000;
- break;
-
case QAM_256:
delay = 200;
sweeprate = 500;
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 11/13] Removing personal email from DVB maintainers
2006-03-01 12:05 [PATCH 00/13] V4L/DVB updates mchehab
` (11 preceding siblings ...)
2006-03-01 12:05 ` [PATCH 12/13] Fix stv0297 for qam128 on tt c1500 (saa7146) mchehab
@ 2006-03-01 12:05 ` mchehab
12 siblings, 0 replies; 14+ messages in thread
From: mchehab @ 2006-03-01 12:05 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: 1141009641 \-0300
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
MAINTAINERS | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9c592aa..c39fb20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -838,7 +838,6 @@ S: Maintained
DVB SUBSYSTEM AND DRIVERS
P: LinuxTV.org Project
-M: mchehab@infradead.org
M: v4l-dvb-maintainer@linuxtv.org
L: linux-dvb@linuxtv.org (subscription required)
W: http://linuxtv.org/
^ permalink raw reply [flat|nested] 14+ messages in thread