AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] dvb: frontend: cx24110: another DiSEqC fix

Browse Source 
Fix DiSEqC problems.

Signed-off-by: Adam Szalkowski <adam@szalkowski.de>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adam Szalkowski 2005-09-09 13:02:35 -07:00 committed by Linus Torvalds
parent d897275500
commit 296c786a0d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/dvb/frontends/cx24110.c
View File

@ -398,7 +398,8 @@ static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
return -EINVAL; return -EINVAL;
rv = cx24110_readreg(state, 0x77); rv = cx24110_readreg(state, 0x77);
cx24110_writereg(state, 0x77, rv | 0x04); if (!(rv & 0x04))
cx24110_writereg(state, 0x77, rv | 0x04);
rv = cx24110_readreg(state, 0x76); rv = cx24110_readreg(state, 0x76);
cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit)); cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit));
@ -418,14 +419,16 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
cx24110_writereg(state, 0x79 + i, cmd->msg[i]); cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
rv = cx24110_readreg(state, 0x77); rv = cx24110_readreg(state, 0x77);
cx24110_writereg(state, 0x77, rv & ~0x04); if (rv & 0x04) {
msleep(30); /* reportedly fixes switching problems */ cx24110_writereg(state, 0x77, rv & ~0x04);
msleep(30); /* reportedly fixes switching problems */
}
rv = cx24110_readreg(state, 0x76); rv = cx24110_readreg(state, 0x76);
cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40) | ((cmd->msg_len-3) & 3)); cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40) | ((cmd->msg_len-3) & 3));
for (i=500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);) for (i=100; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);)
; /* wait for LNB ready */ msleep(1); /* wait for LNB ready */
return 0; return 0;
} }