leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (4479): LNB voltage control was inverted for the benefit of geniatech cards on Kworld

Browse Source 
1) It sets LNBDCPol differently based on the card type. Now it should
work properly for both the kworld and geniatech cards.
2) It stops returning an error for the SEC_VOLTAGE_OFF voltage command
(the cx88-dvb level handles the actual voltage on/off, but it still
passes the ioctl down to the cx24123 level, which previously rejected
the OFF as invalid so the ioctl would report failure)

Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Yeasah Pell <yeasah@schwide.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Yeasah Pell 2006-09-26 12:30:14 -03:00 committed by Mauro Carvalho Chehab
parent 8d90ee5e0e
commit ef76856d26
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/dvb/frontends/cx24123.c
View File

@ -661,6 +661,10 @@ static int cx24123_initfe(struct dvb_frontend* fe)
for (i = 0; i < sizeof(cx24123_regdata) / sizeof(cx24123_regdata[0]); i++) for (i = 0; i < sizeof(cx24123_regdata) / sizeof(cx24123_regdata[0]); i++)
cx24123_writereg(state, cx24123_regdata[i].reg, cx24123_regdata[i].data); cx24123_writereg(state, cx24123_regdata[i].reg, cx24123_regdata[i].data);
/* Set the LNB polarity */
if(state->config->lnb_polarity)
cx24123_writereg(state, 0x32, cx24123_readreg(state, 0x32) | 0x02);
return 0; return 0;
} }
@ -678,6 +682,9 @@ static int cx24123_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage
case SEC_VOLTAGE_18: case SEC_VOLTAGE_18:
dprintk("%s: setting voltage 18V\n", __FUNCTION__); dprintk("%s: setting voltage 18V\n", __FUNCTION__);
return cx24123_writereg(state, 0x29, val | 0x80); return cx24123_writereg(state, 0x29, val | 0x80);
case SEC_VOLTAGE_OFF:
/* already handled in cx88-dvb */
return 0;
default: default:
return -EINVAL; return -EINVAL;
}; };

3
drivers/media/dvb/frontends/cx24123.h
View File

@ -30,6 +30,9 @@ struct cx24123_config
/* Need to set device param for start_dma */ /* Need to set device param for start_dma */
int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured); int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
/* 0 = LNB voltage normal, 1 = LNB voltage inverted */
int lnb_polarity;
}; };
#if defined(CONFIG_DVB_CX24123) || defined(CONFIG_DVB_CX24123_MODULE) #if defined(CONFIG_DVB_CX24123) || defined(CONFIG_DVB_CX24123_MODULE)

1
drivers/media/video/cx88/cx88-dvb.c
View File

@ -498,6 +498,7 @@ static struct cx24123_config hauppauge_novas_config = {
static struct cx24123_config kworld_dvbs_100_config = { static struct cx24123_config kworld_dvbs_100_config = {
.demod_address = 0x15, .demod_address = 0x15,
.set_ts_params = cx24123_set_ts_param, .set_ts_params = cx24123_set_ts_param,
.lnb_polarity = 1,
}; };
static int dvb_register(struct cx8802_dev *dev) static int dvb_register(struct cx8802_dev *dev)