summaryrefslogtreecommitdiff
path: root/gr-trellis/src
diff options
context:
space:
mode:
Diffstat (limited to 'gr-trellis/src')
-rw-r--r--gr-trellis/src/lib/CMakeLists.txt24
-rw-r--r--gr-trellis/src/lib/fsm.h1
-rw-r--r--gr-trellis/src/lib/gnuradio-trellis.rc.in55
-rw-r--r--gr-trellis/src/lib/interleaver.h1
-rw-r--r--gr-trellis/src/lib/trellis_constellation_metrics_cf.h2
-rw-r--r--gr-trellis/src/lib/trellis_encoder_XX.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_metrics_X.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_pccc_decoder_X.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_permutation.h2
-rw-r--r--gr-trellis/src/lib/trellis_sccc_decoder_X.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_siso_combined_f.h2
-rw-r--r--gr-trellis/src/lib/trellis_siso_f.h2
-rw-r--r--gr-trellis/src/lib/trellis_viterbi_X.h.t2
-rw-r--r--gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t2
18 files changed, 94 insertions, 15 deletions
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index e2abf0238f..05f54b9bd8 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011,2013 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -32,6 +32,9 @@ include_directories(
link_directories(${Boost_LIBRARY_DIRS})
+include_directories(${LOG4CPP_INCLUDE_DIRS})
+link_directories(${LOG4CPP_LIBRARY_DIRS})
+
########################################################################
# generate the python helper script which calls into the build utils
########################################################################
@@ -103,6 +106,10 @@ expand_h_cc_i(trellis_sccc_decoder_combined_XX fb fs fi cb cs ci)
expand_h_cc_i(trellis_pccc_decoder_X b s i)
expand_h_cc_i(trellis_pccc_decoder_combined_XX fb fs fi cb cs ci)
+add_custom_target(trellis_generated_includes DEPENDS
+ ${generated_trellis_includes}
+)
+
########################################################################
# Create the master trellis swig include files
########################################################################
@@ -147,9 +154,24 @@ list(APPEND gr_trellis_sources
${generated_trellis_sources}
)
+#Add Windows DLL resource file if using MSVC
+if(MSVC)
+ include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
+
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-trellis.rc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc
+ @ONLY)
+
+ list(APPEND gr_trellis_sources
+ ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.rc
+ )
+endif(MSVC)
+
list(APPEND trellis_libs
gnuradio-core
${Boost_LIBRARIES}
+ ${LOG4CPP_LIBRARIES}
)
add_library(gnuradio-trellis SHARED ${gr_trellis_sources})
diff --git a/gr-trellis/src/lib/fsm.h b/gr-trellis/src/lib/fsm.h
index 47e467898a..99a5cce778 100644
--- a/gr-trellis/src/lib/fsm.h
+++ b/gr-trellis/src/lib/fsm.h
@@ -29,6 +29,7 @@
/*!
* \brief Finite State Machine Specification class.
+ * \ingroup trellis_coding_blk
*
* An instance of this class represents a finite state machine specification (FSMS)
* rather than the FSM itself. It particular the state of the FSM
diff --git a/gr-trellis/src/lib/gnuradio-trellis.rc.in b/gr-trellis/src/lib/gnuradio-trellis.rc.in
new file mode 100644
index 0000000000..db9f187947
--- /dev/null
+++ b/gr-trellis/src/lib/gnuradio-trellis.rc.in
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <afxres.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@
+ PRODUCTVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@
+ FILEFLAGSMASK 0x3fL
+#ifndef NDEBUG
+ FILEFLAGS 0x0L
+#else
+ FILEFLAGS 0x1L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_DRV_INSTALLABLE
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "gnuradio-trellis"
+ VALUE "FileVersion", "@VERSION@"
+ VALUE "InternalName", "gnuradio-trellis.dll"
+ VALUE "LegalCopyright", "Licensed under GPLv3 or any later version"
+ VALUE "OriginalFilename", "gnuradio-trellis.dll"
+ VALUE "ProductName", "gnuradio-trellis"
+ VALUE "ProductVersion", "@VERSION@"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+ END
diff --git a/gr-trellis/src/lib/interleaver.h b/gr-trellis/src/lib/interleaver.h
index fbd378d621..21735bd639 100644
--- a/gr-trellis/src/lib/interleaver.h
+++ b/gr-trellis/src/lib/interleaver.h
@@ -28,6 +28,7 @@
/*!
* \brief INTERLEAVER class
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API interleaver {
private:
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
index 2c2070522c..b799b5cc6d 100644
--- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
@@ -35,7 +35,7 @@ TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_met
/*!
* \brief Evaluate metrics for use by the Viterbi algorithm.
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API trellis_constellation_metrics_cf : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_encoder_XX.h.t b/gr-trellis/src/lib/trellis_encoder_XX.h.t
index 7c4250a929..d94ad80652 100644
--- a/gr-trellis/src/lib/trellis_encoder_XX.h.t
+++ b/gr-trellis/src/lib/trellis_encoder_XX.h.t
@@ -36,7 +36,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (const fsm &FSM, int ST);
/*!
* \brief Convolutional encoder.
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_sync_block
{
diff --git a/gr-trellis/src/lib/trellis_metrics_X.h.t b/gr-trellis/src/lib/trellis_metrics_X.h.t
index ab406c51ea..1bf61dd957 100644
--- a/gr-trellis/src/lib/trellis_metrics_X.h.t
+++ b/gr-trellis/src/lib/trellis_metrics_X.h.t
@@ -36,7 +36,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (int O, int D, const std::vect
/*!
* \brief Evaluate metrics for use by the Viterbi algorithm.
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
index e9bc946818..3561bb5504 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
@@ -46,7 +46,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
index 6e45ea10ac..82216a0917 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
@@ -51,7 +51,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t b/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t
index 75a22b829c..e4682558e2 100644
--- a/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t
@@ -43,7 +43,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
* \brief SCCC encoder.
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_sync_block
{
diff --git a/gr-trellis/src/lib/trellis_permutation.h b/gr-trellis/src/lib/trellis_permutation.h
index cc40518c2c..5669fdd4dd 100644
--- a/gr-trellis/src/lib/trellis_permutation.h
+++ b/gr-trellis/src/lib/trellis_permutation.h
@@ -35,7 +35,7 @@ TRELLIS_API trellis_permutation_sptr trellis_make_permutation (int K, const std:
/*!
* \brief Permutation.
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API trellis_permutation : public gr_sync_block
{
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
index d6fb72f682..b0b0cd37a6 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
@@ -46,7 +46,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
index 3fdc53c624..9b56e7167a 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
@@ -51,7 +51,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t b/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t
index b16d7ffca9..655f2d1ee2 100644
--- a/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t
@@ -43,7 +43,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
* \brief SCCC encoder.
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_sync_block
{
diff --git a/gr-trellis/src/lib/trellis_siso_combined_f.h b/gr-trellis/src/lib/trellis_siso_combined_f.h
index 4b28e8de4a..d3b3b64189 100644
--- a/gr-trellis/src/lib/trellis_siso_combined_f.h
+++ b/gr-trellis/src/lib/trellis_siso_combined_f.h
@@ -47,7 +47,7 @@ TRELLIS_API trellis_siso_combined_f_sptr trellis_make_siso_combined_f (
);
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API trellis_siso_combined_f : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_siso_f.h b/gr-trellis/src/lib/trellis_siso_f.h
index 9341f24683..52e6bf3eb0 100644
--- a/gr-trellis/src/lib/trellis_siso_f.h
+++ b/gr-trellis/src/lib/trellis_siso_f.h
@@ -44,7 +44,7 @@ TRELLIS_API trellis_siso_f_sptr trellis_make_siso_f (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API trellis_siso_f : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_viterbi_X.h.t b/gr-trellis/src/lib/trellis_viterbi_X.h.t
index c0400d3410..b2d5ee6495 100644
--- a/gr-trellis/src/lib/trellis_viterbi_X.h.t
+++ b/gr-trellis/src/lib/trellis_viterbi_X.h.t
@@ -42,7 +42,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
index c7e468e73b..07175bff7e 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
@@ -45,7 +45,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
/*!
- * \ingroup coding_blk
+ * \ingroup trellis_coding_blk
*/
class TRELLIS_API @NAME@ : public gr_block
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 20:29:05 +0000