[Commit-gnuradio] [gnuradio] 01/05: gr-dtv: Minor fixes for VL-SNR framing and blocks XML.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 90801b78467b6f46e6fa278539d20a6435f40b52
Author: Ron Economos <address@hidden>
Date:   Mon Aug 8 22:23:05 2016 -0700

    gr-dtv: Minor fixes for VL-SNR framing and blocks XML.
---
 gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml       | 10 +++++-----
 gr-dtv/grc/dtv_dvb_bch_bb.xml               | 10 +++++-----
 gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml |  4 ++--
 gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc  | 13 +++++++------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml 
b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml
index 1dbf396..2fba572 100644
--- a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml
+++ b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.xml
@@ -16,17 +16,17 @@ $framesize2.val, #slurp
 #end if
 #if str($standard) == 'STANDARD_DVBT2'
 #if str($framesize1) == 'FECFRAME_NORMAL'
-$rate1.val, #slurp
+$rate1.val#slurp
 #else
-$rate2.val, #slurp
+$rate2.val#slurp
 #end if
 #else
 #if str($framesize2) == 'FECFRAME_NORMAL'
-$rate3.val, #slurp
+$rate3.val#slurp
 #else if str($framesize2) == 'FECFRAME_MEDIUM'
-$rate4.val, #slurp
+$rate4.val#slurp
 #else
-$rate5.val, #slurp
+$rate5.val#slurp
 #end if
 #end if
 )</make>
diff --git a/gr-dtv/grc/dtv_dvb_bch_bb.xml b/gr-dtv/grc/dtv_dvb_bch_bb.xml
index 12ac8c6..01b446b 100644
--- a/gr-dtv/grc/dtv_dvb_bch_bb.xml
+++ b/gr-dtv/grc/dtv_dvb_bch_bb.xml
@@ -16,17 +16,17 @@ $framesize2.val, #slurp
 #end if
 #if str($standard) == 'STANDARD_DVBT2'
 #if str($framesize1) == 'FECFRAME_NORMAL'
-$rate1.val, #slurp
+$rate1.val#slurp
 #else
-$rate2.val, #slurp
+$rate2.val#slurp
 #end if
 #else
 #if str($framesize2) == 'FECFRAME_NORMAL'
-$rate3.val, #slurp
+$rate3.val#slurp
 #else if str($framesize2) == 'FECFRAME_MEDIUM'
-$rate4.val, #slurp
+$rate4.val#slurp
 #else
-$rate5.val, #slurp
+$rate5.val#slurp
 #end if
 #end if
 )</make>
diff --git a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml 
b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml
index 3bbcd84..bd7ba2b 100644
--- a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml
+++ b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml
@@ -16,9 +16,9 @@ $paprmode2.val, #slurp
 #end if
 $version.val, #slurp
 #if str($version) == 'VERSION_111'
-$preamble1.val, #slurp
+$preamble1.val#slurp
 #else
-$preamble2.val, #slurp
+$preamble2.val#slurp
 #end if
 )</make>
   <param>
diff --git a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc 
b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
index 4f38581..d6c3386 100644
--- a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
+++ b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
@@ -54,7 +54,7 @@ namespace gr {
         type = 0;
         if (rate == C2_9_VLSNR) {
           frame_size = (FRAME_SIZE_NORMAL - NORMAL_PUNCTURING) + 
(EXTRA_PILOT_SYMBOLS_SET1 * 2);
-          type = 1;    /* force pilots on for VL-SNR */
+          pilots = PILOTS_ON;    /* force pilots on for VL-SNR */
         }
       }
 
@@ -63,16 +63,16 @@ namespace gr {
         type = 2;
         if (rate == C1_5_VLSNR_SF2 || rate == C11_45_VLSNR_SF2) {
           frame_size = ((FRAME_SIZE_SHORT - SHORT_PUNCTURING_SET1) * 2) + 
EXTRA_PILOT_SYMBOLS_SET1;
-          type = 1;    /* force pilots on for VL-SNR */
+          pilots = PILOTS_ON;    /* force pilots on for VL-SNR */
         }
         if (rate == C1_5_VLSNR || rate == C4_15_VLSNR || rate == C1_3_VLSNR) {
           frame_size = (FRAME_SIZE_SHORT - SHORT_PUNCTURING_SET2) + 
EXTRA_PILOT_SYMBOLS_SET2;
-          type = 1;    /* force pilots on for VL-SNR */
+          pilots = PILOTS_ON;    /* force pilots on for VL-SNR */
         }
       }
       else  {
         frame_size = FRAME_SIZE_MEDIUM - MEDIUM_PUNCTURING + 
EXTRA_PILOT_SYMBOLS_SET1;
-        type = 1;    /* force pilots on for VL-SNR */
+        pilots = PILOTS_ON;    /* force pilots on for VL-SNR */
       }
 
       pilot_mode = pilots;
@@ -808,8 +808,7 @@ namespace gr {
       int consumed = 0;
       int produced = 0;
       int slot_count, n;
-      int group;
-      int symbols = 0;
+      int group, symbols;
       gr_complex tempin, tempout;
 
       if (vlsnr_set == VLSNR_OFF) {
@@ -873,6 +872,7 @@ namespace gr {
           n = 0;
           slot_count = 10;
           group = 0;
+          symbols = 0;
           for (int plh = 0; plh < 90; plh++) {
             out[produced++] = m_pl[plh];
             out[produced++] = m_zero;
@@ -1079,6 +1079,7 @@ namespace gr {
           n = 0;
           slot_count = 10;
           group = 0;
+          symbols = 0;
           for (int plh = 0; plh < 90; plh++) {
             out[produced++] = m_pl[plh];
             out[produced++] = m_zero;