From 513a399ae4c75e1b1410e454fc97028d0128a1bc Mon Sep 17 00:00:00 2001 From: Thomas Kolb Date: Sun, 13 Feb 2022 20:01:33 +0100 Subject: [PATCH] Refactoring: moved layer1-related stuff to subdirectory --- impl/CMakeLists.txt | 28 ++++++++++++------------ impl/src/{ => layer1}/config.h | 6 ++--- impl/src/{ => layer1}/correlator.c | 0 impl/src/{ => layer1}/correlator.h | 6 ++--- impl/src/{ => layer1}/freq_est.c | 0 impl/src/{ => layer1}/freq_est.h | 6 ++--- impl/src/{ => layer1}/packet_demod.c | 0 impl/src/{ => layer1}/packet_demod.h | 6 ++--- impl/src/{ => layer1}/packet_mod.c | 0 impl/src/{ => layer1}/packet_mod.h | 6 ++--- impl/src/{ => layer1}/preamble.c | 0 impl/src/{ => layer1}/preamble.h | 6 ++--- impl/src/{ => layer1}/results.h | 6 ++--- impl/src/{ => layer1}/transmission.c | 0 impl/src/{ => layer1}/transmission.h | 6 ++--- impl/src/{ => layer1}/whitening.c | 0 impl/src/{ => layer1}/whitening.h | 6 ++--- impl/src/main.c | 16 +++++++------- impl/test/CMakeLists.txt | 10 ++++----- impl/test/{ => layer1}/test_correlator.c | 2 +- 20 files changed, 55 insertions(+), 55 deletions(-) rename impl/src/{ => layer1}/config.h (89%) rename impl/src/{ => layer1}/correlator.c (100%) rename impl/src/{ => layer1}/correlator.h (98%) rename impl/src/{ => layer1}/freq_est.c (100%) rename impl/src/{ => layer1}/freq_est.h (96%) rename impl/src/{ => layer1}/packet_demod.c (100%) rename impl/src/{ => layer1}/packet_demod.h (98%) rename impl/src/{ => layer1}/packet_mod.c (100%) rename impl/src/{ => layer1}/packet_mod.h (98%) rename impl/src/{ => layer1}/preamble.c (100%) rename impl/src/{ => layer1}/preamble.h (64%) rename impl/src/{ => layer1}/results.h (86%) rename impl/src/{ => layer1}/transmission.c (100%) rename impl/src/{ => layer1}/transmission.h (96%) rename impl/src/{ => layer1}/whitening.c (100%) rename impl/src/{ => layer1}/whitening.h (55%) rename impl/test/{ => layer1}/test_correlator.c (97%) diff --git a/impl/CMakeLists.txt b/impl/CMakeLists.txt index 2ed0fd3..3570236 100644 --- a/impl/CMakeLists.txt +++ b/impl/CMakeLists.txt @@ -11,20 +11,20 @@ set(sources src/utils.c src/utils.h src/main.c - src/packet_mod.h - src/results.h - src/packet_mod.c - src/config.h - src/preamble.h - src/preamble.c - src/transmission.h - src/transmission.c - src/correlator.h - src/correlator.c - src/freq_est.h - src/freq_est.c - src/whitening.h - src/whitening.c + src/layer1/config.h + src/layer1/correlator.c + src/layer1/correlator.h + src/layer1/freq_est.c + src/layer1/freq_est.h + src/layer1/packet_mod.c + src/layer1/packet_mod.h + src/layer1/preamble.c + src/layer1/preamble.h + src/layer1/results.h + src/layer1/transmission.c + src/layer1/transmission.h + src/layer1/whitening.c + src/layer1/whitening.h ) include_directories( diff --git a/impl/src/config.h b/impl/src/layer1/config.h similarity index 89% rename from impl/src/config.h rename to impl/src/layer1/config.h index 37d3c1a..73c2e7d 100644 --- a/impl/src/config.h +++ b/impl/src/layer1/config.h @@ -1,5 +1,5 @@ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef LAYER1_CONFIG_H +#define LAYER1_CONFIG_H #include @@ -22,4 +22,4 @@ #define TRANSMISSION_RAMP_UP_LEN 64 // symbols #define TRANSMISSION_RAMP_DOWN_LEN 32 // symbols -#endif // CONFIG_H +#endif // LAYER1_CONFIG_H diff --git a/impl/src/correlator.c b/impl/src/layer1/correlator.c similarity index 100% rename from impl/src/correlator.c rename to impl/src/layer1/correlator.c diff --git a/impl/src/correlator.h b/impl/src/layer1/correlator.h similarity index 98% rename from impl/src/correlator.h rename to impl/src/layer1/correlator.h index f1e0114..353ec3f 100644 --- a/impl/src/correlator.h +++ b/impl/src/layer1/correlator.h @@ -1,5 +1,5 @@ -#ifndef CORRELATOR_H -#define CORRELATOR_H +#ifndef LAYER1_CORRELATOR_H +#define LAYER1_CORRELATOR_H /*! * \file @@ -144,4 +144,4 @@ float correlator_get_mean_phase_deviation(correlator_ctx_t *ctx, size_t L); float correlator_get_mean_frequency_deviation(correlator_ctx_t *ctx, size_t L, float *phase_offset); -#endif // CORRELATOR_H +#endif // LAYER1_CORRELATOR_H diff --git a/impl/src/freq_est.c b/impl/src/layer1/freq_est.c similarity index 100% rename from impl/src/freq_est.c rename to impl/src/layer1/freq_est.c diff --git a/impl/src/freq_est.h b/impl/src/layer1/freq_est.h similarity index 96% rename from impl/src/freq_est.h rename to impl/src/layer1/freq_est.h index d96bd9e..6ee29d0 100644 --- a/impl/src/freq_est.h +++ b/impl/src/layer1/freq_est.h @@ -1,5 +1,5 @@ -#ifndef FREQ_EST_H -#define FREQ_EST_H +#ifndef LAYER1_FREQ_EST_H +#define LAYER1_FREQ_EST_H #include #include @@ -49,4 +49,4 @@ float freq_est_known_symbols(const float complex *recv, const float complex *ref */ float freq_est_data_free(const float complex *symbols, size_t n, float *final_phase); -#endif // FREQ_EST_H +#endif // LAYER1_FREQ_EST_H diff --git a/impl/src/packet_demod.c b/impl/src/layer1/packet_demod.c similarity index 100% rename from impl/src/packet_demod.c rename to impl/src/layer1/packet_demod.c diff --git a/impl/src/packet_demod.h b/impl/src/layer1/packet_demod.h similarity index 98% rename from impl/src/packet_demod.h rename to impl/src/layer1/packet_demod.h index 186b5bc..c1cccdf 100644 --- a/impl/src/packet_demod.h +++ b/impl/src/layer1/packet_demod.h @@ -1,5 +1,5 @@ -#ifndef PACKET_DEMOD -#define PACKET_DEMOD +#ifndef LAYER1_PACKET_DEMOD_H +#define LAYER1_PACKET_DEMOD_H #include #include @@ -176,4 +176,4 @@ result_t packet_demod_get_result_b(packet_demod_ctx_t *ctx, unsigned char *data, */ result_t packet_demod_get_result_cf(packet_demod_ctx_t *ctx, float complex *data, size_t *length); -#endif // PACKET_DEMOD +#endif // LAYER1_PACKET_DEMOD_H diff --git a/impl/src/packet_mod.c b/impl/src/layer1/packet_mod.c similarity index 100% rename from impl/src/packet_mod.c rename to impl/src/layer1/packet_mod.c diff --git a/impl/src/packet_mod.h b/impl/src/layer1/packet_mod.h similarity index 98% rename from impl/src/packet_mod.h rename to impl/src/layer1/packet_mod.h index 4909a46..3d375d7 100644 --- a/impl/src/packet_mod.h +++ b/impl/src/layer1/packet_mod.h @@ -1,5 +1,5 @@ -#ifndef PACKET_MOD_H -#define PACKET_MOD_H +#ifndef LAYER1_PACKET_MOD_H +#define LAYER1_PACKET_MOD_H #include #include @@ -166,4 +166,4 @@ result_t packet_mod_get_result_b(packet_mod_ctx_t *ctx, unsigned char *data, siz */ result_t packet_mod_get_result_cf(packet_mod_ctx_t *ctx, float complex *data, size_t *length); -#endif // PACKET_MOD_H +#endif // LAYER1_PACKET_MOD_H diff --git a/impl/src/preamble.c b/impl/src/layer1/preamble.c similarity index 100% rename from impl/src/preamble.c rename to impl/src/layer1/preamble.c diff --git a/impl/src/preamble.h b/impl/src/layer1/preamble.h similarity index 64% rename from impl/src/preamble.h rename to impl/src/layer1/preamble.h index aecd71d..c164d02 100644 --- a/impl/src/preamble.h +++ b/impl/src/layer1/preamble.h @@ -1,5 +1,5 @@ -#ifndef PREAMBLE_H -#define PREAMBLE_H +#ifndef LAYER1_PREAMBLE_H +#define LAYER1_PREAMBLE_H #include #include @@ -7,4 +7,4 @@ const float complex* preamble_get_symbols(void); size_t preamble_get_symbol_count(void); -#endif // PREAMBLE_H +#endif // LAYER1_PREAMBLE_H diff --git a/impl/src/results.h b/impl/src/layer1/results.h similarity index 86% rename from impl/src/results.h rename to impl/src/layer1/results.h index fc8df70..cb41477 100644 --- a/impl/src/results.h +++ b/impl/src/layer1/results.h @@ -1,5 +1,5 @@ -#ifndef RESULTS_H -#define RESULTS_H +#ifndef LAYER1_RESULTS_H +#define LAYER1_RESULTS_H typedef enum { OK, @@ -24,4 +24,4 @@ typedef enum { # define ERR_CHECK_LIQUID(call) if((call) != LIQUID_OK) { return ERR_LIQUID; } #endif -#endif // RESULTS_H +#endif // LAYER1_RESULTS_H diff --git a/impl/src/transmission.c b/impl/src/layer1/transmission.c similarity index 100% rename from impl/src/transmission.c rename to impl/src/layer1/transmission.c diff --git a/impl/src/transmission.h b/impl/src/layer1/transmission.h similarity index 96% rename from impl/src/transmission.h rename to impl/src/layer1/transmission.h index 5002b32..3a7948d 100644 --- a/impl/src/transmission.h +++ b/impl/src/layer1/transmission.h @@ -1,5 +1,5 @@ -#ifndef TRANSMISSION_H -#define TRANSMISSION_H +#ifndef LAYER1_TRANSMISSION_H +#define LAYER1_TRANSMISSION_H #include #include @@ -76,4 +76,4 @@ result_t transmission_filter_packet( size_t *output_size); -#endif // TRANSMISSION_H +#endif // LAYER1_TRANSMISSION_H diff --git a/impl/src/whitening.c b/impl/src/layer1/whitening.c similarity index 100% rename from impl/src/whitening.c rename to impl/src/layer1/whitening.c diff --git a/impl/src/whitening.h b/impl/src/layer1/whitening.h similarity index 55% rename from impl/src/whitening.h rename to impl/src/layer1/whitening.h index 448ad70..3a60a14 100644 --- a/impl/src/whitening.h +++ b/impl/src/layer1/whitening.h @@ -1,9 +1,9 @@ -#ifndef WHITENING_H -#define WHITENING_H +#ifndef LAYER1_WHITENING_H +#define LAYER1_WHITENING_H #include #include void whitening_apply_in_place(uint8_t *data, size_t length); -#endif // WHITENING_H +#endif // LAYER1_WHITENING_H diff --git a/impl/src/main.c b/impl/src/main.c index 9deb8ee..e190484 100644 --- a/impl/src/main.c +++ b/impl/src/main.c @@ -4,15 +4,15 @@ #include #include -#include "results.h" #include "utils.h" -#include "packet_mod.h" -#include "config.h" -#include "preamble.h" -#include "transmission.h" -#include "correlator.h" -#include "freq_est.h" -#include "whitening.h" +#include "layer1/results.h" +#include "layer1/packet_mod.h" +#include "layer1/config.h" +#include "layer1/preamble.h" +#include "layer1/transmission.h" +#include "layer1/correlator.h" +#include "layer1/freq_est.h" +#include "layer1/whitening.h" typedef enum { RX_STATE_ACQUISITION, diff --git a/impl/test/CMakeLists.txt b/impl/test/CMakeLists.txt index afdd581..6068eca 100644 --- a/impl/test/CMakeLists.txt +++ b/impl/test/CMakeLists.txt @@ -1,10 +1,10 @@ add_executable( test_correlator - ../src/correlator.c - ../src/correlator.h - ../src/freq_est.c - ../src/freq_est.h - test_correlator.c + ../src/layer1/correlator.c + ../src/layer1/correlator.h + ../src/layer1/freq_est.c + ../src/layer1/freq_est.h + layer1/test_correlator.c ) target_link_libraries( diff --git a/impl/test/test_correlator.c b/impl/test/layer1/test_correlator.c similarity index 97% rename from impl/test/test_correlator.c rename to impl/test/layer1/test_correlator.c index 06db660..64de87e 100644 --- a/impl/test/test_correlator.c +++ b/impl/test/layer1/test_correlator.c @@ -1,6 +1,6 @@ #include -#include +#include #define ARRAY_LEN(x) (sizeof(x) / sizeof(x[0]))