The patch number 9468 was added via Manu Abraham <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Reinhard Nissl <[EMAIL PROTECTED]>
Miscellaneous fixes
- Fix a bitfield
- Set gain appropriately
- Slept for the wrong duration
Signed-off-by: Reinhard Nissl <[EMAIL PROTECTED]>
Signed-off-by: Manu Abraham <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/frontends/stb0899_reg.h | 2 +-
linux/drivers/media/dvb/frontends/stb6100.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff -r 634f33fade82 -r dd8bb48423d6
linux/drivers/media/dvb/frontends/stb0899_reg.h
--- a/linux/drivers/media/dvb/frontends/stb0899_reg.h Wed Jul 09 22:33:38
2008 +0400
+++ b/linux/drivers/media/dvb/frontends/stb0899_reg.h Wed Jul 09 22:38:27
2008 +0400
@@ -362,7 +362,7 @@
#define STB0899_OFF0_CRL_FREQ 0xf304
#define STB0899_BASE_CRL_FREQ 0x00000000
-#define STB0899_CARR_FREQ (0x1fffffff << 0)
+#define STB0899_CARR_FREQ (0x3fffffff << 0)
#define STB0899_OFFST_CARR_FREQ 0
#define STB0899_WIDTH_CARR_FREQ 30
diff -r 634f33fade82 -r dd8bb48423d6 linux/drivers/media/dvb/frontends/stb6100.c
--- a/linux/drivers/media/dvb/frontends/stb6100.c Wed Jul 09 22:33:38
2008 +0400
+++ b/linux/drivers/media/dvb/frontends/stb6100.c Wed Jul 09 22:38:27
2008 +0400
@@ -345,11 +345,11 @@ static int stb6100_set_frequency(struct
/* Baseband gain. */
if (srate >= 15000000)
- g = 8;
- else if (state->srate >= 5000000)
- g = 12;
+ g = 9; // +4 dB
+ else if (srate >= 5000000)
+ g = 11; // +8 dB
else
- g = 14;
+ g = 14; // +14 dB
regs[STB6100_G] = (regs[STB6100_G] & ~STB6100_G_G) | g;
regs[STB6100_G] &= ~STB6100_G_GCT; /* mask GCT */
@@ -410,7 +410,7 @@ static int stb6100_set_frequency(struct
if ((rc = stb6100_write_reg(state, STB6100_VCO, regs[STB6100_VCO])) < 0)
return rc;
- msleep(5); /* wait for LO to lock
*/
+ msleep(10); /* wait for LO to lock
*/
regs[STB6100_VCO] &= ~STB6100_VCO_OSCH; /* vco search disabled
*/
regs[STB6100_VCO] |= STB6100_VCO_OCK; /* search clock off
*/
if ((rc = stb6100_write_reg(state, STB6100_VCO, regs[STB6100_VCO])) < 0)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/dd8bb48423d6311ea69ca0d3d5cf2a37de5c35fa
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
