summaryrefslogtreecommitdiff
path: root/gr-channels
diff options
context:
space:
mode:
Diffstat (limited to 'gr-channels')
-rw-r--r--gr-channels/CMakeLists.txt2
-rw-r--r--gr-channels/include/gnuradio/channels/CMakeLists.txt (renamed from gr-channels/include/channels/CMakeLists.txt)0
-rw-r--r--gr-channels/include/gnuradio/channels/api.h (renamed from gr-channels/include/channels/api.h)2
-rw-r--r--gr-channels/include/gnuradio/channels/channel_model.h (renamed from gr-channels/include/channels/channel_model.h)8
-rw-r--r--gr-channels/include/gnuradio/channels/fading_model.h (renamed from gr-channels/include/channels/fading_model.h)8
-rw-r--r--gr-channels/lib/channel_model_impl.cc8
-rw-r--r--gr-channels/lib/channel_model_impl.h16
-rw-r--r--gr-channels/lib/fading_model_impl.cc20
-rw-r--r--gr-channels/lib/fading_model_impl.h6
-rw-r--r--gr-channels/python/__init__.py3
-rw-r--r--gr-channels/swig/CMakeLists.txt2
-rw-r--r--gr-channels/swig/channels_swig.i8
12 files changed, 41 insertions, 42 deletions
diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt
index f73f49565f..b7df5deee7 100644
--- a/gr-channels/CMakeLists.txt
+++ b/gr-channels/CMakeLists.txt
@@ -84,7 +84,7 @@ CPACK_COMPONENT("channels_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/channels)
+add_subdirectory(include/gnuradio/channels)
add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
diff --git a/gr-channels/include/channels/CMakeLists.txt b/gr-channels/include/gnuradio/channels/CMakeLists.txt
index c0c70e2b00..c0c70e2b00 100644
--- a/gr-channels/include/channels/CMakeLists.txt
+++ b/gr-channels/include/gnuradio/channels/CMakeLists.txt
diff --git a/gr-channels/include/channels/api.h b/gr-channels/include/gnuradio/channels/api.h
index 808336b042..1fd1d9ba8f 100644
--- a/gr-channels/include/channels/api.h
+++ b/gr-channels/include/gnuradio/channels/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_CHANNELS_API_H
#define INCLUDED_CHANNELS_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_channels_EXPORTS
# define CHANNELS_API __GR_ATTR_EXPORT
diff --git a/gr-channels/include/channels/channel_model.h b/gr-channels/include/gnuradio/channels/channel_model.h
index 8e5430f05c..8b533ac7da 100644
--- a/gr-channels/include/channels/channel_model.h
+++ b/gr-channels/include/gnuradio/channels/channel_model.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_H
#define INCLUDED_CHANNELS_CHANNEL_MODEL_H
-#include <channels/api.h>
-#include <gr_hier_block2.h>
-#include <gr_types.h>
+#include <gnuradio/channels/api.h>
+#include <gnuradio/hier_block2.h>
+#include <gnuradio/types.h>
namespace gr {
namespace channels {
@@ -45,7 +45,7 @@ namespace gr {
* Multipath can be approximated in this model by using a FIR
* filter representation of a multipath delay profile..
*/
- class CHANNELS_API channel_model : virtual public gr_hier_block2
+ class CHANNELS_API channel_model : virtual public hier_block2
{
public:
// gr::channels::channel_model::sptr
diff --git a/gr-channels/include/channels/fading_model.h b/gr-channels/include/gnuradio/channels/fading_model.h
index 50632a61fc..c5946d3598 100644
--- a/gr-channels/include/channels/fading_model.h
+++ b/gr-channels/include/gnuradio/channels/fading_model.h
@@ -23,9 +23,9 @@
#ifndef INCLUDED_CHANNELS_FADING_MODEL_H
#define INCLUDED_CHANNELS_FADING_MODEL_H
-#include <channels/api.h>
-#include <gr_sync_block.h>
-#include <gr_types.h>
+#include <gnuradio/channels/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/types.h>
namespace gr {
namespace channels {
@@ -39,7 +39,7 @@ namespace gr {
* be used to help evaluate, design, and test various signals,
* waveforms, and algorithms.
*/
- class CHANNELS_API fading_model : virtual public gr_sync_block
+ class CHANNELS_API fading_model : virtual public sync_block
{
public:
// gr::channels::channel_model::sptr
diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc
index aafab12f37..450c925eb1 100644
--- a/gr-channels/lib/channel_model_impl.cc
+++ b/gr-channels/lib/channel_model_impl.cc
@@ -21,7 +21,7 @@
*/
#include "channel_model_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -48,9 +48,9 @@ namespace gr {
double epsilon,
const std::vector<gr_complex> &taps,
double noise_seed)
- : gr_hier_block2("channel_model",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex)))
+ : hier_block2("channel_model",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex)))
{
d_taps = taps;
while(d_taps.size() < 2) {
diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h
index b94555f122..e0feb91437 100644
--- a/gr-channels/lib/channel_model_impl.h
+++ b/gr-channels/lib/channel_model_impl.h
@@ -23,14 +23,14 @@
#ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
#define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
-#include <gr_top_block.h>
-#include <blocks/add_cc.h>
-#include <blocks/multiply_cc.h>
-#include <analog/sig_source_c.h>
-#include <analog/fastnoise_source_c.h>
-#include <channels/channel_model.h>
-#include <filter/fractional_interpolator_cc.h>
-#include <filter/fir_filter_ccc.h>
+#include <gnuradio/top_block.h>
+#include <gnuradio/blocks/add_cc.h>
+#include <gnuradio/blocks/multiply_cc.h>
+#include <gnuradio/analog/sig_source_c.h>
+#include <gnuradio/analog/fastnoise_source_c.h>
+#include <gnuradio/channels/channel_model.h>
+#include <gnuradio/filter/fractional_interpolator_cc.h>
+#include <gnuradio/filter/fir_filter_ccc.h>
namespace gr {
namespace channels {
diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc
index ecebe4a069..a39a6cf44f 100644
--- a/gr-channels/lib/fading_model_impl.cc
+++ b/gr-channels/lib/fading_model_impl.cc
@@ -21,17 +21,17 @@
*/
#include "fading_model_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <boost/format.hpp>
#include <boost/random.hpp>
-#include <gr_fxpt.h>
+#include <gnuradio/fxpt.h>
#include <sincostable.h>
-// FASTSINCOS: 0 = slow native, 1 = gr_fxpt impl, 2 = sincostable.h
+// FASTSINCOS: 0 = slow native, 1 = gr::fxpt impl, 2 = sincostable.h
#define FASTSINCOS 2
@@ -47,9 +47,9 @@ namespace gr {
// Block constructor
fading_model_impl::fading_model_impl( unsigned int N, float fDTs, bool LOS, float K, int seed )
- : gr_sync_block("fading_model",
- gr_make_io_signature(1, 1, sizeof(gr_complex)),
- gr_make_io_signature(1, 1, sizeof(gr_complex))),
+ : sync_block("fading_model",
+ io_signature::make(1, 1, sizeof(gr_complex)),
+ io_signature::make(1, 1, sizeof(gr_complex))),
seed_1((int)seed),
dist_1(-M_PI, M_PI),
rv_1( seed_1, dist_1 ), // U(-pi,pi)
@@ -163,8 +163,8 @@ namespace gr {
for(int n=1; n<d_N; n++){
float alpha_n = (2*M_PI*n - M_PI + d_theta)/4*d_N;
#if FASTSINCOS == 1
- float s_i = scale_sin*gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(alpha_n))+d_psi[n+1]));
- float s_q = scale_sin*gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::sin(gr_fxpt::float_to_fixed(alpha_n))+d_phi[n+1]));
+ float s_i = scale_sin*gr::fxpt::cos(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::cos(gr::fxpt::float_to_fixed(alpha_n))+d_psi[n+1]));
+ float s_q = scale_sin*gr::fxpt::cos(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::sin(gr::fxpt::float_to_fixed(alpha_n))+d_phi[n+1]));
#elif FASTSINCOS == 2
float s_i = scale_sin*d_table.cos(2*M_PI*d_fDTs*d_m*d_table.cos(alpha_n)+d_psi[n+1]);
float s_q = scale_sin*d_table.cos(2*M_PI*d_fDTs*d_m*d_table.sin(alpha_n)+d_phi[n+1]);
@@ -179,8 +179,8 @@ namespace gr {
if(d_LOS){
#if FASTSINCOS == 1
- float los_i = gr_fxpt::cos(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
- float los_q = gr_fxpt::sin(gr_fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr_fxpt::cos(gr_fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
+ float los_i = gr::fxpt::cos(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::cos(gr::fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
+ float los_q = gr::fxpt::sin(gr::fxpt::float_to_fixed(2*M_PI*d_fDTs*d_m*gr::fxpt::cos(gr::fxpt::float_to_fixed(d_theta_los)) + d_psi[0]));
#elif FASTSINCOS == 2
float los_i = d_table.cos(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_psi[0]);
float los_q = d_table.sin(2*M_PI*d_fDTs*d_m*d_table.cos(d_theta_los) + d_psi[0]);
diff --git a/gr-channels/lib/fading_model_impl.h b/gr-channels/lib/fading_model_impl.h
index 5c2d7f3877..3b816b6679 100644
--- a/gr-channels/lib/fading_model_impl.h
+++ b/gr-channels/lib/fading_model_impl.h
@@ -23,14 +23,14 @@
#ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
#define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
-#include <gr_sync_block.h>
-#include <channels/fading_model.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/channels/fading_model.h>
//#include <iostream>
#include <boost/format.hpp>
#include <boost/random.hpp>
-#include <gr_fxpt.h>
+#include <gnuradio/fxpt.h>
#include <sincostable.h>
namespace gr {
diff --git a/gr-channels/python/__init__.py b/gr-channels/python/__init__.py
index da50a05fc4..0f0efded66 100644
--- a/gr-channels/python/__init__.py
+++ b/gr-channels/python/__init__.py
@@ -20,8 +20,7 @@
#
'''
-This is the gr-channels package. This package provides GNU Radio
-processing blocks for channel models and related functions.
+Blocks for channel models and related functions.
'''
from channels_swig import *
diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt
index fda2da66f2..5f5091f342 100644
--- a/gr-channels/swig/CMakeLists.txt
+++ b/gr-channels/swig/CMakeLists.txt
@@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/channels_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/channels)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/channels)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-channels)
diff --git a/gr-channels/swig/channels_swig.i b/gr-channels/swig/channels_swig.i
index bfd0f9a10a..4cf3e13638 100644
--- a/gr-channels/swig/channels_swig.i
+++ b/gr-channels/swig/channels_swig.i
@@ -28,12 +28,12 @@
%include "channels_swig_doc.i"
%{
-#include "channels/channel_model.h"
-#include "channels/fading_model.h"
+#include "gnuradio/channels/channel_model.h"
+#include "gnuradio/channels/fading_model.h"
%}
-%include "channels/channel_model.h"
-%include "channels/fading_model.h"
+%include "gnuradio/channels/channel_model.h"
+%include "gnuradio/channels/fading_model.h"
GR_SWIG_BLOCK_MAGIC2(channels, channel_model);
GR_SWIG_BLOCK_MAGIC2(channels, fading_model);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 12:55:50 +0000