[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/05: dtv: Cosmetic clean-up.
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/05: dtv: Cosmetic clean-up. |
Date: |
Sun, 27 Nov 2016 22:41:16 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 903b568cc9ee9a302a2108ff1d2e4fa87661af3f
Author: Ron Economos <address@hidden>
Date: Tue Nov 22 14:33:57 2016 -0800
dtv: Cosmetic clean-up.
---
gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc | 2 +-
gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc | 3 +--
gr-dtv/lib/dvb/dvb_bch_bb_impl.cc | 2 +-
gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc | 8 ++++----
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 1 +
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 1 +
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc | 2 ++
gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc | 2 +-
8 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
index d14b46a..123e7fb 100644
--- a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
@@ -326,7 +326,7 @@ namespace gr {
void
dvb_bbheader_bb_impl::build_crc8_table(void)
{
- int r,crc;
+ int r, crc;
for (int i = 0; i < 256; i++) {
r = i;
diff --git a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
index ef1c184..8e86eb4 100644
--- a/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bbscrambler_bb_impl.cc
@@ -279,8 +279,7 @@ namespace gr {
unsigned char *out = (unsigned char *) output_items[0];
for (int i = 0; i < noutput_items; i += kbch) {
- for (int j = 0; j < (int)kbch; ++j)
- {
+ for (int j = 0; j < (int)kbch; ++j) {
out[i + j] = in[i + j] ^ bb_randomise[j];
}
}
diff --git a/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
b/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
index b1ebb6d..8d89f9b 100644
--- a/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bch_bb_impl.cc
@@ -385,7 +385,7 @@ namespace gr {
void
dvb_bch_bb_impl::forecast (int noutput_items, gr_vector_int
&ninput_items_required)
{
- ninput_items_required[0] = (noutput_items / nbch) * kbch;
+ ninput_items_required[0] = (noutput_items / nbch) * kbch;
}
/*
diff --git a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
index 568aac9..84328e1 100644
--- a/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_ldpc_bb_impl.cc
@@ -369,12 +369,12 @@ namespace gr {
void
dvb_ldpc_bb_impl::forecast (int noutput_items, gr_vector_int
&ninput_items_required)
{
- ninput_items_required[0] = (noutput_items / frame_size) * nbch;
+ ninput_items_required[0] = (noutput_items / frame_size) * nbch;
}
#define LDPC_BF(TABLE_NAME, ROWS) \
for (int row = 0; row < ROWS; row++) { \
- for(int n = 0; n < 360; n++) { \
+ for (int n = 0; n < 360; n++) { \
for (int col = 1; col <= TABLE_NAME[row][0]; col++) { \
ldpc_encode.p[index] = (TABLE_NAME[row][col] + (n * q)) % pbits; \
ldpc_encode.d[index] = im; \
@@ -606,7 +606,7 @@ for (int row = 0; row < ROWS; row++) { \
unsigned char *out = (unsigned char *) output_items[0];
const unsigned char *d;
unsigned char *p;
- unsigned char *b;
+ unsigned char *b = (unsigned char *) output_items[0];
unsigned char *s;
// Calculate the number of parity bits
int plen = (frame_size_real + Xp) - nbch;
@@ -657,7 +657,7 @@ for (int row = 0; row < ROWS; row++) { \
p[j] ^= p[j-1];
}
if (signal_constellation == MOD_128APSK) {
- for(int j = 0; j < 6; j++) {
+ for (int j = 0; j < 6; j++) {
p[j + plen] = 0;
}
}
diff --git a/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc
b/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc
index 3ae1deb..e3fb039 100644
--- a/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc
+++ b/gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc
@@ -53,6 +53,7 @@ namespace gr {
m_bpsk[0][1] = gr_complex((r1 * cos(5.0 * M_PI / 4.0)), (r1 *
sin(5.0 * M_PI / 4.0)));
m_bpsk[1][0] = gr_complex((r1 * cos(5.0 * M_PI / 4.0)), (r1 *
sin(M_PI / 4.0)));
m_bpsk[1][1] = gr_complex((r1 * cos(M_PI / 4.0)), (r1 * sin(5.0 *
M_PI /4.0)));
+ break;
case MOD_QPSK:
m_qpsk[0] = gr_complex((r1 * cos(M_PI / 4.0)), (r1 * sin(M_PI /
4.0)));
m_qpsk[1] = gr_complex((r1 * cos(7 * M_PI / 4.0)), (r1 * sin(7 *
M_PI / 4.0)));
diff --git a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
index 688ad7a..5da18b1 100644
--- a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
+++ b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
@@ -71,6 +71,7 @@ namespace gr {
}
else {
frame_size = FRAME_SIZE_MEDIUM - MEDIUM_PUNCTURING +
EXTRA_PILOT_SYMBOLS_SET1;
+ type = 0;
pilots = PILOTS_ON; /* force pilots on for VL-SNR */
}
diff --git a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
index f89d2af..bda49e9 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
@@ -186,6 +186,8 @@ namespace gr {
max_states = 0;
logic = &logic1k[0];
xor_size = 0;
+ bitpermeven = &bitperm1keven[0];
+ bitpermodd = &bitperm1kodd[0];
break;
}
switch (fftsize) {
diff --git a/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
index 28e7c4f..b927386 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc
@@ -500,7 +500,7 @@ namespace gr {
void
dvbt2_modulator_bc_impl::forecast (int noutput_items, gr_vector_int
&ninput_items_required)
{
- ninput_items_required[0] = noutput_items;
+ ninput_items_required[0] = noutput_items;
}
int