From f933a734909e6878c5d202d5121b8e835e089747 Mon Sep 17 00:00:00 2001 From: Paul Sutton Date: Tue, 17 Jun 2014 14:20:00 +0100 Subject: [PATCH 1/2] Directory restructure and cmake cleanup --- CMakeLists.txt | 13 +-- README.md | 12 +- {graphics/include => common}/CMakeLists.txt | 22 ++-- .../lte => common/include/liblte}/config.h | 0 cuhd/CMakeLists.txt | 21 +++- cuhd/include/CMakeLists.txt | 38 ------- cuhd/include/{ => liblte/cuhd}/cuhd.h | 37 +++--- cuhd/include/{ => liblte}/cuhd/cuhd_utils.h | 4 +- cuhd/lib/CMakeLists.txt | 2 +- cuhd/lib/cuhd_imp.cpp | 2 +- cuhd/lib/cuhd_utils.c | 6 +- graphics/CMakeLists.txt | 22 +++- graphics/include/{ => liblte/graphics}/plot.h | 10 +- .../{ => liblte/graphics}/plot/plot_complex.h | 2 +- .../{ => liblte/graphics}/plot/plot_real.h | 2 +- .../{ => liblte/graphics}/plot/plot_scatter.h | 2 +- .../graphics}/plot/plot_waterfall.h | 2 +- graphics/lib/common/plot.cpp | 2 +- graphics/lib/complexplot/plot_complex.cpp | 2 +- graphics/lib/realplot/plot_real.cpp | 2 +- graphics/lib/scatterplot/Scatterplot.h | 2 +- graphics/lib/scatterplot/plot_scatter.cpp | 2 +- graphics/lib/waterfallplot/plot_waterfall.cpp | 2 +- lte/CMakeLists.txt | 16 +-- lte/include/lte.h | 106 ------------------ lte/mac/CMakeLists.txt | 21 ++++ lte/pdcp/CMakeLists.txt | 21 ++++ lte/{include => phy}/CMakeLists.txt | 26 +++-- {examples => lte/phy/examples}/CMakeLists.txt | 16 +-- {examples => lte/phy/examples}/hl_example.c | 2 +- {examples => lte/phy/examples}/ll_example.c | 2 +- {examples => lte/phy/examples}/pbch_enodeb.c | 4 +- {examples => lte/phy/examples}/pbch_ue.c | 6 +- {examples => lte/phy/examples}/scan_mib.c | 4 +- {examples => lte/phy/examples}/scan_pss.c | 4 +- {examples => lte/phy/examples}/scan_rssi.c | 4 +- {examples => lte/phy/examples}/synch_file.c | 2 +- .../include/liblte/phy}/ch_estimation/chest.h | 8 +- .../liblte/phy}/ch_estimation/refsignal.h | 4 +- .../include/liblte/phy}/channel/ch_awgn.h | 2 +- .../include/liblte/phy}/common/base.h | 2 +- .../include/liblte/phy}/common/fft.h | 6 +- .../include/liblte/phy}/common/sequence.h | 4 +- .../include/liblte/phy}/fec/convcoder.h | 2 +- .../lte => phy/include/liblte/phy}/fec/crc.h | 2 +- .../include/liblte/phy}/fec/rm_conv.h | 2 +- .../include/liblte/phy}/fec/rm_turbo.h | 2 +- .../include/liblte/phy}/fec/tc_interl.h | 2 +- .../include/liblte/phy}/fec/turbocoder.h | 2 +- .../include/liblte/phy}/fec/turbodecoder.h | 2 +- .../include/liblte/phy}/fec/viterbi.h | 2 +- .../include/liblte/phy}/filter/filter2d.h | 2 +- .../include/liblte/phy}/io/binsource.h | 2 +- .../include/liblte/phy}/io/filesink.h | 4 +- .../include/liblte/phy}/io/filesource.h | 4 +- .../include/liblte/phy}/io/format.h | 0 .../include/liblte/phy}/io/udpsink.h | 4 +- .../include/liblte/phy}/io/udpsource.h | 4 +- .../include/liblte/phy}/mimo/layermap.h | 2 +- .../include/liblte/phy}/mimo/precoding.h | 2 +- .../include/liblte/phy}/modem/demod_hard.h | 2 +- .../include/liblte/phy}/modem/demod_soft.h | 2 +- .../include/liblte/phy}/modem/mod.h | 2 +- .../include/liblte/phy}/modem/modem_table.h | 2 +- .../lte => phy/include/liblte/phy}/phch/dci.h | 6 +- .../include/liblte/phy}/phch/pbch.h | 22 ++-- .../include/liblte/phy}/phch/pcfich.h | 16 +-- .../include/liblte/phy}/phch/pdcch.h | 26 ++--- .../include/liblte/phy}/phch/phich.h | 14 +-- .../lte => phy/include/liblte/phy}/phch/ra.h | 2 +- .../include/liblte/phy}/phch/regs.h | 4 +- lte/phy/include/liblte/phy/phy.h | 106 ++++++++++++++++++ .../include/liblte/phy}/resampling/interp.h | 2 +- .../liblte/phy}/resampling/resample_arb.h | 2 +- .../liblte/phy}/scrambling/scrambling.h | 6 +- .../lte => phy/include/liblte/phy}/sync/cfo.h | 2 +- .../lte => phy/include/liblte/phy}/sync/pss.h | 6 +- .../lte => phy/include/liblte/phy}/sync/sfo.h | 2 +- .../lte => phy/include/liblte/phy}/sync/sss.h | 6 +- .../include/liblte/phy}/sync/sync.h | 2 +- .../include/liblte/phy}/utils/bit.h | 2 +- .../include/liblte/phy}/utils/cexptab.h | 2 +- .../include/liblte/phy}/utils/convolution.h | 4 +- .../include/liblte/phy}/utils/debug.h | 2 +- .../include/liblte/phy}/utils/dft.h | 2 +- .../include/liblte/phy}/utils/matrix.h | 2 +- .../include/liblte/phy}/utils/mux.h | 2 +- .../include/liblte/phy}/utils/pack.h | 2 +- .../include/liblte/phy}/utils/vector.h | 2 +- lte/{ => phy}/lib/CMakeLists.txt | 14 +-- lte/{ => phy}/lib/ch_estimation/src/chest.c | 8 +- .../lib/ch_estimation/src/refsignal.c | 10 +- .../lib/ch_estimation/test/CMakeLists.txt | 2 +- .../lib/ch_estimation/test/chest_test.c | 2 +- lte/{ => phy}/lib/channel/src/ch_awgn.c | 2 +- lte/{ => phy}/lib/channel/src/gauss.c | 0 lte/{ => phy}/lib/channel/src/gauss.h | 0 lte/{ => phy}/lib/common/src/fft.c | 10 +- lte/{ => phy}/lib/common/src/lte.c | 2 +- lte/{ => phy}/lib/common/src/sequence.c | 2 +- lte/{ => phy}/lib/common/test/CMakeLists.txt | 2 +- lte/{ => phy}/lib/common/test/fft_test.c | 2 +- lte/{ => phy}/lib/fec/src/convcoder.c | 2 +- lte/{ => phy}/lib/fec/src/crc.c | 4 +- lte/{ => phy}/lib/fec/src/parity.h | 0 lte/{ => phy}/lib/fec/src/rm_conv.c | 2 +- lte/{ => phy}/lib/fec/src/rm_turbo.c | 2 +- lte/{ => phy}/lib/fec/src/tc_interl_lte.c | 8 +- lte/{ => phy}/lib/fec/src/tc_interl_umts.c | 4 +- lte/{ => phy}/lib/fec/src/turbocoder.c | 4 +- lte/{ => phy}/lib/fec/src/turbodecoder.c | 4 +- lte/{ => phy}/lib/fec/src/viterbi.c | 4 +- lte/{ => phy}/lib/fec/src/viterbi37.h | 0 lte/{ => phy}/lib/fec/src/viterbi37_port.c | 0 lte/{ => phy}/lib/fec/src/viterbi39.h | 0 lte/{ => phy}/lib/fec/src/viterbi39_port.c | 0 lte/{ => phy}/lib/fec/test/CMakeLists.txt | 10 +- lte/{ => phy}/lib/fec/test/crc_test.c | 2 +- lte/{ => phy}/lib/fec/test/crc_test.h | 2 +- lte/{ => phy}/lib/fec/test/rm_conv_test.c | 2 +- lte/{ => phy}/lib/fec/test/rm_turbo_test.c | 2 +- lte/{ => phy}/lib/fec/test/turbocoder_test.c | 2 +- lte/{ => phy}/lib/fec/test/turbocoder_test.h | 0 lte/{ => phy}/lib/fec/test/viterbi_test.c | 2 +- lte/{ => phy}/lib/fec/test/viterbi_test.h | 0 lte/{ => phy}/lib/filter/src/filter2d.c | 10 +- lte/{ => phy}/lib/io/src/binsource.c | 4 +- lte/{ => phy}/lib/io/src/filesink.c | 2 +- lte/{ => phy}/lib/io/src/filesource.c | 2 +- lte/{ => phy}/lib/io/src/udpsink.c | 2 +- lte/{ => phy}/lib/io/src/udpsource.c | 2 +- lte/{ => phy}/lib/mimo/src/layermap.c | 4 +- lte/{ => phy}/lib/mimo/src/precoding.c | 6 +- lte/{ => phy}/lib/mimo/test/CMakeLists.txt | 4 +- lte/{ => phy}/lib/mimo/test/layermap_test.c | 2 +- lte/{ => phy}/lib/mimo/test/precoding_test.c | 2 +- lte/{ => phy}/lib/modem/src/demod_hard.c | 2 +- lte/{ => phy}/lib/modem/src/demod_soft.c | 4 +- lte/{ => phy}/lib/modem/src/hard_demod_lte.c | 2 +- lte/{ => phy}/lib/modem/src/hard_demod_lte.h | 0 lte/{ => phy}/lib/modem/src/lte_tables.c | 2 +- lte/{ => phy}/lib/modem/src/lte_tables.h | 0 lte/{ => phy}/lib/modem/src/mod.c | 4 +- lte/{ => phy}/lib/modem/src/modem_table.c | 2 +- lte/{ => phy}/lib/modem/src/soft_algs.c | 0 lte/{ => phy}/lib/modem/src/soft_algs.h | 0 lte/{ => phy}/lib/modem/test/CMakeLists.txt | 2 +- lte/{ => phy}/lib/modem/test/modem_test.c | 2 +- lte/{ => phy}/lib/phch/src/dci.c | 10 +- lte/{ => phy}/lib/phch/src/pbch.c | 10 +- lte/{ => phy}/lib/phch/src/pcfich.c | 12 +- lte/{ => phy}/lib/phch/src/pdcch.c | 14 +-- lte/{ => phy}/lib/phch/src/phich.c | 12 +- lte/{ => phy}/lib/phch/src/prb.c | 2 +- lte/{ => phy}/lib/phch/src/prb.h | 0 lte/{ => phy}/lib/phch/src/ra.c | 12 +- lte/{ => phy}/lib/phch/src/regs.c | 6 +- lte/{ => phy}/lib/phch/src/sequences.c | 4 +- lte/{ => phy}/lib/phch/src/tbs_tables.h | 0 lte/{ => phy}/lib/phch/test/CMakeLists.txt | 18 +-- lte/{ => phy}/lib/phch/test/dci_unpacking.c | 2 +- lte/{ => phy}/lib/phch/test/pbch_file_test.c | 2 +- lte/{ => phy}/lib/phch/test/pbch_test.c | 2 +- .../lib/phch/test/pcfich_file_test.c | 2 +- lte/{ => phy}/lib/phch/test/pcfich_test.c | 2 +- lte/{ => phy}/lib/phch/test/pdcch_file_test.c | 2 +- lte/{ => phy}/lib/phch/test/pdcch_test.c | 2 +- lte/{ => phy}/lib/phch/test/phich_file_test.c | 2 +- lte/{ => phy}/lib/phch/test/phich_test.c | 2 +- .../lib/phch/test/signal.1.92M.amar.dat | Bin lte/{ => phy}/lib/phch/test/signal.1.92M.dat | Bin lte/{ => phy}/lib/phch/test/signal.10M.dat | Bin lte/{ => phy}/lib/resampling/src/interp.c | 4 +- .../lib/resampling/src/resample_arb.c | 4 +- .../lib/resampling/test/CMakeLists.txt | 4 +- .../lib/resampling/test/resample_arb_bench.c | 4 +- .../lib/resampling/test/resample_arb_test.c | 4 +- lte/{ => phy}/lib/scrambling/src/scrambling.c | 2 +- .../lib/scrambling/test/CMakeLists.txt | 2 +- .../lib/scrambling/test/scrambling_test.c | 2 +- lte/{ => phy}/lib/sync/src/cfo.c | 8 +- lte/{ => phy}/lib/sync/src/cp.c | 0 lte/{ => phy}/lib/sync/src/find_sss.c | 4 +- lte/{ => phy}/lib/sync/src/gen_sss.c | 2 +- lte/{ => phy}/lib/sync/src/pss.c | 8 +- lte/{ => phy}/lib/sync/src/sfo.c | 2 +- lte/{ => phy}/lib/sync/src/sss.c | 6 +- lte/{ => phy}/lib/sync/src/sync.c | 6 +- lte/{ => phy}/lib/sync/test/CMakeLists.txt | 4 +- lte/{ => phy}/lib/sync/test/cfo_test.c | 2 +- lte/{ => phy}/lib/sync/test/sync_test.c | 2 +- lte/{ => phy}/lib/utils/src/bit.c | 2 +- lte/{ => phy}/lib/utils/src/cexptab.c | 2 +- lte/{ => phy}/lib/utils/src/convolution.c | 6 +- lte/{ => phy}/lib/utils/src/debug.c | 2 +- lte/{ => phy}/lib/utils/src/dft.c | 2 +- lte/{ => phy}/lib/utils/src/matrix.c | 2 +- lte/{ => phy}/lib/utils/src/mux.c | 0 lte/{ => phy}/lib/utils/src/pack.c | 0 lte/{ => phy}/lib/utils/src/vector.c | 2 +- lte/rlc/CMakeLists.txt | 21 ++++ 201 files changed, 605 insertions(+), 555 deletions(-) rename {graphics/include => common}/CMakeLists.txt (68%) rename {lte/include/lte => common/include/liblte}/config.h (100%) delete mode 100644 cuhd/include/CMakeLists.txt rename cuhd/include/{ => liblte/cuhd}/cuhd.h (53%) rename cuhd/include/{ => liblte}/cuhd/cuhd_utils.h (87%) rename graphics/include/{ => liblte/graphics}/plot.h (83%) rename graphics/include/{ => liblte/graphics}/plot/plot_complex.h (98%) rename graphics/include/{ => liblte/graphics}/plot/plot_real.h (98%) rename graphics/include/{ => liblte/graphics}/plot/plot_scatter.h (98%) rename graphics/include/{ => liblte/graphics}/plot/plot_waterfall.h (98%) delete mode 100644 lte/include/lte.h create mode 100644 lte/mac/CMakeLists.txt create mode 100644 lte/pdcp/CMakeLists.txt rename lte/{include => phy}/CMakeLists.txt (62%) rename {examples => lte/phy/examples}/CMakeLists.txt (89%) rename {examples => lte/phy/examples}/hl_example.c (99%) rename {examples => lte/phy/examples}/ll_example.c (97%) rename {examples => lte/phy/examples}/pbch_enodeb.c (99%) rename {examples => lte/phy/examples}/pbch_ue.c (99%) rename {examples => lte/phy/examples}/scan_mib.c (99%) rename {examples => lte/phy/examples}/scan_pss.c (99%) rename {examples => lte/phy/examples}/scan_rssi.c (98%) rename {examples => lte/phy/examples}/synch_file.c (99%) rename lte/{include/lte => phy/include/liblte/phy}/ch_estimation/chest.h (95%) rename lte/{include/lte => phy/include/liblte/phy}/ch_estimation/refsignal.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/channel/ch_awgn.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/common/base.h (99%) rename lte/{include/lte => phy/include/liblte/phy}/common/fft.h (94%) rename lte/{include/lte => phy/include/liblte/phy}/common/sequence.h (95%) rename lte/{include/lte => phy/include/liblte/phy}/fec/convcoder.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/fec/crc.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/fec/rm_conv.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/fec/rm_turbo.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/fec/tc_interl.h (94%) rename lte/{include/lte => phy/include/liblte/phy}/fec/turbocoder.h (94%) rename lte/{include/lte => phy/include/liblte/phy}/fec/turbodecoder.h (92%) rename lte/{include/lte => phy/include/liblte/phy}/fec/viterbi.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/filter/filter2d.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/io/binsource.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/io/filesink.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/io/filesource.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/io/format.h (100%) rename lte/{include/lte => phy/include/liblte/phy}/io/udpsink.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/io/udpsource.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/mimo/layermap.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/mimo/precoding.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/modem/demod_hard.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/modem/demod_soft.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/modem/mod.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/modem/modem_table.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/phch/dci.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/phch/pbch.h (85%) rename lte/{include/lte => phy/include/liblte/phy}/phch/pcfich.h (88%) rename lte/{include/lte => phy/include/liblte/phy}/phch/pdcch.h (87%) rename lte/{include/lte => phy/include/liblte/phy}/phch/phich.h (91%) rename lte/{include/lte => phy/include/liblte/phy}/phch/ra.h (99%) rename lte/{include/lte => phy/include/liblte/phy}/phch/regs.h (98%) create mode 100644 lte/phy/include/liblte/phy/phy.h rename lte/{include/lte => phy/include/liblte/phy}/resampling/interp.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/resampling/resample_arb.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/scrambling/scrambling.h (95%) rename lte/{include/lte => phy/include/liblte/phy}/sync/cfo.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/sync/pss.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/sync/sfo.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/sync/sss.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/sync/sync.h (99%) rename lte/{include/lte => phy/include/liblte/phy}/utils/bit.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/utils/cexptab.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/utils/convolution.h (96%) rename lte/{include/lte => phy/include/liblte/phy}/utils/debug.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/utils/dft.h (99%) rename lte/{include/lte => phy/include/liblte/phy}/utils/matrix.h (98%) rename lte/{include/lte => phy/include/liblte/phy}/utils/mux.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/utils/pack.h (97%) rename lte/{include/lte => phy/include/liblte/phy}/utils/vector.h (98%) rename lte/{ => phy}/lib/CMakeLists.txt (89%) rename lte/{ => phy}/lib/ch_estimation/src/chest.c (98%) rename lte/{ => phy}/lib/ch_estimation/src/refsignal.c (95%) rename lte/{ => phy}/lib/ch_estimation/test/CMakeLists.txt (96%) rename lte/{ => phy}/lib/ch_estimation/test/chest_test.c (99%) rename lte/{ => phy}/lib/channel/src/ch_awgn.c (97%) rename lte/{ => phy}/lib/channel/src/gauss.c (100%) rename lte/{ => phy}/lib/channel/src/gauss.h (100%) rename lte/{ => phy}/lib/common/src/fft.c (95%) rename lte/{ => phy}/lib/common/src/lte.c (99%) rename lte/{ => phy}/lib/common/src/sequence.c (98%) rename lte/{ => phy}/lib/common/test/CMakeLists.txt (96%) rename lte/{ => phy}/lib/common/test/fft_test.c (99%) rename lte/{ => phy}/lib/fec/src/convcoder.c (98%) rename lte/{ => phy}/lib/fec/src/crc.c (98%) rename lte/{ => phy}/lib/fec/src/parity.h (100%) rename lte/{ => phy}/lib/fec/src/rm_conv.c (99%) rename lte/{ => phy}/lib/fec/src/rm_turbo.c (99%) rename lte/{ => phy}/lib/fec/src/tc_interl_lte.c (93%) rename lte/{ => phy}/lib/fec/src/tc_interl_umts.c (94%) rename lte/{ => phy}/lib/fec/src/turbocoder.c (91%) rename lte/{ => phy}/lib/fec/src/turbodecoder.c (94%) rename lte/{ => phy}/lib/fec/src/viterbi.c (98%) rename lte/{ => phy}/lib/fec/src/viterbi37.h (100%) rename lte/{ => phy}/lib/fec/src/viterbi37_port.c (100%) rename lte/{ => phy}/lib/fec/src/viterbi39.h (100%) rename lte/{ => phy}/lib/fec/src/viterbi39_port.c (100%) rename lte/{ => phy}/lib/fec/test/CMakeLists.txt (93%) rename lte/{ => phy}/lib/fec/test/crc_test.c (99%) rename lte/{ => phy}/lib/fec/test/crc_test.h (98%) rename lte/{ => phy}/lib/fec/test/rm_conv_test.c (99%) rename lte/{ => phy}/lib/fec/test/rm_turbo_test.c (99%) rename lte/{ => phy}/lib/fec/test/turbocoder_test.c (99%) rename lte/{ => phy}/lib/fec/test/turbocoder_test.h (100%) rename lte/{ => phy}/lib/fec/test/viterbi_test.c (99%) rename lte/{ => phy}/lib/fec/test/viterbi_test.h (100%) rename lte/{ => phy}/lib/filter/src/filter2d.c (95%) rename lte/{ => phy}/lib/io/src/binsource.c (98%) rename lte/{ => phy}/lib/io/src/filesink.c (98%) rename lte/{ => phy}/lib/io/src/filesource.c (98%) rename lte/{ => phy}/lib/io/src/udpsink.c (98%) rename lte/{ => phy}/lib/io/src/udpsource.c (98%) rename lte/{ => phy}/lib/mimo/src/layermap.c (98%) rename lte/{ => phy}/lib/mimo/src/precoding.c (98%) rename lte/{ => phy}/lib/mimo/test/CMakeLists.txt (96%) rename lte/{ => phy}/lib/mimo/test/layermap_test.c (99%) rename lte/{ => phy}/lib/mimo/test/precoding_test.c (99%) rename lte/{ => phy}/lib/modem/src/demod_hard.c (98%) rename lte/{ => phy}/lib/modem/src/demod_soft.c (97%) rename lte/{ => phy}/lib/modem/src/hard_demod_lte.c (99%) rename lte/{ => phy}/lib/modem/src/hard_demod_lte.h (100%) rename lte/{ => phy}/lib/modem/src/lte_tables.c (99%) rename lte/{ => phy}/lib/modem/src/lte_tables.h (100%) rename lte/{ => phy}/lib/modem/src/mod.c (96%) rename lte/{ => phy}/lib/modem/src/modem_table.c (98%) rename lte/{ => phy}/lib/modem/src/soft_algs.c (100%) rename lte/{ => phy}/lib/modem/src/soft_algs.h (100%) rename lte/{ => phy}/lib/modem/test/CMakeLists.txt (97%) rename lte/{ => phy}/lib/modem/test/modem_test.c (99%) rename lte/{ => phy}/lib/phch/src/dci.c (99%) rename lte/{ => phy}/lib/phch/src/pbch.c (98%) rename lte/{ => phy}/lib/phch/src/pcfich.c (96%) rename lte/{ => phy}/lib/phch/src/pdcch.c (98%) rename lte/{ => phy}/lib/phch/src/phich.c (97%) rename lte/{ => phy}/lib/phch/src/prb.c (98%) rename lte/{ => phy}/lib/phch/src/prb.h (100%) rename lte/{ => phy}/lib/phch/src/ra.c (98%) rename lte/{ => phy}/lib/phch/src/regs.c (99%) rename lte/{ => phy}/lib/phch/src/sequences.c (95%) rename lte/{ => phy}/lib/phch/src/tbs_tables.h (100%) rename lte/{ => phy}/lib/phch/test/CMakeLists.txt (89%) rename lte/{ => phy}/lib/phch/test/dci_unpacking.c (98%) rename lte/{ => phy}/lib/phch/test/pbch_file_test.c (99%) rename lte/{ => phy}/lib/phch/test/pbch_test.c (99%) rename lte/{ => phy}/lib/phch/test/pcfich_file_test.c (99%) rename lte/{ => phy}/lib/phch/test/pcfich_test.c (99%) rename lte/{ => phy}/lib/phch/test/pdcch_file_test.c (99%) rename lte/{ => phy}/lib/phch/test/pdcch_test.c (99%) rename lte/{ => phy}/lib/phch/test/phich_file_test.c (99%) rename lte/{ => phy}/lib/phch/test/phich_test.c (99%) rename lte/{ => phy}/lib/phch/test/signal.1.92M.amar.dat (100%) rename lte/{ => phy}/lib/phch/test/signal.1.92M.dat (100%) rename lte/{ => phy}/lib/phch/test/signal.10M.dat (100%) rename lte/{ => phy}/lib/resampling/src/interp.c (96%) rename lte/{ => phy}/lib/resampling/src/resample_arb.c (98%) rename lte/{ => phy}/lib/resampling/test/CMakeLists.txt (92%) rename lte/{ => phy}/lib/resampling/test/resample_arb_bench.c (91%) rename lte/{ => phy}/lib/resampling/test/resample_arb_test.c (94%) rename lte/{ => phy}/lib/scrambling/src/scrambling.c (98%) rename lte/{ => phy}/lib/scrambling/test/CMakeLists.txt (96%) rename lte/{ => phy}/lib/scrambling/test/scrambling_test.c (99%) rename lte/{ => phy}/lib/sync/src/cfo.c (93%) rename lte/{ => phy}/lib/sync/src/cp.c (100%) rename lte/{ => phy}/lib/sync/src/find_sss.c (98%) rename lte/{ => phy}/lib/sync/src/gen_sss.c (99%) rename lte/{ => phy}/lib/sync/src/pss.c (98%) rename lte/{ => phy}/lib/sync/src/sfo.c (97%) rename lte/{ => phy}/lib/sync/src/sss.c (97%) rename lte/{ => phy}/lib/sync/src/sync.c (98%) rename lte/{ => phy}/lib/sync/test/CMakeLists.txt (94%) rename lte/{ => phy}/lib/sync/test/cfo_test.c (98%) rename lte/{ => phy}/lib/sync/test/sync_test.c (99%) rename lte/{ => phy}/lib/utils/src/bit.c (98%) rename lte/{ => phy}/lib/utils/src/cexptab.c (98%) rename lte/{ => phy}/lib/utils/src/convolution.c (96%) rename lte/{ => phy}/lib/utils/src/debug.c (97%) rename lte/{ => phy}/lib/utils/src/dft.c (99%) rename lte/{ => phy}/lib/utils/src/matrix.c (98%) rename lte/{ => phy}/lib/utils/src/mux.c (100%) rename lte/{ => phy}/lib/utils/src/pack.c (100%) rename lte/{ => phy}/lib/utils/src/vector.c (99%) create mode 100644 lte/rlc/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 845aa2d7a..344c5bd08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ ADD_CUSTOM_TARGET(uninstall # Macro to add -fPIC property to static libs ######################################################################## MACRO(LIBLTE_SET_PIC) - IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) + IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) SET_TARGET_PROPERTIES(${ARGV} PROPERTIES COMPILE_FLAGS -fPIC) ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" ) ENDMACRO(LIBLTE_SET_PIC) @@ -129,15 +129,12 @@ ENDMACRO(LIBLTE_SET_PIC) # through an internal cache variable. ######################################################################## MACRO (APPEND_INTERNAL_LIST LIST_NAME VALUE) - # If the list in not in the cache, create it. IF (${LIST_NAME}) - SET (${LIST_NAME} "${${LIST_NAME}};${VALUE}" CACHE INTERNAL "Internal -variable") + SET (${LIST_NAME} "${${LIST_NAME}};${VALUE}" CACHE INTERNAL "Internal variable") ELSE (${LIST_NAME}) SET (${LIST_NAME} "${VALUE}" CACHE INTERNAL "Internal variable") ENDIF (${LIST_NAME}) - ENDMACRO (APPEND_INTERNAL_LIST) @@ -150,16 +147,16 @@ MESSAGE(STATUS "Building for version: ${VERSION}") ######################################################################## # Add general includes and dependencies ######################################################################## -INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/lte/include) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/common/include) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/lte/phy/include/) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cuhd/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/graphics/include) ######################################################################## # Add the subdirectories ######################################################################## - +ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(lte) ADD_SUBDIRECTORY(cuhd) ADD_SUBDIRECTORY(graphics) -ADD_SUBDIRECTORY(examples) diff --git a/README.md b/README.md index 7141628b7..1b816498b 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ make The library can also be installed using the command ```sudo make install```. -Examples +PHY Examples ========== * eNodeB and UE PBCH example @@ -50,12 +50,12 @@ Examples Setup one or two computers connected to two USRP or UHD-compatible hardware. From the eNodeB, type ``` -examples/pbch_enodeb -f [frequency_in_Hz] -c [cell_id] [-a [UHD args]] [-h for more commands] +lte/phy/examples/pbch_enodeb -f [frequency_in_Hz] -c [cell_id] [-a [UHD args]] [-h for more commands] ``` From the UE, type ``` -examples/pbch_ue -f [frequency_in_Hz] -c [cell_id] [-a [UHD args]] [-h for more commands] +lte/phy/examples/pbch_ue -f [frequency_in_Hz] -c [cell_id] [-a [UHD args]] [-h for more commands] ``` And the output should look something like the following video. In this example, we removed the transmitter and receiver antennas in the middle of the demonstration, showing how reception is still possible (despite with some erros). @@ -70,12 +70,12 @@ If you don't have a pair of USRP, you can also test the demo by writing the samp From the eNodeB, type ``` -examples/pbch_enodeb -o [output_file] -c [cell_id] [-h for more commands] +lte/phy/examples/pbch_enodeb -o [output_file] -c [cell_id] [-h for more commands] ``` From the UE, type ``` -examples/pbch_ue -i [input_file] -c [cell_id] [-h for more commands] +lte/phy/examples/pbch_ue -i [input_file] -c [cell_id] [-h for more commands] ``` @@ -85,7 +85,7 @@ This program uses any hardware supported by the UHD driver to scan an LTE band f For instance, the command: -``` examples/scan_mib -b 3 ``` +``` lte/phy/examples/scan_mib -b 3 ``` Scans the LTE band 3 (1805 to 1880 MHz). Note that you need a hardware supporting these frequencies (e.g. SBX daughterboard for USRP). For more command arguments, type ``` examples/mib_scan_usrp -h ``` diff --git a/graphics/include/CMakeLists.txt b/common/CMakeLists.txt similarity index 68% rename from graphics/include/CMakeLists.txt rename to common/CMakeLists.txt index 593797adb..b22f0870f 100644 --- a/graphics/include/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -19,20 +19,24 @@ # and at http://www.gnu.org/licenses/. # +######################################################################## +# Install headers +######################################################################## +INSTALL(DIRECTORY include/ DESTINATION "${INCLUDE_DIR}" + FILES_MATCHING PATTERN "*.h" + PATTERN ".svn" EXCLUDE +) + ######################################################################## # Add headers to cmake project (useful for IDEs) ######################################################################## SET(HEADERS_ALL "") -FILE(GLOB_RECURSE tmp "*.h") -LIST(APPEND HEADERS_ALL ${tmp}) -FILE(GLOB headers *) +FILE(GLOB headers *) FOREACH (_header ${headers}) - IF(IS_DIRECTORY ${_header}) - FILE(GLOB_RECURSE tmp "${_header}/*.h") - LIST(APPEND HEADERS_ALL ${tmp}) + IF(IS_DIRECTORY ${_header}) + FILE(GLOB_RECURSE tmp "${_header}/*.h") + LIST(APPEND HEADERS_ALL ${tmp}) ENDIF(IS_DIRECTORY ${_header}) ENDFOREACH() -ADD_CUSTOM_TARGET (add_graphics_headers SOURCES ${HEADERS_ALL}) - - +ADD_CUSTOM_TARGET (add_common_headers SOURCES ${HEADERS_ALL}) diff --git a/lte/include/lte/config.h b/common/include/liblte/config.h similarity index 100% rename from lte/include/lte/config.h rename to common/include/liblte/config.h diff --git a/cuhd/CMakeLists.txt b/cuhd/CMakeLists.txt index df98412a8..92d85b032 100644 --- a/cuhd/CMakeLists.txt +++ b/cuhd/CMakeLists.txt @@ -22,16 +22,27 @@ ######################################################################## # Install headers ######################################################################## -ADD_SUBDIRECTORY(include) -INSTALL(DIRECTORY include/ DESTINATION "${INCLUDE_DIR}" - FILES_MATCHING PATTERN "*.h" - PATTERN ".svn" EXCLUDE +INSTALL(DIRECTORY include/ + DESTINATION "${INCLUDE_DIR}" + FILES_MATCHING PATTERN "*.h" + PATTERN ".svn" EXCLUDE ) +######################################################################## +# Add headers to cmake project (useful for IDEs) +######################################################################## +SET(HEADERS_ALL "") +FILE(GLOB headers *) +FOREACH (_header ${headers}) + IF(IS_DIRECTORY ${_header}) + FILE(GLOB_RECURSE tmp "${_header}/*.h") + LIST(APPEND HEADERS_ALL ${tmp}) + ENDIF(IS_DIRECTORY ${_header}) +ENDFOREACH() +ADD_CUSTOM_TARGET (add_cuhd_headers SOURCES ${HEADERS_ALL}) ######################################################################## # Add the subdirectories ######################################################################## - ADD_SUBDIRECTORY(lib) diff --git a/cuhd/include/CMakeLists.txt b/cuhd/include/CMakeLists.txt deleted file mode 100644 index 287712c01..000000000 --- a/cuhd/include/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2012-2013 The libLTE Developers. See the -# COPYRIGHT file at the top-level directory of this distribution. -# -# This file is part of the libLTE library. -# -# libLTE is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# -# libLTE is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# A copy of the GNU Lesser General Public License can be found in -# the LICENSE file in the top-level directory of this distribution -# and at http://www.gnu.org/licenses/. -# - -######################################################################## -# Add headers to cmake project (useful for IDEs) -######################################################################## -SET(HEADERS_ALL "") -FILE(GLOB_RECURSE tmp "*.h") -LIST(APPEND HEADERS_ALL ${tmp}) -FILE(GLOB headers *) -FOREACH (_header ${headers}) - IF(IS_DIRECTORY ${_header}) - FILE(GLOB_RECURSE tmp "${_header}/*.h") - LIST(APPEND HEADERS_ALL ${tmp}) - ENDIF(IS_DIRECTORY ${_header}) -ENDFOREACH() -ADD_CUSTOM_TARGET (add_cuhd_headers SOURCES ${HEADERS_ALL}) - - - diff --git a/cuhd/include/cuhd.h b/cuhd/include/liblte/cuhd/cuhd.h similarity index 53% rename from cuhd/include/cuhd.h rename to cuhd/include/liblte/cuhd/cuhd.h index 188f127c3..d67c2eba1 100644 --- a/cuhd/include/cuhd.h +++ b/cuhd/include/liblte/cuhd/cuhd.h @@ -32,24 +32,25 @@ extern "C" { #endif #include -#include "cuhd/cuhd_utils.h" - -int cuhd_open(char *args, void **handler); -int cuhd_close(void *h); - -int cuhd_start_rx_stream(void *h); -int cuhd_start_rx_stream_nsamples(void *h, int nsamples); -int cuhd_stop_rx_stream(void *h); -bool cuhd_rx_wait_lo_locked(void *h); -double cuhd_set_rx_srate(void *h, double freq); -double cuhd_set_rx_gain(void *h, double gain); -double cuhd_set_rx_freq(void *h, double freq); -int cuhd_recv(void *h, void *data, int nsamples, int blocking); - -double cuhd_set_tx_srate(void *h, double freq); -double cuhd_set_tx_gain(void *h, double gain); -double cuhd_set_tx_freq(void *h, double freq); -int cuhd_send(void *h, void *data, int nsamples, int blocking); +#include "liblte/config.h" +#include "liblte/cuhd/cuhd_utils.h" + +LIBLTE_API int cuhd_open(char *args, void **handler); +LIBLTE_API int cuhd_close(void *h); + +LIBLTE_API int cuhd_start_rx_stream(void *h); +LIBLTE_API int cuhd_start_rx_stream_nsamples(void *h, int nsamples); +LIBLTE_API int cuhd_stop_rx_stream(void *h); +LIBLTE_API bool cuhd_rx_wait_lo_locked(void *h); +LIBLTE_API double cuhd_set_rx_srate(void *h, double freq); +LIBLTE_API double cuhd_set_rx_gain(void *h, double gain); +LIBLTE_API double cuhd_set_rx_freq(void *h, double freq); +LIBLTE_API int cuhd_recv(void *h, void *data, int nsamples, int blocking); + +LIBLTE_API double cuhd_set_tx_srate(void *h, double freq); +LIBLTE_API double cuhd_set_tx_gain(void *h, double gain); +LIBLTE_API double cuhd_set_tx_freq(void *h, double freq); +LIBLTE_API int cuhd_send(void *h, void *data, int nsamples, int blocking); #ifdef __cplusplus diff --git a/cuhd/include/cuhd/cuhd_utils.h b/cuhd/include/liblte/cuhd/cuhd_utils.h similarity index 87% rename from cuhd/include/cuhd/cuhd_utils.h rename to cuhd/include/liblte/cuhd/cuhd_utils.h index f872f830e..ea30ac66a 100644 --- a/cuhd/include/cuhd/cuhd_utils.h +++ b/cuhd/include/liblte/cuhd/cuhd_utils.h @@ -25,6 +25,6 @@ * */ +#include "liblte/config.h" - -int cuhd_rssi_scan(void *uhd, float *freqs, float *rssi, int nof_bands, double fs, int nsamp); +LIBLTE_API int cuhd_rssi_scan(void *uhd, float *freqs, float *rssi, int nof_bands, double fs, int nsamp); diff --git a/cuhd/lib/CMakeLists.txt b/cuhd/lib/CMakeLists.txt index fb74eae89..8d792d8c0 100644 --- a/cuhd/lib/CMakeLists.txt +++ b/cuhd/lib/CMakeLists.txt @@ -23,7 +23,7 @@ FIND_PACKAGE(UHD) IF(UHD_FOUND) - ADD_LIBRARY(cuhd cuhd_imp.cpp cuhd_utils.c) + ADD_LIBRARY(cuhd SHARED cuhd_imp.cpp cuhd_utils.c) INCLUDE_DIRECTORIES(${UHD_INCLUDE_DIRS}) LINK_DIRECTORIES(${UHD_LIBRARY_DIRS}) TARGET_LINK_LIBRARIES(cuhd ${UHD_LIBRARIES}) diff --git a/cuhd/lib/cuhd_imp.cpp b/cuhd/lib/cuhd_imp.cpp index 732a2be34..626415f7e 100644 --- a/cuhd/lib/cuhd_imp.cpp +++ b/cuhd/lib/cuhd_imp.cpp @@ -32,7 +32,7 @@ #include #include "cuhd_handler.hpp" -#include "cuhd.h" +#include "liblte/cuhd/cuhd.h" void my_handler(uhd::msg::type_t type, const std::string &msg){ diff --git a/cuhd/lib/cuhd_utils.c b/cuhd/lib/cuhd_utils.c index 7011236d6..9c4b1e9ac 100644 --- a/cuhd/lib/cuhd_utils.c +++ b/cuhd/lib/cuhd_utils.c @@ -31,9 +31,9 @@ #include -#include "cuhd.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/cuhd/cuhd.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" int cuhd_rssi_scan(void *uhd, float *freqs, float *rssi, int nof_bands, double fs, int nsamp) { int i, j; diff --git a/graphics/CMakeLists.txt b/graphics/CMakeLists.txt index 113999b4a..8bc50c828 100644 --- a/graphics/CMakeLists.txt +++ b/graphics/CMakeLists.txt @@ -22,15 +22,27 @@ ######################################################################## # Install headers ######################################################################## -ADD_SUBDIRECTORY(include) -INSTALL(DIRECTORY include/ DESTINATION "${INCLUDE_DIR}" - FILES_MATCHING PATTERN "*.h" - PATTERN ".svn" EXCLUDE +INSTALL(DIRECTORY include/ + DESTINATION "${INCLUDE_DIR}" + FILES_MATCHING PATTERN "*.h" + PATTERN ".svn" EXCLUDE ) ######################################################################## -# Add the subdirectories +# Add headers to cmake project (useful for IDEs) ######################################################################## +SET(HEADERS_ALL "") +FILE(GLOB headers *) +FOREACH (_header ${headers}) + IF(IS_DIRECTORY ${_header}) + FILE(GLOB_RECURSE tmp "${_header}/*.h") + LIST(APPEND HEADERS_ALL ${tmp}) + ENDIF(IS_DIRECTORY ${_header}) +ENDFOREACH() +ADD_CUSTOM_TARGET (add_graphics_headers SOURCES ${HEADERS_ALL}) +######################################################################## +# Add the subdirectories +######################################################################## ADD_SUBDIRECTORY(lib) diff --git a/graphics/include/plot.h b/graphics/include/liblte/graphics/plot.h similarity index 83% rename from graphics/include/plot.h rename to graphics/include/liblte/graphics/plot.h index 18fd04acf..7170f6d01 100644 --- a/graphics/include/plot.h +++ b/graphics/include/liblte/graphics/plot.h @@ -33,12 +33,12 @@ extern "C" { #endif -#include "lte/config.h" +#include "liblte/config.h" -#include "plot/plot_real.h" -#include "plot/plot_scatter.h" -#include "plot/plot_complex.h" -#include "plot/plot_waterfall.h" +#include "liblte/graphics/plot/plot_real.h" +#include "liblte/graphics/plot/plot_scatter.h" +#include "liblte/graphics/plot/plot_complex.h" +#include "liblte/graphics/plot/plot_waterfall.h" LIBLTE_API int plot_init(); LIBLTE_API void plot_exit(); diff --git a/graphics/include/plot/plot_complex.h b/graphics/include/liblte/graphics/plot/plot_complex.h similarity index 98% rename from graphics/include/plot/plot_complex.h rename to graphics/include/liblte/graphics/plot/plot_complex.h index 1d37cb9c1..61a6d8d23 100644 --- a/graphics/include/plot/plot_complex.h +++ b/graphics/include/liblte/graphics/plot/plot_complex.h @@ -35,7 +35,7 @@ extern "C" { #endif #include -#include "lte/config.h" +#include "liblte/config.h" typedef enum { Ip, Q, Magnitude, Phase diff --git a/graphics/include/plot/plot_real.h b/graphics/include/liblte/graphics/plot/plot_real.h similarity index 98% rename from graphics/include/plot/plot_real.h rename to graphics/include/liblte/graphics/plot/plot_real.h index 6047e7218..8de53d593 100644 --- a/graphics/include/plot/plot_real.h +++ b/graphics/include/liblte/graphics/plot/plot_real.h @@ -34,7 +34,7 @@ extern "C" { #endif #include -#include "lte/config.h" +#include "liblte/config.h" typedef void* plot_real_t; diff --git a/graphics/include/plot/plot_scatter.h b/graphics/include/liblte/graphics/plot/plot_scatter.h similarity index 98% rename from graphics/include/plot/plot_scatter.h rename to graphics/include/liblte/graphics/plot/plot_scatter.h index 8878d705a..d3d0f63b7 100644 --- a/graphics/include/plot/plot_scatter.h +++ b/graphics/include/liblte/graphics/plot/plot_scatter.h @@ -34,7 +34,7 @@ extern "C" { #endif #include -#include "lte/config.h" +#include "liblte/config.h" typedef void* plot_scatter_t; diff --git a/graphics/include/plot/plot_waterfall.h b/graphics/include/liblte/graphics/plot/plot_waterfall.h similarity index 98% rename from graphics/include/plot/plot_waterfall.h rename to graphics/include/liblte/graphics/plot/plot_waterfall.h index 0189f864f..0ac4c84a3 100644 --- a/graphics/include/plot/plot_waterfall.h +++ b/graphics/include/liblte/graphics/plot/plot_waterfall.h @@ -34,7 +34,7 @@ extern "C" { #endif #include -#include "lte/config.h" +#include "liblte/config.h" typedef void* plot_waterfall_t; diff --git a/graphics/lib/common/plot.cpp b/graphics/lib/common/plot.cpp index 0b2b82834..fd6f8170f 100644 --- a/graphics/lib/common/plot.cpp +++ b/graphics/lib/common/plot.cpp @@ -26,7 +26,7 @@ */ -#include "plot.h" +#include "liblte/graphics/plot.h" #include #include #include diff --git a/graphics/lib/complexplot/plot_complex.cpp b/graphics/lib/complexplot/plot_complex.cpp index 0f6b07c86..56c620cb2 100644 --- a/graphics/lib/complexplot/plot_complex.cpp +++ b/graphics/lib/complexplot/plot_complex.cpp @@ -28,7 +28,7 @@ -#include "plot/plot_complex.h" +#include "liblte/graphics/plot/plot_complex.h" #include "Complexplot.h" #include diff --git a/graphics/lib/realplot/plot_real.cpp b/graphics/lib/realplot/plot_real.cpp index 92fd745d3..7395242fd 100644 --- a/graphics/lib/realplot/plot_real.cpp +++ b/graphics/lib/realplot/plot_real.cpp @@ -27,7 +27,7 @@ -#include "plot/plot_real.h" +#include "liblte/graphics/plot/plot_real.h" #include "Realplot.h" #include diff --git a/graphics/lib/scatterplot/Scatterplot.h b/graphics/lib/scatterplot/Scatterplot.h index 158846655..e14d04842 100644 --- a/graphics/lib/scatterplot/Scatterplot.h +++ b/graphics/lib/scatterplot/Scatterplot.h @@ -3,7 +3,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" class ScatterplotWrapper; diff --git a/graphics/lib/scatterplot/plot_scatter.cpp b/graphics/lib/scatterplot/plot_scatter.cpp index b3d36986f..b684d40bc 100644 --- a/graphics/lib/scatterplot/plot_scatter.cpp +++ b/graphics/lib/scatterplot/plot_scatter.cpp @@ -27,7 +27,7 @@ -#include "plot/plot_scatter.h" +#include "liblte/graphics/plot/plot_scatter.h" #include "Scatterplot.h" #include diff --git a/graphics/lib/waterfallplot/plot_waterfall.cpp b/graphics/lib/waterfallplot/plot_waterfall.cpp index 99b1cc568..b5c7a38ea 100644 --- a/graphics/lib/waterfallplot/plot_waterfall.cpp +++ b/graphics/lib/waterfallplot/plot_waterfall.cpp @@ -28,7 +28,7 @@ -#include "plot/plot_waterfall.h" +#include "liblte/graphics/plot/plot_waterfall.h" #include "Waterfallplot.h" #include diff --git a/lte/CMakeLists.txt b/lte/CMakeLists.txt index 113999b4a..a20e90685 100644 --- a/lte/CMakeLists.txt +++ b/lte/CMakeLists.txt @@ -19,18 +19,10 @@ # and at http://www.gnu.org/licenses/. # -######################################################################## -# Install headers -######################################################################## -ADD_SUBDIRECTORY(include) -INSTALL(DIRECTORY include/ DESTINATION "${INCLUDE_DIR}" - FILES_MATCHING PATTERN "*.h" - PATTERN ".svn" EXCLUDE -) - ######################################################################## # Add the subdirectories ######################################################################## - -ADD_SUBDIRECTORY(lib) - +ADD_SUBDIRECTORY(phy) +ADD_SUBDIRECTORY(mac) +ADD_SUBDIRECTORY(rlc) +ADD_SUBDIRECTORY(pdcp) diff --git a/lte/include/lte.h b/lte/include/lte.h deleted file mode 100644 index 19c492dc2..000000000 --- a/lte/include/lte.h +++ /dev/null @@ -1,106 +0,0 @@ -/** - * - * \section COPYRIGHT - * - * Copyright 2013-2014 The libLTE Developers. See the - * COPYRIGHT file at the top-level directory of this distribution. - * - * \section LICENSE - * - * This file is part of the libLTE library. - * - * libLTE is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * libLTE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * A copy of the GNU Lesser General Public License can be found in - * the LICENSE file in the top-level directory of this distribution - * and at http://www.gnu.org/licenses/. - * - */ - - -#include -#include - -#ifndef _LTE_ -#define _LTE_ - -#ifdef __cplusplus - extern "C" { -#endif - -#include "lte/config.h" - -#include "lte/utils/bit.h" -#include "lte/utils/convolution.h" -#include "lte/utils/debug.h" -#include "lte/utils/dft.h" -#include "lte/utils/matrix.h" -#include "lte/utils/mux.h" -#include "lte/utils/cexptab.h" -#include "lte/utils/pack.h" -#include "lte/utils/vector.h" - -#include "lte/common/base.h" -#include "lte/common/fft.h" -#include "lte/common/sequence.h" - -#include "lte/ch_estimation/chest.h" -#include "lte/ch_estimation/refsignal.h" - -#include "lte/channel/ch_awgn.h" - -#include "lte/fec/viterbi.h" -#include "lte/fec/convcoder.h" -#include "lte/fec/crc.h" -#include "lte/fec/tc_interl.h" -#include "lte/fec/turbocoder.h" -#include "lte/fec/turbodecoder.h" -#include "lte/fec/rm_conv.h" -#include "lte/fec/rm_turbo.h" - -#include "lte/filter/filter2d.h" - -#include "lte/io/binsource.h" -#include "lte/io/filesink.h" -#include "lte/io/filesource.h" -#include "lte/io/udpsink.h" -#include "lte/io/udpsource.h" - -#include "lte/modem/demod_hard.h" -#include "lte/modem/demod_soft.h" -#include "lte/modem/mod.h" -#include "lte/modem/modem_table.h" - -#include "lte/mimo/precoding.h" -#include "lte/mimo/layermap.h" - -#include "lte/phch/regs.h" -#include "lte/phch/dci.h" -#include "lte/phch/pdcch.h" -#include "lte/phch/pbch.h" -#include "lte/phch/pcfich.h" -#include "lte/phch/phich.h" - -#include "lte/scrambling/scrambling.h" - -#include "lte/resampling/interp.h" - -#include "lte/sync/pss.h" -#include "lte/sync/sfo.h" -#include "lte/sync/sss.h" -#include "lte/sync/sync.h" -#include "lte/sync/cfo.h" - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/lte/mac/CMakeLists.txt b/lte/mac/CMakeLists.txt new file mode 100644 index 000000000..44f566d64 --- /dev/null +++ b/lte/mac/CMakeLists.txt @@ -0,0 +1,21 @@ +# +# Copyright 2012-2013 The libLTE Developers. See the +# COPYRIGHT file at the top-level directory of this distribution. +# +# This file is part of the libLTE library. +# +# libLTE is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# libLTE is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# A copy of the GNU Lesser General Public License can be found in +# the LICENSE file in the top-level directory of this distribution +# and at http://www.gnu.org/licenses/. +# + diff --git a/lte/pdcp/CMakeLists.txt b/lte/pdcp/CMakeLists.txt new file mode 100644 index 000000000..44f566d64 --- /dev/null +++ b/lte/pdcp/CMakeLists.txt @@ -0,0 +1,21 @@ +# +# Copyright 2012-2013 The libLTE Developers. See the +# COPYRIGHT file at the top-level directory of this distribution. +# +# This file is part of the libLTE library. +# +# libLTE is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# libLTE is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# A copy of the GNU Lesser General Public License can be found in +# the LICENSE file in the top-level directory of this distribution +# and at http://www.gnu.org/licenses/. +# + diff --git a/lte/include/CMakeLists.txt b/lte/phy/CMakeLists.txt similarity index 62% rename from lte/include/CMakeLists.txt rename to lte/phy/CMakeLists.txt index b2756ee48..77373e308 100644 --- a/lte/include/CMakeLists.txt +++ b/lte/phy/CMakeLists.txt @@ -19,20 +19,30 @@ # and at http://www.gnu.org/licenses/. # +######################################################################## +# Install headers +######################################################################## +INSTALL(DIRECTORY include/ + DESTINATION "${INCLUDE_DIR}" + FILES_MATCHING PATTERN "*.h" + PATTERN ".svn" EXCLUDE +) + ######################################################################## # Add headers to cmake project (useful for IDEs) ######################################################################## SET(HEADERS_ALL "") -FILE(GLOB_RECURSE tmp "*.h") -LIST(APPEND HEADERS_ALL ${tmp}) FILE(GLOB headers *) FOREACH (_header ${headers}) - IF(IS_DIRECTORY ${_header}) - FILE(GLOB_RECURSE tmp "${_header}/*.h") - LIST(APPEND HEADERS_ALL ${tmp}) - ENDIF(IS_DIRECTORY ${_header}) + IF(IS_DIRECTORY ${_header}) + FILE(GLOB_RECURSE tmp "${_header}/*.h") + LIST(APPEND HEADERS_ALL ${tmp}) + ENDIF(IS_DIRECTORY ${_header}) ENDFOREACH() ADD_CUSTOM_TARGET (add_lte_headers SOURCES ${HEADERS_ALL}) - - +######################################################################## +# Add subdirectories +######################################################################## +ADD_SUBDIRECTORY(lib) +ADD_SUBDIRECTORY(examples) diff --git a/examples/CMakeLists.txt b/lte/phy/examples/CMakeLists.txt similarity index 89% rename from examples/CMakeLists.txt rename to lte/phy/examples/CMakeLists.txt index 117c6d47c..78a02353a 100644 --- a/examples/CMakeLists.txt +++ b/lte/phy/examples/CMakeLists.txt @@ -25,10 +25,10 @@ ################################################################# add_executable(hl_example hl_example.c) -target_link_libraries(hl_example lte) +target_link_libraries(hl_example lte_phy) add_executable(ll_example ll_example.c) -target_link_libraries(ll_example lte) +target_link_libraries(ll_example lte_phy) ################################################################# @@ -36,7 +36,7 @@ target_link_libraries(ll_example lte) ################################################################# add_executable(synch_file synch_file.c) -target_link_libraries(synch_file lte) +target_link_libraries(synch_file lte_phy) LINK_DIRECTORIES(${UHD_LIBRARY_DIRS}) @@ -52,10 +52,10 @@ LIST(FIND OPTIONAL_LIBS graphics GRAPHICS_FIND) ################################################################# add_executable(pbch_ue pbch_ue.c) -target_link_libraries(pbch_ue lte) +target_link_libraries(pbch_ue lte_phy) add_executable(pbch_enodeb pbch_enodeb.c) -target_link_libraries(pbch_enodeb lte) +target_link_libraries(pbch_enodeb lte_phy) IF(${CUHD_FIND} EQUAL -1) SET_TARGET_PROPERTIES(pbch_ue PROPERTIES COMPILE_DEFINITIONS "DISABLE_UHD") @@ -82,13 +82,13 @@ ENDIF(${GRAPHICS_FIND} EQUAL -1) IF(${CUHD_FIND} GREATER -1) add_executable(scan_rssi scan_rssi.c) - target_link_libraries(scan_rssi lte cuhd ) + target_link_libraries(scan_rssi lte_phy cuhd ) add_executable(scan_pss scan_pss.c) - target_link_libraries(scan_pss lte cuhd ) + target_link_libraries(scan_pss lte_phy cuhd ) add_executable(scan_mib scan_mib.c) - target_link_libraries(scan_mib lte cuhd ) + target_link_libraries(scan_mib lte_phy cuhd ) MESSAGE(STATUS " UHD examples will be installed.") diff --git a/examples/hl_example.c b/lte/phy/examples/hl_example.c similarity index 99% rename from examples/hl_example.c rename to lte/phy/examples/hl_example.c index 7c3769fc8..2d0aa1734 100644 --- a/examples/hl_example.c +++ b/lte/phy/examples/hl_example.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" void usage(char *arg) { printf("Usage: %s nbits snr_db\n",arg); diff --git a/examples/ll_example.c b/lte/phy/examples/ll_example.c similarity index 97% rename from examples/ll_example.c rename to lte/phy/examples/ll_example.c index ef1d37d9d..fc9fec359 100644 --- a/examples/ll_example.c +++ b/lte/phy/examples/ll_example.c @@ -29,7 +29,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int main(int argc, char **argv) { binsource_t bs; diff --git a/examples/pbch_enodeb.c b/lte/phy/examples/pbch_enodeb.c similarity index 99% rename from examples/pbch_enodeb.c rename to lte/phy/examples/pbch_enodeb.c index f99977053..5a0f9c583 100644 --- a/examples/pbch_enodeb.c +++ b/lte/phy/examples/pbch_enodeb.c @@ -31,10 +31,10 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #ifndef DISABLE_UHD - #include "cuhd.h" + #include "liblte/cuhd/cuhd.h" void *uhd; #endif diff --git a/examples/pbch_ue.c b/lte/phy/examples/pbch_ue.c similarity index 99% rename from examples/pbch_ue.c rename to lte/phy/examples/pbch_ue.c index dda68679e..54f39a449 100644 --- a/examples/pbch_ue.c +++ b/lte/phy/examples/pbch_ue.c @@ -36,15 +36,15 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #ifndef DISABLE_UHD - #include "cuhd.h" + #include "liblte/cuhd/cuhd.h" void *uhd; #endif #ifndef DISABLE_GRAPHICS - #include "plot.h" + #include "liblte/graphics/plot.h" plot_real_t poutfft; plot_complex_t pce; plot_scatter_t pscatrecv, pscatequal; diff --git a/examples/scan_mib.c b/lte/phy/examples/scan_mib.c similarity index 99% rename from examples/scan_mib.c rename to lte/phy/examples/scan_mib.c index 59ca08959..9bdf883e6 100644 --- a/examples/scan_mib.c +++ b/lte/phy/examples/scan_mib.c @@ -34,12 +34,12 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" //#define DISABLE_UHD #ifndef DISABLE_UHD -#include "cuhd.h" +#include "liblte/cuhd/cuhd.h" #endif #define MHZ 1000000 diff --git a/examples/scan_pss.c b/lte/phy/examples/scan_pss.c similarity index 99% rename from examples/scan_pss.c rename to lte/phy/examples/scan_pss.c index 97379d610..7f86b9f30 100644 --- a/examples/scan_pss.c +++ b/lte/phy/examples/scan_pss.c @@ -34,8 +34,8 @@ #include #include -#include "lte.h" -#include "cuhd.h" +#include "liblte/phy/phy.h" +#include "liblte/cuhd/cuhd.h" #define MHZ 1000000 #define SAMP_FREQ 1920000 diff --git a/examples/scan_rssi.c b/lte/phy/examples/scan_rssi.c similarity index 98% rename from examples/scan_rssi.c rename to lte/phy/examples/scan_rssi.c index e31651b74..3700cfdba 100644 --- a/examples/scan_rssi.c +++ b/lte/phy/examples/scan_rssi.c @@ -32,8 +32,8 @@ #include #include -#include "lte.h" -#include "cuhd.h" +#include "liblte/phy/phy.h" +#include "liblte/cuhd/cuhd.h" int nof_frames=1000; int band; diff --git a/examples/synch_file.c b/lte/phy/examples/synch_file.c similarity index 99% rename from examples/synch_file.c rename to lte/phy/examples/synch_file.c index c0a1f879a..bd7e02e60 100644 --- a/examples/synch_file.c +++ b/lte/phy/examples/synch_file.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" char *input_file_name; char *output_file_name="abs_corr.txt"; diff --git a/lte/include/lte/ch_estimation/chest.h b/lte/phy/include/liblte/phy/ch_estimation/chest.h similarity index 95% rename from lte/include/lte/ch_estimation/chest.h rename to lte/phy/include/liblte/phy/ch_estimation/chest.h index 2b2041c95..8335e917a 100644 --- a/lte/include/lte/ch_estimation/chest.h +++ b/lte/phy/include/liblte/phy/ch_estimation/chest.h @@ -32,10 +32,10 @@ #include -#include "lte/config.h" -#include "lte/ch_estimation/refsignal.h" -#include "lte/filter/filter2d.h" -#include "lte/common/base.h" +#include "liblte/config.h" +#include "liblte/phy/ch_estimation/refsignal.h" +#include "liblte/phy/filter/filter2d.h" +#include "liblte/phy/common/base.h" typedef _Complex float cf_t; /* this is only a shortcut */ diff --git a/lte/include/lte/ch_estimation/refsignal.h b/lte/phy/include/liblte/phy/ch_estimation/refsignal.h similarity index 96% rename from lte/include/lte/ch_estimation/refsignal.h rename to lte/phy/include/liblte/phy/ch_estimation/refsignal.h index 1bb665b38..f58fa44c8 100644 --- a/lte/include/lte/ch_estimation/refsignal.h +++ b/lte/phy/include/liblte/phy/ch_estimation/refsignal.h @@ -37,8 +37,8 @@ * */ -#include "lte/config.h" -#include "lte/common/base.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/channel/ch_awgn.h b/lte/phy/include/liblte/phy/channel/ch_awgn.h similarity index 98% rename from lte/include/lte/channel/ch_awgn.h rename to lte/phy/include/liblte/phy/channel/ch_awgn.h index c0ababc36..19a452cb1 100644 --- a/lte/include/lte/channel/ch_awgn.h +++ b/lte/phy/include/liblte/phy/channel/ch_awgn.h @@ -27,7 +27,7 @@ #include -#include "lte/config.h" +#include "liblte/config.h" #ifndef CH_AWGN_ #define CH_AWGN_ diff --git a/lte/include/lte/common/base.h b/lte/phy/include/liblte/phy/common/base.h similarity index 99% rename from lte/include/lte/common/base.h rename to lte/phy/include/liblte/phy/common/base.h index f49282312..f1d6f48bc 100644 --- a/lte/include/lte/common/base.h +++ b/lte/phy/include/liblte/phy/common/base.h @@ -29,7 +29,7 @@ #ifndef _LTEBASE_ #define _LTEBASE_ -#include "lte/config.h" +#include "liblte/config.h" #define NSUBFRAMES_X_FRAME 10 #define NSLOTS_X_FRAME (2*NSUBFRAMES_X_FRAME) diff --git a/lte/include/lte/common/fft.h b/lte/phy/include/liblte/phy/common/fft.h similarity index 94% rename from lte/include/lte/common/fft.h rename to lte/phy/include/liblte/phy/common/fft.h index 76b7bcf2e..881c64387 100644 --- a/lte/include/lte/common/fft.h +++ b/lte/phy/include/liblte/phy/common/fft.h @@ -33,9 +33,9 @@ #include #include -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/utils/dft.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/dft.h" typedef _Complex float cf_t; /* this is only a shortcut */ diff --git a/lte/include/lte/common/sequence.h b/lte/phy/include/liblte/phy/common/sequence.h similarity index 95% rename from lte/include/lte/common/sequence.h rename to lte/phy/include/liblte/phy/common/sequence.h index 680ab226e..a3efb1d34 100644 --- a/lte/include/lte/common/sequence.h +++ b/lte/phy/include/liblte/phy/common/sequence.h @@ -29,8 +29,8 @@ #ifndef LTESEQ_ #define LTESEQ_ -#include "lte/config.h" -#include "lte/common/base.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" typedef struct LIBLTE_API{ char *c; diff --git a/lte/include/lte/fec/convcoder.h b/lte/phy/include/liblte/phy/fec/convcoder.h similarity index 98% rename from lte/include/lte/fec/convcoder.h rename to lte/phy/include/liblte/phy/fec/convcoder.h index af5fdbe0d..79416289f 100644 --- a/lte/include/lte/fec/convcoder.h +++ b/lte/phy/include/liblte/phy/fec/convcoder.h @@ -31,7 +31,7 @@ #define CONVCODER_ #include -#include "lte/config.h" +#include "liblte/config.h" typedef struct LIBLTE_API { int R; diff --git a/lte/include/lte/fec/crc.h b/lte/phy/include/liblte/phy/fec/crc.h similarity index 98% rename from lte/include/lte/fec/crc.h rename to lte/phy/include/liblte/phy/fec/crc.h index 7a4060471..e071f3398 100644 --- a/lte/include/lte/fec/crc.h +++ b/lte/phy/include/liblte/phy/fec/crc.h @@ -29,7 +29,7 @@ #ifndef CRC_ #define CRC_ -#include "lte/config.h" +#include "liblte/config.h" typedef struct LIBLTE_API { unsigned long table[256]; diff --git a/lte/include/lte/fec/rm_conv.h b/lte/phy/include/liblte/phy/fec/rm_conv.h similarity index 98% rename from lte/include/lte/fec/rm_conv.h rename to lte/phy/include/liblte/phy/fec/rm_conv.h index 9999d7c3a..ac8c19232 100644 --- a/lte/include/lte/fec/rm_conv.h +++ b/lte/phy/include/liblte/phy/fec/rm_conv.h @@ -29,7 +29,7 @@ #ifndef RM_CONV_ #define RM_CONV_ -#include "lte/config.h" +#include "liblte/config.h" #define RX_NULL 10000 #define TX_NULL 80 diff --git a/lte/include/lte/fec/rm_turbo.h b/lte/phy/include/liblte/phy/fec/rm_turbo.h similarity index 98% rename from lte/include/lte/fec/rm_turbo.h rename to lte/phy/include/liblte/phy/fec/rm_turbo.h index 184a9d039..1bb510b4b 100644 --- a/lte/include/lte/fec/rm_turbo.h +++ b/lte/phy/include/liblte/phy/fec/rm_turbo.h @@ -29,7 +29,7 @@ #ifndef RM_TURBO_ #define RM_TURBO_ -#include "lte/config.h" +#include "liblte/config.h" #ifndef RX_NULL #define RX_NULL 10000 diff --git a/lte/include/lte/fec/tc_interl.h b/lte/phy/include/liblte/phy/fec/tc_interl.h similarity index 94% rename from lte/include/lte/fec/tc_interl.h rename to lte/phy/include/liblte/phy/fec/tc_interl.h index e907cbf19..0c4cbe43c 100644 --- a/lte/include/lte/fec/tc_interl.h +++ b/lte/phy/include/liblte/phy/fec/tc_interl.h @@ -28,7 +28,7 @@ #ifndef TC_INTERL_H #define TC_INTERL_H -#include "lte/config.h" +#include "liblte/config.h" typedef struct LIBLTE_API{ int *forward; diff --git a/lte/include/lte/fec/turbocoder.h b/lte/phy/include/liblte/phy/fec/turbocoder.h similarity index 94% rename from lte/include/lte/fec/turbocoder.h rename to lte/phy/include/liblte/phy/fec/turbocoder.h index 74c1fa2db..9756c9600 100644 --- a/lte/include/lte/fec/turbocoder.h +++ b/lte/phy/include/liblte/phy/fec/turbocoder.h @@ -28,7 +28,7 @@ #ifndef TURBOCODER_H #define TURBOCODER_H -#include "lte/config.h" +#include "liblte/config.h" #define NUMREGS 3 diff --git a/lte/include/lte/fec/turbodecoder.h b/lte/phy/include/liblte/phy/fec/turbodecoder.h similarity index 92% rename from lte/include/lte/fec/turbodecoder.h rename to lte/phy/include/liblte/phy/fec/turbodecoder.h index b505a5adb..58f720332 100644 --- a/lte/include/lte/fec/turbodecoder.h +++ b/lte/phy/include/liblte/phy/fec/turbodecoder.h @@ -1,7 +1,7 @@ #ifndef TURBODECODER_H #define TURBODECODER_H -#include "lte/config.h" +#include "liblte/config.h" #define RATE 3 #define TOTALTAIL 12 diff --git a/lte/include/lte/fec/viterbi.h b/lte/phy/include/liblte/phy/fec/viterbi.h similarity index 98% rename from lte/include/lte/fec/viterbi.h rename to lte/phy/include/liblte/phy/fec/viterbi.h index 9eb0a5722..0d955656d 100644 --- a/lte/include/lte/fec/viterbi.h +++ b/lte/phy/include/liblte/phy/fec/viterbi.h @@ -30,7 +30,7 @@ #define VITERBI_ #include -#include "lte/config.h" +#include "liblte/config.h" typedef enum { viterbi_27, viterbi_29, viterbi_37, viterbi_39 diff --git a/lte/include/lte/filter/filter2d.h b/lte/phy/include/liblte/phy/filter/filter2d.h similarity index 98% rename from lte/include/lte/filter/filter2d.h rename to lte/phy/include/liblte/phy/filter/filter2d.h index 34a945389..afbd3b6f1 100644 --- a/lte/include/lte/filter/filter2d.h +++ b/lte/phy/include/liblte/phy/filter/filter2d.h @@ -30,7 +30,7 @@ #ifndef FILTER2D_ #define FILTER2D_ -#include "lte/config.h" +#include "liblte/config.h" /* 2-D real filter of complex input * diff --git a/lte/include/lte/io/binsource.h b/lte/phy/include/liblte/phy/io/binsource.h similarity index 98% rename from lte/include/lte/io/binsource.h rename to lte/phy/include/liblte/phy/io/binsource.h index 876f59ed7..7e5a06ddf 100644 --- a/lte/include/lte/io/binsource.h +++ b/lte/phy/include/liblte/phy/io/binsource.h @@ -31,7 +31,7 @@ #include -#include "lte/config.h" +#include "liblte/config.h" /* Low-level API */ typedef struct LIBLTE_API{ diff --git a/lte/include/lte/io/filesink.h b/lte/phy/include/liblte/phy/io/filesink.h similarity index 96% rename from lte/include/lte/io/filesink.h rename to lte/phy/include/liblte/phy/io/filesink.h index 7e7e91a43..10a5fa65c 100644 --- a/lte/include/lte/io/filesink.h +++ b/lte/phy/include/liblte/phy/io/filesink.h @@ -32,8 +32,8 @@ #include #include -#include "lte/config.h" -#include "lte/io/format.h" +#include "liblte/config.h" +#include "liblte/phy/io/format.h" /* Low-level API */ typedef struct LIBLTE_API { diff --git a/lte/include/lte/io/filesource.h b/lte/phy/include/liblte/phy/io/filesource.h similarity index 96% rename from lte/include/lte/io/filesource.h rename to lte/phy/include/liblte/phy/io/filesource.h index 0546af0d5..fcd31b1c3 100644 --- a/lte/include/lte/io/filesource.h +++ b/lte/phy/include/liblte/phy/io/filesource.h @@ -32,8 +32,8 @@ #include #include -#include "lte/config.h" -#include "lte/io/format.h" +#include "liblte/config.h" +#include "liblte/phy/io/format.h" /* Low-level API */ typedef struct LIBLTE_API { diff --git a/lte/include/lte/io/format.h b/lte/phy/include/liblte/phy/io/format.h similarity index 100% rename from lte/include/lte/io/format.h rename to lte/phy/include/liblte/phy/io/format.h diff --git a/lte/include/lte/io/udpsink.h b/lte/phy/include/liblte/phy/io/udpsink.h similarity index 96% rename from lte/include/lte/io/udpsink.h rename to lte/phy/include/liblte/phy/io/udpsink.h index 37f5238c3..e4ae81957 100644 --- a/lte/include/lte/io/udpsink.h +++ b/lte/phy/include/liblte/phy/io/udpsink.h @@ -35,8 +35,8 @@ #include #include -#include "lte/config.h" -#include "lte/io/format.h" +#include "liblte/config.h" +#include "liblte/phy/io/format.h" /* Low-level API */ typedef struct LIBLTE_API { diff --git a/lte/include/lte/io/udpsource.h b/lte/phy/include/liblte/phy/io/udpsource.h similarity index 96% rename from lte/include/lte/io/udpsource.h rename to lte/phy/include/liblte/phy/io/udpsource.h index a1c1b3019..77db9346e 100644 --- a/lte/include/lte/io/udpsource.h +++ b/lte/phy/include/liblte/phy/io/udpsource.h @@ -36,8 +36,8 @@ #include #include -#include "lte/config.h" -#include "lte/io/format.h" +#include "liblte/config.h" +#include "liblte/phy/io/format.h" /* Low-level API */ typedef struct LIBLTE_API { diff --git a/lte/include/lte/mimo/layermap.h b/lte/phy/include/liblte/phy/mimo/layermap.h similarity index 98% rename from lte/include/lte/mimo/layermap.h rename to lte/phy/include/liblte/phy/mimo/layermap.h index 1c85e7458..260c19310 100644 --- a/lte/include/lte/mimo/layermap.h +++ b/lte/phy/include/liblte/phy/mimo/layermap.h @@ -29,7 +29,7 @@ #ifndef LAYERMAP_H_ #define LAYERMAP_H_ -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/mimo/precoding.h b/lte/phy/include/liblte/phy/mimo/precoding.h similarity index 98% rename from lte/include/lte/mimo/precoding.h rename to lte/phy/include/liblte/phy/mimo/precoding.h index f11123a69..1cc751802 100644 --- a/lte/include/lte/mimo/precoding.h +++ b/lte/phy/include/liblte/phy/mimo/precoding.h @@ -29,7 +29,7 @@ #ifndef PRECODING_H_ #define PRECODING_H_ -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/modem/demod_hard.h b/lte/phy/include/liblte/phy/modem/demod_hard.h similarity index 98% rename from lte/include/lte/modem/demod_hard.h rename to lte/phy/include/liblte/phy/modem/demod_hard.h index d56ee3e44..a3b621819 100644 --- a/lte/include/lte/modem/demod_hard.h +++ b/lte/phy/include/liblte/phy/modem/demod_hard.h @@ -32,7 +32,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" #include "modem_table.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/modem/demod_soft.h b/lte/phy/include/liblte/phy/modem/demod_soft.h similarity index 98% rename from lte/include/lte/modem/demod_soft.h rename to lte/phy/include/liblte/phy/modem/demod_soft.h index 333415e22..bb2c4368b 100644 --- a/lte/include/lte/modem/demod_soft.h +++ b/lte/phy/include/liblte/phy/modem/demod_soft.h @@ -32,7 +32,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" #include "modem_table.h" enum alg { EXACT, APPROX }; diff --git a/lte/include/lte/modem/mod.h b/lte/phy/include/liblte/phy/modem/mod.h similarity index 98% rename from lte/include/lte/modem/mod.h rename to lte/phy/include/liblte/phy/modem/mod.h index c07b714e0..5467f13d0 100644 --- a/lte/include/lte/modem/mod.h +++ b/lte/phy/include/liblte/phy/modem/mod.h @@ -32,7 +32,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" #include "modem_table.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/modem/modem_table.h b/lte/phy/include/liblte/phy/modem/modem_table.h similarity index 98% rename from lte/include/lte/modem/modem_table.h rename to lte/phy/include/liblte/phy/modem/modem_table.h index 6afddeea6..f94c03f86 100644 --- a/lte/include/lte/modem/modem_table.h +++ b/lte/phy/include/liblte/phy/modem/modem_table.h @@ -34,7 +34,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; typedef struct LIBLTE_API { diff --git a/lte/include/lte/phch/dci.h b/lte/phy/include/liblte/phy/phch/dci.h similarity index 96% rename from lte/include/lte/phch/dci.h rename to lte/phy/include/liblte/phy/phch/dci.h index 1840f8d87..508978f9b 100644 --- a/lte/include/lte/phch/dci.h +++ b/lte/phy/include/liblte/phy/phch/dci.h @@ -30,9 +30,9 @@ #include -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/phch/ra.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/phch/ra.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/phch/pbch.h b/lte/phy/include/liblte/phy/phch/pbch.h similarity index 85% rename from lte/include/lte/phch/pbch.h rename to lte/phy/include/liblte/phy/phch/pbch.h index da4272afd..6583aca9d 100644 --- a/lte/include/lte/phch/pbch.h +++ b/lte/phy/include/liblte/phy/phch/pbch.h @@ -29,17 +29,17 @@ #ifndef PBCH_ #define PBCH_ -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/mimo/precoding.h" -#include "lte/mimo/layermap.h" -#include "lte/modem/mod.h" -#include "lte/modem/demod_soft.h" -#include "lte/scrambling/scrambling.h" -#include "lte/fec/rm_conv.h" -#include "lte/fec/convcoder.h" -#include "lte/fec/viterbi.h" -#include "lte/fec/crc.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/mimo/precoding.h" +#include "liblte/phy/mimo/layermap.h" +#include "liblte/phy/modem/mod.h" +#include "liblte/phy/modem/demod_soft.h" +#include "liblte/phy/scrambling/scrambling.h" +#include "liblte/phy/fec/rm_conv.h" +#include "liblte/phy/fec/convcoder.h" +#include "liblte/phy/fec/viterbi.h" +#include "liblte/phy/fec/crc.h" #define PBCH_RE_CPNORM 240 #define PBCH_RE_CPEXT 216 diff --git a/lte/include/lte/phch/pcfich.h b/lte/phy/include/liblte/phy/phch/pcfich.h similarity index 88% rename from lte/include/lte/phch/pcfich.h rename to lte/phy/include/liblte/phy/phch/pcfich.h index aa35e1f1d..176f4cdc9 100644 --- a/lte/include/lte/phch/pcfich.h +++ b/lte/phy/include/liblte/phy/phch/pcfich.h @@ -29,14 +29,14 @@ #ifndef PCFICH_ #define PCFICH_ -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/mimo/precoding.h" -#include "lte/mimo/layermap.h" -#include "lte/modem/mod.h" -#include "lte/modem/demod_hard.h" -#include "lte/scrambling/scrambling.h" -#include "lte/phch/regs.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/mimo/precoding.h" +#include "liblte/phy/mimo/layermap.h" +#include "liblte/phy/modem/mod.h" +#include "liblte/phy/modem/demod_hard.h" +#include "liblte/phy/scrambling/scrambling.h" +#include "liblte/phy/phch/regs.h" #define PCFICH_CFI_LEN 32 #define PCFICH_RE PCFICH_CFI_LEN/2 diff --git a/lte/include/lte/phch/pdcch.h b/lte/phy/include/liblte/phy/phch/pdcch.h similarity index 87% rename from lte/include/lte/phch/pdcch.h rename to lte/phy/include/liblte/phy/phch/pdcch.h index ebbb2539a..b533f250b 100644 --- a/lte/include/lte/phch/pdcch.h +++ b/lte/phy/include/liblte/phy/phch/pdcch.h @@ -29,19 +29,19 @@ #ifndef PDCCH_ #define PDCCH_ -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/mimo/precoding.h" -#include "lte/mimo/layermap.h" -#include "lte/modem/mod.h" -#include "lte/modem/demod_soft.h" -#include "lte/scrambling/scrambling.h" -#include "lte/fec/rm_conv.h" -#include "lte/fec/convcoder.h" -#include "lte/fec/viterbi.h" -#include "lte/fec/crc.h" -#include "lte/phch/dci.h" -#include "lte/phch/regs.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/mimo/precoding.h" +#include "liblte/phy/mimo/layermap.h" +#include "liblte/phy/modem/mod.h" +#include "liblte/phy/modem/demod_soft.h" +#include "liblte/phy/scrambling/scrambling.h" +#include "liblte/phy/fec/rm_conv.h" +#include "liblte/phy/fec/convcoder.h" +#include "liblte/phy/fec/viterbi.h" +#include "liblte/phy/fec/crc.h" +#include "liblte/phy/phch/dci.h" +#include "liblte/phy/phch/regs.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/phch/phich.h b/lte/phy/include/liblte/phy/phch/phich.h similarity index 91% rename from lte/include/lte/phch/phich.h rename to lte/phy/include/liblte/phy/phch/phich.h index d2ad2ab02..eec569c96 100644 --- a/lte/include/lte/phch/phich.h +++ b/lte/phy/include/liblte/phy/phch/phich.h @@ -29,13 +29,13 @@ #ifndef PHICH_ #define PHICH_ -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/mimo/precoding.h" -#include "lte/mimo/layermap.h" -#include "lte/modem/mod.h" -#include "lte/modem/demod_hard.h" -#include "lte/scrambling/scrambling.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/mimo/precoding.h" +#include "liblte/phy/mimo/layermap.h" +#include "liblte/phy/modem/mod.h" +#include "liblte/phy/modem/demod_hard.h" +#include "liblte/phy/scrambling/scrambling.h" #include "regs.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/phch/ra.h b/lte/phy/include/liblte/phy/phch/ra.h similarity index 99% rename from lte/include/lte/phch/ra.h rename to lte/phy/include/liblte/phy/phch/ra.h index dae32602f..bd7026a24 100644 --- a/lte/include/lte/phch/ra.h +++ b/lte/phy/include/liblte/phy/phch/ra.h @@ -31,7 +31,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" /** Structures and utility functions for DL/UL resource * allocation. diff --git a/lte/include/lte/phch/regs.h b/lte/phy/include/liblte/phy/phch/regs.h similarity index 98% rename from lte/include/lte/phch/regs.h rename to lte/phy/include/liblte/phy/phch/regs.h index ba9ff42aa..496444e0a 100644 --- a/lte/include/lte/phch/regs.h +++ b/lte/phy/include/liblte/phy/phch/regs.h @@ -30,8 +30,8 @@ #define _REGS_H_ #include -#include "lte/config.h" -#include "lte/common/base.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" #define REGS_PHICH_NSYM 12 #define REGS_PHICH_REGS_X_GROUP 3 diff --git a/lte/phy/include/liblte/phy/phy.h b/lte/phy/include/liblte/phy/phy.h new file mode 100644 index 000000000..079c35749 --- /dev/null +++ b/lte/phy/include/liblte/phy/phy.h @@ -0,0 +1,106 @@ +/** + * + * \section COPYRIGHT + * + * Copyright 2013-2014 The libLTE Developers. See the + * COPYRIGHT file at the top-level directory of this distribution. + * + * \section LICENSE + * + * This file is part of the libLTE library. + * + * libLTE is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * libLTE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * A copy of the GNU Lesser General Public License can be found in + * the LICENSE file in the top-level directory of this distribution + * and at http://www.gnu.org/licenses/. + * + */ + + +#include +#include + +#ifndef _LTE_ +#define _LTE_ + +#ifdef __cplusplus + extern "C" { +#endif + +#include "liblte/config.h" + +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/convolution.h" +#include "liblte/phy/utils/debug.h" +#include "liblte/phy/utils/dft.h" +#include "liblte/phy/utils/matrix.h" +#include "liblte/phy/utils/mux.h" +#include "liblte/phy/utils/cexptab.h" +#include "liblte/phy/utils/pack.h" +#include "liblte/phy/utils/vector.h" + +#include "liblte/phy/common/base.h" +#include "liblte/phy/common/fft.h" +#include "liblte/phy/common/sequence.h" + +#include "liblte/phy/ch_estimation/chest.h" +#include "liblte/phy/ch_estimation/refsignal.h" + +#include "liblte/phy/channel/ch_awgn.h" + +#include "liblte/phy/fec/viterbi.h" +#include "liblte/phy/fec/convcoder.h" +#include "liblte/phy/fec/crc.h" +#include "liblte/phy/fec/tc_interl.h" +#include "liblte/phy/fec/turbocoder.h" +#include "liblte/phy/fec/turbodecoder.h" +#include "liblte/phy/fec/rm_conv.h" +#include "liblte/phy/fec/rm_turbo.h" + +#include "liblte/phy/filter/filter2d.h" + +#include "liblte/phy/io/binsource.h" +#include "liblte/phy/io/filesink.h" +#include "liblte/phy/io/filesource.h" +#include "liblte/phy/io/udpsink.h" +#include "liblte/phy/io/udpsource.h" + +#include "liblte/phy/modem/demod_hard.h" +#include "liblte/phy/modem/demod_soft.h" +#include "liblte/phy/modem/mod.h" +#include "liblte/phy/modem/modem_table.h" + +#include "liblte/phy/mimo/precoding.h" +#include "liblte/phy/mimo/layermap.h" + +#include "liblte/phy/phch/regs.h" +#include "liblte/phy/phch/dci.h" +#include "liblte/phy/phch/pdcch.h" +#include "liblte/phy/phch/pbch.h" +#include "liblte/phy/phch/pcfich.h" +#include "liblte/phy/phch/phich.h" + +#include "liblte/phy/scrambling/scrambling.h" + +#include "liblte/phy/resampling/interp.h" + +#include "liblte/phy/sync/pss.h" +#include "liblte/phy/sync/sfo.h" +#include "liblte/phy/sync/sss.h" +#include "liblte/phy/sync/sync.h" +#include "liblte/phy/sync/cfo.h" + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lte/include/lte/resampling/interp.h b/lte/phy/include/liblte/phy/resampling/interp.h similarity index 97% rename from lte/include/lte/resampling/interp.h rename to lte/phy/include/liblte/phy/resampling/interp.h index d41c83c47..ef7e87205 100644 --- a/lte/include/lte/resampling/interp.h +++ b/lte/phy/include/liblte/phy/resampling/interp.h @@ -28,7 +28,7 @@ #ifndef INTERP_H #define INTERP_H_ -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/resampling/resample_arb.h b/lte/phy/include/liblte/phy/resampling/resample_arb.h similarity index 98% rename from lte/include/lte/resampling/resample_arb.h rename to lte/phy/include/liblte/phy/resampling/resample_arb.h index 7a77435e7..5a9f7f31e 100644 --- a/lte/include/lte/resampling/resample_arb.h +++ b/lte/phy/include/liblte/phy/resampling/resample_arb.h @@ -31,7 +31,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/scrambling/scrambling.h b/lte/phy/include/liblte/phy/scrambling/scrambling.h similarity index 95% rename from lte/include/lte/scrambling/scrambling.h rename to lte/phy/include/liblte/phy/scrambling/scrambling.h index b677b6d51..b80abe842 100644 --- a/lte/include/lte/scrambling/scrambling.h +++ b/lte/phy/include/liblte/phy/scrambling/scrambling.h @@ -29,9 +29,9 @@ #ifndef SCRAMBLING_ #define SCRAMBLING_ -#include "lte/config.h" -#include "lte/common/sequence.h" -#include "lte/common/base.h" +#include "liblte/config.h" +#include "liblte/phy/common/sequence.h" +#include "liblte/phy/common/base.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/sync/cfo.h b/lte/phy/include/liblte/phy/sync/cfo.h similarity index 98% rename from lte/include/lte/sync/cfo.h rename to lte/phy/include/liblte/phy/sync/cfo.h index b07291f4f..c2adb9a04 100644 --- a/lte/include/lte/sync/cfo.h +++ b/lte/phy/include/liblte/phy/sync/cfo.h @@ -31,7 +31,7 @@ #include -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/sync/pss.h b/lte/phy/include/liblte/phy/sync/pss.h similarity index 97% rename from lte/include/lte/sync/pss.h rename to lte/phy/include/liblte/phy/sync/pss.h index 30a0cafb4..884470ee1 100644 --- a/lte/include/lte/sync/pss.h +++ b/lte/phy/include/liblte/phy/sync/pss.h @@ -32,9 +32,9 @@ #include #include -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/utils/convolution.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/convolution.h" typedef _Complex float cf_t; /* this is only a shortcut */ diff --git a/lte/include/lte/sync/sfo.h b/lte/phy/include/liblte/phy/sync/sfo.h similarity index 97% rename from lte/include/lte/sync/sfo.h rename to lte/phy/include/liblte/phy/sync/sfo.h index 92234976b..1027c6a3b 100644 --- a/lte/include/lte/sync/sfo.h +++ b/lte/phy/include/liblte/phy/sync/sfo.h @@ -29,7 +29,7 @@ #ifndef SFO_ #define SFO_ -#include "lte/config.h" +#include "liblte/config.h" LIBLTE_API float sfo_estimate(int *t0, int len, float period); LIBLTE_API float sfo_estimate_period(int *t0, int *t, int len, float period); diff --git a/lte/include/lte/sync/sss.h b/lte/phy/include/liblte/phy/sync/sss.h similarity index 97% rename from lte/include/lte/sync/sss.h rename to lte/phy/include/liblte/phy/sync/sss.h index 54e7adb50..ce5b502ec 100644 --- a/lte/include/lte/sync/sss.h +++ b/lte/phy/include/liblte/phy/sync/sss.h @@ -32,9 +32,9 @@ #include #include -#include "lte/config.h" -#include "lte/common/base.h" -#include "lte/utils/dft.h" +#include "liblte/config.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/dft.h" typedef _Complex float cf_t; /* this is only a shortcut */ diff --git a/lte/include/lte/sync/sync.h b/lte/phy/include/liblte/phy/sync/sync.h similarity index 99% rename from lte/include/lte/sync/sync.h rename to lte/phy/include/liblte/phy/sync/sync.h index 972ffa5ae..b1602a117 100644 --- a/lte/include/lte/sync/sync.h +++ b/lte/phy/include/liblte/phy/sync/sync.h @@ -31,7 +31,7 @@ #include -#include "lte/config.h" +#include "liblte/config.h" #include "pss.h" #include "sss.h" #include "sfo.h" diff --git a/lte/include/lte/utils/bit.h b/lte/phy/include/liblte/phy/utils/bit.h similarity index 97% rename from lte/include/lte/utils/bit.h rename to lte/phy/include/liblte/phy/utils/bit.h index 94099f25f..7256b6d09 100644 --- a/lte/include/lte/utils/bit.h +++ b/lte/phy/include/liblte/phy/utils/bit.h @@ -32,7 +32,7 @@ #include #include -#include "lte/config.h" +#include "liblte/config.h" LIBLTE_API uint32_t bit_unpack(char **bits, int nof_bits); LIBLTE_API void bit_pack(uint32_t value, char **bits, int nof_bits); diff --git a/lte/include/lte/utils/cexptab.h b/lte/phy/include/liblte/phy/utils/cexptab.h similarity index 98% rename from lte/include/lte/utils/cexptab.h rename to lte/phy/include/liblte/phy/utils/cexptab.h index 647a89587..058ea81c4 100644 --- a/lte/include/lte/utils/cexptab.h +++ b/lte/phy/include/liblte/phy/utils/cexptab.h @@ -30,7 +30,7 @@ #define CEXPTAB_ #include -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/utils/convolution.h b/lte/phy/include/liblte/phy/utils/convolution.h similarity index 96% rename from lte/include/lte/utils/convolution.h rename to lte/phy/include/liblte/phy/utils/convolution.h index 3b32e5c72..99c058f02 100644 --- a/lte/include/lte/utils/convolution.h +++ b/lte/phy/include/liblte/phy/utils/convolution.h @@ -29,8 +29,8 @@ #ifndef CONVOLUTION_H_ #define CONVOLUTION_H_ -#include "lte/config.h" -#include "lte/utils/dft.h" +#include "liblte/config.h" +#include "liblte/phy/utils/dft.h" typedef struct LIBLTE_API { _Complex float *input_fft; diff --git a/lte/include/lte/utils/debug.h b/lte/phy/include/liblte/phy/utils/debug.h similarity index 98% rename from lte/include/lte/utils/debug.h rename to lte/phy/include/liblte/phy/utils/debug.h index 8eb2bb34a..06b03079c 100644 --- a/lte/include/lte/utils/debug.h +++ b/lte/phy/include/liblte/phy/utils/debug.h @@ -29,7 +29,7 @@ #define DEBUG_H #include -#include "lte/config.h" +#include "liblte/config.h" #define VERBOSE_DEBUG 2 #define VERBOSE_INFO 1 diff --git a/lte/include/lte/utils/dft.h b/lte/phy/include/liblte/phy/utils/dft.h similarity index 99% rename from lte/include/lte/utils/dft.h rename to lte/phy/include/liblte/phy/utils/dft.h index 15072e6f2..17503bfc3 100644 --- a/lte/include/lte/utils/dft.h +++ b/lte/phy/include/liblte/phy/utils/dft.h @@ -30,7 +30,7 @@ #define DFT_H_ #include -#include "lte/config.h" +#include "liblte/config.h" /* dft is a frontend to the fftw3 library. It facilitates the computation of diff --git a/lte/include/lte/utils/matrix.h b/lte/phy/include/liblte/phy/utils/matrix.h similarity index 98% rename from lte/include/lte/utils/matrix.h rename to lte/phy/include/liblte/phy/utils/matrix.h index 0d8baa266..b128e70a5 100644 --- a/lte/include/lte/utils/matrix.h +++ b/lte/phy/include/liblte/phy/utils/matrix.h @@ -29,7 +29,7 @@ #define MATRIX_ #include -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/include/lte/utils/mux.h b/lte/phy/include/liblte/phy/utils/mux.h similarity index 97% rename from lte/include/lte/utils/mux.h rename to lte/phy/include/liblte/phy/utils/mux.h index 0e5d238ec..a1fc54824 100644 --- a/lte/include/lte/utils/mux.h +++ b/lte/phy/include/liblte/phy/utils/mux.h @@ -28,7 +28,7 @@ #ifndef MUX_ #define MUX_ -#include "lte/config.h" +#include "liblte/config.h" LIBLTE_API void mux(void **input, void *output, int *input_lengths, int *input_padding_pre, int nof_inputs, int sample_sz); diff --git a/lte/include/lte/utils/pack.h b/lte/phy/include/liblte/phy/utils/pack.h similarity index 97% rename from lte/include/lte/utils/pack.h rename to lte/phy/include/liblte/phy/utils/pack.h index 50193a145..cae0be966 100644 --- a/lte/include/lte/utils/pack.h +++ b/lte/phy/include/liblte/phy/utils/pack.h @@ -29,7 +29,7 @@ #ifndef PACK_ #define PACK_ -#include "lte/config.h" +#include "liblte/config.h" LIBLTE_API unsigned int unpack_bits(char **bits, int nof_bits); LIBLTE_API void pack_bits(unsigned int value, char **bits, int nof_bits); diff --git a/lte/include/lte/utils/vector.h b/lte/phy/include/liblte/phy/utils/vector.h similarity index 98% rename from lte/include/lte/utils/vector.h rename to lte/phy/include/liblte/phy/utils/vector.h index fb983cc33..4456f8036 100644 --- a/lte/include/lte/utils/vector.h +++ b/lte/phy/include/liblte/phy/utils/vector.h @@ -30,7 +30,7 @@ #define VECTOR_ #include -#include "lte/config.h" +#include "liblte/config.h" typedef _Complex float cf_t; diff --git a/lte/lib/CMakeLists.txt b/lte/phy/lib/CMakeLists.txt similarity index 89% rename from lte/lib/CMakeLists.txt rename to lte/phy/lib/CMakeLists.txt index 634f0fa13..ec06db805 100644 --- a/lte/lib/CMakeLists.txt +++ b/lte/phy/lib/CMakeLists.txt @@ -41,7 +41,6 @@ ENDIF(${DISABLE_VOLK}) ######################################################################## # Recurse subdirectories and compile all source files into the same lib ######################################################################## - FILE(GLOB modules *) SET(SOURCES_ALL "") FOREACH (_module ${modules}) @@ -51,15 +50,15 @@ FOREACH (_module ${modules}) ENDIF(IS_DIRECTORY ${_module}) ENDFOREACH() -ADD_LIBRARY(lte SHARED ${SOURCES_ALL}) -TARGET_LINK_LIBRARIES(lte m ${FFTW3F_LIBRARIES}) -INSTALL(TARGETS lte DESTINATION ${LIBRARY_DIR}) -LIBLTE_SET_PIC(lte) +ADD_LIBRARY(lte_phy SHARED ${SOURCES_ALL}) +TARGET_LINK_LIBRARIES(lte_phy m ${FFTW3F_LIBRARIES}) +INSTALL(TARGETS lte_phy DESTINATION ${LIBRARY_DIR}) +LIBLTE_SET_PIC(lte_phy) IF(VOLK_FOUND) INCLUDE_DIRECTORIES(${VOLK_INCLUDE_DIRS}) - SET_TARGET_PROPERTIES(lte PROPERTIES COMPILE_DEFINITIONS "${VOLK_DEFINITIONS}") - TARGET_LINK_LIBRARIES(lte ${VOLK_LIBRARIES}) + SET_TARGET_PROPERTIES(lte_phy PROPERTIES COMPILE_DEFINITIONS "${VOLK_DEFINITIONS}") + TARGET_LINK_LIBRARIES(lte_phy ${VOLK_LIBRARIES}) MESSAGE(STATUS " Compiling with VOLK SIMD library.") ELSE(VOLK_FOUND) MESSAGE(STATUS " VOLK SIMD library NOT found. Using generic implementation.") @@ -69,7 +68,6 @@ ENDIF(VOLK_FOUND) ######################################################################## # Recurse subdirectories and find all directories with a CMakeLists.txt file in it ######################################################################## - FILE(GLOB_RECURSE cmakefiles CMakeLists.txt) FOREACH (_file ${cmakefiles}) GET_FILENAME_COMPONENT(dir ${_file} PATH) diff --git a/lte/lib/ch_estimation/src/chest.c b/lte/phy/lib/ch_estimation/src/chest.c similarity index 98% rename from lte/lib/ch_estimation/src/chest.c rename to lte/phy/lib/ch_estimation/src/chest.c index cc1e53a26..a953153d9 100644 --- a/lte/lib/ch_estimation/src/chest.c +++ b/lte/phy/lib/ch_estimation/src/chest.c @@ -32,10 +32,10 @@ #include #include -#include "lte/ch_estimation/chest.h" -#include "lte/resampling/interp.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/ch_estimation/chest.h" +#include "liblte/phy/resampling/interp.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" #define SLOT_SZ(q) (q->nof_symbols * q->symbol_sz) #define SF_SZ(q) (2 * SLOT_SZ(q)) diff --git a/lte/lib/ch_estimation/src/refsignal.c b/lte/phy/lib/ch_estimation/src/refsignal.c similarity index 95% rename from lte/lib/ch_estimation/src/refsignal.c rename to lte/phy/lib/ch_estimation/src/refsignal.c index 46651819f..ff4e91181 100644 --- a/lte/lib/ch_estimation/src/refsignal.c +++ b/lte/phy/lib/ch_estimation/src/refsignal.c @@ -32,11 +32,11 @@ #include #include -#include "lte/common/base.h" -#include "lte/ch_estimation/refsignal.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" -#include "lte/common/sequence.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/ch_estimation/refsignal.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" +#include "liblte/phy/common/sequence.h" #define idx(x, y) (l*nof_refs_x_symbol+i) diff --git a/lte/lib/ch_estimation/test/CMakeLists.txt b/lte/phy/lib/ch_estimation/test/CMakeLists.txt similarity index 96% rename from lte/lib/ch_estimation/test/CMakeLists.txt rename to lte/phy/lib/ch_estimation/test/CMakeLists.txt index 9f4be5ea8..8ac180007 100644 --- a/lte/lib/ch_estimation/test/CMakeLists.txt +++ b/lte/phy/lib/ch_estimation/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(chest_test chest_test.c) -TARGET_LINK_LIBRARIES(chest_test lte) +TARGET_LINK_LIBRARIES(chest_test lte_phy) ADD_TEST(chest_test_all_cellids chest_test) ADD_TEST(chest_test_cellid chest_test -c 1) diff --git a/lte/lib/ch_estimation/test/chest_test.c b/lte/phy/lib/ch_estimation/test/chest_test.c similarity index 99% rename from lte/lib/ch_estimation/test/chest_test.c rename to lte/phy/lib/ch_estimation/test/chest_test.c index fd97399fe..5f5d6647e 100644 --- a/lte/lib/ch_estimation/test/chest_test.c +++ b/lte/phy/lib/ch_estimation/test/chest_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int cell_id = -1; int nof_prb = 6; diff --git a/lte/lib/channel/src/ch_awgn.c b/lte/phy/lib/channel/src/ch_awgn.c similarity index 97% rename from lte/lib/channel/src/ch_awgn.c rename to lte/phy/lib/channel/src/ch_awgn.c index 087215ea0..54a70b482 100644 --- a/lte/lib/channel/src/ch_awgn.c +++ b/lte/phy/lib/channel/src/ch_awgn.c @@ -31,7 +31,7 @@ #include #include "gauss.h" -#include "lte/channel/ch_awgn.h" +#include "liblte/phy/channel/ch_awgn.h" void ch_awgn_c(const cf_t* x, cf_t* y, float variance, int buff_sz) { _Complex float tmp; diff --git a/lte/lib/channel/src/gauss.c b/lte/phy/lib/channel/src/gauss.c similarity index 100% rename from lte/lib/channel/src/gauss.c rename to lte/phy/lib/channel/src/gauss.c diff --git a/lte/lib/channel/src/gauss.h b/lte/phy/lib/channel/src/gauss.h similarity index 100% rename from lte/lib/channel/src/gauss.h rename to lte/phy/lib/channel/src/gauss.h diff --git a/lte/lib/common/src/fft.c b/lte/phy/lib/common/src/fft.c similarity index 95% rename from lte/lib/common/src/fft.c rename to lte/phy/lib/common/src/fft.c index 77916f54b..7057f4240 100644 --- a/lte/lib/common/src/fft.c +++ b/lte/phy/lib/common/src/fft.c @@ -29,11 +29,11 @@ #include #include -#include "lte/common/base.h" -#include "lte/utils/dft.h" -#include "lte/common/fft.h" -#include "lte/utils/debug.h" -#include "lte/utils/vector.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/dft.h" +#include "liblte/phy/common/fft.h" +#include "liblte/phy/utils/debug.h" +#include "liblte/phy/utils/vector.h" int lte_fft_init_(lte_fft_t *q, lte_cp_t cp_type, int nof_prb, dft_dir_t dir) { int symbol_sz = lte_symbol_sz(nof_prb); diff --git a/lte/lib/common/src/lte.c b/lte/phy/lib/common/src/lte.c similarity index 99% rename from lte/lib/common/src/lte.c rename to lte/phy/lib/common/src/lte.c index 909359c80..92ae3a2a5 100644 --- a/lte/lib/common/src/lte.c +++ b/lte/phy/lib/common/src/lte.c @@ -32,7 +32,7 @@ #include #include -#include "lte/common/base.h" +#include "liblte/phy/common/base.h" const int tc_cb_sizes[NOF_TC_CB_SIZES] = { 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120, 128, 136, 144, 152, 160, 168, 176, 184, 192, 200, 208, 216, 224, 232, diff --git a/lte/lib/common/src/sequence.c b/lte/phy/lib/common/src/sequence.c similarity index 98% rename from lte/lib/common/src/sequence.c rename to lte/phy/lib/common/src/sequence.c index 87dbbf4be..a659b0562 100644 --- a/lte/lib/common/src/sequence.c +++ b/lte/phy/lib/common/src/sequence.c @@ -26,7 +26,7 @@ */ -#include "lte/common/sequence.h" +#include "liblte/phy/common/sequence.h" #include #include diff --git a/lte/lib/common/test/CMakeLists.txt b/lte/phy/lib/common/test/CMakeLists.txt similarity index 96% rename from lte/lib/common/test/CMakeLists.txt rename to lte/phy/lib/common/test/CMakeLists.txt index 18ed7f8fb..dc4bcfe8e 100644 --- a/lte/lib/common/test/CMakeLists.txt +++ b/lte/phy/lib/common/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(fft_test fft_test.c) -TARGET_LINK_LIBRARIES(fft_test lte) +TARGET_LINK_LIBRARIES(fft_test lte_phy) ADD_TEST(fft_normal fft_test) ADD_TEST(fft_extended fft_test -e) diff --git a/lte/lib/common/test/fft_test.c b/lte/phy/lib/common/test/fft_test.c similarity index 99% rename from lte/lib/common/test/fft_test.c rename to lte/phy/lib/common/test/fft_test.c index 2b3c1188c..0a12cffd1 100644 --- a/lte/lib/common/test/fft_test.c +++ b/lte/phy/lib/common/test/fft_test.c @@ -32,7 +32,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int nof_prb = -1; lte_cp_t cp = CPNORM; diff --git a/lte/lib/fec/src/convcoder.c b/lte/phy/lib/fec/src/convcoder.c similarity index 98% rename from lte/lib/fec/src/convcoder.c rename to lte/phy/lib/fec/src/convcoder.c index 97a3b157e..c20121d5c 100644 --- a/lte/lib/fec/src/convcoder.c +++ b/lte/phy/lib/fec/src/convcoder.c @@ -30,7 +30,7 @@ #include #include -#include "lte/fec/convcoder.h" +#include "liblte/phy/fec/convcoder.h" #include "parity.h" int convcoder_encode(convcoder_t *q, char *input, char *output, int frame_length) { diff --git a/lte/lib/fec/src/crc.c b/lte/phy/lib/fec/src/crc.c similarity index 98% rename from lte/lib/fec/src/crc.c rename to lte/phy/lib/fec/src/crc.c index f64325b75..00f74785c 100644 --- a/lte/lib/fec/src/crc.c +++ b/lte/phy/lib/fec/src/crc.c @@ -29,8 +29,8 @@ #include #include -#include "lte/utils/pack.h" -#include "lte/fec/crc.h" +#include "liblte/phy/utils/pack.h" +#include "liblte/phy/fec/crc.h" void gen_crc_table(crc_t *h) { diff --git a/lte/lib/fec/src/parity.h b/lte/phy/lib/fec/src/parity.h similarity index 100% rename from lte/lib/fec/src/parity.h rename to lte/phy/lib/fec/src/parity.h diff --git a/lte/lib/fec/src/rm_conv.c b/lte/phy/lib/fec/src/rm_conv.c similarity index 99% rename from lte/lib/fec/src/rm_conv.c rename to lte/phy/lib/fec/src/rm_conv.c index 2e8a2653e..2b9a3ad46 100644 --- a/lte/lib/fec/src/rm_conv.c +++ b/lte/phy/lib/fec/src/rm_conv.c @@ -28,7 +28,7 @@ #include #include -#include "lte/fec/rm_conv.h" +#include "liblte/phy/fec/rm_conv.h" #define NCOLS 32 #define NROWS_MAX NCOLS diff --git a/lte/lib/fec/src/rm_turbo.c b/lte/phy/lib/fec/src/rm_turbo.c similarity index 99% rename from lte/lib/fec/src/rm_turbo.c rename to lte/phy/lib/fec/src/rm_turbo.c index 5c7acd792..5e78e67ba 100644 --- a/lte/lib/fec/src/rm_turbo.c +++ b/lte/phy/lib/fec/src/rm_turbo.c @@ -31,7 +31,7 @@ #include #include -#include "lte/fec/rm_turbo.h" +#include "liblte/phy/fec/rm_turbo.h" #define NCOLS 32 #define NROWS_MAX NCOLS diff --git a/lte/lib/fec/src/tc_interl_lte.c b/lte/phy/lib/fec/src/tc_interl_lte.c similarity index 93% rename from lte/lib/fec/src/tc_interl_lte.c rename to lte/phy/lib/fec/src/tc_interl_lte.c index bfaf4232c..e5b6c3985 100644 --- a/lte/lib/fec/src/tc_interl_lte.c +++ b/lte/phy/lib/fec/src/tc_interl_lte.c @@ -28,10 +28,10 @@ #include #include -#include "lte/common/base.h" -#include "lte/fec/tc_interl.h" -#include "lte/fec/turbocoder.h" -#include "lte/utils/debug.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/fec/tc_interl.h" +#include "liblte/phy/fec/turbocoder.h" +#include "liblte/phy/utils/debug.h" /************************************************ * diff --git a/lte/lib/fec/src/tc_interl_umts.c b/lte/phy/lib/fec/src/tc_interl_umts.c similarity index 94% rename from lte/lib/fec/src/tc_interl_umts.c rename to lte/phy/lib/fec/src/tc_interl_umts.c index 635afd761..590eeaa7c 100644 --- a/lte/lib/fec/src/tc_interl_umts.c +++ b/lte/phy/lib/fec/src/tc_interl_umts.c @@ -28,8 +28,8 @@ #include #include -#include "lte/fec/tc_interl.h" -#include "lte/fec/turbocoder.h" +#include "liblte/phy/fec/tc_interl.h" +#include "liblte/phy/fec/turbocoder.h" #define TURBO_RATE 3 diff --git a/lte/lib/fec/src/turbocoder.c b/lte/phy/lib/fec/src/turbocoder.c similarity index 91% rename from lte/lib/fec/src/turbocoder.c rename to lte/phy/lib/fec/src/turbocoder.c index 509cef252..72ab6d5d0 100644 --- a/lte/lib/fec/src/turbocoder.c +++ b/lte/phy/lib/fec/src/turbocoder.c @@ -26,8 +26,8 @@ */ -#include "lte/fec/tc_interl.h" -#include "lte/fec/turbocoder.h" +#include "liblte/phy/fec/tc_interl.h" +#include "liblte/phy/fec/turbocoder.h" #define NOF_REGS 3 diff --git a/lte/lib/fec/src/turbodecoder.c b/lte/phy/lib/fec/src/turbodecoder.c similarity index 94% rename from lte/lib/fec/src/turbodecoder.c rename to lte/phy/lib/fec/src/turbodecoder.c index e0c696336..24d5aaa69 100644 --- a/lte/lib/fec/src/turbodecoder.c +++ b/lte/phy/lib/fec/src/turbodecoder.c @@ -3,8 +3,8 @@ #include #include -#include "lte/fec/tc_interl.h" -#include "lte/fec/turbodecoder.h" +#include "liblte/phy/fec/tc_interl.h" +#include "liblte/phy/fec/turbodecoder.h" /************************************************ * diff --git a/lte/lib/fec/src/viterbi.c b/lte/phy/lib/fec/src/viterbi.c similarity index 98% rename from lte/lib/fec/src/viterbi.c rename to lte/phy/lib/fec/src/viterbi.c index dc47923c6..4b79ea983 100644 --- a/lte/lib/fec/src/viterbi.c +++ b/lte/phy/lib/fec/src/viterbi.c @@ -30,8 +30,8 @@ #include #include -#include "lte/utils/vector.h" -#include "lte/fec/viterbi.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/fec/viterbi.h" #include "parity.h" #include "viterbi37.h" #include "viterbi39.h" diff --git a/lte/lib/fec/src/viterbi37.h b/lte/phy/lib/fec/src/viterbi37.h similarity index 100% rename from lte/lib/fec/src/viterbi37.h rename to lte/phy/lib/fec/src/viterbi37.h diff --git a/lte/lib/fec/src/viterbi37_port.c b/lte/phy/lib/fec/src/viterbi37_port.c similarity index 100% rename from lte/lib/fec/src/viterbi37_port.c rename to lte/phy/lib/fec/src/viterbi37_port.c diff --git a/lte/lib/fec/src/viterbi39.h b/lte/phy/lib/fec/src/viterbi39.h similarity index 100% rename from lte/lib/fec/src/viterbi39.h rename to lte/phy/lib/fec/src/viterbi39.h diff --git a/lte/lib/fec/src/viterbi39_port.c b/lte/phy/lib/fec/src/viterbi39_port.c similarity index 100% rename from lte/lib/fec/src/viterbi39_port.c rename to lte/phy/lib/fec/src/viterbi39_port.c diff --git a/lte/lib/fec/test/CMakeLists.txt b/lte/phy/lib/fec/test/CMakeLists.txt similarity index 93% rename from lte/lib/fec/test/CMakeLists.txt rename to lte/phy/lib/fec/test/CMakeLists.txt index 1d0cc28bb..f5e0a817c 100644 --- a/lte/lib/fec/test/CMakeLists.txt +++ b/lte/phy/lib/fec/test/CMakeLists.txt @@ -25,10 +25,10 @@ ######################################################################## ADD_EXECUTABLE(rm_conv_test rm_conv_test.c) -TARGET_LINK_LIBRARIES(rm_conv_test lte) +TARGET_LINK_LIBRARIES(rm_conv_test lte_phy) ADD_EXECUTABLE(rm_turbo_test rm_turbo_test.c) -TARGET_LINK_LIBRARIES(rm_turbo_test lte) +TARGET_LINK_LIBRARIES(rm_turbo_test lte_phy) ADD_TEST(rm_conv_test_1 rm_conv_test -t 480 -r 1920) ADD_TEST(rm_conv_test_2 rm_conv_test -t 1920 -r 480) @@ -38,7 +38,7 @@ ADD_TEST(rm_conv_test_2 rm_conv_test -t 1920 -r 480) # Turbo Coder TEST ######################################################################## ADD_EXECUTABLE(turbocoder_test turbocoder_test.c) -TARGET_LINK_LIBRARIES(turbocoder_test lte) +TARGET_LINK_LIBRARIES(turbocoder_test lte_phy) ADD_TEST(turbocoder_test_504_1 turbocoder_test -n 100 -s 1 -l 504 -e 1.0 -t) ADD_TEST(turbocoder_test_504_2 turbocoder_test -n 100 -s 1 -l 504 -e 2.0 -t) @@ -50,7 +50,7 @@ ADD_TEST(turbocoder_test_known turbocoder_test -n 1 -s 1 -k -e 0.5) ######################################################################## ADD_EXECUTABLE(viterbi_test viterbi_test.c) -TARGET_LINK_LIBRARIES(viterbi_test lte) +TARGET_LINK_LIBRARIES(viterbi_test lte_phy) ADD_TEST(viterbi_40_0 viterbi_test -n 1000 -s 1 -l 40 -k 7 -t -e 0.0) ADD_TEST(viterbi_40_2 viterbi_test -n 1000 -s 1 -l 40 -k 7 -t -e 2.0) @@ -67,7 +67,7 @@ ADD_TEST(viterbi_1000_4 viterbi_test -n 100 -s 1 -l 1000 -k 7 -t -e 4.5) ######################################################################## ADD_EXECUTABLE(crc_test crc_test.c) -TARGET_LINK_LIBRARIES(crc_test lte) +TARGET_LINK_LIBRARIES(crc_test lte_phy) ADD_TEST(crc_24A crc_test -n 5001 -l 24 -p 0x1864CFB -s 1) ADD_TEST(crc_24B crc_test -n 5001 -l 24 -p 0x1800063 -s 1) diff --git a/lte/lib/fec/test/crc_test.c b/lte/phy/lib/fec/test/crc_test.c similarity index 99% rename from lte/lib/fec/test/crc_test.c rename to lte/phy/lib/fec/test/crc_test.c index e1244f59f..476bad1b3 100644 --- a/lte/lib/fec/test/crc_test.c +++ b/lte/phy/lib/fec/test/crc_test.c @@ -33,7 +33,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #include "crc_test.h" int num_bits = 5001, crc_length = 24; diff --git a/lte/lib/fec/test/crc_test.h b/lte/phy/lib/fec/test/crc_test.h similarity index 98% rename from lte/lib/fec/test/crc_test.h rename to lte/phy/lib/fec/test/crc_test.h index 6968b07b0..152e77e5c 100644 --- a/lte/lib/fec/test/crc_test.h +++ b/lte/phy/lib/fec/test/crc_test.h @@ -27,7 +27,7 @@ #include -#include "lte/fec/crc.h" +#include "liblte/phy/fec/crc.h" typedef struct { int n; diff --git a/lte/lib/fec/test/rm_conv_test.c b/lte/phy/lib/fec/test/rm_conv_test.c similarity index 99% rename from lte/lib/fec/test/rm_conv_test.c rename to lte/phy/lib/fec/test/rm_conv_test.c index 7c0be9e0e..84910527b 100644 --- a/lte/lib/fec/test/rm_conv_test.c +++ b/lte/phy/lib/fec/test/rm_conv_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int nof_tx_bits=-1, nof_rx_bits=-1; diff --git a/lte/lib/fec/test/rm_turbo_test.c b/lte/phy/lib/fec/test/rm_turbo_test.c similarity index 99% rename from lte/lib/fec/test/rm_turbo_test.c rename to lte/phy/lib/fec/test/rm_turbo_test.c index f76109f68..6b61a1e6e 100644 --- a/lte/lib/fec/test/rm_turbo_test.c +++ b/lte/phy/lib/fec/test/rm_turbo_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int nof_tx_bits=-1, nof_rx_bits=-1; int rv_idx = 0; diff --git a/lte/lib/fec/test/turbocoder_test.c b/lte/phy/lib/fec/test/turbocoder_test.c similarity index 99% rename from lte/lib/fec/test/turbocoder_test.c rename to lte/phy/lib/fec/test/turbocoder_test.c index d7bcdae3e..85eb03abf 100644 --- a/lte/lib/fec/test/turbocoder_test.c +++ b/lte/phy/lib/fec/test/turbocoder_test.c @@ -35,7 +35,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #include "turbocoder_test.h" diff --git a/lte/lib/fec/test/turbocoder_test.h b/lte/phy/lib/fec/test/turbocoder_test.h similarity index 100% rename from lte/lib/fec/test/turbocoder_test.h rename to lte/phy/lib/fec/test/turbocoder_test.h diff --git a/lte/lib/fec/test/viterbi_test.c b/lte/phy/lib/fec/test/viterbi_test.c similarity index 99% rename from lte/lib/fec/test/viterbi_test.c rename to lte/phy/lib/fec/test/viterbi_test.c index 1ca2e7443..7354e3c28 100644 --- a/lte/lib/fec/test/viterbi_test.c +++ b/lte/phy/lib/fec/test/viterbi_test.c @@ -33,7 +33,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #include "viterbi_test.h" diff --git a/lte/lib/fec/test/viterbi_test.h b/lte/phy/lib/fec/test/viterbi_test.h similarity index 100% rename from lte/lib/fec/test/viterbi_test.h rename to lte/phy/lib/fec/test/viterbi_test.h diff --git a/lte/lib/filter/src/filter2d.c b/lte/phy/lib/filter/src/filter2d.c similarity index 95% rename from lte/lib/filter/src/filter2d.c rename to lte/phy/lib/filter/src/filter2d.c index 6b3cc0213..26e1af259 100644 --- a/lte/lib/filter/src/filter2d.c +++ b/lte/phy/lib/filter/src/filter2d.c @@ -30,12 +30,12 @@ #include #include -#include "lte/utils/debug.h" +#include "liblte/phy/utils/debug.h" -#include "lte/filter/filter2d.h" -#include "lte/utils/matrix.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/filter/filter2d.h" +#include "liblte/phy/utils/matrix.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" /* Useful macros */ #define intceil(X, Y) ((X-1)/Y+1) diff --git a/lte/lib/io/src/binsource.c b/lte/phy/lib/io/src/binsource.c similarity index 98% rename from lte/lib/io/src/binsource.c rename to lte/phy/lib/io/src/binsource.c index bf8fea741..962cd3c04 100644 --- a/lte/lib/io/src/binsource.c +++ b/lte/phy/lib/io/src/binsource.c @@ -30,8 +30,8 @@ #include #include -#include "lte/io/binsource.h" -#include "lte/utils/bit.h" +#include "liblte/phy/io/binsource.h" +#include "liblte/phy/utils/bit.h" #define DIV(a,b) ((a-1)/b+1) diff --git a/lte/lib/io/src/filesink.c b/lte/phy/lib/io/src/filesink.c similarity index 98% rename from lte/lib/io/src/filesink.c rename to lte/phy/lib/io/src/filesink.c index 1eddd78c2..f68bff002 100644 --- a/lte/lib/io/src/filesink.c +++ b/lte/phy/lib/io/src/filesink.c @@ -32,7 +32,7 @@ #include -#include "lte/io/filesink.h" +#include "liblte/phy/io/filesink.h" int filesink_init(filesink_t *q, char *filename, data_type_t type) { bzero(q, sizeof(filesink_t)); diff --git a/lte/lib/io/src/filesource.c b/lte/phy/lib/io/src/filesource.c similarity index 98% rename from lte/lib/io/src/filesource.c rename to lte/phy/lib/io/src/filesource.c index 3e789d4fe..72e8c2cd1 100644 --- a/lte/lib/io/src/filesource.c +++ b/lte/phy/lib/io/src/filesource.c @@ -30,7 +30,7 @@ #include #include -#include "lte/io/filesource.h" +#include "liblte/phy/io/filesource.h" int filesource_init(filesource_t *q, char *filename, data_type_t type) { bzero(q, sizeof(filesource_t)); diff --git a/lte/lib/io/src/udpsink.c b/lte/phy/lib/io/src/udpsink.c similarity index 98% rename from lte/lib/io/src/udpsink.c rename to lte/phy/lib/io/src/udpsink.c index d2d59daa7..5a5890741 100644 --- a/lte/lib/io/src/udpsink.c +++ b/lte/phy/lib/io/src/udpsink.c @@ -35,7 +35,7 @@ #include -#include "lte/io/udpsink.h" +#include "liblte/phy/io/udpsink.h" int udpsink_init(udpsink_t *q, char *address, int port, data_type_t type) { bzero(q, sizeof(udpsink_t)); diff --git a/lte/lib/io/src/udpsource.c b/lte/phy/lib/io/src/udpsource.c similarity index 98% rename from lte/lib/io/src/udpsource.c rename to lte/phy/lib/io/src/udpsource.c index 2a3bc2344..a6a39d2ac 100644 --- a/lte/lib/io/src/udpsource.c +++ b/lte/phy/lib/io/src/udpsource.c @@ -33,7 +33,7 @@ #include #include -#include "lte/io/udpsource.h" +#include "liblte/phy/io/udpsource.h" int udpsource_init(udpsource_t *q, char *address, int port, data_type_t type) { bzero(q, sizeof(udpsource_t)); diff --git a/lte/lib/mimo/src/layermap.c b/lte/phy/lib/mimo/src/layermap.c similarity index 98% rename from lte/lib/mimo/src/layermap.c rename to lte/phy/lib/mimo/src/layermap.c index 316c8fe79..9ec0b81a3 100644 --- a/lte/lib/mimo/src/layermap.c +++ b/lte/phy/lib/mimo/src/layermap.c @@ -30,8 +30,8 @@ #include #include -#include "lte/common/base.h" -#include "lte/mimo/layermap.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/mimo/layermap.h" diff --git a/lte/lib/mimo/src/precoding.c b/lte/phy/lib/mimo/src/precoding.c similarity index 98% rename from lte/lib/mimo/src/precoding.c rename to lte/phy/lib/mimo/src/precoding.c index f6ed753aa..26f47bd2b 100644 --- a/lte/lib/mimo/src/precoding.c +++ b/lte/phy/lib/mimo/src/precoding.c @@ -33,9 +33,9 @@ #include #include -#include "lte/common/base.h" -#include "lte/mimo/precoding.h" -#include "lte/utils/vector.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/mimo/precoding.h" +#include "liblte/phy/utils/vector.h" int precoding_single(cf_t *x, cf_t *y, int nof_symbols) { memcpy(y, x, nof_symbols * sizeof(cf_t)); diff --git a/lte/lib/mimo/test/CMakeLists.txt b/lte/phy/lib/mimo/test/CMakeLists.txt similarity index 96% rename from lte/lib/mimo/test/CMakeLists.txt rename to lte/phy/lib/mimo/test/CMakeLists.txt index 48f9e0353..fab534951 100644 --- a/lte/lib/mimo/test/CMakeLists.txt +++ b/lte/phy/lib/mimo/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(layermap_test layermap_test.c) -TARGET_LINK_LIBRARIES(layermap_test lte) +TARGET_LINK_LIBRARIES(layermap_test lte_phy) ADD_TEST(layermap_single layermap_test -n 1000 -m single -c 1 -l 1) @@ -55,7 +55,7 @@ ADD_TEST(layermap_multiplex_28 layermap_test -n 1000 -m multiplex -c 2 -l 8) ######################################################################## ADD_EXECUTABLE(precoding_test precoding_test.c) -TARGET_LINK_LIBRARIES(precoding_test lte) +TARGET_LINK_LIBRARIES(precoding_test lte_phy) ADD_TEST(precoding_single precoding_test -n 1000 -m single) ADD_TEST(precoding_diversity2 precoding_test -n 1000 -m diversity -l 2 -p 2) diff --git a/lte/lib/mimo/test/layermap_test.c b/lte/phy/lib/mimo/test/layermap_test.c similarity index 99% rename from lte/lib/mimo/test/layermap_test.c rename to lte/phy/lib/mimo/test/layermap_test.c index cb85765ed..61cd5b8c8 100644 --- a/lte/lib/mimo/test/layermap_test.c +++ b/lte/phy/lib/mimo/test/layermap_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int nof_symbols = 1000; int nof_cw = 1, nof_layers = 1; diff --git a/lte/lib/mimo/test/precoding_test.c b/lte/phy/lib/mimo/test/precoding_test.c similarity index 99% rename from lte/lib/mimo/test/precoding_test.c rename to lte/phy/lib/mimo/test/precoding_test.c index 67d8dcdf2..f2b411a3a 100644 --- a/lte/lib/mimo/test/precoding_test.c +++ b/lte/phy/lib/mimo/test/precoding_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #define MSE_THRESHOLD 0.00001 diff --git a/lte/lib/modem/src/demod_hard.c b/lte/phy/lib/modem/src/demod_hard.c similarity index 98% rename from lte/lib/modem/src/demod_hard.c rename to lte/phy/lib/modem/src/demod_hard.c index e341e47d7..7664821a8 100644 --- a/lte/lib/modem/src/demod_hard.c +++ b/lte/phy/lib/modem/src/demod_hard.c @@ -29,7 +29,7 @@ #include #include -#include "lte/modem/demod_hard.h" +#include "liblte/phy/modem/demod_hard.h" #include "hard_demod_lte.h" diff --git a/lte/lib/modem/src/demod_soft.c b/lte/phy/lib/modem/src/demod_soft.c similarity index 97% rename from lte/lib/modem/src/demod_soft.c rename to lte/phy/lib/modem/src/demod_soft.c index 1aaf81227..2c874a1af 100644 --- a/lte/lib/modem/src/demod_soft.c +++ b/lte/phy/lib/modem/src/demod_soft.c @@ -29,8 +29,8 @@ #include #include -#include "lte/utils/bit.h" -#include "lte/modem/demod_soft.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/modem/demod_soft.h" #include "soft_algs.h" diff --git a/lte/lib/modem/src/hard_demod_lte.c b/lte/phy/lib/modem/src/hard_demod_lte.c similarity index 99% rename from lte/lib/modem/src/hard_demod_lte.c rename to lte/phy/lib/modem/src/hard_demod_lte.c index a6c07d264..761c72140 100644 --- a/lte/lib/modem/src/hard_demod_lte.c +++ b/lte/phy/lib/modem/src/hard_demod_lte.c @@ -30,7 +30,7 @@ #include #include -#include "lte/modem/demod_hard.h" +#include "liblte/phy/modem/demod_hard.h" #include "hard_demod_lte.h" /** diff --git a/lte/lib/modem/src/hard_demod_lte.h b/lte/phy/lib/modem/src/hard_demod_lte.h similarity index 100% rename from lte/lib/modem/src/hard_demod_lte.h rename to lte/phy/lib/modem/src/hard_demod_lte.h diff --git a/lte/lib/modem/src/lte_tables.c b/lte/phy/lib/modem/src/lte_tables.c similarity index 99% rename from lte/lib/modem/src/lte_tables.c rename to lte/phy/lib/modem/src/lte_tables.c index 7d65f4df5..020b59913 100644 --- a/lte/lib/modem/src/lte_tables.c +++ b/lte/phy/lib/modem/src/lte_tables.c @@ -31,7 +31,7 @@ #include #include -#include "lte/modem/modem_table.h" +#include "liblte/phy/modem/modem_table.h" #include "lte_tables.h" /** diff --git a/lte/lib/modem/src/lte_tables.h b/lte/phy/lib/modem/src/lte_tables.h similarity index 100% rename from lte/lib/modem/src/lte_tables.h rename to lte/phy/lib/modem/src/lte_tables.h diff --git a/lte/lib/modem/src/mod.c b/lte/phy/lib/modem/src/mod.c similarity index 96% rename from lte/lib/modem/src/mod.c rename to lte/phy/lib/modem/src/mod.c index a80473db5..382d86d10 100644 --- a/lte/lib/modem/src/mod.c +++ b/lte/phy/lib/modem/src/mod.c @@ -30,8 +30,8 @@ #include #include -#include "lte/utils/bit.h" -#include "lte/modem/mod.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/modem/mod.h" /** Low-level API */ diff --git a/lte/lib/modem/src/modem_table.c b/lte/phy/lib/modem/src/modem_table.c similarity index 98% rename from lte/lib/modem/src/modem_table.c rename to lte/phy/lib/modem/src/modem_table.c index 61437a175..578b6dc98 100644 --- a/lte/lib/modem/src/modem_table.c +++ b/lte/phy/lib/modem/src/modem_table.c @@ -33,7 +33,7 @@ #include #include -#include "lte/modem/modem_table.h" +#include "liblte/phy/modem/modem_table.h" #include "lte_tables.h" /** Internal functions */ diff --git a/lte/lib/modem/src/soft_algs.c b/lte/phy/lib/modem/src/soft_algs.c similarity index 100% rename from lte/lib/modem/src/soft_algs.c rename to lte/phy/lib/modem/src/soft_algs.c diff --git a/lte/lib/modem/src/soft_algs.h b/lte/phy/lib/modem/src/soft_algs.h similarity index 100% rename from lte/lib/modem/src/soft_algs.h rename to lte/phy/lib/modem/src/soft_algs.h diff --git a/lte/lib/modem/test/CMakeLists.txt b/lte/phy/lib/modem/test/CMakeLists.txt similarity index 97% rename from lte/lib/modem/test/CMakeLists.txt rename to lte/phy/lib/modem/test/CMakeLists.txt index 7b1689b17..70308be83 100644 --- a/lte/lib/modem/test/CMakeLists.txt +++ b/lte/phy/lib/modem/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(modem_test modem_test.c) -TARGET_LINK_LIBRARIES(modem_test lte) +TARGET_LINK_LIBRARIES(modem_test lte_phy) ADD_TEST(modem_bpsk modem_test -n 1020 -m 1) ADD_TEST(modem_qpsk modem_test -n 1020 -m 2) diff --git a/lte/lib/modem/test/modem_test.c b/lte/phy/lib/modem/test/modem_test.c similarity index 99% rename from lte/lib/modem/test/modem_test.c rename to lte/phy/lib/modem/test/modem_test.c index 499950dbe..6a483c0a6 100644 --- a/lte/lib/modem/test/modem_test.c +++ b/lte/phy/lib/modem/test/modem_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int num_bits = 1000; enum modem_std modulation; diff --git a/lte/lib/phch/src/dci.c b/lte/phy/lib/phch/src/dci.c similarity index 99% rename from lte/lib/phch/src/dci.c rename to lte/phy/lib/phch/src/dci.c index 99b2420dd..06c3ee09e 100644 --- a/lte/lib/phch/src/dci.c +++ b/lte/phy/lib/phch/src/dci.c @@ -35,11 +35,11 @@ #include #include -#include "lte/phch/dci.h" -#include "lte/common/base.h" -#include "lte/utils/bit.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/phch/dci.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" int dci_init(dci_t *q, int max_dcis) { q->msg = calloc(sizeof(dci_msg_t), max_dcis); diff --git a/lte/lib/phch/src/pbch.c b/lte/phy/lib/phch/src/pbch.c similarity index 98% rename from lte/lib/phch/src/pbch.c rename to lte/phy/lib/phch/src/pbch.c index 4b1671b7d..6504a4e9d 100644 --- a/lte/lib/phch/src/pbch.c +++ b/lte/phy/lib/phch/src/pbch.c @@ -36,11 +36,11 @@ #include #include "prb.h" -#include "lte/phch/pbch.h" -#include "lte/common/base.h" -#include "lte/utils/bit.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/phch/pbch.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" const char crc_mask[4][16] = { {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, diff --git a/lte/lib/phch/src/pcfich.c b/lte/phy/lib/phch/src/pcfich.c similarity index 96% rename from lte/lib/phch/src/pcfich.c rename to lte/phy/lib/phch/src/pcfich.c index 4afd56f6b..70985d2aa 100644 --- a/lte/lib/phch/src/pcfich.c +++ b/lte/phy/lib/phch/src/pcfich.c @@ -35,12 +35,12 @@ #include #include -#include "lte/phch/regs.h" -#include "lte/phch/pcfich.h" -#include "lte/common/base.h" -#include "lte/utils/bit.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/phch/regs.h" +#include "liblte/phy/phch/pcfich.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" // Table 5.3.4-1 diff --git a/lte/lib/phch/src/pdcch.c b/lte/phy/lib/phch/src/pdcch.c similarity index 98% rename from lte/lib/phch/src/pdcch.c rename to lte/phy/lib/phch/src/pdcch.c index 700b5f8a7..f705b511c 100644 --- a/lte/lib/phch/src/pdcch.c +++ b/lte/phy/lib/phch/src/pdcch.c @@ -34,13 +34,13 @@ #include #include -#include "lte/phch/dci.h" -#include "lte/phch/regs.h" -#include "lte/phch/pdcch.h" -#include "lte/common/base.h" -#include "lte/utils/bit.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/phch/dci.h" +#include "liblte/phy/phch/regs.h" +#include "liblte/phy/phch/pdcch.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" #define PDCCH_NOF_FORMATS 4 #define PDCCH_FORMAT_NOF_CCE(i) (1< #include "prb.h" -#include "lte/phch/regs.h" -#include "lte/phch/phich.h" -#include "lte/common/base.h" -#include "lte/utils/bit.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/phch/regs.h" +#include "liblte/phy/phch/phich.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" /** Table 6.9.1-2 */ const cf_t w_normal[PHICH_NORM_NSEQUENCES][4] = { { 1, 1, 1, 1 }, diff --git a/lte/lib/phch/src/prb.c b/lte/phy/lib/phch/src/prb.c similarity index 98% rename from lte/lib/phch/src/prb.c rename to lte/phy/lib/phch/src/prb.c index a51b9d9df..7d899d4fa 100644 --- a/lte/lib/phch/src/prb.c +++ b/lte/phy/lib/phch/src/prb.c @@ -30,7 +30,7 @@ #include #include "prb.h" -#include "lte/common/base.h" +#include "liblte/phy/common/base.h" void prb_cp_ref(cf_t **input, cf_t **output, int offset, int nof_refs, int nof_prb, bool advance_output) { diff --git a/lte/lib/phch/src/prb.h b/lte/phy/lib/phch/src/prb.h similarity index 100% rename from lte/lib/phch/src/prb.h rename to lte/phy/lib/phch/src/prb.h diff --git a/lte/lib/phch/src/ra.c b/lte/phy/lib/phch/src/ra.c similarity index 98% rename from lte/lib/phch/src/ra.c rename to lte/phy/lib/phch/src/ra.c index 65c3bea4f..9af42d7be 100644 --- a/lte/lib/phch/src/ra.c +++ b/lte/phy/lib/phch/src/ra.c @@ -28,12 +28,12 @@ #include #include #include -#include "lte/common/base.h" -#include "lte/utils/bit.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" -#include "lte/phch/ra.h" -#include "lte/utils/bit.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/utils/bit.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" +#include "liblte/phy/phch/ra.h" +#include "liblte/phy/utils/bit.h" #include "tbs_tables.h" diff --git a/lte/lib/phch/src/regs.c b/lte/phy/lib/phch/src/regs.c similarity index 99% rename from lte/lib/phch/src/regs.c rename to lte/phy/lib/phch/src/regs.c index ad7bbfb62..57ffe2f4d 100644 --- a/lte/lib/phch/src/regs.c +++ b/lte/phy/lib/phch/src/regs.c @@ -30,9 +30,9 @@ #include #include -#include "lte/common/base.h" -#include "lte/phch/regs.h" -#include "lte/utils/debug.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/phch/regs.h" +#include "liblte/phy/utils/debug.h" regs_reg_t *regs_find_reg(regs_t *h, int k, int l); diff --git a/lte/lib/phch/src/sequences.c b/lte/phy/lib/phch/src/sequences.c similarity index 95% rename from lte/lib/phch/src/sequences.c rename to lte/phy/lib/phch/src/sequences.c index b6ddb8fe4..6f3dc1f6d 100644 --- a/lte/lib/phch/src/sequences.c +++ b/lte/phy/lib/phch/src/sequences.c @@ -27,8 +27,8 @@ #include -#include "lte/common/base.h" -#include "lte/common/sequence.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/common/sequence.h" /** * 36.211 6.6.1 diff --git a/lte/lib/phch/src/tbs_tables.h b/lte/phy/lib/phch/src/tbs_tables.h similarity index 100% rename from lte/lib/phch/src/tbs_tables.h rename to lte/phy/lib/phch/src/tbs_tables.h diff --git a/lte/lib/phch/test/CMakeLists.txt b/lte/phy/lib/phch/test/CMakeLists.txt similarity index 89% rename from lte/lib/phch/test/CMakeLists.txt rename to lte/phy/lib/phch/test/CMakeLists.txt index f7a6c00d1..45a63286f 100644 --- a/lte/lib/phch/test/CMakeLists.txt +++ b/lte/phy/lib/phch/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(pbch_test pbch_test.c) -TARGET_LINK_LIBRARIES(pbch_test lte) +TARGET_LINK_LIBRARIES(pbch_test lte_phy) ADD_TEST(pbch_test_6 pbch_test -p 1 -n 6 -c 100) ADD_TEST(pbch_test_62 pbch_test -p 2 -n 6 -c 100) @@ -39,7 +39,7 @@ ADD_TEST(pbch_test_504 pbch_test -p 4 -n 50 -c 50) ######################################################################## ADD_EXECUTABLE(pcfich_test pcfich_test.c) -TARGET_LINK_LIBRARIES(pcfich_test lte) +TARGET_LINK_LIBRARIES(pcfich_test lte_phy) ADD_TEST(pcfich_test_6 pcfich_test -p 1 -n 6) ADD_TEST(pcfich_test_62 pcfich_test -p 2 -n 6) @@ -53,7 +53,7 @@ ADD_TEST(pcfich_test_104 pcfich_test -p 4 -n 10) ######################################################################## ADD_EXECUTABLE(phich_test phich_test.c) -TARGET_LINK_LIBRARIES(phich_test lte) +TARGET_LINK_LIBRARIES(phich_test lte_phy) ADD_TEST(phich_test_6 phich_test -p 1 -n 6) ADD_TEST(phich_test_62 phich_test -p 2 -n 6) @@ -73,28 +73,28 @@ ADD_TEST(phich_test_104 phich_test -p 4 -n 10 -e -l -g 1/2) ######################################################################## ADD_EXECUTABLE(pdcch_test pdcch_test.c) -TARGET_LINK_LIBRARIES(pdcch_test lte) +TARGET_LINK_LIBRARIES(pdcch_test lte_phy) ADD_TEST(pdcch_test pdcch_test) ADD_EXECUTABLE(dci_unpacking dci_unpacking.c) -TARGET_LINK_LIBRARIES(dci_unpacking lte) +TARGET_LINK_LIBRARIES(dci_unpacking lte_phy) ######################################################################## # FILE TEST ######################################################################## ADD_EXECUTABLE(pbch_file_test pbch_file_test.c) -TARGET_LINK_LIBRARIES(pbch_file_test lte) +TARGET_LINK_LIBRARIES(pbch_file_test lte_phy) ADD_EXECUTABLE(pcfich_file_test pcfich_file_test.c) -TARGET_LINK_LIBRARIES(pcfich_file_test lte) +TARGET_LINK_LIBRARIES(pcfich_file_test lte_phy) ADD_EXECUTABLE(phich_file_test phich_file_test.c) -TARGET_LINK_LIBRARIES(phich_file_test lte) +TARGET_LINK_LIBRARIES(phich_file_test lte_phy) ADD_EXECUTABLE(pdcch_file_test pdcch_file_test.c) -TARGET_LINK_LIBRARIES(pdcch_file_test lte) +TARGET_LINK_LIBRARIES(pdcch_file_test lte_phy) ADD_TEST(pbch_file_test pbch_file_test -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.1.92M.dat) ADD_TEST(pcfich_file_test pcfich_file_test -c 150 -n 50 -p 2 -i ${CMAKE_CURRENT_SOURCE_DIR}/signal.10M.dat) diff --git a/lte/lib/phch/test/dci_unpacking.c b/lte/phy/lib/phch/test/dci_unpacking.c similarity index 98% rename from lte/lib/phch/test/dci_unpacking.c rename to lte/phy/lib/phch/test/dci_unpacking.c index 49ca02293..e37bdd08c 100644 --- a/lte/lib/phch/test/dci_unpacking.c +++ b/lte/phy/lib/phch/test/dci_unpacking.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" void usage(char *prog) { printf("Usage: %s nof_prb length_bits Word0 Word1 ...\n", prog); diff --git a/lte/lib/phch/test/pbch_file_test.c b/lte/phy/lib/phch/test/pbch_file_test.c similarity index 99% rename from lte/lib/phch/test/pbch_file_test.c rename to lte/phy/lib/phch/test/pbch_file_test.c index 963299cca..6982537ff 100644 --- a/lte/lib/phch/test/pbch_file_test.c +++ b/lte/phy/lib/phch/test/pbch_file_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" char *input_file_name = NULL; char *matlab_file_name = NULL; diff --git a/lte/lib/phch/test/pbch_test.c b/lte/phy/lib/phch/test/pbch_test.c similarity index 99% rename from lte/lib/phch/test/pbch_test.c rename to lte/phy/lib/phch/test/pbch_test.c index 77c3575a0..a17386024 100644 --- a/lte/lib/phch/test/pbch_test.c +++ b/lte/phy/lib/phch/test/pbch_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int cell_id = 1; int nof_prb = 6; diff --git a/lte/lib/phch/test/pcfich_file_test.c b/lte/phy/lib/phch/test/pcfich_file_test.c similarity index 99% rename from lte/lib/phch/test/pcfich_file_test.c rename to lte/phy/lib/phch/test/pcfich_file_test.c index 98af86da0..02c9aa0d0 100644 --- a/lte/lib/phch/test/pcfich_file_test.c +++ b/lte/phy/lib/phch/test/pcfich_file_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" char *input_file_name = NULL; char *matlab_file_name = NULL; diff --git a/lte/lib/phch/test/pcfich_test.c b/lte/phy/lib/phch/test/pcfich_test.c similarity index 99% rename from lte/lib/phch/test/pcfich_test.c rename to lte/phy/lib/phch/test/pcfich_test.c index 1067026f6..a28414c6a 100644 --- a/lte/lib/phch/test/pcfich_test.c +++ b/lte/phy/lib/phch/test/pcfich_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int cell_id = -1; int nof_prb = 6; diff --git a/lte/lib/phch/test/pdcch_file_test.c b/lte/phy/lib/phch/test/pdcch_file_test.c similarity index 99% rename from lte/lib/phch/test/pdcch_file_test.c rename to lte/phy/lib/phch/test/pdcch_file_test.c index 5d812e239..cce20a23d 100644 --- a/lte/lib/phch/test/pdcch_file_test.c +++ b/lte/phy/lib/phch/test/pdcch_file_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" char *input_file_name = NULL; char *matlab_file_name = NULL; diff --git a/lte/lib/phch/test/pdcch_test.c b/lte/phy/lib/phch/test/pdcch_test.c similarity index 99% rename from lte/lib/phch/test/pdcch_test.c rename to lte/phy/lib/phch/test/pdcch_test.c index f33708a1f..0fe7722fc 100644 --- a/lte/lib/phch/test/pdcch_test.c +++ b/lte/phy/lib/phch/test/pdcch_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int cell_id = 1; int nof_prb = 6; diff --git a/lte/lib/phch/test/phich_file_test.c b/lte/phy/lib/phch/test/phich_file_test.c similarity index 99% rename from lte/lib/phch/test/phich_file_test.c rename to lte/phy/lib/phch/test/phich_file_test.c index 6bcbe7a91..6f3bd03c4 100644 --- a/lte/lib/phch/test/phich_file_test.c +++ b/lte/phy/lib/phch/test/phich_file_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" char *input_file_name = NULL; char *matlab_file_name = NULL; diff --git a/lte/lib/phch/test/phich_test.c b/lte/phy/lib/phch/test/phich_test.c similarity index 99% rename from lte/lib/phch/test/phich_test.c rename to lte/phy/lib/phch/test/phich_test.c index c26888ab3..36faaaba1 100644 --- a/lte/lib/phch/test/phich_test.c +++ b/lte/phy/lib/phch/test/phich_test.c @@ -31,7 +31,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int cell_id = -1; int nof_prb = 6; diff --git a/lte/lib/phch/test/signal.1.92M.amar.dat b/lte/phy/lib/phch/test/signal.1.92M.amar.dat similarity index 100% rename from lte/lib/phch/test/signal.1.92M.amar.dat rename to lte/phy/lib/phch/test/signal.1.92M.amar.dat diff --git a/lte/lib/phch/test/signal.1.92M.dat b/lte/phy/lib/phch/test/signal.1.92M.dat similarity index 100% rename from lte/lib/phch/test/signal.1.92M.dat rename to lte/phy/lib/phch/test/signal.1.92M.dat diff --git a/lte/lib/phch/test/signal.10M.dat b/lte/phy/lib/phch/test/signal.10M.dat similarity index 100% rename from lte/lib/phch/test/signal.10M.dat rename to lte/phy/lib/phch/test/signal.10M.dat diff --git a/lte/lib/resampling/src/interp.c b/lte/phy/lib/resampling/src/interp.c similarity index 96% rename from lte/lib/resampling/src/interp.c rename to lte/phy/lib/resampling/src/interp.c index 96908bf20..db273da7c 100644 --- a/lte/lib/resampling/src/interp.c +++ b/lte/phy/lib/resampling/src/interp.c @@ -27,8 +27,8 @@ #include #include -#include "lte/resampling/interp.h" -#include "lte/utils/debug.h" +#include "liblte/phy/resampling/interp.h" +#include "liblte/phy/utils/debug.h" /* Performs 1st order linear interpolation with out-of-bound interpolation */ void interp_linear_offset(cf_t *input, cf_t *output, int M, int len, int off_st, int off_end) { diff --git a/lte/lib/resampling/src/resample_arb.c b/lte/phy/lib/resampling/src/resample_arb.c similarity index 98% rename from lte/lib/resampling/src/resample_arb.c rename to lte/phy/lib/resampling/src/resample_arb.c index 044012b2d..49ef39895 100644 --- a/lte/lib/resampling/src/resample_arb.c +++ b/lte/phy/lib/resampling/src/resample_arb.c @@ -27,8 +27,8 @@ #include #include -#include "lte/resampling/resample_arb.h" -#include "lte/utils/debug.h" +#include "liblte/phy/resampling/resample_arb.h" +#include "liblte/phy/utils/debug.h" float resample_arb_polyfilt[RESAMPLE_ARB_N][RESAMPLE_ARB_M] = {{0,0.002400347599485495,-0.006922416132556366,0.0179104136912176,0.99453086623794,-0.008521087756729117,0.0008598969867484128,0.0004992625165376107}, diff --git a/lte/lib/resampling/test/CMakeLists.txt b/lte/phy/lib/resampling/test/CMakeLists.txt similarity index 92% rename from lte/lib/resampling/test/CMakeLists.txt rename to lte/phy/lib/resampling/test/CMakeLists.txt index d2b6bd0f1..5deb366e8 100644 --- a/lte/lib/resampling/test/CMakeLists.txt +++ b/lte/phy/lib/resampling/test/CMakeLists.txt @@ -24,10 +24,10 @@ ######################################################################## ADD_EXECUTABLE(resample_arb_test resample_arb_test.c) -TARGET_LINK_LIBRARIES(resample_arb_test lte) +TARGET_LINK_LIBRARIES(resample_arb_test lte_phy) ADD_EXECUTABLE(resample_arb_bench resample_arb_bench.c) -TARGET_LINK_LIBRARIES(resample_arb_bench lte) +TARGET_LINK_LIBRARIES(resample_arb_bench lte_phy) ADD_TEST(resample resample_arb_test) diff --git a/lte/lib/resampling/test/resample_arb_bench.c b/lte/phy/lib/resampling/test/resample_arb_bench.c similarity index 91% rename from lte/lib/resampling/test/resample_arb_bench.c rename to lte/phy/lib/resampling/test/resample_arb_bench.c index d0893cda7..c911f8dc1 100644 --- a/lte/lib/resampling/test/resample_arb_bench.c +++ b/lte/phy/lib/resampling/test/resample_arb_bench.c @@ -5,8 +5,8 @@ #include #include -#include "lte.h" -#include "lte/resampling/resample_arb.h" +#include "liblte/phy/phy.h" +#include "liblte/phy/resampling/resample_arb.h" typedef _Complex float cf_t; diff --git a/lte/lib/resampling/test/resample_arb_test.c b/lte/phy/lib/resampling/test/resample_arb_test.c similarity index 94% rename from lte/lib/resampling/test/resample_arb_test.c rename to lte/phy/lib/resampling/test/resample_arb_test.c index a7b8823f6..78b491691 100644 --- a/lte/lib/resampling/test/resample_arb_test.c +++ b/lte/phy/lib/resampling/test/resample_arb_test.c @@ -5,8 +5,8 @@ #include #include -#include "lte.h" -#include "lte/resampling/resample_arb.h" +#include "liblte/phy/phy.h" +#include "liblte/phy/resampling/resample_arb.h" typedef _Complex float cf_t; diff --git a/lte/lib/scrambling/src/scrambling.c b/lte/phy/lib/scrambling/src/scrambling.c similarity index 98% rename from lte/lib/scrambling/src/scrambling.c rename to lte/phy/lib/scrambling/src/scrambling.c index 43114e95d..940d7cf8a 100644 --- a/lte/lib/scrambling/src/scrambling.c +++ b/lte/phy/lib/scrambling/src/scrambling.c @@ -30,7 +30,7 @@ #include #include #include -#include "lte/scrambling/scrambling.h" +#include "liblte/phy/scrambling/scrambling.h" void scrambling_f(sequence_t *s, float *data) { scrambling_f_offset(s, data, 0, s->len); diff --git a/lte/lib/scrambling/test/CMakeLists.txt b/lte/phy/lib/scrambling/test/CMakeLists.txt similarity index 96% rename from lte/lib/scrambling/test/CMakeLists.txt rename to lte/phy/lib/scrambling/test/CMakeLists.txt index bf9709cc5..0509ed5c6 100644 --- a/lte/lib/scrambling/test/CMakeLists.txt +++ b/lte/phy/lib/scrambling/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(scrambling_test scrambling_test.c) -TARGET_LINK_LIBRARIES(scrambling_test lte) +TARGET_LINK_LIBRARIES(scrambling_test lte_phy) ADD_TEST(scrambling_pbch_bit scrambling_test -s PBCH -c 50) ADD_TEST(scrambling_pbch_float scrambling_test -s PBCH -c 50 -f) diff --git a/lte/lib/scrambling/test/scrambling_test.c b/lte/phy/lib/scrambling/test/scrambling_test.c similarity index 99% rename from lte/lib/scrambling/test/scrambling_test.c rename to lte/phy/lib/scrambling/test/scrambling_test.c index f15b577ff..02056590d 100644 --- a/lte/lib/scrambling/test/scrambling_test.c +++ b/lte/phy/lib/scrambling/test/scrambling_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" char *sequence_name = NULL; bool do_floats = false; diff --git a/lte/lib/sync/src/cfo.c b/lte/phy/lib/sync/src/cfo.c similarity index 93% rename from lte/lib/sync/src/cfo.c rename to lte/phy/lib/sync/src/cfo.c index 4888d8352..2f3c7dac5 100644 --- a/lte/lib/sync/src/cfo.c +++ b/lte/phy/lib/sync/src/cfo.c @@ -29,10 +29,10 @@ #include #include -#include "lte/utils/cexptab.h" -#include "lte/sync/cfo.h" -#include "lte/utils/vector.h" -#include "lte/utils/debug.h" +#include "liblte/phy/utils/cexptab.h" +#include "liblte/phy/sync/cfo.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/debug.h" int cfo_init(cfo_t *h, int nsamples) { int ret = -1; diff --git a/lte/lib/sync/src/cp.c b/lte/phy/lib/sync/src/cp.c similarity index 100% rename from lte/lib/sync/src/cp.c rename to lte/phy/lib/sync/src/cp.c diff --git a/lte/lib/sync/src/find_sss.c b/lte/phy/lib/sync/src/find_sss.c similarity index 98% rename from lte/lib/sync/src/find_sss.c rename to lte/phy/lib/sync/src/find_sss.c index 05f0940e1..72e1db859 100644 --- a/lte/lib/sync/src/find_sss.c +++ b/lte/phy/lib/sync/src/find_sss.c @@ -28,8 +28,8 @@ #include -#include "lte/utils/vector.h" -#include "lte/sync/sss.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/sync/sss.h" cf_t corr_sz(cf_t *z, cf_t *s) { cf_t sum; diff --git a/lte/lib/sync/src/gen_sss.c b/lte/phy/lib/sync/src/gen_sss.c similarity index 99% rename from lte/lib/sync/src/gen_sss.c rename to lte/phy/lib/sync/src/gen_sss.c index a54940ea2..89279cda3 100644 --- a/lte/lib/sync/src/gen_sss.c +++ b/lte/phy/lib/sync/src/gen_sss.c @@ -28,7 +28,7 @@ #include -#include "lte/sync/sss.h" +#include "liblte/phy/sync/sss.h" /** * @brief Function documentation: initSSStables() diff --git a/lte/lib/sync/src/pss.c b/lte/phy/lib/sync/src/pss.c similarity index 98% rename from lte/lib/sync/src/pss.c rename to lte/phy/lib/sync/src/pss.c index 596be1fbe..cb4044188 100644 --- a/lte/lib/sync/src/pss.c +++ b/lte/phy/lib/sync/src/pss.c @@ -32,10 +32,10 @@ #include #include -#include "lte/sync/pss.h" -#include "lte/utils/dft.h" -#include "lte/utils/vector.h" -#include "lte/utils/convolution.h" +#include "liblte/phy/sync/pss.h" +#include "liblte/phy/utils/dft.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/convolution.h" #define NOT_SYNC 0xF0F0F0F0 diff --git a/lte/lib/sync/src/sfo.c b/lte/phy/lib/sync/src/sfo.c similarity index 97% rename from lte/lib/sync/src/sfo.c rename to lte/phy/lib/sync/src/sfo.c index d484f93ab..43df2a872 100644 --- a/lte/lib/sync/src/sfo.c +++ b/lte/phy/lib/sync/src/sfo.c @@ -28,7 +28,7 @@ #include #include -#include "lte/sync/sfo.h" +#include "liblte/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/lte/lib/sync/src/sss.c b/lte/phy/lib/sync/src/sss.c similarity index 97% rename from lte/lib/sync/src/sss.c rename to lte/phy/lib/sync/src/sss.c index b29b267a6..550a081b4 100644 --- a/lte/lib/sync/src/sss.c +++ b/lte/phy/lib/sync/src/sss.c @@ -31,9 +31,9 @@ #include #include -#include "lte/sync/sss.h" -#include "lte/utils/dft.h" -#include "lte/utils/convolution.h" +#include "liblte/phy/sync/sss.h" +#include "liblte/phy/utils/dft.h" +#include "liblte/phy/utils/convolution.h" void generate_sss_all_tables(struct sss_tables *tables, int N_id_2); void convert_tables(struct fc_tables *fc_tables, struct sss_tables *in); diff --git a/lte/lib/sync/src/sync.c b/lte/phy/lib/sync/src/sync.c similarity index 98% rename from lte/lib/sync/src/sync.c rename to lte/phy/lib/sync/src/sync.c index bac87bc42..5b0e28dd7 100644 --- a/lte/lib/sync/src/sync.c +++ b/lte/phy/lib/sync/src/sync.c @@ -29,9 +29,9 @@ #include -#include "lte/utils/debug.h" -#include "lte/common/base.h" -#include "lte/sync/sync.h" +#include "liblte/phy/utils/debug.h" +#include "liblte/phy/common/base.h" +#include "liblte/phy/sync/sync.h" int sync_init(sync_t *q, int frame_size) { int N_id_2; diff --git a/lte/lib/sync/test/CMakeLists.txt b/lte/phy/lib/sync/test/CMakeLists.txt similarity index 94% rename from lte/lib/sync/test/CMakeLists.txt rename to lte/phy/lib/sync/test/CMakeLists.txt index 425edff73..2c5b29c3b 100644 --- a/lte/lib/sync/test/CMakeLists.txt +++ b/lte/phy/lib/sync/test/CMakeLists.txt @@ -24,7 +24,7 @@ ######################################################################## ADD_EXECUTABLE(sync_test sync_test.c) -TARGET_LINK_LIBRARIES(sync_test lte) +TARGET_LINK_LIBRARIES(sync_test lte_phy) ADD_TEST(sync_test_100 sync_test -o 100) ADD_TEST(sync_test_400 sync_test -o 400) @@ -36,7 +36,7 @@ ADD_TEST(sync_test_400_e sync_test -o 400 -e) ######################################################################## ADD_EXECUTABLE(cfo_test cfo_test.c) -TARGET_LINK_LIBRARIES(cfo_test lte) +TARGET_LINK_LIBRARIES(cfo_test lte_phy) ADD_TEST(cfo_test_1 cfo_test -f 0.12345 -n 1000) ADD_TEST(cfo_test_2 cfo_test -f 0.99849 -n 1000) diff --git a/lte/lib/sync/test/cfo_test.c b/lte/phy/lib/sync/test/cfo_test.c similarity index 98% rename from lte/lib/sync/test/cfo_test.c rename to lte/phy/lib/sync/test/cfo_test.c index 4d2445901..1ccb17cc2 100644 --- a/lte/lib/sync/test/cfo_test.c +++ b/lte/phy/lib/sync/test/cfo_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" #define MAX_MSE 0.1 diff --git a/lte/lib/sync/test/sync_test.c b/lte/phy/lib/sync/test/sync_test.c similarity index 99% rename from lte/lib/sync/test/sync_test.c rename to lte/phy/lib/sync/test/sync_test.c index c46681875..71fc670e0 100644 --- a/lte/lib/sync/test/sync_test.c +++ b/lte/phy/lib/sync/test/sync_test.c @@ -34,7 +34,7 @@ #include #include -#include "lte.h" +#include "liblte/phy/phy.h" int cell_id = -1, offset = 0; lte_cp_t cp = CPNORM; diff --git a/lte/lib/utils/src/bit.c b/lte/phy/lib/utils/src/bit.c similarity index 98% rename from lte/lib/utils/src/bit.c rename to lte/phy/lib/utils/src/bit.c index a25a3f430..2a38b30fb 100644 --- a/lte/lib/utils/src/bit.c +++ b/lte/phy/lib/utils/src/bit.c @@ -29,7 +29,7 @@ #include #include -#include "lte/utils/bit.h" +#include "liblte/phy/utils/bit.h" void bit_pack(uint32_t value, char **bits, int nof_bits) { diff --git a/lte/lib/utils/src/cexptab.c b/lte/phy/lib/utils/src/cexptab.c similarity index 98% rename from lte/lib/utils/src/cexptab.c rename to lte/phy/lib/utils/src/cexptab.c index eb9f849f1..457f80e29 100644 --- a/lte/lib/utils/src/cexptab.c +++ b/lte/phy/lib/utils/src/cexptab.c @@ -31,7 +31,7 @@ #include #include -#include "lte/utils/cexptab.h" +#include "liblte/phy/utils/cexptab.h" int cexptab_init(cexptab_t *h, int size) { int i; diff --git a/lte/lib/utils/src/convolution.c b/lte/phy/lib/utils/src/convolution.c similarity index 96% rename from lte/lib/utils/src/convolution.c rename to lte/phy/lib/utils/src/convolution.c index ba3b4cbc9..3e2eec954 100644 --- a/lte/lib/utils/src/convolution.c +++ b/lte/phy/lib/utils/src/convolution.c @@ -29,9 +29,9 @@ #include #include -#include "lte/utils/dft.h" -#include "lte/utils/vector.h" -#include "lte/utils/convolution.h" +#include "liblte/phy/utils/dft.h" +#include "liblte/phy/utils/vector.h" +#include "liblte/phy/utils/convolution.h" int conv_fft_cc_init(conv_fft_cc_t *state, int input_len, int filter_len) { diff --git a/lte/lib/utils/src/debug.c b/lte/phy/lib/utils/src/debug.c similarity index 97% rename from lte/lib/utils/src/debug.c rename to lte/phy/lib/utils/src/debug.c index 7d7edf964..3541c4b5b 100644 --- a/lte/lib/utils/src/debug.c +++ b/lte/phy/lib/utils/src/debug.c @@ -25,7 +25,7 @@ * */ -#include "lte/utils/debug.h" +#include "liblte/phy/utils/debug.h" int verbose = 0; diff --git a/lte/lib/utils/src/dft.c b/lte/phy/lib/utils/src/dft.c similarity index 99% rename from lte/lib/utils/src/dft.c rename to lte/phy/lib/utils/src/dft.c index 9123945c1..d7e06b7ba 100644 --- a/lte/lib/utils/src/dft.c +++ b/lte/phy/lib/utils/src/dft.c @@ -31,7 +31,7 @@ #include #include -#include "lte/utils/dft.h" +#include "liblte/phy/utils/dft.h" #define div(a,b) ((a-1)/b+1) diff --git a/lte/lib/utils/src/matrix.c b/lte/phy/lib/utils/src/matrix.c similarity index 98% rename from lte/lib/utils/src/matrix.c rename to lte/phy/lib/utils/src/matrix.c index de16c502a..484ad37e1 100644 --- a/lte/lib/utils/src/matrix.c +++ b/lte/phy/lib/utils/src/matrix.c @@ -32,7 +32,7 @@ #include #include -#include "lte/utils/matrix.h" +#include "liblte/phy/utils/matrix.h" int matrix_init(void ***q, int sz_x, int sz_y, int elem_sz) { int i; diff --git a/lte/lib/utils/src/mux.c b/lte/phy/lib/utils/src/mux.c similarity index 100% rename from lte/lib/utils/src/mux.c rename to lte/phy/lib/utils/src/mux.c diff --git a/lte/lib/utils/src/pack.c b/lte/phy/lib/utils/src/pack.c similarity index 100% rename from lte/lib/utils/src/pack.c rename to lte/phy/lib/utils/src/pack.c diff --git a/lte/lib/utils/src/vector.c b/lte/phy/lib/utils/src/vector.c similarity index 99% rename from lte/lib/utils/src/vector.c rename to lte/phy/lib/utils/src/vector.c index d049ce1e0..4d4d18970 100644 --- a/lte/lib/utils/src/vector.c +++ b/lte/phy/lib/utils/src/vector.c @@ -26,7 +26,7 @@ */ -#include "lte/utils/vector.h" +#include "liblte/phy/utils/vector.h" #include #include #include diff --git a/lte/rlc/CMakeLists.txt b/lte/rlc/CMakeLists.txt new file mode 100644 index 000000000..44f566d64 --- /dev/null +++ b/lte/rlc/CMakeLists.txt @@ -0,0 +1,21 @@ +# +# Copyright 2012-2013 The libLTE Developers. See the +# COPYRIGHT file at the top-level directory of this distribution. +# +# This file is part of the libLTE library. +# +# libLTE is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# libLTE is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# A copy of the GNU Lesser General Public License can be found in +# the LICENSE file in the top-level directory of this distribution +# and at http://www.gnu.org/licenses/. +# + From 34a2241bb59b7c929d6dd7a2e84a96fa5a88e79e Mon Sep 17 00:00:00 2001 From: Paul Sutton Date: Tue, 17 Jun 2014 15:28:29 +0100 Subject: [PATCH 2/2] Changing order of ADD_SUBDIRECTORY to ensure cuhd is built before lte --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 344c5bd08..c8f92b065 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,7 +156,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/graphics/include) # Add the subdirectories ######################################################################## ADD_SUBDIRECTORY(common) -ADD_SUBDIRECTORY(lte) ADD_SUBDIRECTORY(cuhd) ADD_SUBDIRECTORY(graphics) +ADD_SUBDIRECTORY(lte)