diff options
author | Patrick Boettcher <pb@linuxtv.org> | 2005-07-07 20:57:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:55 -0400 |
commit | f46dbb050b5c7585c34b9ef717d81d6fee883f9b (patch) | |
tree | 8b399f437f36b36bfbd79b5369b14a38b2eed7eb /drivers/media/dvb/frontends/cx22702.c | |
parent | f03cbea36ab9412dcea58e953be4933b36c9b7be (diff) |
[PATCH] dvb: frontend: cx22702: support for cxusb
Add .get_tune_settings callback (min_delay_ms = 1sec) and output_mode-field
(parallel/serial) to support cxusb; minor cleanups.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/frontends/cx22702.c')
-rw-r--r-- | drivers/media/dvb/frontends/cx22702.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index f4aa44136c7c..9f639297a9f2 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
@@ -76,7 +76,6 @@ static u8 init_tab [] = { | |||
76 | 0x49, 0x56, | 76 | 0x49, 0x56, |
77 | 0x6b, 0x1e, | 77 | 0x6b, 0x1e, |
78 | 0xc8, 0x02, | 78 | 0xc8, 0x02, |
79 | 0xf8, 0x02, | ||
80 | 0xf9, 0x00, | 79 | 0xf9, 0x00, |
81 | 0xfa, 0x00, | 80 | 0xfa, 0x00, |
82 | 0xfb, 0x00, | 81 | 0xfb, 0x00, |
@@ -203,7 +202,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet | |||
203 | struct cx22702_state* state = fe->demodulator_priv; | 202 | struct cx22702_state* state = fe->demodulator_priv; |
204 | 203 | ||
205 | /* set PLL */ | 204 | /* set PLL */ |
206 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe); | 205 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe); |
207 | if (state->config->pll_set) { | 206 | if (state->config->pll_set) { |
208 | state->config->pll_set(fe, p); | 207 | state->config->pll_set(fe, p); |
209 | } else if (state->config->pll_desc) { | 208 | } else if (state->config->pll_desc) { |
@@ -217,7 +216,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet | |||
217 | } else { | 216 | } else { |
218 | BUG(); | 217 | BUG(); |
219 | } | 218 | } |
220 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1); | 219 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1); |
221 | 220 | ||
222 | /* set inversion */ | 221 | /* set inversion */ |
223 | cx22702_set_inversion (state, p->inversion); | 222 | cx22702_set_inversion (state, p->inversion); |
@@ -256,7 +255,7 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet | |||
256 | cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc ); | 255 | cx22702_writereg(state, 0x0B, cx22702_readreg(state, 0x0B) & 0xfc ); |
257 | cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 ); | 256 | cx22702_writereg(state, 0x0C, (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40 ); |
258 | cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */ | 257 | cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */ |
259 | printk("%s: Autodetecting\n",__FUNCTION__); | 258 | dprintk("%s: Autodetecting\n",__FUNCTION__); |
260 | return 0; | 259 | return 0; |
261 | } | 260 | } |
262 | 261 | ||
@@ -347,10 +346,11 @@ static int cx22702_init (struct dvb_frontend* fe) | |||
347 | for (i=0; i<sizeof(init_tab); i+=2) | 346 | for (i=0; i<sizeof(init_tab); i+=2) |
348 | cx22702_writereg (state, init_tab[i], init_tab[i+1]); | 347 | cx22702_writereg (state, init_tab[i], init_tab[i+1]); |
349 | 348 | ||
349 | cx22702_writereg (state, 0xf8, (state->config->output_mode << 1) & 0x02); | ||
350 | 350 | ||
351 | /* init PLL */ | 351 | /* init PLL */ |
352 | if (state->config->pll_init) { | 352 | if (state->config->pll_init) { |
353 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe); | 353 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) & 0xfe); |
354 | state->config->pll_init(fe); | 354 | state->config->pll_init(fe); |
355 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1); | 355 | cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1); |
356 | } | 356 | } |
@@ -440,8 +440,10 @@ static int cx22702_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
440 | 440 | ||
441 | /* RS Uncorrectable Packet Count then reset */ | 441 | /* RS Uncorrectable Packet Count then reset */ |
442 | _ucblocks = cx22702_readreg (state, 0xE3); | 442 | _ucblocks = cx22702_readreg (state, 0xE3); |
443 | if (state->prevUCBlocks < _ucblocks) *ucblocks = (_ucblocks - state->prevUCBlocks); | 443 | if (state->prevUCBlocks < _ucblocks) |
444 | else *ucblocks = state->prevUCBlocks - _ucblocks; | 444 | *ucblocks = (_ucblocks - state->prevUCBlocks); |
445 | else | ||
446 | *ucblocks = state->prevUCBlocks - _ucblocks; | ||
445 | state->prevUCBlocks = _ucblocks; | 447 | state->prevUCBlocks = _ucblocks; |
446 | 448 | ||
447 | return 0; | 449 | return 0; |
@@ -457,6 +459,12 @@ static int cx22702_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
457 | return cx22702_get_tps (state, &p->u.ofdm); | 459 | return cx22702_get_tps (state, &p->u.ofdm); |
458 | } | 460 | } |
459 | 461 | ||
462 | static int cx22702_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune) | ||
463 | { | ||
464 | tune->min_delay_ms = 1000; | ||
465 | return 0; | ||
466 | } | ||
467 | |||
460 | static void cx22702_release(struct dvb_frontend* fe) | 468 | static void cx22702_release(struct dvb_frontend* fe) |
461 | { | 469 | { |
462 | struct cx22702_state* state = fe->demodulator_priv; | 470 | struct cx22702_state* state = fe->demodulator_priv; |
@@ -472,7 +480,8 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, | |||
472 | 480 | ||
473 | /* allocate memory for the internal state */ | 481 | /* allocate memory for the internal state */ |
474 | state = kmalloc(sizeof(struct cx22702_state), GFP_KERNEL); | 482 | state = kmalloc(sizeof(struct cx22702_state), GFP_KERNEL); |
475 | if (state == NULL) goto error; | 483 | if (state == NULL) |
484 | goto error; | ||
476 | 485 | ||
477 | /* setup the state */ | 486 | /* setup the state */ |
478 | state->config = config; | 487 | state->config = config; |
@@ -481,7 +490,8 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, | |||
481 | state->prevUCBlocks = 0; | 490 | state->prevUCBlocks = 0; |
482 | 491 | ||
483 | /* check if the demod is there */ | 492 | /* check if the demod is there */ |
484 | if (cx22702_readreg(state, 0x1f) != 0x3) goto error; | 493 | if (cx22702_readreg(state, 0x1f) != 0x3) |
494 | goto error; | ||
485 | 495 | ||
486 | /* create dvb_frontend */ | 496 | /* create dvb_frontend */ |
487 | state->frontend.ops = &state->ops; | 497 | state->frontend.ops = &state->ops; |
@@ -514,6 +524,7 @@ static struct dvb_frontend_ops cx22702_ops = { | |||
514 | 524 | ||
515 | .set_frontend = cx22702_set_tps, | 525 | .set_frontend = cx22702_set_tps, |
516 | .get_frontend = cx22702_get_frontend, | 526 | .get_frontend = cx22702_get_frontend, |
527 | .get_tune_settings = cx22702_get_tune_settings, | ||
517 | 528 | ||
518 | .read_status = cx22702_read_status, | 529 | .read_status = cx22702_read_status, |
519 | .read_ber = cx22702_read_ber, | 530 | .read_ber = cx22702_read_ber, |