Merge branch 'vuplus-1.6' of 192.168.102.66:/var/ikseong/repo/openembedded into test_0921
[vuplus_openembedded] / recipes / v4l-dvb / files / backport-e.patch
1 From 4c4e24eb2549c1e48af535b143653458ed6d6f86 Mon Sep 17 00:00:00 2001
2 From: Andreas Oberritter <obi@linuxtv.org>
3 Date: Mon, 8 Aug 2011 14:35:01 +0000
4 Subject: [PATCH 2/3] DVB: dvb_frontend: Fix compatibility criteria for satellite receivers
5 Cc: user.vdr@gmail.com,
6     alannisota@gmail.com
7
8 - When converting satellite receiver parameters from S2API to legacy,
9   identify a satellite receiver by its 'delivery_system' instead of
10   'modulation', which may overlap between different delivery systems.
11
12 Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
13 ---
14  drivers/media/dvb/dvb-core/dvb_frontend.c |   13 +++++--------
15  1 files changed, 5 insertions(+), 8 deletions(-)
16
17 diff -Naur a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
18 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-08-09 19:03:35.000000000 +0200
19 +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-08-09 19:13:06.288210465 +0200
20 @@ -1144,16 +1144,13 @@
21         p->frequency = c->frequency;
22         p->inversion = c->inversion;
23  
24 -       switch(c->modulation) {
25 -       case PSK_8:
26 -       case APSK_16:
27 -       case APSK_32:
28 -       case QPSK:
29 +       if (c->delivery_system == SYS_DSS ||
30 +           c->delivery_system == SYS_DVBS ||
31 +           c->delivery_system == SYS_DVBS2 ||
32 +           c->delivery_system == SYS_ISDBS ||
33 +           c->delivery_system == SYS_TURBO) {
34                 p->u.qpsk.symbol_rate = c->symbol_rate;
35                 p->u.qpsk.fec_inner = c->fec_inner;
36 -               break;
37 -       default:
38 -               break;
39         }
40  
41         /* Fake out a generic DVB-T request so we pass validation in the ioctl */