From 8c172bfee02a05b223bfafb518df5d7d28bbeb94 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 18 May 2017 09:48:24 +0200 Subject: [PATCH] fix includes --- srslte/examples/cell_measurement.c | 4 +- srslte/examples/cell_search.c | 4 +- srslte/examples/pdsch_enodeb.c | 2 +- srslte/examples/pdsch_ue.c | 4 +- srslte/examples/tutorial_examples/pss.c | 2 +- srslte/examples/tutorial_examples/simple_tx.c | 2 +- srslte/examples/usrp_capture.c | 4 +- srslte/examples/usrp_capture_sync.c | 2 +- srslte/examples/usrp_txrx.c | 2 +- .../srslte/phy/ch_estimation/chest_dl.h | 10 +- .../srslte/phy/ch_estimation/chest_ul.h | 8 +- .../srslte/phy/ch_estimation/refsignal_dl.h | 2 +- .../srslte/phy/ch_estimation/refsignal_ul.h | 4 +- srslte/include/srslte/phy/common/sequence.h | 2 +- srslte/include/srslte/phy/dft/dft_precoding.h | 4 +- srslte/include/srslte/phy/dft/ofdm.h | 4 +- srslte/include/srslte/phy/enb/enb_dl.h | 38 ++--- srslte/include/srslte/phy/enb/enb_ul.h | 20 +-- srslte/include/srslte/phy/fec/softbuffer.h | 2 +- srslte/include/srslte/phy/fec/turbocoder.h | 2 +- srslte/include/srslte/phy/fec/turbodecoder.h | 8 +- .../include/srslte/phy/fec/turbodecoder_gen.h | 4 +- .../include/srslte/phy/fec/turbodecoder_sse.h | 4 +- srslte/include/srslte/phy/io/filesink.h | 2 +- srslte/include/srslte/phy/io/filesource.h | 2 +- srslte/include/srslte/phy/mimo/layermap.h | 2 +- srslte/include/srslte/phy/mimo/precoding.h | 2 +- srslte/include/srslte/phy/modem/modem_table.h | 2 +- srslte/include/srslte/phy/phch/cqi.h | 2 +- srslte/include/srslte/phy/phch/dci.h | 4 +- srslte/include/srslte/phy/phch/pbch.h | 20 +-- srslte/include/srslte/phy/phch/pcfich.h | 14 +- srslte/include/srslte/phy/phch/pdcch.h | 24 +-- srslte/include/srslte/phy/phch/pdsch.h | 20 +-- srslte/include/srslte/phy/phch/pdsch_cfg.h | 6 +- srslte/include/srslte/phy/phch/phich.h | 12 +- srslte/include/srslte/phy/phch/prach.h | 4 +- srslte/include/srslte/phy/phch/pucch.h | 10 +- srslte/include/srslte/phy/phch/pusch.h | 24 +-- srslte/include/srslte/phy/phch/pusch_cfg.h | 6 +- srslte/include/srslte/phy/phch/ra.h | 2 +- srslte/include/srslte/phy/phch/regs.h | 2 +- srslte/include/srslte/phy/phch/sch.h | 16 +- srslte/include/srslte/phy/phch/uci.h | 10 +- srslte/include/srslte/phy/rf/rf_utils.h | 2 +- .../srslte/phy/scrambling/scrambling.h | 4 +- srslte/include/srslte/phy/sync/cfo.h | 2 +- srslte/include/srslte/phy/sync/pss.h | 6 +- srslte/include/srslte/phy/sync/sss.h | 4 +- srslte/include/srslte/phy/sync/sync.h | 8 +- srslte/include/srslte/phy/ue/ue_cell_search.h | 12 +- srslte/include/srslte/phy/ue/ue_dl.h | 34 ++-- srslte/include/srslte/phy/ue/ue_mib.h | 10 +- srslte/include/srslte/phy/ue/ue_phy.h | 2 +- srslte/include/srslte/phy/ue/ue_sync.h | 16 +- srslte/include/srslte/phy/ue/ue_ul.h | 20 +-- srslte/include/srslte/phy/utils/convolution.h | 2 +- srslte/include/srslte/phy/utils/filter.h | 2 +- srslte/include/srslte/srslte.h | 160 +++++++++--------- srslte/lib/phy/agc/agc.c | 8 +- srslte/lib/phy/ch_estimation/chest_common.c | 6 +- srslte/lib/phy/ch_estimation/chest_dl.c | 6 +- srslte/lib/phy/ch_estimation/chest_ul.c | 8 +- srslte/lib/phy/ch_estimation/refsignal_dl.c | 10 +- srslte/lib/phy/ch_estimation/refsignal_ul.c | 12 +- srslte/lib/phy/channel/ch_awgn.c | 2 +- srslte/lib/phy/common/phy_common.c | 4 +- srslte/lib/phy/common/sequence.c | 6 +- srslte/lib/phy/common/timestamp.c | 2 +- srslte/lib/phy/dft/dft_fftw.c | 4 +- srslte/lib/phy/dft/dft_precoding.c | 10 +- srslte/lib/phy/dft/ofdm.c | 10 +- srslte/lib/phy/enb/enb_dl.c | 2 +- srslte/lib/phy/enb/enb_ul.c | 2 +- srslte/lib/phy/fec/cbsegm.c | 6 +- srslte/lib/phy/fec/convcoder.c | 2 +- srslte/lib/phy/fec/crc.c | 4 +- srslte/lib/phy/fec/rm_conv.c | 2 +- srslte/lib/phy/fec/rm_turbo.c | 8 +- srslte/lib/phy/fec/softbuffer.c | 14 +- srslte/lib/phy/fec/tc_interl_lte.c | 10 +- srslte/lib/phy/fec/tc_interl_umts.c | 4 +- srslte/lib/phy/fec/test/crc_test.h | 2 +- srslte/lib/phy/fec/turbocoder.c | 8 +- srslte/lib/phy/fec/turbodecoder.c | 8 +- srslte/lib/phy/fec/turbodecoder_gen.c | 4 +- srslte/lib/phy/fec/turbodecoder_sse.c | 4 +- srslte/lib/phy/fec/viterbi.c | 4 +- srslte/lib/phy/io/binsource.c | 4 +- srslte/lib/phy/io/filesink.c | 2 +- srslte/lib/phy/io/filesource.c | 2 +- srslte/lib/phy/io/netsink.c | 2 +- srslte/lib/phy/io/netsource.c | 2 +- srslte/lib/phy/mimo/layermap.c | 4 +- srslte/lib/phy/mimo/precoding.c | 6 +- srslte/lib/phy/modem/demod_hard.c | 2 +- srslte/lib/phy/modem/demod_soft.c | 6 +- srslte/lib/phy/modem/hard_demod_lte.c | 2 +- srslte/lib/phy/modem/lte_tables.c | 2 +- srslte/lib/phy/modem/mod.c | 4 +- srslte/lib/phy/modem/modem_table.c | 6 +- srslte/lib/phy/phch/cqi.c | 10 +- srslte/lib/phy/phch/dci.c | 10 +- srslte/lib/phy/phch/pbch.c | 10 +- srslte/lib/phy/phch/pcfich.c | 12 +- srslte/lib/phy/phch/pdcch.c | 14 +- srslte/lib/phy/phch/pdsch.c | 12 +- srslte/lib/phy/phch/phich.c | 12 +- srslte/lib/phy/phch/prach.c | 8 +- srslte/lib/phy/phch/prb_dl.c | 2 +- srslte/lib/phy/phch/pucch.c | 18 +- srslte/lib/phy/phch/pusch.c | 18 +- srslte/lib/phy/phch/ra.c | 12 +- srslte/lib/phy/phch/regs.c | 6 +- srslte/lib/phy/phch/sch.c | 16 +- srslte/lib/phy/phch/sequences.c | 4 +- srslte/lib/phy/phch/test/prach_test_multi.c | 2 +- srslte/lib/phy/phch/test/prach_test_usrp.c | 2 +- srslte/lib/phy/phch/uci.c | 18 +- srslte/lib/phy/resampling/decim.c | 4 +- srslte/lib/phy/resampling/interp.c | 6 +- srslte/lib/phy/resampling/resample_arb.c | 4 +- .../phy/resampling/test/resample_arb_bench.c | 2 +- .../phy/resampling/test/resample_arb_test.c | 2 +- srslte/lib/phy/rf/rf_blade_imp.c | 2 +- srslte/lib/phy/rf/rf_blade_imp.h | 2 +- srslte/lib/phy/rf/rf_imp.c | 2 +- srslte/lib/phy/rf/rf_limesdr_imp.c | 2 +- srslte/lib/phy/rf/rf_limesdr_imp.h | 2 +- srslte/lib/phy/rf/rf_soapy_imp.c | 2 +- srslte/lib/phy/rf/rf_soapy_imp.h | 2 +- srslte/lib/phy/rf/rf_uhd_imp.c | 2 +- srslte/lib/phy/rf/rf_uhd_imp.h | 2 +- srslte/lib/phy/rf/rf_utils.c | 4 +- srslte/lib/phy/rf/uhd_c_api.cpp | 2 +- srslte/lib/phy/rf/uhd_c_api.h | 2 +- srslte/lib/phy/scrambling/scrambling.c | 6 +- srslte/lib/phy/sync/cfo.c | 8 +- srslte/lib/phy/sync/cp.c | 6 +- srslte/lib/phy/sync/find_sss.c | 4 +- srslte/lib/phy/sync/gen_sss.c | 2 +- srslte/lib/phy/sync/pss.c | 10 +- srslte/lib/phy/sync/sfo.c | 2 +- srslte/lib/phy/sync/sss.c | 8 +- srslte/lib/phy/sync/sync.c | 10 +- srslte/lib/phy/sync/test/pss_usrp.c | 2 +- srslte/lib/phy/ue/ue_cell_search.c | 6 +- srslte/lib/phy/ue/ue_dl.c | 2 +- srslte/lib/phy/ue/ue_mib.c | 6 +- srslte/lib/phy/ue/ue_sync.c | 8 +- srslte/lib/phy/ue/ue_ul.c | 2 +- srslte/lib/phy/utils/bit.c | 2 +- srslte/lib/phy/utils/cexptab.c | 2 +- srslte/lib/phy/utils/convolution.c | 6 +- srslte/lib/phy/utils/debug.c | 2 +- srslte/lib/phy/utils/filter.c | 2 +- srslte/lib/phy/utils/ringbuffer.c | 4 +- srslte/lib/phy/utils/test/dft_test.c | 2 +- srslte/lib/phy/utils/vector.c | 6 +- srslte/lib/phy/utils/vector_simd.c | 2 +- 160 files changed, 582 insertions(+), 582 deletions(-) diff --git a/srslte/examples/cell_measurement.c b/srslte/examples/cell_measurement.c index a88303f48..bc8262b29 100644 --- a/srslte/examples/cell_measurement.c +++ b/srslte/examples/cell_measurement.c @@ -38,8 +38,8 @@ #define ENABLE_AGC_DEFAULT #include "srslte/srslte.h" -#include "srslte/rf/rf.h" -#include "srslte/rf/rf_utils.h" +#include "srslte/phy/rf/rf.h" +#include "srslte/phy/rf/rf_utils.h" cell_search_cfg_t cell_detect_config = { SRSLTE_DEFAULT_MAX_FRAMES_PBCH, diff --git a/srslte/examples/cell_search.c b/srslte/examples/cell_search.c index fc684578a..8ab560e0c 100644 --- a/srslte/examples/cell_search.c +++ b/srslte/examples/cell_search.c @@ -37,11 +37,11 @@ #include "srslte/srslte.h" -#include "srslte/rf/rf_utils.h" +#include "srslte/phy/rf/rf_utils.h" #ifndef DISABLE_RF -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #endif #define MHZ 1000000 diff --git a/srslte/examples/pdsch_enodeb.c b/srslte/examples/pdsch_enodeb.c index 0d3aa6c4a..800e04de9 100644 --- a/srslte/examples/pdsch_enodeb.c +++ b/srslte/examples/pdsch_enodeb.c @@ -41,7 +41,7 @@ #ifndef DISABLE_RF -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" srslte_rf_t rf; #else #warning Compiling pdsch_ue with no RF support diff --git a/srslte/examples/pdsch_ue.c b/srslte/examples/pdsch_ue.c index d37c736a9..06b3c93a9 100644 --- a/srslte/examples/pdsch_ue.c +++ b/srslte/examples/pdsch_ue.c @@ -42,8 +42,8 @@ #define ENABLE_AGC_DEFAULT #ifndef DISABLE_RF -#include "srslte/rf/rf.h" -#include "srslte/rf/rf_utils.h" +#include "srslte/phy/rf/rf.h" +#include "srslte/phy/rf/rf_utils.h" cell_search_cfg_t cell_detect_config = { SRSLTE_DEFAULT_MAX_FRAMES_PBCH, diff --git a/srslte/examples/tutorial_examples/pss.c b/srslte/examples/tutorial_examples/pss.c index fc2f43242..da487895c 100644 --- a/srslte/examples/tutorial_examples/pss.c +++ b/srslte/examples/tutorial_examples/pss.c @@ -35,7 +35,7 @@ #include #include "srslte/srslte.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #ifndef DISABLE_GRAPHICS diff --git a/srslte/examples/tutorial_examples/simple_tx.c b/srslte/examples/tutorial_examples/simple_tx.c index c82b14748..b56ccb281 100644 --- a/srslte/examples/tutorial_examples/simple_tx.c +++ b/srslte/examples/tutorial_examples/simple_tx.c @@ -35,7 +35,7 @@ #include "srslte/srslte.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" srslte_rf_t rf; char *output_file_name = NULL; diff --git a/srslte/examples/usrp_capture.c b/srslte/examples/usrp_capture.c index 148a6f070..2692deb0d 100644 --- a/srslte/examples/usrp_capture.c +++ b/srslte/examples/usrp_capture.c @@ -36,8 +36,8 @@ #include #include "srslte/srslte.h" -#include "srslte/rf/rf.h" -#include "srslte/io/filesink.h" +#include "srslte/phy/rf/rf.h" +#include "srslte/phy/io/filesink.h" static bool keep_running = true; char *output_file_name; diff --git a/srslte/examples/usrp_capture_sync.c b/srslte/examples/usrp_capture_sync.c index 6e7f74cb6..6938ee878 100644 --- a/srslte/examples/usrp_capture_sync.c +++ b/srslte/examples/usrp_capture_sync.c @@ -36,7 +36,7 @@ #include #include "srslte/srslte.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" static bool keep_running = true; char *output_file_name = NULL; diff --git a/srslte/examples/usrp_txrx.c b/srslte/examples/usrp_txrx.c index 11af41089..508b4b397 100644 --- a/srslte/examples/usrp_txrx.c +++ b/srslte/examples/usrp_txrx.c @@ -33,7 +33,7 @@ #include #include -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include "srslte/srslte.h" uint32_t nof_prb = 25; diff --git a/srslte/include/srslte/phy/ch_estimation/chest_dl.h b/srslte/include/srslte/phy/ch_estimation/chest_dl.h index 110e3d509..a454f939c 100644 --- a/srslte/include/srslte/phy/ch_estimation/chest_dl.h +++ b/srslte/include/srslte/phy/ch_estimation/chest_dl.h @@ -45,11 +45,11 @@ #include "srslte/config.h" -#include "srslte/ch_estimation/chest_common.h" -#include "srslte/resampling/interp.h" -#include "srslte/ch_estimation/refsignal_dl.h" -#include "srslte/common/phy_common.h" -#include "srslte/sync/pss.h" +#include "srslte/phy/ch_estimation/chest_common.h" +#include "srslte/phy/resampling/interp.h" +#include "srslte/phy/ch_estimation/refsignal_dl.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/sync/pss.h" typedef enum { diff --git a/srslte/include/srslte/phy/ch_estimation/chest_ul.h b/srslte/include/srslte/phy/ch_estimation/chest_ul.h index 8f21cb6b3..1e505210c 100644 --- a/srslte/include/srslte/phy/ch_estimation/chest_ul.h +++ b/srslte/include/srslte/phy/ch_estimation/chest_ul.h @@ -43,10 +43,10 @@ #include "srslte/config.h" -#include "srslte/ch_estimation/chest_common.h" -#include "srslte/resampling/interp.h" -#include "srslte/ch_estimation/refsignal_ul.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/ch_estimation/chest_common.h" +#include "srslte/phy/resampling/interp.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" +#include "srslte/phy/common/phy_common.h" typedef struct { srslte_cell_t cell; diff --git a/srslte/include/srslte/phy/ch_estimation/refsignal_dl.h b/srslte/include/srslte/phy/ch_estimation/refsignal_dl.h index bc0410b3d..3cdf7901e 100644 --- a/srslte/include/srslte/phy/ch_estimation/refsignal_dl.h +++ b/srslte/include/srslte/phy/ch_estimation/refsignal_dl.h @@ -36,7 +36,7 @@ #define SRSLTE_REFSIGNAL_DL_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" // Number of references in a subframe: there are 2 symbols for port_id=0,1 x 2 slots x 2 refs per prb #define SRSLTE_REFSIGNAL_NUM_SF(nof_prb, port_id) (((port_id)<2?8:4)*(nof_prb)) diff --git a/srslte/include/srslte/phy/ch_estimation/refsignal_ul.h b/srslte/include/srslte/phy/ch_estimation/refsignal_ul.h index 1c6814b63..72bfb5d94 100644 --- a/srslte/include/srslte/phy/ch_estimation/refsignal_ul.h +++ b/srslte/include/srslte/phy/ch_estimation/refsignal_ul.h @@ -36,8 +36,8 @@ #define SRSLTE_REFSIGNAL_UL_ #include "srslte/config.h" -#include "srslte/phch/pucch.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/phch/pucch.h" +#include "srslte/phy/common/phy_common.h" #define SRSLTE_NOF_GROUPS_U 30 #define SRSLTE_NOF_SEQUENCES_U 2 diff --git a/srslte/include/srslte/phy/common/sequence.h b/srslte/include/srslte/phy/common/sequence.h index 291545cd2..dbeba5ff4 100644 --- a/srslte/include/srslte/phy/common/sequence.h +++ b/srslte/include/srslte/phy/common/sequence.h @@ -37,7 +37,7 @@ #define LTESEQ_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" typedef struct SRSLTE_API { uint8_t *c; diff --git a/srslte/include/srslte/phy/dft/dft_precoding.h b/srslte/include/srslte/phy/dft/dft_precoding.h index e860e5b7b..6e5c5dc40 100644 --- a/srslte/include/srslte/phy/dft/dft_precoding.h +++ b/srslte/include/srslte/phy/dft/dft_precoding.h @@ -37,8 +37,8 @@ #define DFTPREC_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/dft/dft.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/dft/dft.h" /* DFT-based Transform Precoding object */ typedef struct SRSLTE_API { diff --git a/srslte/include/srslte/phy/dft/ofdm.h b/srslte/include/srslte/phy/dft/ofdm.h index a218fcc5b..990d7a8cc 100644 --- a/srslte/include/srslte/phy/dft/ofdm.h +++ b/srslte/include/srslte/phy/dft/ofdm.h @@ -41,8 +41,8 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/dft/dft.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/dft/dft.h" /* This is common for both directions */ typedef struct SRSLTE_API{ diff --git a/srslte/include/srslte/phy/enb/enb_dl.h b/srslte/include/srslte/phy/enb/enb_dl.h index 560441c70..08cb5da4f 100644 --- a/srslte/include/srslte/phy/enb/enb_dl.h +++ b/srslte/include/srslte/phy/enb/enb_dl.h @@ -40,25 +40,25 @@ #include -#include "srslte/common/phy_common.h" -#include "srslte/dft/ofdm.h" -#include "srslte/sync/pss.h" -#include "srslte/sync/sss.h" -#include "srslte/ch_estimation/refsignal_dl.h" -#include "srslte/phch/dci.h" -#include "srslte/phch/pbch.h" -#include "srslte/phch/pcfich.h" -#include "srslte/phch/pdcch.h" -#include "srslte/phch/pdsch.h" -#include "srslte/phch/pdsch_cfg.h" -#include "srslte/phch/phich.h" -#include "srslte/phch/ra.h" -#include "srslte/phch/regs.h" - -#include "srslte/enb/enb_ul.h" - -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/sync/pss.h" +#include "srslte/phy/sync/sss.h" +#include "srslte/phy/ch_estimation/refsignal_dl.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/pbch.h" +#include "srslte/phy/phch/pcfich.h" +#include "srslte/phy/phch/pdcch.h" +#include "srslte/phy/phch/pdsch.h" +#include "srslte/phy/phch/pdsch_cfg.h" +#include "srslte/phy/phch/phich.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/phch/regs.h" + +#include "srslte/phy/enb/enb_ul.h" + +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #include "srslte/config.h" diff --git a/srslte/include/srslte/phy/enb/enb_ul.h b/srslte/include/srslte/phy/enb/enb_ul.h index 6e426b81c..486566a1c 100644 --- a/srslte/include/srslte/phy/enb/enb_ul.h +++ b/srslte/include/srslte/phy/enb/enb_ul.h @@ -40,16 +40,16 @@ #include -#include "srslte/common/phy_common.h" -#include "srslte/dft/ofdm.h" -#include "srslte/ch_estimation/chest_ul.h" -#include "srslte/phch/prach.h" -#include "srslte/phch/pusch.h" -#include "srslte/phch/pusch_cfg.h" -#include "srslte/phch/ra.h" - -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/ch_estimation/chest_ul.h" +#include "srslte/phy/phch/prach.h" +#include "srslte/phy/phch/pusch.h" +#include "srslte/phy/phch/pusch_cfg.h" +#include "srslte/phy/phch/ra.h" + +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #include "srslte/config.h" diff --git a/srslte/include/srslte/phy/fec/softbuffer.h b/srslte/include/srslte/phy/fec/softbuffer.h index 28e5de69c..a47cc7b96 100644 --- a/srslte/include/srslte/phy/fec/softbuffer.h +++ b/srslte/include/srslte/phy/fec/softbuffer.h @@ -37,7 +37,7 @@ #define SOFTBUFFER_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" typedef struct SRSLTE_API { uint32_t max_cb; diff --git a/srslte/include/srslte/phy/fec/turbocoder.h b/srslte/include/srslte/phy/fec/turbocoder.h index 710a9f5fe..119e4f641 100644 --- a/srslte/include/srslte/phy/fec/turbocoder.h +++ b/srslte/include/srslte/phy/fec/turbocoder.h @@ -39,7 +39,7 @@ #define TURBOCODER_ #include "srslte/config.h" -#include "srslte/fec/tc_interl.h" +#include "srslte/phy/fec/tc_interl.h" #define SRSLTE_TCOD_MAX_LEN_CB_BYTES (6144/8) diff --git a/srslte/include/srslte/phy/fec/turbodecoder.h b/srslte/include/srslte/phy/fec/turbodecoder.h index c887cba83..149841fad 100644 --- a/srslte/include/srslte/phy/fec/turbodecoder.h +++ b/srslte/include/srslte/phy/fec/turbodecoder.h @@ -40,8 +40,8 @@ #define TURBODECODER_ #include "srslte/config.h" -#include "srslte/fec/tc_interl.h" -#include "srslte/fec/cbsegm.h" +#include "srslte/phy/fec/tc_interl.h" +#include "srslte/phy/fec/cbsegm.h" #define SRSLTE_TCOD_RATE 3 #define SRSLTE_TCOD_TOTALTAIL 12 @@ -49,10 +49,10 @@ #define SRSLTE_TCOD_MAX_LEN_CB 6144 #define SRSLTE_TCOD_MAX_LEN_CODED (SRSLTE_TCOD_RATE*SRSLTE_TCOD_MAX_LEN_CB+SRSLTE_TCOD_TOTALTAIL) -#include "srslte/fec/turbodecoder_gen.h" +#include "srslte/phy/fec/turbodecoder_gen.h" #ifdef LV_HAVE_SSE -#include "srslte/fec/turbodecoder_sse.h" +#include "srslte/phy/fec/turbodecoder_sse.h" #endif typedef struct SRSLTE_API { diff --git a/srslte/include/srslte/phy/fec/turbodecoder_gen.h b/srslte/include/srslte/phy/fec/turbodecoder_gen.h index a8a4e14cd..7f219201a 100644 --- a/srslte/include/srslte/phy/fec/turbodecoder_gen.h +++ b/srslte/include/srslte/phy/fec/turbodecoder_gen.h @@ -40,8 +40,8 @@ #define TURBODECODER_GEN_ #include "srslte/config.h" -#include "srslte/fec/tc_interl.h" -#include "srslte/fec/cbsegm.h" +#include "srslte/phy/fec/tc_interl.h" +#include "srslte/phy/fec/cbsegm.h" #define SRSLTE_TCOD_RATE 3 #define SRSLTE_TCOD_TOTALTAIL 12 diff --git a/srslte/include/srslte/phy/fec/turbodecoder_sse.h b/srslte/include/srslte/phy/fec/turbodecoder_sse.h index 52cbc7333..8b9f24372 100644 --- a/srslte/include/srslte/phy/fec/turbodecoder_sse.h +++ b/srslte/include/srslte/phy/fec/turbodecoder_sse.h @@ -40,8 +40,8 @@ #define TURBODECODER_SSE_ #include "srslte/config.h" -#include "srslte/fec/tc_interl.h" -#include "srslte/fec/cbsegm.h" +#include "srslte/phy/fec/tc_interl.h" +#include "srslte/phy/fec/cbsegm.h" #define SRSLTE_TCOD_RATE 3 #define SRSLTE_TCOD_TOTALTAIL 12 diff --git a/srslte/include/srslte/phy/io/filesink.h b/srslte/include/srslte/phy/io/filesink.h index 106cba8c5..b8ca8db51 100644 --- a/srslte/include/srslte/phy/io/filesink.h +++ b/srslte/include/srslte/phy/io/filesink.h @@ -41,7 +41,7 @@ #include #include "srslte/config.h" -#include "srslte/io/format.h" +#include "srslte/phy/io/format.h" /* Low-level API */ typedef struct SRSLTE_API { diff --git a/srslte/include/srslte/phy/io/filesource.h b/srslte/include/srslte/phy/io/filesource.h index e966dcbde..ee8bc080d 100644 --- a/srslte/include/srslte/phy/io/filesource.h +++ b/srslte/include/srslte/phy/io/filesource.h @@ -41,7 +41,7 @@ #include #include "srslte/config.h" -#include "srslte/io/format.h" +#include "srslte/phy/io/format.h" /* Low-level API */ typedef struct SRSLTE_API { diff --git a/srslte/include/srslte/phy/mimo/layermap.h b/srslte/include/srslte/phy/mimo/layermap.h index 998cf3fde..5daf51c14 100644 --- a/srslte/include/srslte/phy/mimo/layermap.h +++ b/srslte/include/srslte/phy/mimo/layermap.h @@ -38,7 +38,7 @@ #define LAYERMAP_H_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" /* Generates the vector of layer-mapped symbols "x" based on the vector of data symbols "d" */ diff --git a/srslte/include/srslte/phy/mimo/precoding.h b/srslte/include/srslte/phy/mimo/precoding.h index 0002daebb..62fad08ef 100644 --- a/srslte/include/srslte/phy/mimo/precoding.h +++ b/srslte/include/srslte/phy/mimo/precoding.h @@ -37,7 +37,7 @@ #define PRECODING_H_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" /** The precoder takes as input nlayers vectors "x" from the * layer mapping and generates nports vectors "y" to be mapped onto diff --git a/srslte/include/srslte/phy/modem/modem_table.h b/srslte/include/srslte/phy/modem/modem_table.h index 576a7598f..20b0a0f88 100644 --- a/srslte/include/srslte/phy/modem/modem_table.h +++ b/srslte/include/srslte/phy/modem/modem_table.h @@ -40,7 +40,7 @@ #include #include -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" #include "srslte/config.h" typedef struct { diff --git a/srslte/include/srslte/phy/phch/cqi.h b/srslte/include/srslte/phy/phch/cqi.h index 9a7b243be..f6857dfa0 100644 --- a/srslte/include/srslte/phy/phch/cqi.h +++ b/srslte/include/srslte/phy/phch/cqi.h @@ -38,7 +38,7 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" #define SRSLTE_CQI_MAX_BITS 64 diff --git a/srslte/include/srslte/phy/phch/dci.h b/srslte/include/srslte/phy/phch/dci.h index 1bc169f77..6976a6b24 100644 --- a/srslte/include/srslte/phy/phch/dci.h +++ b/srslte/include/srslte/phy/phch/dci.h @@ -40,8 +40,8 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/phch/ra.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/phch/ra.h" #define SRSLTE_DCI_MAX_BITS 128 diff --git a/srslte/include/srslte/phy/phch/pbch.h b/srslte/include/srslte/phy/phch/pbch.h index e63f52f07..8489df05a 100644 --- a/srslte/include/srslte/phy/phch/pbch.h +++ b/srslte/include/srslte/phy/phch/pbch.h @@ -38,16 +38,16 @@ #define PBCH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/scrambling/scrambling.h" -#include "srslte/fec/rm_conv.h" -#include "srslte/fec/convcoder.h" -#include "srslte/fec/viterbi.h" -#include "srslte/fec/crc.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/scrambling/scrambling.h" +#include "srslte/phy/fec/rm_conv.h" +#include "srslte/phy/fec/convcoder.h" +#include "srslte/phy/fec/viterbi.h" +#include "srslte/phy/fec/crc.h" #define SRSLTE_BCH_PAYLOAD_LEN 24 #define SRSLTE_BCH_PAYLOADCRC_LEN (SRSLTE_BCH_PAYLOAD_LEN+16) diff --git a/srslte/include/srslte/phy/phch/pcfich.h b/srslte/include/srslte/phy/phch/pcfich.h index 91cbd5229..672caed2c 100644 --- a/srslte/include/srslte/phy/phch/pcfich.h +++ b/srslte/include/srslte/phy/phch/pcfich.h @@ -36,13 +36,13 @@ #define PCFICH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/scrambling/scrambling.h" -#include "srslte/phch/regs.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/scrambling/scrambling.h" +#include "srslte/phy/phch/regs.h" #define PCFICH_CFI_LEN 32 #define PCFICH_RE PCFICH_CFI_LEN/2 diff --git a/srslte/include/srslte/phy/phch/pdcch.h b/srslte/include/srslte/phy/phch/pdcch.h index a83bf6ffd..8d4aba790 100644 --- a/srslte/include/srslte/phy/phch/pdcch.h +++ b/srslte/include/srslte/phy/phch/pdcch.h @@ -36,18 +36,18 @@ #define PDCCH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/scrambling/scrambling.h" -#include "srslte/fec/rm_conv.h" -#include "srslte/fec/convcoder.h" -#include "srslte/fec/viterbi.h" -#include "srslte/fec/crc.h" -#include "srslte/phch/dci.h" -#include "srslte/phch/regs.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/scrambling/scrambling.h" +#include "srslte/phy/fec/rm_conv.h" +#include "srslte/phy/fec/convcoder.h" +#include "srslte/phy/fec/viterbi.h" +#include "srslte/phy/fec/crc.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/regs.h" diff --git a/srslte/include/srslte/phy/phch/pdsch.h b/srslte/include/srslte/phy/phch/pdsch.h index 7e90973ed..7730d2fa1 100644 --- a/srslte/include/srslte/phy/phch/pdsch.h +++ b/srslte/include/srslte/phy/phch/pdsch.h @@ -36,16 +36,16 @@ #define PDSCH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/scrambling/scrambling.h" -#include "srslte/phch/dci.h" -#include "srslte/phch/regs.h" -#include "srslte/phch/sch.h" -#include "srslte/phch/pdsch_cfg.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/scrambling/scrambling.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/phch/sch.h" +#include "srslte/phy/phch/pdsch_cfg.h" typedef struct { srslte_sequence_t seq[SRSLTE_NSUBFRAMES_X_FRAME]; diff --git a/srslte/include/srslte/phy/phch/pdsch_cfg.h b/srslte/include/srslte/phy/phch/pdsch_cfg.h index 07ece3a7b..2745470f8 100644 --- a/srslte/include/srslte/phy/phch/pdsch_cfg.h +++ b/srslte/include/srslte/phy/phch/pdsch_cfg.h @@ -35,9 +35,9 @@ #ifndef PDSCHCFG_ #define PDSCHCFG_ -#include "srslte/phch/ra.h" -#include "srslte/fec/softbuffer.h" -#include "srslte/fec/cbsegm.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/fec/softbuffer.h" +#include "srslte/phy/fec/cbsegm.h" typedef struct SRSLTE_API { srslte_cbsegm_t cb_segm; diff --git a/srslte/include/srslte/phy/phch/phich.h b/srslte/include/srslte/phy/phch/phich.h index 2e477b41e..18454a2d5 100644 --- a/srslte/include/srslte/phy/phch/phich.h +++ b/srslte/include/srslte/phy/phch/phich.h @@ -36,12 +36,12 @@ #define PHICH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/scrambling/scrambling.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/scrambling/scrambling.h" #include "regs.h" diff --git a/srslte/include/srslte/phy/phch/prach.h b/srslte/include/srslte/phy/phch/prach.h index 69c79aea2..a08256a57 100644 --- a/srslte/include/srslte/phy/phch/prach.h +++ b/srslte/include/srslte/phy/phch/prach.h @@ -40,8 +40,8 @@ #include #include #include "srslte/config.h" -#include "srslte/dft/dft.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/common/phy_common.h" /** Generation and detection of RACH signals for uplink. diff --git a/srslte/include/srslte/phy/phch/pucch.h b/srslte/include/srslte/phy/phch/pucch.h index a91274441..3542dc53f 100644 --- a/srslte/include/srslte/phy/phch/pucch.h +++ b/srslte/include/srslte/phy/phch/pucch.h @@ -36,11 +36,11 @@ #define PUCCH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/common/sequence.h" -#include "srslte/modem/mod.h" -#include "srslte/phch/cqi.h" -#include "srslte/phch/uci.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/common/sequence.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/phch/cqi.h" +#include "srslte/phy/phch/uci.h" #define SRSLTE_PUCCH_N_SEQ 12 #define SRSLTE_PUCCH2_NOF_BITS SRSLTE_UCI_CQI_CODED_PUCCH_B diff --git a/srslte/include/srslte/phy/phch/pusch.h b/srslte/include/srslte/phy/phch/pusch.h index 25f4f40d8..bf04a4781 100644 --- a/srslte/include/srslte/phy/phch/pusch.h +++ b/srslte/include/srslte/phy/phch/pusch.h @@ -36,18 +36,18 @@ #define PUSCH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/scrambling/scrambling.h" -#include "srslte/phch/regs.h" -#include "srslte/phch/dci.h" -#include "srslte/phch/sch.h" -#include "srslte/phch/pusch_cfg.h" -#include "srslte/dft/dft_precoding.h" -#include "srslte/ch_estimation/refsignal_ul.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/scrambling/scrambling.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/sch.h" +#include "srslte/phy/phch/pusch_cfg.h" +#include "srslte/phy/dft/dft_precoding.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" #define SRSLTE_PUSCH_MAX_TDEC_ITERS 5 diff --git a/srslte/include/srslte/phy/phch/pusch_cfg.h b/srslte/include/srslte/phy/phch/pusch_cfg.h index eb9abe02d..5d743d94c 100644 --- a/srslte/include/srslte/phy/phch/pusch_cfg.h +++ b/srslte/include/srslte/phy/phch/pusch_cfg.h @@ -35,9 +35,9 @@ #ifndef PUSCHCFG_ #define PUSCHCFG_ -#include "srslte/phch/ra.h" -#include "srslte/fec/softbuffer.h" -#include "srslte/fec/cbsegm.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/fec/softbuffer.h" +#include "srslte/phy/fec/cbsegm.h" typedef struct SRSLTE_API { uint32_t I_offset_cqi; diff --git a/srslte/include/srslte/phy/phch/ra.h b/srslte/include/srslte/phy/phch/ra.h index fb17703dd..cec2e6087 100644 --- a/srslte/include/srslte/phy/phch/ra.h +++ b/srslte/include/srslte/phy/phch/ra.h @@ -40,7 +40,7 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" /************************************************** * Common structures used for Resource Allocation diff --git a/srslte/include/srslte/phy/phch/regs.h b/srslte/include/srslte/phy/phch/regs.h index f7d5f91f1..9d5129e36 100644 --- a/srslte/include/srslte/phy/phch/regs.h +++ b/srslte/include/srslte/phy/phch/regs.h @@ -37,7 +37,7 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" #define REGS_PHICH_NSYM 12 #define REGS_PHICH_REGS_X_GROUP 3 diff --git a/srslte/include/srslte/phy/phch/sch.h b/srslte/include/srslte/phy/phch/sch.h index 7c365120b..4ef0b3070 100644 --- a/srslte/include/srslte/phy/phch/sch.h +++ b/srslte/include/srslte/phy/phch/sch.h @@ -36,14 +36,14 @@ #define SCH_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/fec/rm_turbo.h" -#include "srslte/fec/turbocoder.h" -#include "srslte/fec/turbodecoder.h" -#include "srslte/fec/crc.h" -#include "srslte/phch/pdsch_cfg.h" -#include "srslte/phch/pusch_cfg.h" -#include "srslte/phch/uci.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/fec/rm_turbo.h" +#include "srslte/phy/fec/turbocoder.h" +#include "srslte/phy/fec/turbodecoder.h" +#include "srslte/phy/fec/crc.h" +#include "srslte/phy/phch/pdsch_cfg.h" +#include "srslte/phy/phch/pusch_cfg.h" +#include "srslte/phy/phch/uci.h" #ifndef SRSLTE_RX_NULL #define SRSLTE_RX_NULL 10000 diff --git a/srslte/include/srslte/phy/phch/uci.h b/srslte/include/srslte/phy/phch/uci.h index fa916c283..bad87866e 100644 --- a/srslte/include/srslte/phy/phch/uci.h +++ b/srslte/include/srslte/phy/phch/uci.h @@ -36,11 +36,11 @@ #define UCI_ #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/phch/pusch_cfg.h" -#include "srslte/fec/crc.h" -#include "srslte/fec/viterbi.h" -#include "srslte/phch/cqi.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/phch/pusch_cfg.h" +#include "srslte/phy/fec/crc.h" +#include "srslte/phy/fec/viterbi.h" +#include "srslte/phy/phch/cqi.h" #define SRSLTE_UCI_MAX_CQI_LEN_PUSCH 512 #define SRSLTE_UCI_MAX_CQI_LEN_PUCCH 13 diff --git a/srslte/include/srslte/phy/rf/rf_utils.h b/srslte/include/srslte/phy/rf/rf_utils.h index c5f55a6c1..7dddb20f4 100644 --- a/srslte/include/srslte/phy/rf/rf_utils.h +++ b/srslte/include/srslte/phy/rf/rf_utils.h @@ -26,7 +26,7 @@ #include "srslte/srslte.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" typedef struct SRSLTE_API { uint32_t max_frames_pbch; // timeout in number of 5ms frames for MIB decoding diff --git a/srslte/include/srslte/phy/scrambling/scrambling.h b/srslte/include/srslte/phy/scrambling/scrambling.h index 4e1fe40e6..4fa74790a 100644 --- a/srslte/include/srslte/phy/scrambling/scrambling.h +++ b/srslte/include/srslte/phy/scrambling/scrambling.h @@ -36,8 +36,8 @@ #define SCRAMBLING_ #include "srslte/config.h" -#include "srslte/common/sequence.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/sequence.h" +#include "srslte/phy/common/phy_common.h" /* Scrambling has no state */ SRSLTE_API void srslte_scrambling_b(srslte_sequence_t *s, diff --git a/srslte/include/srslte/phy/sync/cfo.h b/srslte/include/srslte/phy/sync/cfo.h index b2cbce644..642e81fc4 100644 --- a/srslte/include/srslte/phy/sync/cfo.h +++ b/srslte/include/srslte/phy/sync/cfo.h @@ -38,7 +38,7 @@ #include #include "srslte/config.h" -#include "srslte/utils/cexptab.h" +#include "srslte/phy/utils/cexptab.h" /** If the frequency is changed more than the tolerance, a new table is generated */ #define SRSLTE_CFO_TOLERANCE 0.00001 diff --git a/srslte/include/srslte/phy/sync/pss.h b/srslte/include/srslte/phy/sync/pss.h index a90a12bf9..f18c5b6af 100644 --- a/srslte/include/srslte/phy/sync/pss.h +++ b/srslte/include/srslte/phy/sync/pss.h @@ -49,9 +49,9 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/convolution.h" -#include "srslte/utils/filter.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/convolution.h" +#include "srslte/phy/utils/filter.h" #define CONVOLUTION_FFT diff --git a/srslte/include/srslte/phy/sync/sss.h b/srslte/include/srslte/phy/sync/sss.h index 2d9ac5c4e..aca57e860 100644 --- a/srslte/include/srslte/phy/sync/sss.h +++ b/srslte/include/srslte/phy/sync/sss.h @@ -40,8 +40,8 @@ #include #include "srslte/config.h" -#include "srslte/common/phy_common.h" -#include "srslte/dft/dft.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/dft/dft.h" #define SRSLTE_SSS_N 31 diff --git a/srslte/include/srslte/phy/sync/sync.h b/srslte/include/srslte/phy/sync/sync.h index a96873e1e..ab22d64fc 100644 --- a/srslte/include/srslte/phy/sync/sync.h +++ b/srslte/include/srslte/phy/sync/sync.h @@ -49,10 +49,10 @@ #include #include "srslte/config.h" -#include "srslte/sync/pss.h" -#include "srslte/sync/sss.h" -#include "srslte/sync/cfo.h" -#include "srslte/sync/cp.h" +#include "srslte/phy/sync/pss.h" +#include "srslte/phy/sync/sss.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/sync/cp.h" #define SRSLTE_SYNC_FFT_SZ_MIN 64 #define SRSLTE_SYNC_FFT_SZ_MAX 2048 diff --git a/srslte/include/srslte/phy/ue/ue_cell_search.h b/srslte/include/srslte/phy/ue/ue_cell_search.h index 628683f09..bcabe1728 100644 --- a/srslte/include/srslte/phy/ue/ue_cell_search.h +++ b/srslte/include/srslte/phy/ue/ue_cell_search.h @@ -46,12 +46,12 @@ #include #include "srslte/config.h" -#include "srslte/ue/ue_sync.h" -#include "srslte/ue/ue_mib.h" -#include "srslte/sync/cfo.h" -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/phch/pbch.h" -#include "srslte/dft/ofdm.h" +#include "srslte/phy/ue/ue_sync.h" +#include "srslte/phy/ue/ue_mib.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/phch/pbch.h" +#include "srslte/phy/dft/ofdm.h" #define SRSLTE_CS_NOF_PRB 6 #define SRSLTE_CS_SAMP_FREQ 1920000.0 diff --git a/srslte/include/srslte/phy/ue/ue_dl.h b/srslte/include/srslte/phy/ue/ue_dl.h index a32794aa2..7c3f83320 100644 --- a/srslte/include/srslte/phy/ue/ue_dl.h +++ b/srslte/include/srslte/phy/ue/ue_dl.h @@ -40,23 +40,23 @@ #include -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/dft/ofdm.h" -#include "srslte/common/phy_common.h" - -#include "srslte/phch/dci.h" -#include "srslte/phch/pcfich.h" -#include "srslte/phch/pdcch.h" -#include "srslte/phch/pdsch.h" -#include "srslte/phch/pdsch_cfg.h" -#include "srslte/phch/phich.h" -#include "srslte/phch/ra.h" -#include "srslte/phch/regs.h" - -#include "srslte/sync/cfo.h" - -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/common/phy_common.h" + +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/pcfich.h" +#include "srslte/phy/phch/pdcch.h" +#include "srslte/phy/phch/pdsch.h" +#include "srslte/phy/phch/pdsch_cfg.h" +#include "srslte/phy/phch/phich.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/phch/regs.h" + +#include "srslte/phy/sync/cfo.h" + +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #include "srslte/config.h" diff --git a/srslte/include/srslte/phy/ue/ue_mib.h b/srslte/include/srslte/phy/ue/ue_mib.h index 202b6ee7f..abefa014f 100644 --- a/srslte/include/srslte/phy/ue/ue_mib.h +++ b/srslte/include/srslte/phy/ue/ue_mib.h @@ -49,11 +49,11 @@ #include #include "srslte/config.h" -#include "srslte/ue/ue_sync.h" -#include "srslte/sync/cfo.h" -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/phch/pbch.h" -#include "srslte/dft/ofdm.h" +#include "srslte/phy/ue/ue_sync.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/phch/pbch.h" +#include "srslte/phy/dft/ofdm.h" #define SRSLTE_UE_MIB_NOF_PRB 6 diff --git a/srslte/include/srslte/phy/ue/ue_phy.h b/srslte/include/srslte/phy/ue/ue_phy.h index 8f760e127..369b96027 100644 --- a/srslte/include/srslte/phy/ue/ue_phy.h +++ b/srslte/include/srslte/phy/ue/ue_phy.h @@ -33,7 +33,7 @@ *****************************************************************************/ #include "srslte/srslte.h" -#include "srslte/utils/queue.h" +#include "srslte/phy/utils/queue.h" #ifndef UEPHY_H #define UEPHY_H diff --git a/srslte/include/srslte/phy/ue/ue_sync.h b/srslte/include/srslte/phy/ue/ue_sync.h index 15c1ff129..94d4f9136 100644 --- a/srslte/include/srslte/phy/ue/ue_sync.h +++ b/srslte/include/srslte/phy/ue/ue_sync.h @@ -52,14 +52,14 @@ #include #include "srslte/config.h" -#include "srslte/sync/sync.h" -#include "srslte/sync/cfo.h" -#include "srslte/agc/agc.h" -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/phch/pbch.h" -#include "srslte/dft/ofdm.h" -#include "srslte/common/timestamp.h" -#include "srslte/io/filesource.h" +#include "srslte/phy/sync/sync.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/agc/agc.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/phch/pbch.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/common/timestamp.h" +#include "srslte/phy/io/filesource.h" typedef enum SRSLTE_API { SF_FIND, SF_TRACK} srslte_ue_sync_state_t; diff --git a/srslte/include/srslte/phy/ue/ue_ul.h b/srslte/include/srslte/phy/ue/ue_ul.h index 20642cdcc..2afa8068a 100644 --- a/srslte/include/srslte/phy/ue/ue_ul.h +++ b/srslte/include/srslte/phy/ue/ue_ul.h @@ -38,16 +38,16 @@ #ifndef UEUL_H #define UEUL_H -#include "srslte/common/phy_common.h" -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/dft/ofdm.h" -#include "srslte/ch_estimation/refsignal_ul.h" -#include "srslte/phch/pusch.h" -#include "srslte/phch/dci.h" -#include "srslte/phch/ra.h" -#include "srslte/sync/cfo.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" +#include "srslte/phy/phch/pusch.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #include "srslte/config.h" diff --git a/srslte/include/srslte/phy/utils/convolution.h b/srslte/include/srslte/phy/utils/convolution.h index 10adcd76a..27ea7e590 100644 --- a/srslte/include/srslte/phy/utils/convolution.h +++ b/srslte/include/srslte/phy/utils/convolution.h @@ -36,7 +36,7 @@ #define CONVOLUTION_H_ #include "srslte/config.h" -#include "srslte/dft/dft.h" +#include "srslte/phy/dft/dft.h" typedef struct SRSLTE_API { cf_t *input_fft; diff --git a/srslte/include/srslte/phy/utils/filter.h b/srslte/include/srslte/phy/utils/filter.h index 87f7424c4..70e00363c 100644 --- a/srslte/include/srslte/phy/utils/filter.h +++ b/srslte/include/srslte/phy/utils/filter.h @@ -38,7 +38,7 @@ #include #include "srslte/config.h" #include -#include "srslte/utils/vector.h" +#include "srslte/phy/utils/vector.h" typedef struct SRSLTE_API{ cf_t *filter_input; cf_t *downsampled_input; diff --git a/srslte/include/srslte/srslte.h b/srslte/include/srslte/srslte.h index 719b5d945..f44f5325d 100644 --- a/srslte/include/srslte/srslte.h +++ b/srslte/include/srslte/srslte.h @@ -38,88 +38,88 @@ #include "srslte/config.h" #include "srslte/version.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/convolution.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/cexptab.h" -#include "srslte/utils/vector.h" - -#include "srslte/common/timestamp.h" -#include "srslte/common/sequence.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/convolution.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/cexptab.h" +#include "srslte/phy/utils/vector.h" + +#include "srslte/phy/common/timestamp.h" +#include "srslte/phy/common/sequence.h" +#include "srslte/phy/common/phy_common.h" -#include "srslte/ch_estimation/chest_ul.h" -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/ch_estimation/refsignal_dl.h" -#include "srslte/ch_estimation/refsignal_ul.h" - -#include "srslte/resampling/interp.h" -#include "srslte/resampling/decim.h" -#include "srslte/resampling/resample_arb.h" - -#include "srslte/channel/ch_awgn.h" - -#include "srslte/fec/viterbi.h" -#include "srslte/fec/convcoder.h" -#include "srslte/fec/crc.h" -#include "srslte/fec/tc_interl.h" -#include "srslte/fec/turbocoder.h" -#include "srslte/fec/turbodecoder.h" -#include "srslte/fec/cbsegm.h" -#include "srslte/fec/rm_conv.h" -#include "srslte/fec/rm_turbo.h" - -#include "srslte/dft/dft_precoding.h" -#include "srslte/dft/ofdm.h" -#include "srslte/dft/dft.h" - -#include "srslte/io/binsource.h" -#include "srslte/io/filesink.h" -#include "srslte/io/filesource.h" -#include "srslte/io/netsink.h" -#include "srslte/io/netsource.h" - -#include "srslte/modem/demod_hard.h" -#include "srslte/modem/demod_soft.h" -#include "srslte/modem/mod.h" -#include "srslte/modem/modem_table.h" - -#include "srslte/mimo/precoding.h" -#include "srslte/mimo/layermap.h" - -#include "srslte/phch/cqi.h" -#include "srslte/phch/dci.h" -#include "srslte/fec/softbuffer.h" -#include "srslte/phch/pbch.h" -#include "srslte/phch/pcfich.h" -#include "srslte/phch/pdcch.h" -#include "srslte/phch/pdsch.h" -#include "srslte/phch/phich.h" -#include "srslte/phch/pusch.h" -#include "srslte/phch/pucch.h" -#include "srslte/phch/prach.h" -#include "srslte/phch/ra.h" -#include "srslte/phch/regs.h" -#include "srslte/phch/sch.h" -#include "srslte/phch/uci.h" +#include "srslte/phy/ch_estimation/chest_ul.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/ch_estimation/refsignal_dl.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" + +#include "srslte/phy/resampling/interp.h" +#include "srslte/phy/resampling/decim.h" +#include "srslte/phy/resampling/resample_arb.h" + +#include "srslte/phy/channel/ch_awgn.h" + +#include "srslte/phy/fec/viterbi.h" +#include "srslte/phy/fec/convcoder.h" +#include "srslte/phy/fec/crc.h" +#include "srslte/phy/fec/tc_interl.h" +#include "srslte/phy/fec/turbocoder.h" +#include "srslte/phy/fec/turbodecoder.h" +#include "srslte/phy/fec/cbsegm.h" +#include "srslte/phy/fec/rm_conv.h" +#include "srslte/phy/fec/rm_turbo.h" + +#include "srslte/phy/dft/dft_precoding.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/dft/dft.h" + +#include "srslte/phy/io/binsource.h" +#include "srslte/phy/io/filesink.h" +#include "srslte/phy/io/filesource.h" +#include "srslte/phy/io/netsink.h" +#include "srslte/phy/io/netsource.h" + +#include "srslte/phy/modem/demod_hard.h" +#include "srslte/phy/modem/demod_soft.h" +#include "srslte/phy/modem/mod.h" +#include "srslte/phy/modem/modem_table.h" + +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/mimo/layermap.h" + +#include "srslte/phy/phch/cqi.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/fec/softbuffer.h" +#include "srslte/phy/phch/pbch.h" +#include "srslte/phy/phch/pcfich.h" +#include "srslte/phy/phch/pdcch.h" +#include "srslte/phy/phch/pdsch.h" +#include "srslte/phy/phch/phich.h" +#include "srslte/phy/phch/pusch.h" +#include "srslte/phy/phch/pucch.h" +#include "srslte/phy/phch/prach.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/phch/sch.h" +#include "srslte/phy/phch/uci.h" -#include "srslte/ue/ue_sync.h" -#include "srslte/ue/ue_mib.h" -#include "srslte/ue/ue_cell_search.h" -#include "srslte/ue/ue_dl.h" -#include "srslte/ue/ue_ul.h" - -#include "srslte/enb/enb_dl.h" -#include "srslte/enb/enb_ul.h" - -#include "srslte/scrambling/scrambling.h" - -#include "srslte/sync/pss.h" -#include "srslte/sync/sfo.h" -#include "srslte/sync/sss.h" -#include "srslte/sync/sync.h" -#include "srslte/sync/cfo.h" -#include "srslte/sync/cp.h" +#include "srslte/phy/ue/ue_sync.h" +#include "srslte/phy/ue/ue_mib.h" +#include "srslte/phy/ue/ue_cell_search.h" +#include "srslte/phy/ue/ue_dl.h" +#include "srslte/phy/ue/ue_ul.h" + +#include "srslte/phy/enb/enb_dl.h" +#include "srslte/phy/enb/enb_ul.h" + +#include "srslte/phy/scrambling/scrambling.h" + +#include "srslte/phy/sync/pss.h" +#include "srslte/phy/sync/sfo.h" +#include "srslte/phy/sync/sss.h" +#include "srslte/phy/sync/sync.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/sync/cp.h" #ifdef __cplusplus } diff --git a/srslte/lib/phy/agc/agc.c b/srslte/lib/phy/agc/agc.c index 3d971427a..3134de729 100644 --- a/srslte/lib/phy/agc/agc.c +++ b/srslte/lib/phy/agc/agc.c @@ -31,11 +31,11 @@ #include #include -#include "srslte/utils/debug.h" +#include "srslte/phy/utils/debug.h" -#include "srslte/agc/agc.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/agc/agc.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" int srslte_agc_init (srslte_agc_t *q, srslte_agc_mode_t mode) { return srslte_agc_init_acc(q, mode, 0); diff --git a/srslte/lib/phy/ch_estimation/chest_common.c b/srslte/lib/phy/ch_estimation/chest_common.c index dfb92f974..2ef80130d 100644 --- a/srslte/lib/phy/ch_estimation/chest_common.c +++ b/srslte/lib/phy/ch_estimation/chest_common.c @@ -33,9 +33,9 @@ #include #include -#include "srslte/ch_estimation/chest_common.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/convolution.h" +#include "srslte/phy/ch_estimation/chest_common.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/convolution.h" void srslte_chest_set_triangle_filter(float *fil, int filter_len) { diff --git a/srslte/lib/phy/ch_estimation/chest_dl.c b/srslte/lib/phy/ch_estimation/chest_dl.c index 5368c706f..690721b3c 100644 --- a/srslte/lib/phy/ch_estimation/chest_dl.c +++ b/srslte/lib/phy/ch_estimation/chest_dl.c @@ -35,9 +35,9 @@ #include "srslte/config.h" -#include "srslte/ch_estimation/chest_dl.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/convolution.h" +#include "srslte/phy/ch_estimation/chest_dl.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/convolution.h" //#define DEFAULT_FILTER_LEN 3 diff --git a/srslte/lib/phy/ch_estimation/chest_ul.c b/srslte/lib/phy/ch_estimation/chest_ul.c index 9f86b69ee..9996fc9c3 100644 --- a/srslte/lib/phy/ch_estimation/chest_ul.c +++ b/srslte/lib/phy/ch_estimation/chest_ul.c @@ -35,10 +35,10 @@ #include "srslte/config.h" -#include "srslte/dft/dft_precoding.h" -#include "srslte/ch_estimation/chest_ul.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/convolution.h" +#include "srslte/phy/dft/dft_precoding.h" +#include "srslte/phy/ch_estimation/chest_ul.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/convolution.h" #define NOF_REFS_SYM (q->cell.nof_prb*SRSLTE_NRE) #define NOF_REFS_SF (NOF_REFS_SYM*2) // 2 reference symbols per subframe diff --git a/srslte/lib/phy/ch_estimation/refsignal_dl.c b/srslte/lib/phy/ch_estimation/refsignal_dl.c index c0d6767a2..ec0f0b4e0 100644 --- a/srslte/lib/phy/ch_estimation/refsignal_dl.c +++ b/srslte/lib/phy/ch_estimation/refsignal_dl.c @@ -31,11 +31,11 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/ch_estimation/refsignal_dl.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" -#include "srslte/common/sequence.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/ch_estimation/refsignal_dl.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/common/sequence.h" uint32_t srslte_refsignal_cs_v(uint32_t port_id, uint32_t ref_symbol_idx) { diff --git a/srslte/lib/phy/ch_estimation/refsignal_ul.c b/srslte/lib/phy/ch_estimation/refsignal_ul.c index 143bf53f4..609ef52d0 100644 --- a/srslte/lib/phy/ch_estimation/refsignal_ul.c +++ b/srslte/lib/phy/ch_estimation/refsignal_ul.c @@ -30,12 +30,12 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/ch_estimation/refsignal_ul.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" -#include "srslte/common/sequence.h" -#include "srslte/dft/dft_precoding.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/common/sequence.h" +#include "srslte/phy/dft/dft_precoding.h" #include "ul_rs_tables.h" diff --git a/srslte/lib/phy/channel/ch_awgn.c b/srslte/lib/phy/channel/ch_awgn.c index 25a8db7f1..d88a91abc 100644 --- a/srslte/lib/phy/channel/ch_awgn.c +++ b/srslte/lib/phy/channel/ch_awgn.c @@ -31,7 +31,7 @@ #include #include "gauss.h" -#include "srslte/channel/ch_awgn.h" +#include "srslte/phy/channel/ch_awgn.h" float srslte_ch_awgn_get_variance(float ebno_db, float rate) { float esno_db = ebno_db + 10 * log10f(rate); diff --git a/srslte/lib/phy/common/phy_common.c b/srslte/lib/phy/common/phy_common.c index e4a7d8d20..8386ae18b 100644 --- a/srslte/lib/phy/common/phy_common.c +++ b/srslte/lib/phy/common/phy_common.c @@ -31,8 +31,8 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/common/sequence.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/common/sequence.h" #ifdef FORCE_STANDARD_RATE static bool use_standard_rates = true; diff --git a/srslte/lib/phy/common/sequence.c b/srslte/lib/phy/common/sequence.c index 5b2af5351..2a863bcee 100644 --- a/srslte/lib/phy/common/sequence.c +++ b/srslte/lib/phy/common/sequence.c @@ -29,9 +29,9 @@ #include #include -#include "srslte/common/sequence.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/bit.h" +#include "srslte/phy/common/sequence.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/bit.h" #define Nc 1600 diff --git a/srslte/lib/phy/common/timestamp.c b/srslte/lib/phy/common/timestamp.c index ffa028ce5..8c2fbe39f 100644 --- a/srslte/lib/phy/common/timestamp.c +++ b/srslte/lib/phy/common/timestamp.c @@ -24,7 +24,7 @@ * */ -#include "srslte/common/timestamp.h" +#include "srslte/phy/common/timestamp.h" #include "math.h" int srslte_timestamp_init(srslte_timestamp_t *t, time_t full_secs, double frac_secs){ diff --git a/srslte/lib/phy/dft/dft_fftw.c b/srslte/lib/phy/dft/dft_fftw.c index d6dc55b84..347e04547 100644 --- a/srslte/lib/phy/dft/dft_fftw.c +++ b/srslte/lib/phy/dft/dft_fftw.c @@ -30,8 +30,8 @@ #include #include -#include "srslte/dft/dft.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/utils/vector.h" #define dft_ceil(a,b) ((a-1)/b+1) #define dft_floor(a,b) (a/b) diff --git a/srslte/lib/phy/dft/dft_precoding.c b/srslte/lib/phy/dft/dft_precoding.c index bc285d8f6..3bec5b96e 100644 --- a/srslte/lib/phy/dft/dft_precoding.c +++ b/srslte/lib/phy/dft/dft_precoding.c @@ -33,11 +33,11 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" -#include "srslte/dft/dft.h" -#include "srslte/dft/dft_precoding.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/dft/dft_precoding.h" /* Create DFT plans for transform precoding */ int srslte_dft_precoding_init(srslte_dft_precoding_t *q, uint32_t max_prb) diff --git a/srslte/lib/phy/dft/ofdm.c b/srslte/lib/phy/dft/ofdm.c index 856ff28da..69b7e9161 100644 --- a/srslte/lib/phy/dft/ofdm.c +++ b/srslte/lib/phy/dft/ofdm.c @@ -30,11 +30,11 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/dft/dft.h" -#include "srslte/dft/ofdm.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/dft/ofdm.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" int srslte_ofdm_init_(srslte_ofdm_t *q, srslte_cp_t cp, int symbol_sz, int nof_prb, srslte_dft_dir_t dir) { diff --git a/srslte/lib/phy/enb/enb_dl.c b/srslte/lib/phy/enb/enb_dl.c index 33809015d..4cc33d3b8 100644 --- a/srslte/lib/phy/enb/enb_dl.c +++ b/srslte/lib/phy/enb/enb_dl.c @@ -24,7 +24,7 @@ * */ -#include "srslte/enb/enb_dl.h" +#include "srslte/phy/enb/enb_dl.h" #include #include diff --git a/srslte/lib/phy/enb/enb_ul.c b/srslte/lib/phy/enb/enb_ul.c index f536e33f8..9c294ac43 100644 --- a/srslte/lib/phy/enb/enb_ul.c +++ b/srslte/lib/phy/enb/enb_ul.c @@ -24,7 +24,7 @@ * */ -#include "srslte/enb/enb_ul.h" +#include "srslte/phy/enb/enb_ul.h" #include #include diff --git a/srslte/lib/phy/fec/cbsegm.c b/srslte/lib/phy/fec/cbsegm.c index bbd2c174a..6370abca0 100644 --- a/srslte/lib/phy/fec/cbsegm.c +++ b/srslte/lib/phy/fec/cbsegm.c @@ -27,9 +27,9 @@ #include #include -#include "srslte/fec/turbodecoder_gen.h" -#include "srslte/fec/cbsegm.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/fec/turbodecoder_gen.h" +#include "srslte/phy/fec/cbsegm.h" +#include "srslte/phy/utils/debug.h" const uint32_t tc_cb_sizes[SRSLTE_NOF_TC_CB_SIZES] = { 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120, diff --git a/srslte/lib/phy/fec/convcoder.c b/srslte/lib/phy/fec/convcoder.c index e5f486556..260ce1e33 100644 --- a/srslte/lib/phy/fec/convcoder.c +++ b/srslte/lib/phy/fec/convcoder.c @@ -30,7 +30,7 @@ #include #include -#include "srslte/fec/convcoder.h" +#include "srslte/phy/fec/convcoder.h" #include "parity.h" int srslte_convcoder_encode(srslte_convcoder_t *q, uint8_t *input, uint8_t *output, uint32_t frame_length) { diff --git a/srslte/lib/phy/fec/crc.c b/srslte/lib/phy/fec/crc.c index e77366fcd..a2f6d7931 100644 --- a/srslte/lib/phy/fec/crc.c +++ b/srslte/lib/phy/fec/crc.c @@ -28,8 +28,8 @@ #include #include -#include "srslte/utils/bit.h" -#include "srslte/fec/crc.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/fec/crc.h" void gen_crc_table(srslte_crc_t *h) { diff --git a/srslte/lib/phy/fec/rm_conv.c b/srslte/lib/phy/fec/rm_conv.c index f994c96fa..ddf38d274 100644 --- a/srslte/lib/phy/fec/rm_conv.c +++ b/srslte/lib/phy/fec/rm_conv.c @@ -28,7 +28,7 @@ #include #include -#include "srslte/fec/rm_conv.h" +#include "srslte/phy/fec/rm_conv.h" #define NCOLS 32 #define NROWS_MAX NCOLS diff --git a/srslte/lib/phy/fec/rm_turbo.c b/srslte/lib/phy/fec/rm_turbo.c index 1d250ff43..312d5c930 100644 --- a/srslte/lib/phy/fec/rm_turbo.c +++ b/srslte/lib/phy/fec/rm_turbo.c @@ -31,10 +31,10 @@ #include #include -#include "srslte/fec/rm_turbo.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/fec/cbsegm.h" +#include "srslte/phy/fec/rm_turbo.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/fec/cbsegm.h" #ifdef DEBUG_MODE #warning FIXME: Disabling SSE/AVX turbo rate matching diff --git a/srslte/lib/phy/fec/softbuffer.c b/srslte/lib/phy/fec/softbuffer.c index 46eaaef69..8efa937cb 100644 --- a/srslte/lib/phy/fec/softbuffer.c +++ b/srslte/lib/phy/fec/softbuffer.c @@ -33,13 +33,13 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/phch/ra.h" -#include "srslte/fec/turbodecoder_gen.h" -#include "srslte/fec/rm_turbo.h" -#include "srslte/fec/softbuffer.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/fec/turbodecoder_gen.h" +#include "srslte/phy/fec/rm_turbo.h" +#include "srslte/phy/fec/softbuffer.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #define MAX_PDSCH_RE(cp) (2 * SRSLTE_CP_NSYMB(cp) * 12) diff --git a/srslte/lib/phy/fec/tc_interl_lte.c b/srslte/lib/phy/fec/tc_interl_lte.c index 2124b9819..06ba7a753 100644 --- a/srslte/lib/phy/fec/tc_interl_lte.c +++ b/srslte/lib/phy/fec/tc_interl_lte.c @@ -28,11 +28,11 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/fec/tc_interl.h" -#include "srslte/fec/turbocoder.h" -#include "srslte/fec/cbsegm.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/fec/tc_interl.h" +#include "srslte/phy/fec/turbocoder.h" +#include "srslte/phy/fec/cbsegm.h" +#include "srslte/phy/utils/debug.h" /************************************************ * diff --git a/srslte/lib/phy/fec/tc_interl_umts.c b/srslte/lib/phy/fec/tc_interl_umts.c index 914e59ba2..d7f9ecdb7 100644 --- a/srslte/lib/phy/fec/tc_interl_umts.c +++ b/srslte/lib/phy/fec/tc_interl_umts.c @@ -29,8 +29,8 @@ #include #include -#include "srslte/fec/tc_interl.h" -#include "srslte/fec/turbocoder.h" +#include "srslte/phy/fec/tc_interl.h" +#include "srslte/phy/fec/turbocoder.h" #define TURBO_SRSLTE_TCOD_RATE 3 diff --git a/srslte/lib/phy/fec/test/crc_test.h b/srslte/lib/phy/fec/test/crc_test.h index 39968aeff..3123133b9 100644 --- a/srslte/lib/phy/fec/test/crc_test.h +++ b/srslte/lib/phy/fec/test/crc_test.h @@ -26,7 +26,7 @@ #include -#include "srslte/fec/crc.h" +#include "srslte/phy/fec/crc.h" typedef struct { int n; diff --git a/srslte/lib/phy/fec/turbocoder.c b/srslte/lib/phy/fec/turbocoder.c index 10ce0b4eb..b7785980c 100644 --- a/srslte/lib/phy/fec/turbocoder.c +++ b/srslte/lib/phy/fec/turbocoder.c @@ -30,10 +30,10 @@ #include #include -#include "srslte/fec/cbsegm.h" -#include "srslte/fec/turbocoder.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/fec/cbsegm.h" +#include "srslte/phy/fec/turbocoder.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" #define NOF_REGS 3 diff --git a/srslte/lib/phy/fec/turbodecoder.c b/srslte/lib/phy/fec/turbodecoder.c index bb8c51c4f..145c88d6d 100644 --- a/srslte/lib/phy/fec/turbodecoder.c +++ b/srslte/lib/phy/fec/turbodecoder.c @@ -30,15 +30,15 @@ #include #include -#include "srslte/fec/turbodecoder.h" -#include "srslte/fec/turbodecoder_gen.h" +#include "srslte/phy/fec/turbodecoder.h" +#include "srslte/phy/fec/turbodecoder_gen.h" #ifdef LV_HAVE_SSE -#include "srslte/fec/turbodecoder_sse.h" +#include "srslte/phy/fec/turbodecoder_sse.h" #endif -#include "srslte/utils/vector.h" +#include "srslte/phy/utils/vector.h" int srslte_tdec_init(srslte_tdec_t * h, uint32_t max_long_cb) { diff --git a/srslte/lib/phy/fec/turbodecoder_gen.c b/srslte/lib/phy/fec/turbodecoder_gen.c index 9a70a4f7f..396d94caa 100644 --- a/srslte/lib/phy/fec/turbodecoder_gen.c +++ b/srslte/lib/phy/fec/turbodecoder_gen.c @@ -31,8 +31,8 @@ #include #include -#include "srslte/fec/turbodecoder_gen.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/fec/turbodecoder_gen.h" +#include "srslte/phy/utils/vector.h" #define NUMSTATES 8 #define NINPUTS 2 diff --git a/srslte/lib/phy/fec/turbodecoder_sse.c b/srslte/lib/phy/fec/turbodecoder_sse.c index 849323cc5..91d96c287 100644 --- a/srslte/lib/phy/fec/turbodecoder_sse.c +++ b/srslte/lib/phy/fec/turbodecoder_sse.c @@ -31,8 +31,8 @@ #include #include -#include "srslte/fec/turbodecoder_sse.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/fec/turbodecoder_sse.h" +#include "srslte/phy/utils/vector.h" #include diff --git a/srslte/lib/phy/fec/viterbi.c b/srslte/lib/phy/fec/viterbi.c index 09ef4af8e..baebed0a1 100644 --- a/srslte/lib/phy/fec/viterbi.c +++ b/srslte/lib/phy/fec/viterbi.c @@ -31,8 +31,8 @@ #include #include -#include "srslte/utils/vector.h" -#include "srslte/fec/viterbi.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/fec/viterbi.h" #include "parity.h" #include "viterbi37.h" diff --git a/srslte/lib/phy/io/binsource.c b/srslte/lib/phy/io/binsource.c index 8b789a9b4..f78bfc49b 100644 --- a/srslte/lib/phy/io/binsource.c +++ b/srslte/lib/phy/io/binsource.c @@ -29,8 +29,8 @@ #include #include -#include "srslte/io/binsource.h" -#include "srslte/utils/bit.h" +#include "srslte/phy/io/binsource.h" +#include "srslte/phy/utils/bit.h" #define DIV(a,b) ((a-1)/b+1) diff --git a/srslte/lib/phy/io/filesink.c b/srslte/lib/phy/io/filesink.c index c84b172ed..6f163f468 100644 --- a/srslte/lib/phy/io/filesink.c +++ b/srslte/lib/phy/io/filesink.c @@ -31,7 +31,7 @@ #include -#include "srslte/io/filesink.h" +#include "srslte/phy/io/filesink.h" int srslte_filesink_init(srslte_filesink_t *q, char *filename, srslte_datatype_t type) { bzero(q, sizeof(srslte_filesink_t)); diff --git a/srslte/lib/phy/io/filesource.c b/srslte/lib/phy/io/filesource.c index 5d4ccd845..4010f8da4 100644 --- a/srslte/lib/phy/io/filesource.c +++ b/srslte/lib/phy/io/filesource.c @@ -29,7 +29,7 @@ #include #include -#include "srslte/io/filesource.h" +#include "srslte/phy/io/filesource.h" int srslte_filesource_init(srslte_filesource_t *q, char *filename, srslte_datatype_t type) { bzero(q, sizeof(srslte_filesource_t)); diff --git a/srslte/lib/phy/io/netsink.c b/srslte/lib/phy/io/netsink.c index 0a4c8110d..ac01df9d2 100644 --- a/srslte/lib/phy/io/netsink.c +++ b/srslte/lib/phy/io/netsink.c @@ -36,7 +36,7 @@ #include -#include "srslte/io/netsink.h" +#include "srslte/phy/io/netsink.h" int srslte_netsink_init(srslte_netsink_t *q, const char *address, uint16_t port, srslte_netsink_type_t type) { bzero(q, sizeof(srslte_netsink_t)); diff --git a/srslte/lib/phy/io/netsource.c b/srslte/lib/phy/io/netsource.c index 4e81331f4..62fe6734b 100644 --- a/srslte/lib/phy/io/netsource.c +++ b/srslte/lib/phy/io/netsource.c @@ -34,7 +34,7 @@ #include #include -#include "srslte/io/netsource.h" +#include "srslte/phy/io/netsource.h" int srslte_netsource_init(srslte_netsource_t *q, const char *address, uint16_t port, srslte_netsource_type_t type) { bzero(q, sizeof(srslte_netsource_t)); diff --git a/srslte/lib/phy/mimo/layermap.c b/srslte/lib/phy/mimo/layermap.c index 982e00f5b..868bf2f6a 100644 --- a/srslte/lib/phy/mimo/layermap.c +++ b/srslte/lib/phy/mimo/layermap.c @@ -29,8 +29,8 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/mimo/layermap.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/layermap.h" diff --git a/srslte/lib/phy/mimo/precoding.c b/srslte/lib/phy/mimo/precoding.c index 289c6a981..8781dbad2 100644 --- a/srslte/lib/phy/mimo/precoding.c +++ b/srslte/lib/phy/mimo/precoding.c @@ -30,9 +30,9 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/utils/vector.h" #ifdef LV_HAVE_SSE #include diff --git a/srslte/lib/phy/modem/demod_hard.c b/srslte/lib/phy/modem/demod_hard.c index cfbfc26ff..76f54236d 100644 --- a/srslte/lib/phy/modem/demod_hard.c +++ b/srslte/lib/phy/modem/demod_hard.c @@ -28,7 +28,7 @@ #include #include -#include "srslte/modem/demod_hard.h" +#include "srslte/phy/modem/demod_hard.h" #include "hard_demod_lte.h" diff --git a/srslte/lib/phy/modem/demod_soft.c b/srslte/lib/phy/modem/demod_soft.c index ca3c504cf..259a12271 100644 --- a/srslte/lib/phy/modem/demod_soft.c +++ b/srslte/lib/phy/modem/demod_soft.c @@ -28,9 +28,9 @@ #include #include -#include "srslte/utils/vector.h" -#include "srslte/utils/bit.h" -#include "srslte/modem/demod_soft.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/modem/demod_soft.h" // AVX implementation not useful for integers. Wait for AVX2 diff --git a/srslte/lib/phy/modem/hard_demod_lte.c b/srslte/lib/phy/modem/hard_demod_lte.c index da0f1d23e..c1cf36283 100644 --- a/srslte/lib/phy/modem/hard_demod_lte.c +++ b/srslte/lib/phy/modem/hard_demod_lte.c @@ -29,7 +29,7 @@ #include #include -#include "srslte/modem/demod_hard.h" +#include "srslte/phy/modem/demod_hard.h" #include "hard_demod_lte.h" diff --git a/srslte/lib/phy/modem/lte_tables.c b/srslte/lib/phy/modem/lte_tables.c index bc221f55d..d15fa36fb 100644 --- a/srslte/lib/phy/modem/lte_tables.c +++ b/srslte/lib/phy/modem/lte_tables.c @@ -30,7 +30,7 @@ #include #include -#include "srslte/modem/modem_table.h" +#include "srslte/phy/modem/modem_table.h" #include "lte_tables.h" /** diff --git a/srslte/lib/phy/modem/mod.c b/srslte/lib/phy/modem/mod.c index 309a92f43..b72fdd133 100644 --- a/srslte/lib/phy/modem/mod.c +++ b/srslte/lib/phy/modem/mod.c @@ -30,8 +30,8 @@ #include #include -#include "srslte/utils/bit.h" -#include "srslte/modem/mod.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/modem/mod.h" /** Low-level API */ diff --git a/srslte/lib/phy/modem/modem_table.c b/srslte/lib/phy/modem/modem_table.c index 6c3b8a0c5..c19e52e77 100644 --- a/srslte/lib/phy/modem/modem_table.c +++ b/srslte/lib/phy/modem/modem_table.c @@ -32,9 +32,9 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/modem/modem_table.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/modem/modem_table.h" +#include "srslte/phy/utils/vector.h" #include "lte_tables.h" /** Internal functions */ diff --git a/srslte/lib/phy/phch/cqi.c b/srslte/lib/phy/phch/cqi.c index 5ac536341..a684db8c9 100644 --- a/srslte/lib/phy/phch/cqi.c +++ b/srslte/lib/phy/phch/cqi.c @@ -33,11 +33,11 @@ #include #include -#include "srslte/phch/cqi.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/cqi.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" /******************************************************* * PACKING FUNCTIONS * diff --git a/srslte/lib/phy/phch/dci.c b/srslte/lib/phy/phch/dci.c index 6d06ff10a..96c446259 100644 --- a/srslte/lib/phy/phch/dci.c +++ b/srslte/lib/phy/phch/dci.c @@ -33,11 +33,11 @@ #include #include -#include "srslte/phch/dci.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #include "dci_sz_table.h" diff --git a/srslte/lib/phy/phch/pbch.c b/srslte/lib/phy/phch/pbch.c index d1dd0026a..bff7b0619 100644 --- a/srslte/lib/phy/phch/pbch.c +++ b/srslte/lib/phy/phch/pbch.c @@ -34,11 +34,11 @@ #include #include "prb_dl.h" -#include "srslte/phch/pbch.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/pbch.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #define PBCH_RE_CP_NORM 240 #define PBCH_RE_CP_EXT 216 diff --git a/srslte/lib/phy/phch/pcfich.c b/srslte/lib/phy/phch/pcfich.c index a8290f6fc..ec1e13abc 100644 --- a/srslte/lib/phy/phch/pcfich.c +++ b/srslte/lib/phy/phch/pcfich.c @@ -33,12 +33,12 @@ #include #include -#include "srslte/phch/regs.h" -#include "srslte/phch/pcfich.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/phch/pcfich.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" // Table 5.3.4-1 static uint8_t cfi_table[4][PCFICH_CFI_LEN] = { diff --git a/srslte/lib/phy/phch/pdcch.c b/srslte/lib/phy/phch/pdcch.c index 6833659c8..cfdb19621 100644 --- a/srslte/lib/phy/phch/pdcch.c +++ b/srslte/lib/phy/phch/pdcch.c @@ -32,13 +32,13 @@ #include #include -#include "srslte/phch/dci.h" -#include "srslte/phch/regs.h" -#include "srslte/phch/pdcch.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/dci.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/phch/pdcch.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" #define PDCCH_NOF_FORMATS 4 #define PDCCH_FORMAT_NOF_CCE(i) (1< #include "prb_dl.h" -#include "srslte/phch/pdsch.h" -#include "srslte/phch/sch.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/phch/pdsch.h" +#include "srslte/phy/phch/sch.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" #define MAX_PDSCH_RE(cp) (2 * SRSLTE_CP_NSYMB(cp) * 12) diff --git a/srslte/lib/phy/phch/phich.c b/srslte/lib/phy/phch/phich.c index f7e6d7d29..7de2f5d37 100644 --- a/srslte/lib/phy/phch/phich.c +++ b/srslte/lib/phy/phch/phich.c @@ -33,12 +33,12 @@ #include #include -#include "srslte/phch/regs.h" -#include "srslte/phch/phich.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/phch/phich.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" /** Table 6.9.1-2 */ const cf_t w_normal[SRSLTE_PHICH_NORM_NSEQUENCES][4] = { { 1, 1, 1, 1 }, diff --git a/srslte/lib/phy/phch/prach.c b/srslte/lib/phy/phch/prach.c index 61a851705..5a2169fd9 100644 --- a/srslte/lib/phy/phch/prach.c +++ b/srslte/lib/phy/phch/prach.c @@ -27,10 +27,10 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/phch/prach.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/phch/prach.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" float save_corr[4096]; diff --git a/srslte/lib/phy/phch/prb_dl.c b/srslte/lib/phy/phch/prb_dl.c index 8b81e130e..ac8d6f346 100644 --- a/srslte/lib/phy/phch/prb_dl.c +++ b/srslte/lib/phy/phch/prb_dl.c @@ -29,7 +29,7 @@ #include #include "prb_dl.h" -#include "srslte/common/phy_common.h" +#include "srslte/phy/common/phy_common.h" //#define DEBUG_IDX diff --git a/srslte/lib/phy/phch/pucch.c b/srslte/lib/phy/phch/pucch.c index 443dd57bd..c58f69871 100644 --- a/srslte/lib/phy/phch/pucch.c +++ b/srslte/lib/phy/phch/pucch.c @@ -34,15 +34,15 @@ #include #include -#include "srslte/ch_estimation/refsignal_ul.h" -#include "srslte/phch/pucch.h" -#include "srslte/common/sequence.h" -#include "srslte/common/phy_common.h" -#include "srslte/mimo/precoding.h" -#include "srslte/scrambling/scrambling.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" -#include "srslte/modem/demod_soft.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" +#include "srslte/phy/phch/pucch.h" +#include "srslte/phy/common/sequence.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/mimo/precoding.h" +#include "srslte/phy/scrambling/scrambling.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/modem/demod_soft.h" #define MAX_PUSCH_RE(cp) (2 * SRSLTE_CP_NSYMB(cp) * 12) diff --git a/srslte/lib/phy/phch/pusch.c b/srslte/lib/phy/phch/pusch.c index f82173f54..65ab08411 100644 --- a/srslte/lib/phy/phch/pusch.c +++ b/srslte/lib/phy/phch/pusch.c @@ -33,15 +33,15 @@ #include #include -#include "srslte/ch_estimation/refsignal_ul.h" -#include "srslte/phch/pusch.h" -#include "srslte/phch/pusch_cfg.h" -#include "srslte/phch/uci.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" -#include "srslte/dft/dft_precoding.h" +#include "srslte/phy/ch_estimation/refsignal_ul.h" +#include "srslte/phy/phch/pusch.h" +#include "srslte/phy/phch/pusch_cfg.h" +#include "srslte/phy/phch/uci.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/dft/dft_precoding.h" #define MAX_PUSCH_RE(cp) (2 * SRSLTE_CP_NSYMB(cp) * 12) diff --git a/srslte/lib/phy/phch/ra.c b/srslte/lib/phy/phch/ra.c index 678b61cc9..cd07e997f 100644 --- a/srslte/lib/phy/phch/ra.c +++ b/srslte/lib/phy/phch/ra.c @@ -28,12 +28,12 @@ #include #include #include -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" -#include "srslte/phch/ra.h" -#include "srslte/utils/bit.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/phch/ra.h" +#include "srslte/phy/utils/bit.h" #include "tbs_tables.h" diff --git a/srslte/lib/phy/phch/regs.c b/srslte/lib/phy/phch/regs.c index 8ada33e7f..6d6c8ab2e 100644 --- a/srslte/lib/phy/phch/regs.c +++ b/srslte/lib/phy/phch/regs.c @@ -29,9 +29,9 @@ #include #include -#include "srslte/common/phy_common.h" -#include "srslte/phch/regs.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/phch/regs.h" +#include "srslte/phy/utils/debug.h" #define REG_IDX(r, i, n) r->k[i]+r->l*n*SRSLTE_NRE diff --git a/srslte/lib/phy/phch/sch.c b/srslte/lib/phy/phch/sch.c index 3b521f794..b7a5cfc28 100644 --- a/srslte/lib/phy/phch/sch.c +++ b/srslte/lib/phy/phch/sch.c @@ -33,14 +33,14 @@ #include #include -#include "srslte/phch/pdsch.h" -#include "srslte/phch/pusch.h" -#include "srslte/phch/sch.h" -#include "srslte/phch/uci.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/phch/pdsch.h" +#include "srslte/phy/phch/pusch.h" +#include "srslte/phy/phch/sch.h" +#include "srslte/phy/phch/uci.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" #define SRSLTE_PDSCH_MAX_TDEC_ITERS 4 diff --git a/srslte/lib/phy/phch/sequences.c b/srslte/lib/phy/phch/sequences.c index c731f526b..2816709b4 100644 --- a/srslte/lib/phy/phch/sequences.c +++ b/srslte/lib/phy/phch/sequences.c @@ -26,8 +26,8 @@ #include -#include "srslte/common/phy_common.h" -#include "srslte/common/sequence.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/common/sequence.h" /** * 36.211 6.6.1 diff --git a/srslte/lib/phy/phch/test/prach_test_multi.c b/srslte/lib/phy/phch/test/prach_test_multi.c index aa4d9a915..9e3dc1c97 100644 --- a/srslte/lib/phy/phch/test/prach_test_multi.c +++ b/srslte/lib/phy/phch/test/prach_test_multi.c @@ -32,7 +32,7 @@ #include #include -#include "srslte/phch/prach.h" +#include "srslte/phy/phch/prach.h" #define MAX_LEN 70176 diff --git a/srslte/lib/phy/phch/test/prach_test_usrp.c b/srslte/lib/phy/phch/test/prach_test_usrp.c index 0cd85e39d..f5f1a9e5c 100644 --- a/srslte/lib/phy/phch/test/prach_test_usrp.c +++ b/srslte/lib/phy/phch/test/prach_test_usrp.c @@ -33,7 +33,7 @@ #include #include -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include "srslte/srslte.h" #define MAX_LEN 70176 diff --git a/srslte/lib/phy/phch/uci.c b/srslte/lib/phy/phch/uci.c index 60ce417f5..821e5be5f 100644 --- a/srslte/lib/phy/phch/uci.c +++ b/srslte/lib/phy/phch/uci.c @@ -33,15 +33,15 @@ #include #include -#include "srslte/phch/uci.h" -#include "srslte/fec/cbsegm.h" -#include "srslte/fec/convcoder.h" -#include "srslte/fec/crc.h" -#include "srslte/fec/rm_conv.h" -#include "srslte/common/phy_common.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/bit.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/phch/uci.h" +#include "srslte/phy/fec/cbsegm.h" +#include "srslte/phy/fec/convcoder.h" +#include "srslte/phy/fec/crc.h" +#include "srslte/phy/fec/rm_conv.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/debug.h" /* Table 5.2.2.6.4-1: Basis sequence for (32, O) code */ diff --git a/srslte/lib/phy/resampling/decim.c b/srslte/lib/phy/resampling/decim.c index 78e017646..eba486a28 100644 --- a/srslte/lib/phy/resampling/decim.c +++ b/srslte/lib/phy/resampling/decim.c @@ -26,8 +26,8 @@ #include #include -#include "srslte/resampling/decim.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/resampling/decim.h" +#include "srslte/phy/utils/debug.h" /* Performs integer linear decimation by a factor of M */ diff --git a/srslte/lib/phy/resampling/interp.c b/srslte/lib/phy/resampling/interp.c index c844461ca..553caf4b7 100644 --- a/srslte/lib/phy/resampling/interp.c +++ b/srslte/lib/phy/resampling/interp.c @@ -29,9 +29,9 @@ #include #include -#include "srslte/resampling/interp.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/resampling/interp.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" /*************** STATIC FUNCTIONS ***********************/ diff --git a/srslte/lib/phy/resampling/resample_arb.c b/srslte/lib/phy/resampling/resample_arb.c index c7f10d2c2..7bdb4deec 100644 --- a/srslte/lib/phy/resampling/resample_arb.c +++ b/srslte/lib/phy/resampling/resample_arb.c @@ -26,8 +26,8 @@ #include #include -#include "srslte/resampling/resample_arb.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/resampling/resample_arb.h" +#include "srslte/phy/utils/debug.h" float srslte_resample_arb_polyfilt[SRSLTE_RESAMPLE_ARB_N][SRSLTE_RESAMPLE_ARB_M] = {{0,0.002400347599485495,-0.006922416132556366,0.0179104136912176,0.99453086623794,-0.008521087756729117,0.0008598969867484128,0.0004992625165376107}, diff --git a/srslte/lib/phy/resampling/test/resample_arb_bench.c b/srslte/lib/phy/resampling/test/resample_arb_bench.c index c3a260b09..48879d036 100644 --- a/srslte/lib/phy/resampling/test/resample_arb_bench.c +++ b/srslte/lib/phy/resampling/test/resample_arb_bench.c @@ -32,7 +32,7 @@ #include #include "srslte/srslte.h" -#include "srslte/resampling/resample_arb.h" +#include "srslte/phy/resampling/resample_arb.h" diff --git a/srslte/lib/phy/resampling/test/resample_arb_test.c b/srslte/lib/phy/resampling/test/resample_arb_test.c index ad861e842..cf740da00 100644 --- a/srslte/lib/phy/resampling/test/resample_arb_test.c +++ b/srslte/lib/phy/resampling/test/resample_arb_test.c @@ -32,7 +32,7 @@ #include #include "srslte/srslte.h" -#include "srslte/resampling/resample_arb.h" +#include "srslte/phy/resampling/resample_arb.h" diff --git a/srslte/lib/phy/rf/rf_blade_imp.c b/srslte/lib/phy/rf/rf_blade_imp.c index 8cc19c881..f3dd471f6 100644 --- a/srslte/lib/phy/rf/rf_blade_imp.c +++ b/srslte/lib/phy/rf/rf_blade_imp.c @@ -32,7 +32,7 @@ #include "srslte/srslte.h" #include "rf_blade_imp.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #define CONVERT_BUFFER_SIZE 240*1024 diff --git a/srslte/lib/phy/rf/rf_blade_imp.h b/srslte/lib/phy/rf/rf_blade_imp.h index f40ee374e..07e9bb7cf 100644 --- a/srslte/lib/phy/rf/rf_blade_imp.h +++ b/srslte/lib/phy/rf/rf_blade_imp.h @@ -26,7 +26,7 @@ #include "srslte/config.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #define DEVNAME "bladerf" diff --git a/srslte/lib/phy/rf/rf_imp.c b/srslte/lib/phy/rf/rf_imp.c index eca353ffa..92b8143da 100644 --- a/srslte/lib/phy/rf/rf_imp.c +++ b/srslte/lib/phy/rf/rf_imp.c @@ -26,7 +26,7 @@ #include -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include "srslte/srslte.h" #include "rf_dev.h" diff --git a/srslte/lib/phy/rf/rf_limesdr_imp.c b/srslte/lib/phy/rf/rf_limesdr_imp.c index f3594c479..2de409b42 100644 --- a/srslte/lib/phy/rf/rf_limesdr_imp.c +++ b/srslte/lib/phy/rf/rf_limesdr_imp.c @@ -32,7 +32,7 @@ #include "srslte/srslte.h" #include "rf_limesdr_imp.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include "lime/LimeSuite.h" typedef struct { diff --git a/srslte/lib/phy/rf/rf_limesdr_imp.h b/srslte/lib/phy/rf/rf_limesdr_imp.h index 5200f2987..cf644668a 100644 --- a/srslte/lib/phy/rf/rf_limesdr_imp.h +++ b/srslte/lib/phy/rf/rf_limesdr_imp.h @@ -27,7 +27,7 @@ #include #include #include "srslte/config.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" SRSLTE_API int rf_limesdr_open( char *args, diff --git a/srslte/lib/phy/rf/rf_soapy_imp.c b/srslte/lib/phy/rf/rf_soapy_imp.c index 261c4ab54..89a26c124 100644 --- a/srslte/lib/phy/rf/rf_soapy_imp.c +++ b/srslte/lib/phy/rf/rf_soapy_imp.c @@ -32,7 +32,7 @@ #include "srslte/srslte.h" #include "rf_soapy_imp.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include #include diff --git a/srslte/lib/phy/rf/rf_soapy_imp.h b/srslte/lib/phy/rf/rf_soapy_imp.h index 145609267..fff5ddd9c 100644 --- a/srslte/lib/phy/rf/rf_soapy_imp.h +++ b/srslte/lib/phy/rf/rf_soapy_imp.h @@ -27,7 +27,7 @@ #include #include #include "srslte/config.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" SRSLTE_API int rf_soapy_open( char *args, diff --git a/srslte/lib/phy/rf/rf_uhd_imp.c b/srslte/lib/phy/rf/rf_uhd_imp.c index 6cbe5ceb1..319093994 100644 --- a/srslte/lib/phy/rf/rf_uhd_imp.c +++ b/srslte/lib/phy/rf/rf_uhd_imp.c @@ -32,7 +32,7 @@ #include "srslte/srslte.h" #include "rf_uhd_imp.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include "uhd_c_api.h" typedef struct { diff --git a/srslte/lib/phy/rf/rf_uhd_imp.h b/srslte/lib/phy/rf/rf_uhd_imp.h index edab6ea51..7c26f015c 100644 --- a/srslte/lib/phy/rf/rf_uhd_imp.h +++ b/srslte/lib/phy/rf/rf_uhd_imp.h @@ -28,7 +28,7 @@ #include #include "srslte/config.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #define DEVNAME_B200 "uhd_b200" #define DEVNAME_X300 "uhd_x300" diff --git a/srslte/lib/phy/rf/rf_utils.c b/srslte/lib/phy/rf/rf_utils.c index 10c6b53df..f4a2c6790 100644 --- a/srslte/lib/phy/rf/rf_utils.c +++ b/srslte/lib/phy/rf/rf_utils.c @@ -36,8 +36,8 @@ #include "srslte/srslte.h" -#include "srslte/rf/rf.h" -#include "srslte/rf/rf_utils.h" +#include "srslte/phy/rf/rf.h" +#include "srslte/phy/rf/rf_utils.h" int rf_rssi_scan(srslte_rf_t *rf, float *freqs, float *rssi, int nof_bands, double fs, int nsamp) { int i, j; diff --git a/srslte/lib/phy/rf/uhd_c_api.cpp b/srslte/lib/phy/rf/uhd_c_api.cpp index 92af48f69..da348c17b 100644 --- a/srslte/lib/phy/rf/uhd_c_api.cpp +++ b/srslte/lib/phy/rf/uhd_c_api.cpp @@ -5,7 +5,7 @@ #include extern "C" { -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #include "uhd_c_api.h" } diff --git a/srslte/lib/phy/rf/uhd_c_api.h b/srslte/lib/phy/rf/uhd_c_api.h index 263441975..19a6d96ff 100644 --- a/srslte/lib/phy/rf/uhd_c_api.h +++ b/srslte/lib/phy/rf/uhd_c_api.h @@ -1,7 +1,7 @@ #include #include "srslte/config.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" /* Declare functions not currently provided by the C-API */ SRSLTE_API void rf_uhd_register_msg_handler_c(void (*new_handler)(const char*)); diff --git a/srslte/lib/phy/scrambling/scrambling.c b/srslte/lib/phy/scrambling/scrambling.c index f8f423ffb..bb5637814 100644 --- a/srslte/lib/phy/scrambling/scrambling.c +++ b/srslte/lib/phy/scrambling/scrambling.c @@ -28,9 +28,9 @@ #include #include #include -#include "srslte/utils/bit.h" -#include "srslte/utils/vector.h" -#include "srslte/scrambling/scrambling.h" +#include "srslte/phy/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/scrambling/scrambling.h" void srslte_scrambling_f(srslte_sequence_t *s, float *data) { srslte_scrambling_f_offset(s, data, 0, s->len); diff --git a/srslte/lib/phy/sync/cfo.c b/srslte/lib/phy/sync/cfo.c index f9304576a..456015164 100644 --- a/srslte/lib/phy/sync/cfo.c +++ b/srslte/lib/phy/sync/cfo.c @@ -28,10 +28,10 @@ #include #include -#include "srslte/utils/cexptab.h" -#include "srslte/sync/cfo.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/utils/cexptab.h" +#include "srslte/phy/sync/cfo.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" int srslte_cfo_init(srslte_cfo_t *h, uint32_t nsamples) { int ret = SRSLTE_ERROR; diff --git a/srslte/lib/phy/sync/cp.c b/srslte/lib/phy/sync/cp.c index ca415c466..c745aca85 100644 --- a/srslte/lib/phy/sync/cp.c +++ b/srslte/lib/phy/sync/cp.c @@ -26,9 +26,9 @@ #include -#include "srslte/sync/cp.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/sync/cp.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/debug.h" int srslte_cp_synch_init(srslte_cp_synch_t *q, uint32_t symbol_sz) { diff --git a/srslte/lib/phy/sync/find_sss.c b/srslte/lib/phy/sync/find_sss.c index 9c9478ac0..2afeced42 100644 --- a/srslte/lib/phy/sync/find_sss.c +++ b/srslte/lib/phy/sync/find_sss.c @@ -29,8 +29,8 @@ #include #include -#include "srslte/utils/vector.h" -#include "srslte/sync/sss.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/sync/sss.h" #define MAX_M 3 diff --git a/srslte/lib/phy/sync/gen_sss.c b/srslte/lib/phy/sync/gen_sss.c index b210dbfde..421d9e9e6 100644 --- a/srslte/lib/phy/sync/gen_sss.c +++ b/srslte/lib/phy/sync/gen_sss.c @@ -27,7 +27,7 @@ #include -#include "srslte/sync/sss.h" +#include "srslte/phy/sync/sss.h" /** * @brief Function documentation: initSSStables() diff --git a/srslte/lib/phy/sync/pss.c b/srslte/lib/phy/sync/pss.c index 7293e3f25..2ad166bc0 100644 --- a/srslte/lib/phy/sync/pss.c +++ b/srslte/lib/phy/sync/pss.c @@ -31,11 +31,11 @@ #include #include -#include "srslte/sync/pss.h" -#include "srslte/dft/dft.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/convolution.h" -#include "srslte/utils/debug.h" +#include "srslte/phy/sync/pss.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/convolution.h" +#include "srslte/phy/utils/debug.h" int srslte_pss_synch_init_N_id_2(cf_t *pss_signal_freq, cf_t *pss_signal_time, diff --git a/srslte/lib/phy/sync/sfo.c b/srslte/lib/phy/sync/sfo.c index a238e0dd2..7e630038b 100644 --- a/srslte/lib/phy/sync/sfo.c +++ b/srslte/lib/phy/sync/sfo.c @@ -27,7 +27,7 @@ #include #include -#include "srslte/sync/sfo.h" +#include "srslte/phy/sync/sfo.h" /* Estimate SFO based on the array of time estimates t0 * of length len. The parameter period is the time between t0 samples diff --git a/srslte/lib/phy/sync/sss.c b/srslte/lib/phy/sync/sss.c index 27818866a..3586e04de 100644 --- a/srslte/lib/phy/sync/sss.c +++ b/srslte/lib/phy/sync/sss.c @@ -31,10 +31,10 @@ #include #include -#include "srslte/sync/sss.h" -#include "srslte/dft/dft.h" -#include "srslte/utils/convolution.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/sync/sss.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/utils/convolution.h" +#include "srslte/phy/utils/vector.h" void generate_sss_all_tables(srslte_sss_tables_t *tables, uint32_t N_id_2); void convert_tables(srslte_sss_fc_tables_t *fc_tables, srslte_sss_tables_t *in); diff --git a/srslte/lib/phy/sync/sync.c b/srslte/lib/phy/sync/sync.c index 4325f508d..fb77e1b25 100644 --- a/srslte/lib/phy/sync/sync.c +++ b/srslte/lib/phy/sync/sync.c @@ -29,11 +29,11 @@ #include #include -#include "srslte/utils/debug.h" -#include "srslte/common/phy_common.h" -#include "srslte/sync/sync.h" -#include "srslte/utils/vector.h" -#include "srslte/sync/cfo.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/common/phy_common.h" +#include "srslte/phy/sync/sync.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/sync/cfo.h" #define MEANPEAK_EMA_ALPHA 0.1 #define CFO_EMA_ALPHA 0.1 diff --git a/srslte/lib/phy/sync/test/pss_usrp.c b/srslte/lib/phy/sync/test/pss_usrp.c index 74d9c8dea..8e8377b83 100644 --- a/srslte/lib/phy/sync/test/pss_usrp.c +++ b/srslte/lib/phy/sync/test/pss_usrp.c @@ -35,7 +35,7 @@ #include #include "srslte/srslte.h" -#include "srslte/rf/rf.h" +#include "srslte/phy/rf/rf.h" #ifndef DISABLE_GRAPHICS diff --git a/srslte/lib/phy/ue/ue_cell_search.c b/srslte/lib/phy/ue/ue_cell_search.c index 868af36b9..f8c38a1bb 100644 --- a/srslte/lib/phy/ue/ue_cell_search.c +++ b/srslte/lib/phy/ue/ue_cell_search.c @@ -30,10 +30,10 @@ #include #include -#include "srslte/ue/ue_cell_search.h" +#include "srslte/phy/ue/ue_cell_search.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" int srslte_ue_cellsearch_init(srslte_ue_cellsearch_t * q, uint32_t max_frames, int (recv_callback)(void*, void*, uint32_t,srslte_timestamp_t*), diff --git a/srslte/lib/phy/ue/ue_dl.c b/srslte/lib/phy/ue/ue_dl.c index f75c69fa2..7201f96c2 100644 --- a/srslte/lib/phy/ue/ue_dl.c +++ b/srslte/lib/phy/ue/ue_dl.c @@ -24,7 +24,7 @@ * */ -#include "srslte/ue/ue_dl.h" +#include "srslte/phy/ue/ue_dl.h" #include #include diff --git a/srslte/lib/phy/ue/ue_mib.c b/srslte/lib/phy/ue/ue_mib.c index 9b5b4e9ef..34c2bc2e3 100644 --- a/srslte/lib/phy/ue/ue_mib.c +++ b/srslte/lib/phy/ue/ue_mib.c @@ -30,10 +30,10 @@ #include #include -#include "srslte/ue/ue_mib.h" +#include "srslte/phy/ue/ue_mib.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" int srslte_ue_mib_init(srslte_ue_mib_t * q, srslte_cell_t cell) diff --git a/srslte/lib/phy/ue/ue_sync.c b/srslte/lib/phy/ue/ue_sync.c index d6403c5cb..3d13c6176 100644 --- a/srslte/lib/phy/ue/ue_sync.c +++ b/srslte/lib/phy/ue/ue_sync.c @@ -31,11 +31,11 @@ #include -#include "srslte/ue/ue_sync.h" +#include "srslte/phy/ue/ue_sync.h" -#include "srslte/io/filesource.h" -#include "srslte/utils/debug.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/io/filesource.h" +#include "srslte/phy/utils/debug.h" +#include "srslte/phy/utils/vector.h" #define MAX_TIME_OFFSET 128 diff --git a/srslte/lib/phy/ue/ue_ul.c b/srslte/lib/phy/ue/ue_ul.c index b14b45673..08edcafe0 100644 --- a/srslte/lib/phy/ue/ue_ul.c +++ b/srslte/lib/phy/ue/ue_ul.c @@ -28,7 +28,7 @@ #include #include -#include "srslte/ue/ue_ul.h" +#include "srslte/phy/ue/ue_ul.h" #define CURRENT_FFTSIZE srslte_symbol_sz(q->cell.nof_prb) #define CURRENT_SFLEN SRSLTE_SF_LEN(CURRENT_FFTSIZE) diff --git a/srslte/lib/phy/utils/bit.c b/srslte/lib/phy/utils/bit.c index c6a9ef6cc..a5fcb400f 100644 --- a/srslte/lib/phy/utils/bit.c +++ b/srslte/lib/phy/utils/bit.c @@ -31,7 +31,7 @@ #include #include -#include "srslte/utils/bit.h" +#include "srslte/phy/utils/bit.h" void srslte_bit_interleave(uint8_t *input, uint8_t *output, uint16_t *interleaver, uint32_t nof_bits) { srslte_bit_interleave_w_offset(input, output, interleaver, nof_bits, 0); diff --git a/srslte/lib/phy/utils/cexptab.c b/srslte/lib/phy/utils/cexptab.c index 1d0548add..47ff8ef96 100644 --- a/srslte/lib/phy/utils/cexptab.c +++ b/srslte/lib/phy/utils/cexptab.c @@ -30,7 +30,7 @@ #include #include -#include "srslte/utils/cexptab.h" +#include "srslte/phy/utils/cexptab.h" int srslte_cexptab_init(srslte_cexptab_t *h, uint32_t size) { uint32_t i; diff --git a/srslte/lib/phy/utils/convolution.c b/srslte/lib/phy/utils/convolution.c index 4895c33e5..d3b852b76 100644 --- a/srslte/lib/phy/utils/convolution.c +++ b/srslte/lib/phy/utils/convolution.c @@ -28,9 +28,9 @@ #include #include -#include "srslte/dft/dft.h" -#include "srslte/utils/vector.h" -#include "srslte/utils/convolution.h" +#include "srslte/phy/dft/dft.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/convolution.h" int srslte_conv_fft_cc_init(srslte_conv_fft_cc_t *q, uint32_t input_len, uint32_t filter_len) { diff --git a/srslte/lib/phy/utils/debug.c b/srslte/lib/phy/utils/debug.c index e863b5735..423abee6c 100644 --- a/srslte/lib/phy/utils/debug.c +++ b/srslte/lib/phy/utils/debug.c @@ -24,7 +24,7 @@ * */ -#include "srslte/utils/debug.h" +#include "srslte/phy/utils/debug.h" int srslte_verbose = 0; diff --git a/srslte/lib/phy/utils/filter.c b/srslte/lib/phy/utils/filter.c index cea7cadce..7fa9635f5 100644 --- a/srslte/lib/phy/utils/filter.c +++ b/srslte/lib/phy/utils/filter.c @@ -24,7 +24,7 @@ * */ -#include "srslte/utils/filter.h" +#include "srslte/phy/utils/filter.h" #define SRSLTE_NUM_FILTERS 8 #define SRSLTE_MAX_FILTER_SIZE 11 diff --git a/srslte/lib/phy/utils/ringbuffer.c b/srslte/lib/phy/utils/ringbuffer.c index d615512ee..86578b3ea 100644 --- a/srslte/lib/phy/utils/ringbuffer.c +++ b/srslte/lib/phy/utils/ringbuffer.c @@ -2,8 +2,8 @@ #include #include -#include "srslte/utils/ringbuffer.h" -#include "srslte/utils/vector.h" +#include "srslte/phy/utils/ringbuffer.h" +#include "srslte/phy/utils/vector.h" int srslte_ringbuffer_init(srslte_ringbuffer_t *q, int capacity) { diff --git a/srslte/lib/phy/utils/test/dft_test.c b/srslte/lib/phy/utils/test/dft_test.c index 27000efa3..fd5a308a7 100644 --- a/srslte/lib/phy/utils/test/dft_test.c +++ b/srslte/lib/phy/utils/test/dft_test.c @@ -32,7 +32,7 @@ #include #include -#include "srslte/dft/dft.h" +#include "srslte/phy/dft/dft.h" diff --git a/srslte/lib/phy/utils/vector.c b/srslte/lib/phy/utils/vector.c index a4e32dde5..2c42886e9 100644 --- a/srslte/lib/phy/utils/vector.c +++ b/srslte/lib/phy/utils/vector.c @@ -31,9 +31,9 @@ #include #include -#include "srslte/utils/vector.h" -#include "srslte/utils/vector_simd.h" -#include "srslte/utils/bit.h" +#include "srslte/phy/utils/vector.h" +#include "srslte/phy/utils/vector_simd.h" +#include "srslte/phy/utils/bit.h" #ifdef HAVE_VOLK #include "volk/volk.h" diff --git a/srslte/lib/phy/utils/vector_simd.c b/srslte/lib/phy/utils/vector_simd.c index 14b70b3d3..817dfa2da 100644 --- a/srslte/lib/phy/utils/vector_simd.c +++ b/srslte/lib/phy/utils/vector_simd.c @@ -31,7 +31,7 @@ #include #include -#include "srslte/utils/vector_simd.h" +#include "srslte/phy/utils/vector_simd.h" #include #include