From f50ada9ed7f9c40212990ae85fb2a6d645fb49d5 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 11 Apr 2010 06:12:52 -0300 Subject: [PATCH] --- yaml --- r: 193016 b: refs/heads/master c: b187913c77adbd865194c6b8072764e3474d56ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c | 2 +- trunk/drivers/media/dvb/frontends/cx24116.c | 2 +- trunk/include/linux/dvb/frontend.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 291cba0673a4..4a4542fb0f7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd3f616d4b60a50328be152f66c93bd451461a39 +refs/heads/master: b187913c77adbd865194c6b8072764e3474d56ea diff --git a/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c index 7a7f1b2b681c..39143805f3da 100644 --- a/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c +++ b/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c @@ -349,7 +349,7 @@ static struct dvb_frontend_ops gp8psk_fe_ops = { * FE_CAN_QAM_16 is for compatibility * (Myth incorrectly detects Turbo-QPSK as plain QAM-16) */ - FE_CAN_QPSK | FE_CAN_QAM_16 + FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_PSK_8 }, .release = gp8psk_fe_release, diff --git a/trunk/drivers/media/dvb/frontends/cx24116.c b/trunk/drivers/media/dvb/frontends/cx24116.c index 2410d8b59b6b..13ae2c58d79f 100644 --- a/trunk/drivers/media/dvb/frontends/cx24116.c +++ b/trunk/drivers/media/dvb/frontends/cx24116.c @@ -1479,7 +1479,7 @@ static struct dvb_frontend_ops cx24116_ops = { FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | FE_CAN_2G_MODULATION | - FE_CAN_QPSK | FE_CAN_RECOVER + FE_CAN_QPSK | FE_CAN_RECOVER | FE_CAN_PSK_8 }, .release = cx24116_release, diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h index b6cb5425cde3..7c73f0b09e9c 100644 --- a/trunk/include/linux/dvb/frontend.h +++ b/trunk/include/linux/dvb/frontend.h @@ -62,6 +62,7 @@ typedef enum fe_caps { FE_CAN_8VSB = 0x200000, FE_CAN_16VSB = 0x400000, FE_HAS_EXTENDED_CAPS = 0x800000, /* We need more bitspace for newer APIs, indicate this. */ + FE_CAN_PSK_8 = 0x8000000, /* frontend supports "8psk modulation" */ FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */ FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */ FE_CAN_RECOVER = 0x40000000, /* frontend can recover from a cable unplug automatically */