Commit b699c271 authored by Igor M. Liplianin's avatar Igor M. Liplianin Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13407): Add Prof 7301 PCI DVB-S2 card 



Add Prof 7301 PCI DVB-S2 card

The card based on stv0903 demod, stb6100 tuner.

Signed-off-by: default avatarIgor M. Liplianin <liplianin@me.by>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fa26ae3e

Documentation/video4linux/CARDLIST.cx88

+1 −0
Original line number Diff line number Diff line
@@ -81,3 +81,4 @@ 
 80 -> Hauppauge WinTV-IR Only                             [0070:9290]

 81 -> Leadtek WinFast DTV1800 Hybrid                      [107d:6654]

 82 -> WinFast DTV2000 H rev. J                            [107d:6f2b]

 83 -> Prof 7301 DVB-S/S2                                  [b034:3034]

drivers/media/dvb/frontends/stb6100_proc.h

0 → 100644
+138 −0
Original line number Diff line number Diff line 
/*

	STB6100 Silicon Tuner wrapper

	Copyright (C)2009 Igor M. Liplianin (liplianin@me.by)



	This program is free software; you can redistribute it and/or modify

	it under the terms of the GNU General Public License as published by

	the Free Software Foundation; either version 2 of the License, or

	(at your option) any later version.



	This program is distributed in the hope that it will be useful,

	but WITHOUT ANY WARRANTY; without even the implied warranty of

	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

	GNU General Public License for more details.



	You should have received a copy of the GNU General Public License

	along with this program; if not, write to the Free Software

	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/



static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)

{

	struct dvb_frontend_ops	*frontend_ops = NULL;

	struct dvb_tuner_ops	*tuner_ops = NULL;

	struct tuner_state	state;

	int err = 0;



	if (&fe->ops)

		frontend_ops = &fe->ops;

	if (&frontend_ops->tuner_ops)

		tuner_ops = &frontend_ops->tuner_ops;

	if (tuner_ops->get_state) {

		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 1);



		err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &state);

		if (err < 0) {

			printk(KERN_ERR "%s: Invalid parameter\n", __func__);

			return err;

		}



		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 0);



		*frequency = state.frequency;

	}



	return 0;

}



static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)

{

	struct dvb_frontend_ops	*frontend_ops = NULL;

	struct dvb_tuner_ops	*tuner_ops = NULL;

	struct tuner_state	state;

	int err = 0;



	state.frequency = frequency;

	if (&fe->ops)

		frontend_ops = &fe->ops;

	if (&frontend_ops->tuner_ops)

		tuner_ops = &frontend_ops->tuner_ops;

	if (tuner_ops->set_state) {

		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 1);



		err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &state);

		if (err < 0) {

			printk(KERN_ERR "%s: Invalid parameter\n", __func__);

			return err;

		}



		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 0);



	}



	return 0;

}



static int stb6100_get_bandw(struct dvb_frontend *fe, u32 *bandwidth)

{

	struct dvb_frontend_ops	*frontend_ops = NULL;

	struct dvb_tuner_ops	*tuner_ops = NULL;

	struct tuner_state	state;

	int err = 0;



	if (&fe->ops)

		frontend_ops = &fe->ops;

	if (&frontend_ops->tuner_ops)

		tuner_ops = &frontend_ops->tuner_ops;

	if (tuner_ops->get_state) {

		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 1);



		err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &state);

		if (err < 0) {

			printk(KERN_ERR "%s: Invalid parameter\n", __func__);

			return err;

		}



		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 0);



		*bandwidth = state.bandwidth;

	}



	return 0;

}



static int stb6100_set_bandw(struct dvb_frontend *fe, u32 bandwidth)

{

	struct dvb_frontend_ops	*frontend_ops = NULL;

	struct dvb_tuner_ops	*tuner_ops = NULL;

	struct tuner_state	state;

	int err = 0;



	state.bandwidth = bandwidth;

	if (&fe->ops)

		frontend_ops = &fe->ops;

	if (&frontend_ops->tuner_ops)

		tuner_ops = &frontend_ops->tuner_ops;

	if (tuner_ops->set_state) {

		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 1);



		err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &state);

		if (err < 0) {

			printk(KERN_ERR "%s: Invalid parameter\n", __func__);

			return err;

		}



		if (frontend_ops->i2c_gate_ctrl)

			frontend_ops->i2c_gate_ctrl(fe, 0);



	}



	return 0;

}

drivers/media/dvb/frontends/stv0900.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ struct stv0900_config { 
	u8 tun2_maddress;

	u8 tun1_adc;/* 1 for stv6110, 2 for stb6100 */

	u8 tun2_adc;

	/* Set device param to start dma */

	int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);

};



#if defined(CONFIG_DVB_STV0900) || (defined(CONFIG_DVB_STV0900_MODULE) \

drivers/media/dvb/frontends/stv0900_core.c

+3 −0
Original line number Diff line number Diff line
@@ -1494,6 +1494,9 @@ static enum dvbfe_search stv0900_search(struct dvb_frontend *fe, 
	if (!(INRANGE(100000, c->symbol_rate, 70000000)))

		return DVBFE_ALGO_SEARCH_FAILED;



	if (state->config->set_ts_params)

		state->config->set_ts_params(fe, 0);



	p_result.locked = FALSE;

	p_search.path = demod;

	p_search.frequency = c->frequency;

drivers/media/video/cx88/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ config VIDEO_CX88_DVB 
	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_STV0288 if !DVB_FE_CUSTOMISE

	select DVB_STB6000 if !DVB_FE_CUSTOMISE

	select DVB_STV0900 if !DVB_FE_CUSTOMISE

	select DVB_STB6100 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE

	---help---

	  This adds support for DVB/ATSC cards based on the