korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] DVB: gp8psk-fe: use SYS_TURBO

Browse Source 
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andreas Oberritter 2011-08-08 11:54:37 -03:00 committed by Mauro Carvalho Chehab
parent 14f55794b2
commit 8fc74fdb0f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/dvb/dvb-usb/gp8psk-fe.c
View File

@ -144,19 +144,25 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend* fe,
cmd[6] = (freq >> 16) & 0xff; cmd[6] = (freq >> 16) & 0xff;
cmd[7] = (freq >> 24) & 0xff; cmd[7] = (freq >> 24) & 0xff;
/* backwards compatibility: DVB-S + 8-PSK were used for Turbo-FEC */
if (c->delivery_system == SYS_DVBS && c->modulation == PSK_8)
c->delivery_system = SYS_TURBO;
switch (c->delivery_system) { switch (c->delivery_system) {
case SYS_DVBS: case SYS_DVBS:
/* Allow QPSK and 8PSK (even for DVB-S) */ if (c->modulation != QPSK) {
if (c->modulation != QPSK && c->modulation != PSK_8) {
deb_fe("%s: unsupported modulation selected (%d)\n", deb_fe("%s: unsupported modulation selected (%d)\n",
__func__, c->modulation); __func__, c->modulation);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
c->fec_inner = FEC_AUTO; c->fec_inner = FEC_AUTO;
break; break;
case SYS_DVBS2: case SYS_DVBS2: /* kept for backwards compatibility */
deb_fe("%s: DVB-S2 delivery system selected\n", __func__); deb_fe("%s: DVB-S2 delivery system selected\n", __func__);
break; break;
case SYS_TURBO:
deb_fe("%s: Turbo-FEC delivery system selected\n", __func__);
break;
default: default:
deb_fe("%s: unsupported delivery system selected (%d)\n", deb_fe("%s: unsupported delivery system selected (%d)\n",
@ -189,7 +195,10 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend* fe,
default: default:
cmd[9] = 5; break; cmd[9] = 5; break;
} }
cmd[8] = ADV_MOD_DVB_QPSK; if (c->delivery_system == SYS_TURBO)
cmd[8] = ADV_MOD_TURBO_QPSK;
else
cmd[8] = ADV_MOD_DVB_QPSK;
break; break;
case PSK_8: /* PSK_8 is for compatibility with DN */ case PSK_8: /* PSK_8 is for compatibility with DN */
cmd[8] = ADV_MOD_TURBO_8PSK; cmd[8] = ADV_MOD_TURBO_8PSK;