[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Sun, 22 Mar 2015 15:59:46 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 65df3e31166b8f517a3779cddcdb7db5e68cdc9c
Merge: e845d8b 9024682
Author: Johnathan Corgan <address@hidden>
Date: Sun Mar 22 08:39:11 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/lib/vmcircbuf.cc | 5 +-
gnuradio-runtime/lib/vmcircbuf_prefs.cc | 16 +-
gnuradio-runtime/lib/vmcircbuf_prefs.h | 2 +-
gr-dtv/examples/README.dvbt2 | 11 +
gr-dtv/examples/vv003-cr23.grc | 2161 +++++++++++++
gr-dtv/examples/vv009-4kfft.grc | 2161 +++++++++++++
gr-dtv/examples/vv018-miso.grc | 2567 +++++++++++++++
gr-dtv/grc/CMakeLists.txt | 9 +
gr-dtv/grc/dtv_block_tree.xml | 12 +
gr-dtv/grc/dtv_dvbt2_cellinterleaver_cc.xml | 72 +
gr-dtv/grc/dtv_dvbt2_framemapper_cc.xml | 562 ++++
gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.xml | 301 ++
gr-dtv/grc/dtv_dvbt2_interleaver_bb.xml | 105 +
gr-dtv/grc/dtv_dvbt2_miso_cc.xml | 254 ++
gr-dtv/grc/dtv_dvbt2_modulator_bc.xml | 75 +
gr-dtv/grc/dtv_dvbt2_p1insertion_cc.xml | 276 ++
gr-dtv/grc/dtv_dvbt2_paprtr_cc.xml | 286 ++
gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.xml | 386 +++
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 9 +
.../gnuradio/dtv/dvbt2_cellinterleaver_cc.h | 58 +
gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h | 75 +
.../gnuradio/dtv/dvbt2_freqinterleaver_cc.h | 62 +
gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h | 57 +
gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h | 61 +
gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h | 58 +
gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h | 61 +
gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h | 64 +
.../include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h | 66 +
gr-dtv/lib/CMakeLists.txt | 11 +
gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc | 277 ++
gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.h | 59 +
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 2011 ++++++++++++
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h | 211 ++
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc | 876 +++++
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h | 72 +
gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc | 624 ++++
gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.h | 84 +
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc | 596 ++++
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h | 53 +
gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.cc | 964 ++++++
gr-dtv/lib/dvbt2/dvbt2_modulator_bc_impl.h | 57 +
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc | 366 +++
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h | 85 +
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 984 ++++++
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h | 112 +
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc | 3375 ++++++++++++++++++++
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h | 173 +
gr-dtv/swig/dtv_swig.i | 27 +
gr-utils/python/modtool/gr-newmod/MANIFEST.md | 18 +
gr-utils/python/modtool/modtool_info.py | 2 +-
50 files changed, 20855 insertions(+), 14 deletions(-)