summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/stb6100.c
diff options
context:
space:
mode:
authorManu Abraham <manu@linuxtv.org>2008-10-27 01:28:52 +0400
committerManu Abraham <manu@linuxtv.org>2008-10-27 01:28:52 +0400
commitc553edd5135a293a84f9fd98ed49c51e33bf3787 (patch)
tree868e4956704211ae016603431cc6ea00ddab4437 /linux/drivers/media/dvb/frontends/stb6100.c
parent84ff5e0bcaa2989c3fb8c2f75f39aaa3858dd767 (diff)
downloadmediapointer-dvb-s2-c553edd5135a293a84f9fd98ed49c51e33bf3787.tar.gz
mediapointer-dvb-s2-c553edd5135a293a84f9fd98ed49c51e33bf3787.tar.bz2
Port STB0899 and STB6100
From: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Manu Abraham <manu@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stb6100.c')
-rw-r--r--linux/drivers/media/dvb/frontends/stb6100.c28
1 files changed, 6 insertions, 22 deletions
diff --git a/linux/drivers/media/dvb/frontends/stb6100.c b/linux/drivers/media/dvb/frontends/stb6100.c
index 653d7efc6..c148de77f 100644
--- a/linux/drivers/media/dvb/frontends/stb6100.c
+++ b/linux/drivers/media/dvb/frontends/stb6100.c
@@ -312,7 +312,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
int rc;
const struct stb6100_lkup *ptr;
struct stb6100_state *state = fe->tuner_priv;
- struct dvbfe_params params;
+ struct dvb_frontend_parameters p;
u32 srate = 0, fvco, nint, nfrac;
u8 regs[STB6100_NUMREGS];
@@ -320,28 +320,12 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
if ((rc = stb6100_read_regs(state, regs)) < 0)
return rc;
- if (fe->ops.get_params) {
- dprintk(verbose, FE_DEBUG, 1, "Get Frontend parameters");
- fe->ops.get_params(fe, &params);
- }
- switch (params.delivery) {
- case DVBFE_DELSYS_DVBS:
- srate = params.delsys.dvbs.symbol_rate;
- dprintk(verbose, FE_DEBUG, 1, "Delivery system = DVB-S, Symbol Rate=[%d]", srate);
- break;
- case DVBFE_DELSYS_DSS:
- dprintk(verbose, FE_DEBUG, 1, "Delivery system = DSS, Symbol Rate=[%d]", srate);
- srate = params.delsys.dss.symbol_rate;
- break;
- case DVBFE_DELSYS_DVBS2:
- dprintk(verbose, FE_DEBUG, 1, "Delivery system = DVB-S2, Symbol Rate=[%d]", srate);
- srate = params.delsys.dvbs2.symbol_rate;
- break;
- default:
- dprintk(verbose, FE_NOTICE, 1, "symbol rate unknown!");
- srate = 22000000; /* just a typical default value */
- break;
+
+ if (fe->ops.get_frontend) {
+ dprintk(verbose, FE_DEBUG, 1, "Get frontend parameters");
+ fe->ops.get_frontend(fe, &p);
}
+ srate = p.u.qpsk.symbol_rate;
/* Baseband gain. */
if (srate >= 15000000)