From patchwork Sun May 8 19:17:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Kerrison X-Patchwork-Id: 766482 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p48JHmgY029660 for ; Sun, 8 May 2011 19:17:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754959Ab1EHTRq (ORCPT ); Sun, 8 May 2011 15:17:46 -0400 Received: from stevekez.vm.bytemark.co.uk ([80.68.91.30]:55423 "EHLO stevekerrison.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754663Ab1EHTRp (ORCPT ); Sun, 8 May 2011 15:17:45 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by stevekerrison.com (Postfix) with ESMTP id 79CF2163D0; Sun, 8 May 2011 20:17:44 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at stevekerrison.com Received: from stevekerrison.com ([127.0.0.1]) by localhost (stevekez.vm.bytemark.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xW7uSpLpmyzz; Sun, 8 May 2011 20:17:39 +0100 (BST) Received: from localhost.localdomain (94-193-106-123.zone7.bethere.co.uk [94.193.106.123]) (Authenticated sender: steve@stevekerrison.com) by stevekerrison.com (Postfix) with ESMTPSA id 01EA716549; Sun, 8 May 2011 20:17:33 +0100 (BST) From: Steve Kerrison To: Antti Palosaari , Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: Andreas Oberritter , Steve Kerrison Subject: [PATCH v2 5/5] Documentation: Update to include DVB-T2 additions Date: Sun, 8 May 2011 20:17:20 +0100 Message-Id: <1304882240-23044-6-git-send-email-steve@stevekerrison.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4DC6BF28.8070006@redhat.com> References: <4DC6BF28.8070006@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 08 May 2011 19:17:48 +0000 (UTC) A few new capabilities added to frontend.h for DVB-T2. Added these to the documentation plus some notes explaining that they are used by the T2 delivery system. Signed-off-by: Steve Kerrison --- Documentation/DocBook/dvb/dvbproperty.xml | 36 ++++++++++++++++++++++++++-- Documentation/DocBook/dvb/frontend.h.xml | 20 +++++++++++++--- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/Documentation/DocBook/dvb/dvbproperty.xml b/Documentation/DocBook/dvb/dvbproperty.xml index 05ce603..52d5e3c 100644 --- a/Documentation/DocBook/dvb/dvbproperty.xml +++ b/Documentation/DocBook/dvb/dvbproperty.xml @@ -217,9 +217,12 @@ get/set up to 64 properties. The actual meaning of each property is described on Bandwidth for the channel, in HZ. Possible values: + 1712000, + 5000000, 6000000, 7000000, - 8000000. + 8000000, + 10000000. Notes: @@ -231,6 +234,8 @@ get/set up to 64 properties. The actual meaning of each property is described on 4) Bandwidth in ISDB-T is fixed (6MHz) or can be easily derived from other parameters (DTV_ISDBT_SB_SEGMENT_IDX, DTV_ISDBT_SB_SEGMENT_COUNT). + 5) DVB-T supports 6, 7 and 8MHz. + 6) In addition, DVB-T2 supports 1.172, 5 and 10MHz.
@@ -257,6 +262,7 @@ typedef enum fe_delivery_system { SYS_DMBTH, SYS_CMMB, SYS_DAB, + SYS_DVBT2, } fe_delivery_system_t; @@ -273,7 +279,10 @@ typedef enum fe_transmit_mode { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, - TRANSMISSION_MODE_4K + TRANSMISSION_MODE_4K, + TRANSMISSION_MODE_1K, + TRANSMISSION_MODE_16K, + TRANSMISSION_MODE_32K, } fe_transmit_mode_t; @@ -284,6 +293,8 @@ typedef enum fe_transmit_mode { 2) If DTV_TRANSMISSION_MODE is set the TRANSMISSION_MODE_AUTO the hardware will try to find the correct FFT-size (if capable) and will use TMCC to fill in the missing parameters. + 3) DVB-T specifies 2K and 8K as valid sizes. + 4) DVB-T2 specifies 1K, 2K, 4K, 8K, 16K and 32K.
@@ -296,7 +307,10 @@ typedef enum fe_guard_interval { GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, - GUARD_INTERVAL_AUTO + GUARD_INTERVAL_AUTO, + GUARD_INTERVAL_1_128, + GUARD_INTERVAL_19_128, + GUARD_INTERVAL_19_256, } fe_guard_interval_t; @@ -304,6 +318,7 @@ typedef enum fe_guard_interval { 1) If DTV_GUARD_INTERVAL is set the GUARD_INTERVAL_AUTO the hardware will try to find the correct guard interval (if capable) and will use TMCC to fill in the missing parameters. + 2) Intervals 1/128, 19/128 and 19/256 are used only for DVB-T2 at present
@@ -553,5 +568,20 @@ typedef enum fe_guard_interval { +
+ DVB-T2 parameters + + This section covers parameters that apply only to the DVB-T2 delivery method. DVB-T2 + support is currently in the early stages development so expect this section to grow + and become more detailed with time. + +
+ <constant>DTV_DVBT2_PLP_ID</constant> + + DVB-T2 supports Physical Layer Pipes (PLP) to allow transmission of + many data types via a single multiplex. The API will soon support this + at which point this section will be expanded. +
+
diff --git a/Documentation/DocBook/dvb/frontend.h.xml b/Documentation/DocBook/dvb/frontend.h.xml index d08e0d4..d792f78 100644 --- a/Documentation/DocBook/dvb/frontend.h.xml +++ b/Documentation/DocBook/dvb/frontend.h.xml @@ -176,14 +176,20 @@ typedef enum fe_transmit_mode { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, - TRANSMISSION_MODE_4K + TRANSMISSION_MODE_4K, + TRANSMISSION_MODE_1K, + TRANSMISSION_MODE_16K, + TRANSMISSION_MODE_32K, } fe_transmit_mode_t; typedef enum fe_bandwidth { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, - BANDWIDTH_AUTO + BANDWIDTH_AUTO, + BANDWIDTH_5_MHZ, + BANDWIDTH_10_MHZ, + BANDWIDTH_1_712_MHZ, } fe_bandwidth_t; @@ -192,7 +198,10 @@ typedef enum fe_guard_interval { GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_4, - GUARD_INTERVAL_AUTO + GUARD_INTERVAL_AUTO, + GUARD_INTERVAL_1_128, + GUARD_INTERVAL_19_128, + GUARD_INTERVAL_19_256, } fe_guard_interval_t; @@ -306,7 +315,9 @@ struct dvb_frontend_event { #define DTV_ISDBS_TS_ID 42 -#define DTV_MAX_COMMAND DTV_ISDBS_TS_ID +#define DTV_DVBT2_PLP_ID 43 + +#define DTV_MAX_COMMAND DTV_DVBT2_PLP_ID typedef enum fe_pilot { PILOT_ON, @@ -338,6 +349,7 @@ typedef enum fe_delivery_system { SYS_DMBTH, SYS_CMMB, SYS_DAB, + SYS_DVBT2, } fe_delivery_system_t; struct dtv_cmds_h {