From 9d71bec7b6cf5f8421b4c24cb4d6ada925b91dca Mon Sep 17 00:00:00 2001 From: David Rupprecht Date: Sat, 31 Mar 2018 19:04:04 +0200 Subject: [PATCH 1/5] Unified include guards --- lib/include/srslte/asn1/gtpc.h | 6 +++--- lib/include/srslte/asn1/gtpc_ies.h | 6 +++--- lib/include/srslte/asn1/gtpc_msg.h | 6 +++--- lib/include/srslte/asn1/liblte_common.h | 6 +++--- lib/include/srslte/asn1/liblte_mme.h | 6 +++--- lib/include/srslte/asn1/liblte_rrc.h | 6 +++--- lib/include/srslte/asn1/liblte_s1ap.h | 6 +++--- lib/include/srslte/build_info.h.in | 4 ++-- lib/include/srslte/common/bcd_helpers.h | 6 +++--- lib/include/srslte/common/block_queue.h | 6 +++--- lib/include/srslte/common/buffer_pool.h | 6 +++--- lib/include/srslte/common/common.h | 8 ++++---- lib/include/srslte/common/config.h | 6 +++--- lib/include/srslte/common/interfaces_common.h | 6 +++--- lib/include/srslte/common/liblte_security.h | 6 +++--- lib/include/srslte/common/liblte_ssl.h | 6 +++--- lib/include/srslte/common/log.h | 6 +++--- lib/include/srslte/common/log_filter.h | 6 +++--- lib/include/srslte/common/logger.h | 6 +++--- lib/include/srslte/common/logger_file.h | 8 ++++---- lib/include/srslte/common/logger_stdout.h | 6 +++--- lib/include/srslte/common/mac_pcap.h | 8 ++++---- lib/include/srslte/common/metrics_hub.h | 6 +++--- lib/include/srslte/common/msg_queue.h | 8 ++++---- lib/include/srslte/common/nas_pcap.h | 8 ++++---- lib/include/srslte/common/pcap.h | 6 +++--- lib/include/srslte/common/pdu.h | 8 ++++---- lib/include/srslte/common/pdu_queue.h | 6 +++--- lib/include/srslte/common/security.h | 8 ++++---- lib/include/srslte/common/snow_3g.h | 3 +++ lib/include/srslte/common/task_dispatcher.h | 8 ++++---- lib/include/srslte/common/thread_pool.h | 6 +++--- lib/include/srslte/common/threads.h | 7 ++++--- lib/include/srslte/common/timeout.h | 8 ++++---- lib/include/srslte/common/timers.h | 6 +++--- lib/include/srslte/common/trace.h | 6 +++--- lib/include/srslte/common/tti_sync.h | 6 +++--- lib/include/srslte/common/tti_sync_cv.h | 8 ++++---- lib/include/srslte/config.h | 6 +++--- lib/include/srslte/interfaces/enb_interfaces.h | 6 +++--- lib/include/srslte/interfaces/enb_metrics_interface.h | 6 +++--- lib/include/srslte/interfaces/epc_interfaces.h | 6 +++--- lib/include/srslte/interfaces/sched_interface.h | 6 +++--- lib/include/srslte/interfaces/ue_interfaces.h | 8 ++++---- lib/include/srslte/phy/agc/agc.h | 6 +++--- lib/include/srslte/phy/ch_estimation/chest_common.h | 6 +++--- lib/include/srslte/phy/ch_estimation/chest_dl.h | 6 +++--- lib/include/srslte/phy/ch_estimation/chest_ul.h | 6 +++--- lib/include/srslte/phy/ch_estimation/refsignal_dl.h | 6 +++--- lib/include/srslte/phy/ch_estimation/refsignal_ul.h | 6 +++--- lib/include/srslte/phy/channel/ch_awgn.h | 6 +++--- lib/include/srslte/phy/common/phy_common.h | 6 +++--- lib/include/srslte/phy/common/phy_logger.h | 6 +++--- lib/include/srslte/phy/common/sequence.h | 6 +++--- lib/include/srslte/phy/common/timestamp.h | 6 +++--- lib/include/srslte/phy/dft/dft.h | 6 +++--- lib/include/srslte/phy/dft/dft_precoding.h | 6 +++--- lib/include/srslte/phy/dft/ofdm.h | 6 +++--- lib/include/srslte/phy/enb/enb_dl.h | 6 +++--- lib/include/srslte/phy/enb/enb_ul.h | 6 +++--- lib/include/srslte/phy/fec/cbsegm.h | 6 +++--- lib/include/srslte/phy/fec/convcoder.h | 6 +++--- lib/include/srslte/phy/fec/crc.h | 6 +++--- lib/include/srslte/phy/fec/rm_conv.h | 6 +++--- lib/include/srslte/phy/fec/rm_turbo.h | 6 +++--- lib/include/srslte/phy/fec/softbuffer.h | 6 +++--- lib/include/srslte/phy/fec/tc_interl.h | 6 +++--- lib/include/srslte/phy/fec/turbocoder.h | 6 +++--- lib/include/srslte/phy/fec/turbodecoder.h | 6 +++--- lib/include/srslte/phy/fec/turbodecoder_gen.h | 6 +++--- lib/include/srslte/phy/fec/turbodecoder_simd.h | 6 +++--- lib/include/srslte/phy/fec/turbodecoder_simd_inter.h | 6 +++--- lib/include/srslte/phy/fec/turbodecoder_sse.h | 6 +++--- lib/include/srslte/phy/fec/viterbi.h | 6 +++--- lib/include/srslte/phy/io/binsource.h | 6 +++--- lib/include/srslte/phy/io/filesink.h | 6 +++--- lib/include/srslte/phy/io/filesource.h | 6 +++--- lib/include/srslte/phy/io/format.h | 6 +++--- lib/include/srslte/phy/io/netsink.h | 6 +++--- lib/include/srslte/phy/io/netsource.h | 6 +++--- lib/include/srslte/phy/mimo/layermap.h | 6 +++--- lib/include/srslte/phy/mimo/precoding.h | 6 +++--- lib/include/srslte/phy/modem/demod_hard.h | 6 +++--- lib/include/srslte/phy/modem/demod_soft.h | 6 +++--- lib/include/srslte/phy/modem/mod.h | 6 +++--- lib/include/srslte/phy/modem/modem_table.h | 6 +++--- lib/include/srslte/phy/phch/cqi.h | 6 +++--- lib/include/srslte/phy/phch/dci.h | 4 ++-- lib/include/srslte/phy/phch/pbch.h | 6 +++--- lib/include/srslte/phy/phch/pcfich.h | 6 +++--- lib/include/srslte/phy/phch/pdcch.h | 6 +++--- lib/include/srslte/phy/phch/pdsch.h | 6 +++--- lib/include/srslte/phy/phch/pdsch_cfg.h | 6 +++--- lib/include/srslte/phy/phch/phich.h | 6 +++--- lib/include/srslte/phy/phch/pmch.h | 6 +++--- lib/include/srslte/phy/phch/prach.h | 6 +++--- lib/include/srslte/phy/phch/pucch.h | 6 +++--- lib/include/srslte/phy/phch/pusch.h | 6 +++--- lib/include/srslte/phy/phch/pusch_cfg.h | 6 +++--- lib/include/srslte/phy/phch/ra.h | 6 +++--- lib/include/srslte/phy/phch/regs.h | 6 +++--- lib/include/srslte/phy/phch/sch.h | 6 +++--- lib/include/srslte/phy/phch/uci.h | 6 +++--- lib/include/srslte/phy/resampling/decim.h | 6 +++--- lib/include/srslte/phy/resampling/interp.h | 6 +++--- lib/include/srslte/phy/resampling/resample_arb.h | 6 +++--- lib/include/srslte/phy/rf/rf.h | 6 +++--- lib/include/srslte/phy/rf/rf_utils.h | 3 +++ lib/include/srslte/phy/scrambling/scrambling.h | 6 +++--- lib/include/srslte/phy/sync/cfo.h | 6 +++--- lib/include/srslte/phy/sync/cp.h | 6 +++--- lib/include/srslte/phy/sync/pss.h | 6 +++--- lib/include/srslte/phy/sync/sfo.h | 6 +++--- lib/include/srslte/phy/sync/sss.h | 6 +++--- lib/include/srslte/phy/sync/sync.h | 6 +++--- lib/include/srslte/phy/ue/ue_cell_search.h | 6 +++--- lib/include/srslte/phy/ue/ue_dl.h | 6 +++--- lib/include/srslte/phy/ue/ue_mib.h | 6 +++--- lib/include/srslte/phy/ue/ue_phy.h | 6 +++--- lib/include/srslte/phy/ue/ue_sync.h | 6 +++--- lib/include/srslte/phy/ue/ue_ul.h | 6 +++--- lib/include/srslte/phy/utils/bit.h | 6 +++--- lib/include/srslte/phy/utils/cexptab.h | 6 +++--- lib/include/srslte/phy/utils/convolution.h | 6 +++--- lib/include/srslte/phy/utils/debug.h | 6 +++--- lib/include/srslte/phy/utils/filter.h | 7 ++++--- lib/include/srslte/phy/utils/mat.h | 2 +- lib/include/srslte/phy/utils/ringbuffer.h | 6 +++--- lib/include/srslte/phy/utils/simd.h | 6 +++--- lib/include/srslte/phy/utils/vector.h | 6 +++--- lib/include/srslte/phy/utils/vector_simd.h | 6 +++--- lib/include/srslte/radio/radio.h | 6 +++--- lib/include/srslte/radio/radio_multi.h | 6 +++--- lib/include/srslte/srslte.h | 6 +++--- lib/include/srslte/upper/pdcp.h | 8 ++++---- lib/include/srslte/upper/pdcp_entity.h | 8 ++++---- lib/include/srslte/upper/rlc.h | 6 +++--- lib/include/srslte/upper/rlc_am.h | 8 ++++---- lib/include/srslte/upper/rlc_common.h | 6 +++--- lib/include/srslte/upper/rlc_entity.h | 8 ++++---- lib/include/srslte/upper/rlc_interface.h | 6 +++--- lib/include/srslte/upper/rlc_metrics.h | 8 ++++---- lib/include/srslte/upper/rlc_tm.h | 6 +++--- lib/include/srslte/upper/rlc_um.h | 6 +++--- lib/include/srslte/version.h.in | 4 ++-- srsenb/hdr/cfg_parser.h | 4 ++-- srsenb/hdr/enb.h | 6 +++--- srsenb/hdr/mac/mac.h | 8 ++++---- srsenb/hdr/mac/mac_metrics.h | 6 +++--- srsenb/hdr/mac/scheduler.h | 6 +++--- srsenb/hdr/mac/scheduler_harq.h | 6 +++--- srsenb/hdr/mac/scheduler_metric.h | 6 +++--- srsenb/hdr/mac/scheduler_ue.h | 6 +++--- srsenb/hdr/mac/ue.h | 6 +++--- srsenb/hdr/metrics_stdout.h | 6 +++--- srsenb/hdr/parser.h | 4 ++-- srsenb/hdr/phy/phch_common.h | 6 +++--- srsenb/hdr/phy/phch_worker.h | 6 +++--- srsenb/hdr/phy/phy.h | 6 +++--- srsenb/hdr/phy/phy_metrics.h | 6 +++--- srsenb/hdr/phy/prach_worker.h | 6 +++--- srsenb/hdr/phy/txrx.h | 6 +++--- srsenb/hdr/upper/common_enb.h | 6 +++--- srsenb/hdr/upper/gtpu.h | 6 +++--- srsenb/hdr/upper/pdcp.h | 6 +++--- srsenb/hdr/upper/rlc.h | 6 +++--- srsenb/hdr/upper/rrc.h | 6 +++--- srsenb/hdr/upper/rrc_metrics.h | 6 +++--- srsenb/hdr/upper/s1ap.h | 6 +++--- srsenb/hdr/upper/s1ap_metrics.h | 6 +++--- srsepc/hdr/hss/hss.h | 6 +++--- srsepc/hdr/mme/mme.h | 6 +++--- srsepc/hdr/mme/mme_gtpc.h | 6 +++--- srsepc/hdr/mme/s1ap.h | 6 +++--- srsepc/hdr/mme/s1ap_common.h | 7 ++++--- srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h | 6 +++--- srsepc/hdr/mme/s1ap_mngmt_proc.h | 6 +++--- srsepc/hdr/mme/s1ap_nas_transport.h | 6 +++--- srsepc/hdr/spgw/spgw.h | 6 +++--- srsue/hdr/mac/demux.h | 6 +++--- srsue/hdr/mac/dl_harq.h | 6 +++--- srsue/hdr/mac/dl_sps.h | 6 +++--- srsue/hdr/mac/mac.h | 6 +++--- srsue/hdr/mac/mac_metrics.h | 6 +++--- srsue/hdr/mac/mux.h | 6 +++--- srsue/hdr/mac/proc.h | 6 +++--- srsue/hdr/mac/proc_bsr.h | 6 +++--- srsue/hdr/mac/proc_phr.h | 6 +++--- srsue/hdr/mac/proc_ra.h | 6 +++--- srsue/hdr/mac/proc_sr.h | 6 +++--- srsue/hdr/mac/ul_harq.h | 6 +++--- srsue/hdr/mac/ul_sps.h | 6 +++--- srsue/hdr/metrics_csv.h | 6 +++--- srsue/hdr/metrics_stdout.h | 6 +++--- srsue/hdr/phy/phch_common.h | 6 +++--- srsue/hdr/phy/phch_recv.h | 6 +++--- srsue/hdr/phy/phch_worker.h | 6 +++--- srsue/hdr/phy/phy.h | 6 +++--- srsue/hdr/phy/phy_metrics.h | 6 +++--- srsue/hdr/phy/prach.h | 6 +++--- srsue/hdr/ue.h | 6 +++--- srsue/hdr/ue_base.h | 6 +++--- srsue/hdr/ue_metrics_interface.h | 6 +++--- srsue/hdr/upper/gw.h | 6 +++--- srsue/hdr/upper/gw_metrics.h | 6 +++--- srsue/hdr/upper/nas.h | 6 +++--- srsue/hdr/upper/rrc.h | 6 +++--- srsue/hdr/upper/rrc_common.h | 6 +++--- srsue/hdr/upper/usim.h | 6 +++--- 209 files changed, 640 insertions(+), 631 deletions(-) diff --git a/lib/include/srslte/asn1/gtpc.h b/lib/include/srslte/asn1/gtpc.h index d204cd31d..3c2a3247f 100644 --- a/lib/include/srslte/asn1/gtpc.h +++ b/lib/include/srslte/asn1/gtpc.h @@ -21,8 +21,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef GTPC_V2_H -#define GTPC_V2_H +#ifndef SRSLTE_GTPC_H +#define SRSLTE_GTPC_H #include #include "srslte/asn1/gtpc_msg.h" @@ -94,4 +94,4 @@ typedef struct gtpc_pdu union gtpc_msg_choice choice; }gtpc_pdu_t; }//namespace -#endif +#endif // SRSLTE_GTPC_H diff --git a/lib/include/srslte/asn1/gtpc_ies.h b/lib/include/srslte/asn1/gtpc_ies.h index 657fc7c16..0ddcfaacb 100644 --- a/lib/include/srslte/asn1/gtpc_ies.h +++ b/lib/include/srslte/asn1/gtpc_ies.h @@ -22,8 +22,8 @@ * */ -#ifndef GTPC_IES_H -#define GTPC_IES_H +#ifndef SRSLTE_GTPC_IES_H +#define SRSLTE_GTPC_IES_H #include "srslte/phy/io/netsource.h" @@ -426,4 +426,4 @@ typedef struct gtpc_f_teid_ie //locally, according to the rules of TS 29.274 v10.14.0 Section 7. } //namespace -#endif //GTPC_IES_H +#endif // SRSLTE_GTPC_IES_H diff --git a/lib/include/srslte/asn1/gtpc_msg.h b/lib/include/srslte/asn1/gtpc_msg.h index 159be0c80..61591d7c4 100644 --- a/lib/include/srslte/asn1/gtpc_msg.h +++ b/lib/include/srslte/asn1/gtpc_msg.h @@ -21,8 +21,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef GTPC_V2_MSG_H -#define GTPC_V2_MSG_H +#ifndef SRSLTE_GTPC_MSG_H +#define SRSLTE_GTPC_MSG_H #include "srslte/asn1/gtpc_ies.h" @@ -442,4 +442,4 @@ struct gtpc_release_access_bearers_request } //namespace -#endif //GTPC_V2_MSG_H +#endif // SRSLTE_GTPC_MSG_H diff --git a/lib/include/srslte/asn1/liblte_common.h b/lib/include/srslte/asn1/liblte_common.h index 36fb32190..21d962748 100644 --- a/lib/include/srslte/asn1/liblte_common.h +++ b/lib/include/srslte/asn1/liblte_common.h @@ -33,8 +33,8 @@ *******************************************************************************/ -#ifndef __LIBLTE_COMMON_H__ -#define __LIBLTE_COMMON_H__ +#ifndef SRSLTE_LIBLTE_COMMON_H +#define SRSLTE_LIBLTE_COMMON_H /******************************************************************************* INCLUDES @@ -244,4 +244,4 @@ void liblte_align_up(uint8_t **ptr, uint32_t align); *********************************************************************/ void liblte_align_up_zero(uint8_t **ptr, uint32_t align); -#endif /* __LIBLTE_COMMON_H__ */ +#endif // SRSLTE_LIBLTE_COMMON_H diff --git a/lib/include/srslte/asn1/liblte_mme.h b/lib/include/srslte/asn1/liblte_mme.h index 85b8b2241..31b1a49df 100644 --- a/lib/include/srslte/asn1/liblte_mme.h +++ b/lib/include/srslte/asn1/liblte_mme.h @@ -35,8 +35,8 @@ *******************************************************************************/ -#ifndef __LIBLTE_MME_H__ -#define __LIBLTE_MME_H__ +#ifndef SRSLTE_LIBLTE_MME_H +#define SRSLTE_LIBLTE_MME_H /******************************************************************************* INCLUDES @@ -4038,4 +4038,4 @@ LIBLTE_ERROR_ENUM liblte_mme_pack_pdn_disconnect_request_msg(LIBLTE_MME_PDN_DISC LIBLTE_ERROR_ENUM liblte_mme_unpack_pdn_disconnect_request_msg(LIBLTE_BYTE_MSG_STRUCT *msg, LIBLTE_MME_PDN_DISCONNECT_REQUEST_MSG_STRUCT *pdn_discon_req); -#endif /* __LIBLTE_MME_H__ */ +#endif // SRSLTE_LIBLTE_MME_H diff --git a/lib/include/srslte/asn1/liblte_rrc.h b/lib/include/srslte/asn1/liblte_rrc.h index e0fb43aef..4fdff34e2 100644 --- a/lib/include/srslte/asn1/liblte_rrc.h +++ b/lib/include/srslte/asn1/liblte_rrc.h @@ -51,8 +51,8 @@ *******************************************************************************/ -#ifndef __LIBLTE_RRC_H__ -#define __LIBLTE_RRC_H__ +#ifndef SRSLTE_LIBLTE_RRC_H +#define SRSLTE_LIBLTE_RRC_H /******************************************************************************* INCLUDES @@ -7013,4 +7013,4 @@ LIBLTE_ERROR_ENUM liblte_rrc_pack_ul_dcch_msg(LIBLTE_RRC_UL_DCCH_MSG_STRUCT *ul_ LIBLTE_ERROR_ENUM liblte_rrc_unpack_ul_dcch_msg(LIBLTE_BIT_MSG_STRUCT *msg, LIBLTE_RRC_UL_DCCH_MSG_STRUCT *ul_dcch_msg); -#endif /* __LIBLTE_RRC_H__ */ +#endif // SRSLTE_LIBLTE_RRC_H diff --git a/lib/include/srslte/asn1/liblte_s1ap.h b/lib/include/srslte/asn1/liblte_s1ap.h index 077ddac66..0874ec753 100644 --- a/lib/include/srslte/asn1/liblte_s1ap.h +++ b/lib/include/srslte/asn1/liblte_s1ap.h @@ -4,8 +4,8 @@ /* ********************************************************************************/ -#ifndef LIBLTE_S1AP_H -#define LIBLTE_S1AP_H +#ifndef SRSLTE_LIBLTE_S1AP_H +#define SRSLTE_LIBLTE_S1AP_H /******************************************************************************* /* Warnings/Todos @@ -10352,4 +10352,4 @@ LIBLTE_ERROR_ENUM liblte_s1ap_pack_s1ap_pdu( LIBLTE_ERROR_ENUM liblte_s1ap_unpack_s1ap_pdu( LIBLTE_BYTE_MSG_STRUCT *msg, LIBLTE_S1AP_S1AP_PDU_STRUCT *s1ap_pdu); -#endif // LIBLTE_S1AP_H +#endif // SRSLTE_LIBLTE_S1AP_H diff --git a/lib/include/srslte/build_info.h.in b/lib/include/srslte/build_info.h.in index 90dac1dbb..5409ab077 100644 --- a/lib/include/srslte/build_info.h.in +++ b/lib/include/srslte/build_info.h.in @@ -25,8 +25,8 @@ * */ -#ifndef BUILD_INFO_ -#define BUILD_INFO_ +#ifndef SRSLTE_BUILD_INFO_H_IN +#define SRSLTE_BUILD_INFO_H_IN # ifdef __cplusplus extern "C" { diff --git a/lib/include/srslte/common/bcd_helpers.h b/lib/include/srslte/common/bcd_helpers.h index 10bed4347..b145a2d5a 100644 --- a/lib/include/srslte/common/bcd_helpers.h +++ b/lib/include/srslte/common/bcd_helpers.h @@ -24,8 +24,8 @@ * */ -#ifndef BCD_HELPERS -#define BCD_HELPERS +#ifndef SRSLTE_BCD_HELPERS_H +#define SRSLTE_BCD_HELPERS_H #include #include @@ -194,4 +194,4 @@ inline void s1ap_mccmnc_to_plmn(uint16_t mcc, uint16_t mnc, uint32_t *plmn) } // namespace srslte -#endif // BCD_HELPERS +#endif // SRSLTE_BCD_HELPERS_H diff --git a/lib/include/srslte/common/block_queue.h b/lib/include/srslte/common/block_queue.h index b4b312b60..b04a91985 100644 --- a/lib/include/srslte/common/block_queue.h +++ b/lib/include/srslte/common/block_queue.h @@ -24,8 +24,8 @@ * */ -#ifndef BLOCK_QUEUE -#define BLOCK_QUEUE +#ifndef SRSLTE_BLOCK_QUEUE_H +#define SRSLTE_BLOCK_QUEUE_H #include #include @@ -94,4 +94,4 @@ private: } -#endif \ No newline at end of file +#endif // SRSLTE_BLOCK_QUEUE_H \ No newline at end of file diff --git a/lib/include/srslte/common/buffer_pool.h b/lib/include/srslte/common/buffer_pool.h index 76634a697..1895c8330 100644 --- a/lib/include/srslte/common/buffer_pool.h +++ b/lib/include/srslte/common/buffer_pool.h @@ -24,8 +24,8 @@ * */ -#ifndef BUFFER_POOL_H -#define BUFFER_POOL_H +#ifndef SRSLTE_BUFFER_POOL_H +#define SRSLTE_BUFFER_POOL_H #include #include @@ -187,4 +187,4 @@ private: } // namespace srsue -#endif // BUFFER_POOL_H +#endif // SRSLTE_BUFFER_POOL_H diff --git a/lib/include/srslte/common/common.h b/lib/include/srslte/common/common.h index de9f6d5aa..754b7423d 100644 --- a/lib/include/srslte/common/common.h +++ b/lib/include/srslte/common/common.h @@ -24,8 +24,8 @@ * */ -#ifndef COMMON_H -#define COMMON_H +#ifndef SRSLTE_COMMON_H +#define SRSLTE_COMMON_H /******************************************************************************* INCLUDES @@ -239,6 +239,6 @@ private: }; -} // namespace srsue +} // namespace srslte -#endif // COMMON_H +#endif // SRSLTE_COMMON_H diff --git a/lib/include/srslte/common/config.h b/lib/include/srslte/common/config.h index 3231355fa..ed95631cd 100644 --- a/lib/include/srslte/common/config.h +++ b/lib/include/srslte/common/config.h @@ -24,8 +24,8 @@ * */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef SRSLTE_CONFIG_H +#define SRSLTE_CONFIG_H // Generic helper definitions for shared library support #if defined _WIN32 || defined __CYGWIN__ @@ -54,4 +54,4 @@ // cf_t definition typedef _Complex float cf_t; -#endif // CONFIG_H +#endif // SRSLTE_CONFIG_H diff --git a/lib/include/srslte/common/interfaces_common.h b/lib/include/srslte/common/interfaces_common.h index e7de90ea1..50eb024b5 100644 --- a/lib/include/srslte/common/interfaces_common.h +++ b/lib/include/srslte/common/interfaces_common.h @@ -24,8 +24,8 @@ * */ -#ifndef INTERFACE_COMMON_H -#define INTERFACE_COMMON_H +#ifndef SRSLTE_INTERFACES_COMMON_H +#define SRSLTE_INTERFACES_COMMON_H #include "srslte/common/timers.h" #include "srslte/common/security.h" @@ -96,4 +96,4 @@ public: } -#endif +#endif // SRSLTE_INTERFACES_COMMON_H diff --git a/lib/include/srslte/common/liblte_security.h b/lib/include/srslte/common/liblte_security.h index 02cc42ca8..8dc31f341 100644 --- a/lib/include/srslte/common/liblte_security.h +++ b/lib/include/srslte/common/liblte_security.h @@ -29,8 +29,8 @@ *******************************************************************************/ -#ifndef __LIBLTE_SECURITY_H__ -#define __LIBLTE_SECURITY_H__ +#ifndef SRSLTE_LIBLTE_SECURITY_H +#define SRSLTE_LIBLTE_SECURITY_H /******************************************************************************* INCLUDES @@ -345,4 +345,4 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f5_star(uint8 *k, uint8 *rand, uint8 *ak); -#endif /* __LIBLTE_SECURITY_H__ */ +#endif // SRSLTE_LIBLTE_SECURITY_H diff --git a/lib/include/srslte/common/liblte_ssl.h b/lib/include/srslte/common/liblte_ssl.h index d96c728ab..2ac4e794f 100644 --- a/lib/include/srslte/common/liblte_ssl.h +++ b/lib/include/srslte/common/liblte_ssl.h @@ -1,5 +1,5 @@ -#ifndef __LIBLTE_SSL_H__ -#define __LIBLTE_SSL_H__ +#ifndef SRSLTE_LIBLTE_SSL_H +#define SRSLTE_LIBLTE_SSL_H #ifdef HAVE_POLARSSL @@ -62,4 +62,4 @@ void sha256(const unsigned char *key, size_t keylen, #endif // HAVE_MBEDTLS -#endif // __LIBLTE_SSL_H__ +#endif // SRSLTE_LIBLTE_SSL_H diff --git a/lib/include/srslte/common/log.h b/lib/include/srslte/common/log.h index 45c359629..c7cec8488 100644 --- a/lib/include/srslte/common/log.h +++ b/lib/include/srslte/common/log.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef LOG_H -#define LOG_H +#ifndef SRSLTE_LOG_H +#define SRSLTE_LOG_H #include #include @@ -149,5 +149,5 @@ protected: } // namespace srslte -#endif // LOG_H +#endif // SRSLTE_LOG_H diff --git a/lib/include/srslte/common/log_filter.h b/lib/include/srslte/common/log_filter.h index 430a59199..2bcc510b7 100644 --- a/lib/include/srslte/common/log_filter.h +++ b/lib/include/srslte/common/log_filter.h @@ -32,8 +32,8 @@ * common logger object. *****************************************************************************/ -#ifndef LOG_FILTER_H -#define LOG_FILTER_H +#ifndef SRSLTE_LOG_FILTER_H +#define SRSLTE_LOG_FILTER_H #include #include @@ -98,4 +98,4 @@ private: } // namespace srsue -#endif // LOG_FILTER_H +#endif // SRSLTE_LOG_FILTER_H diff --git a/lib/include/srslte/common/logger.h b/lib/include/srslte/common/logger.h index 95e52922c..ed352cd5f 100644 --- a/lib/include/srslte/common/logger.h +++ b/lib/include/srslte/common/logger.h @@ -29,8 +29,8 @@ * Description: Interface for logging output *****************************************************************************/ -#ifndef LOGGER_H -#define LOGGER_H +#ifndef SRSLTE_LOGGER_H +#define SRSLTE_LOGGER_H #include #include @@ -45,4 +45,4 @@ public: } // namespace srslte -#endif // LOGGER_H +#endif // SRSLTE_LOGGER_H diff --git a/lib/include/srslte/common/logger_file.h b/lib/include/srslte/common/logger_file.h index d67a83220..f0bd5a15b 100644 --- a/lib/include/srslte/common/logger_file.h +++ b/lib/include/srslte/common/logger_file.h @@ -32,8 +32,8 @@ * increase queue size. If empty, consumer blocks. *****************************************************************************/ -#ifndef LOGGER_FILE_H -#define LOGGER_FILE_H +#ifndef SRSLTE_LOGGER_FILE_H +#define SRSLTE_LOGGER_FILE_H #include #include @@ -74,6 +74,6 @@ private: std::deque buffer; }; -} // namespace srsue +} // namespace srslte -#endif // LOGGER_H +#endif // SRSLTE_LOGGER_FILE_H diff --git a/lib/include/srslte/common/logger_stdout.h b/lib/include/srslte/common/logger_stdout.h index b76faadaf..4aab21d6b 100644 --- a/lib/include/srslte/common/logger_stdout.h +++ b/lib/include/srslte/common/logger_stdout.h @@ -29,8 +29,8 @@ * Description: Interface for logging output *****************************************************************************/ -#ifndef LOGGER_STDOUT_H -#define LOGGER_STDOUT_H +#ifndef SRSLTE_LOGGER_STDOUT_H +#define SRSLTE_LOGGER_STDOUT_H #include #include @@ -51,4 +51,4 @@ namespace srslte { } // namespace srslte -#endif // LOGGER_H +#endif // SRSLTE_LOGGER_STDOUT_H diff --git a/lib/include/srslte/common/mac_pcap.h b/lib/include/srslte/common/mac_pcap.h index 26a8f20bb..b403c8c49 100644 --- a/lib/include/srslte/common/mac_pcap.h +++ b/lib/include/srslte/common/mac_pcap.h @@ -24,8 +24,8 @@ * */ -#ifndef MACPCAP_H -#define MACPCAP_H +#ifndef SRSLTE_MAC_PCAP_H +#define SRSLTE_MAC_PCAP_H #include #include "srslte/common/pcap.h" @@ -59,6 +59,6 @@ private: uint16_t crnti_, uint8_t direction, uint8_t rnti_type); }; -} // namespace srsue +} // namespace srslte -#endif // MACPCAP_H +#endif // SRSLTE_MAC_PCAP_H diff --git a/lib/include/srslte/common/metrics_hub.h b/lib/include/srslte/common/metrics_hub.h index 05ab4c5fa..a73f3d90e 100644 --- a/lib/include/srslte/common/metrics_hub.h +++ b/lib/include/srslte/common/metrics_hub.h @@ -5,8 +5,8 @@ * to get metrics *****************************************************************************/ -#ifndef METRICS_HUB_H -#define METRICS_HUB_H +#ifndef SRSLTE_METRICS_HUB_H +#define SRSLTE_METRICS_HUB_H #include #include "srslte/common/threads.h" @@ -79,4 +79,4 @@ private: } // namespace srslte -#endif // METRICS_HUB_H +#endif // SRSLTE_METRICS_HUB_H diff --git a/lib/include/srslte/common/msg_queue.h b/lib/include/srslte/common/msg_queue.h index e8b8c742a..0dcdc2a55 100644 --- a/lib/include/srslte/common/msg_queue.h +++ b/lib/include/srslte/common/msg_queue.h @@ -30,8 +30,8 @@ * Reference: *****************************************************************************/ -#ifndef MSG_QUEUE_H -#define MSG_QUEUE_H +#ifndef SRSLTE_MSG_QUEUE_H +#define SRSLTE_MSG_QUEUE_H #include "srslte/common/common.h" #include @@ -149,7 +149,7 @@ private: uint32_t tail; }; -} // namespace srsue +} // namespace srslte -#endif // MSG_QUEUE_H +#endif // SRSLTE_MSG_QUEUE_H diff --git a/lib/include/srslte/common/nas_pcap.h b/lib/include/srslte/common/nas_pcap.h index 68fcabb73..061ba5010 100644 --- a/lib/include/srslte/common/nas_pcap.h +++ b/lib/include/srslte/common/nas_pcap.h @@ -1,5 +1,5 @@ -#ifndef NAS_PCAP_H -#define NAS_PCAP_H +#ifndef SRSLTE_NAS_PCAP_H +#define SRSLTE_NAS_PCAP_H #include "srslte/common/pcap.h" @@ -20,6 +20,6 @@ private: void pack_and_write(uint8_t* pdu, uint32_t pdu_len_bytes); }; -} //namespace srsue +} //namespace srslte -#endif // NAS_PCAP_H +#endif // SRSLTE_NAS_PCAP_H diff --git a/lib/include/srslte/common/pcap.h b/lib/include/srslte/common/pcap.h index ce4fcf541..d52547312 100644 --- a/lib/include/srslte/common/pcap.h +++ b/lib/include/srslte/common/pcap.h @@ -24,8 +24,8 @@ * */ -#ifndef UEPCAP_H -#define UEPCAP_H +#ifndef SRSLTE_PCAP_H +#define SRSLTE_PCAP_H #include #include @@ -247,4 +247,4 @@ inline int LTE_PCAP_NAS_WritePDU(FILE *fd, NAS_Context_Info_t *context, return 1; } -#endif /* UEPCAP_H */ +#endif // SRSLTE_PCAP_H diff --git a/lib/include/srslte/common/pdu.h b/lib/include/srslte/common/pdu.h index 5d0f5a235..cc2bb64f5 100644 --- a/lib/include/srslte/common/pdu.h +++ b/lib/include/srslte/common/pdu.h @@ -24,8 +24,8 @@ * */ -#ifndef MACPDU_H -#define MACPDU_H +#ifndef SRSLTE_PDU_H +#define SRSLTE_PDU_H #include #include "srslte/common/log.h" @@ -338,6 +338,6 @@ private: uint8_t backoff_indicator; }; -} // namespace srsue +} // namespace srslte -#endif // MACPDU_H +#endif // SRSLTE_PDU_H diff --git a/lib/include/srslte/common/pdu_queue.h b/lib/include/srslte/common/pdu_queue.h index 40e0f2dd2..a0c2b1da9 100644 --- a/lib/include/srslte/common/pdu_queue.h +++ b/lib/include/srslte/common/pdu_queue.h @@ -24,8 +24,8 @@ * */ -#ifndef PDUPROC_H -#define PDUPROC_H +#ifndef SRSLTE_PDU_QUEUE_H +#define SRSLTE_PDU_QUEUE_H #include "srslte/common/log.h" #include "srslte/common/block_queue.h" @@ -79,7 +79,7 @@ private: } // namespace srslte -#endif // PDUPROC_H +#endif // SRSLTE_PDU_QUEUE_H diff --git a/lib/include/srslte/common/security.h b/lib/include/srslte/common/security.h index 9ba2616d1..80b4c0c0e 100644 --- a/lib/include/srslte/common/security.h +++ b/lib/include/srslte/common/security.h @@ -24,8 +24,8 @@ * */ -#ifndef SECURITY_H -#define SECURITY_H +#ifndef SRSLTE_SECURITY_H +#define SRSLTE_SECURITY_H /****************************************************************************** * Common security header - wraps ciphering/integrity check algorithms. @@ -175,6 +175,6 @@ uint8_t security_milenage_f5_star( uint8_t *k, uint8_t *ak); -} // namespace srsue +} // namespace srslte -#endif // SECURITY_H +#endif // SRSLTE_SECURITY_H diff --git a/lib/include/srslte/common/snow_3g.h b/lib/include/srslte/common/snow_3g.h index c20e6a626..d4c742bb7 100644 --- a/lib/include/srslte/common/snow_3g.h +++ b/lib/include/srslte/common/snow_3g.h @@ -9,6 +9,8 @@ * and Integrity Algorithms UEA2 & UIA2. * Document 2: SNOW 3G Specification" *---------------------------------------------------------*/ +#ifndef SRSLTE_SNOW_3G_H +#define SRSLTE_SNOW_3G_H #include #include @@ -69,3 +71,4 @@ void snow3g_f8( u8 *key, u32 count, u32 bearer, u32 dir, \ u8* snow3g_f9( u8* key, u32 count, u32 fresh, u32 dir, \ u8 *data, u64 length); +#endif // SRSLTE_SNOW_3G_H \ No newline at end of file diff --git a/lib/include/srslte/common/task_dispatcher.h b/lib/include/srslte/common/task_dispatcher.h index 5a86fc311..c1d223a2b 100644 --- a/lib/include/srslte/common/task_dispatcher.h +++ b/lib/include/srslte/common/task_dispatcher.h @@ -30,8 +30,8 @@ * Reference: *****************************************************************************/ -#ifndef TASK_DISPATCHER_H -#define TASK_DISPATCHER_H +#ifndef SRSLTE_TASK_DISPATCHER_H +#define SRSLTE_TASK_DISPATCHER_H #include #include @@ -56,6 +56,6 @@ private: bool running; }; -} // namespace srsue +} // namespace srslte -#endif // TASK_DISPATCHER_H +#endif // SRSLTE_TASK_DISPATCHER_H diff --git a/lib/include/srslte/common/thread_pool.h b/lib/include/srslte/common/thread_pool.h index 812ee2433..865fc10d9 100644 --- a/lib/include/srslte/common/thread_pool.h +++ b/lib/include/srslte/common/thread_pool.h @@ -31,8 +31,8 @@ * Reference: *****************************************************************************/ -#ifndef THREAD_POOL_H -#define THREAD_POOL_H +#ifndef SRSLTE_THREAD_POOL_H +#define SRSLTE_THREAD_POOL_H #include #include @@ -102,4 +102,4 @@ private: }; } -#endif +#endif // SRSLTE_THREAD_POOL_H diff --git a/lib/include/srslte/common/threads.h b/lib/include/srslte/common/threads.h index 949ece195..e58f056b5 100644 --- a/lib/include/srslte/common/threads.h +++ b/lib/include/srslte/common/threads.h @@ -24,6 +24,7 @@ * */ + #include #include #include @@ -46,8 +47,8 @@ #ifdef __cplusplus } -#ifndef THREADS_ -#define THREADS_ +#ifndef SRSLTE_THREADS_H +#define SRSLTE_THREADS_H class thread { @@ -159,7 +160,7 @@ private: -#endif // THREADS_ +#endif // SRSLTE_THREADS_H #endif // __cplusplus diff --git a/lib/include/srslte/common/timeout.h b/lib/include/srslte/common/timeout.h index 4174b0237..bca09da31 100644 --- a/lib/include/srslte/common/timeout.h +++ b/lib/include/srslte/common/timeout.h @@ -31,8 +31,8 @@ * Reference: *****************************************************************************/ -#ifndef TIMEOUT_H -#define TIMEOUT_H +#ifndef SRSLTE_TIMEOUT_H +#define SRSLTE_TIMEOUT_H #include #include @@ -126,6 +126,6 @@ private: int duration_msec; }; -} // namespace srsue +} // namespace srslte -#endif // TIMEOUT_H +#endif // SRSLTE_TIMEOUT_H diff --git a/lib/include/srslte/common/timers.h b/lib/include/srslte/common/timers.h index 5e8b1cfd5..a2d8dc15a 100644 --- a/lib/include/srslte/common/timers.h +++ b/lib/include/srslte/common/timers.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef TIMERS_H -#define TIMERS_H +#ifndef SRSLTE_TIMERS_H +#define SRSLTE_TIMERS_H #include #include @@ -173,4 +173,4 @@ private: } // namespace srslte -#endif // TIMERS_H +#endif // SRSLTE_TIMERS_H diff --git a/lib/include/srslte/common/trace.h b/lib/include/srslte/common/trace.h index 64d55e460..00c7739f6 100644 --- a/lib/include/srslte/common/trace.h +++ b/lib/include/srslte/common/trace.h @@ -30,8 +30,8 @@ * Reference: *****************************************************************************/ -#ifndef TRACE_H -#define TRACE_H +#ifndef SRSLTE_TRACE_H +#define SRSLTE_TRACE_H #include #include @@ -98,4 +98,4 @@ private: } // namespace srslte -#endif // TRACE_H +#endif // SRSLTE_TRACE_H diff --git a/lib/include/srslte/common/tti_sync.h b/lib/include/srslte/common/tti_sync.h index fd62f442b..dd018f889 100644 --- a/lib/include/srslte/common/tti_sync.h +++ b/lib/include/srslte/common/tti_sync.h @@ -33,8 +33,8 @@ * Reference: *****************************************************************************/ -#ifndef TTISYNC_H -#define TTISYNC_H +#ifndef SRSLTE_TTI_SYNC_H +#define SRSLTE_TTI_SYNC_H #include @@ -77,4 +77,4 @@ class tti_sync } // namespace srsue -#endif // TTISYNC_H +#endif // SRSLTE_TTI_SYNC_H diff --git a/lib/include/srslte/common/tti_sync_cv.h b/lib/include/srslte/common/tti_sync_cv.h index 887ac4f04..2ba975faa 100644 --- a/lib/include/srslte/common/tti_sync_cv.h +++ b/lib/include/srslte/common/tti_sync_cv.h @@ -30,8 +30,8 @@ * Reference: *****************************************************************************/ -#ifndef TTISYNC_CV_H -#define TTISYNC_CV_H +#ifndef SRSLTE_TTI_SYNC_CV_H +#define SRSLTE_TTI_SYNC_CV_H #include #include "srslte/common/tti_sync.h" @@ -54,6 +54,6 @@ class tti_sync_cv : public tti_sync pthread_mutex_t mutex; }; -} // namespace srsue +} // namespace srslte -#endif // TTISYNC_CV_H +#endif // SRSLTE_TTI_SYNC_CV_H diff --git a/lib/include/srslte/config.h b/lib/include/srslte/config.h index 1e9d27aac..02c43777f 100644 --- a/lib/include/srslte/config.h +++ b/lib/include/srslte/config.h @@ -24,8 +24,8 @@ * */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef SRSLTE_CONFIG_H +#define SRSLTE_CONFIG_H // Generic helper definitions for shared library support #if defined _WIN32 || defined __CYGWIN__ @@ -64,4 +64,4 @@ typedef _Complex float cf_t; typedef _Complex short int c16_t; #endif /* ENABLE_C16 */ -#endif // CONFIG_H +#endif // SRSLTE_CONFIG_H diff --git a/lib/include/srslte/interfaces/enb_interfaces.h b/lib/include/srslte/interfaces/enb_interfaces.h index cd7d10020..cad5c5eb1 100644 --- a/lib/include/srslte/interfaces/enb_interfaces.h +++ b/lib/include/srslte/interfaces/enb_interfaces.h @@ -36,8 +36,8 @@ #include -#ifndef ENBINTERFACES_H -#define ENBINTERFACES_H +#ifndef SRSLTE_ENB_INTERFACES_H +#define SRSLTE_ENB_INTERFACES_H namespace srsenb { @@ -272,4 +272,4 @@ public: } -#endif +#endif // SRSLTE_ENB_INTERFACES_H diff --git a/lib/include/srslte/interfaces/enb_metrics_interface.h b/lib/include/srslte/interfaces/enb_metrics_interface.h index ee00e3453..6c8b2e740 100644 --- a/lib/include/srslte/interfaces/enb_metrics_interface.h +++ b/lib/include/srslte/interfaces/enb_metrics_interface.h @@ -24,8 +24,8 @@ * */ -#ifndef ENB_METRICS_INTERFACE_H -#define ENB_METRICS_INTERFACE_H +#ifndef SRSLTE_ENB_METRICS_INTERFACE_H +#define SRSLTE_ENB_METRICS_INTERFACE_H #include @@ -64,4 +64,4 @@ public: } // namespace srsenb -#endif // ENB_METRICS_INTERFACE_H +#endif // SRSLTE_ENB_METRICS_INTERFACE_H diff --git a/lib/include/srslte/interfaces/epc_interfaces.h b/lib/include/srslte/interfaces/epc_interfaces.h index 21646628a..60238b7f9 100644 --- a/lib/include/srslte/interfaces/epc_interfaces.h +++ b/lib/include/srslte/interfaces/epc_interfaces.h @@ -1,5 +1,5 @@ -#ifndef EPC_INTERFACE_H -#define EPC_INTERFACE_H +#ifndef SRSLTE_EPC_INTERFACES_H +#define SRSLTE_EPC_INTERFACES_H #include "srslte/srslte.h" @@ -15,4 +15,4 @@ public: }; } -#endif // ENB_METRICS_INTERFACE_H +#endif // SRSLTE_EPC_INTERFACES_H diff --git a/lib/include/srslte/interfaces/sched_interface.h b/lib/include/srslte/interfaces/sched_interface.h index 562499dfb..5160b4490 100644 --- a/lib/include/srslte/interfaces/sched_interface.h +++ b/lib/include/srslte/interfaces/sched_interface.h @@ -26,8 +26,8 @@ #include "srslte/srslte.h" -#ifndef SCHED_INTERFACE_H -#define SCHED_INTERFACE_H +#ifndef SRSLTE_SCHED_INTERFACE_H +#define SRSLTE_SCHED_INTERFACE_H namespace srsenb { @@ -248,4 +248,4 @@ public: } -#endif +#endif // SRSLTE_SCHED_INTERFACE_H diff --git a/lib/include/srslte/interfaces/ue_interfaces.h b/lib/include/srslte/interfaces/ue_interfaces.h index bea0cb05c..b1c0672d3 100644 --- a/lib/include/srslte/interfaces/ue_interfaces.h +++ b/lib/include/srslte/interfaces/ue_interfaces.h @@ -30,8 +30,8 @@ * to other layers. *****************************************************************************/ -#ifndef INTERFACES_H -#define INTERFACES_H +#ifndef SRSLTE_UE_INTERFACES_H +#define SRSLTE_UE_INTERFACES_H #include @@ -599,6 +599,6 @@ public: }; -} // namespace srslte +} // namespace srsue -#endif // INTERFACES_H +#endif // SRSLTE_UE_INTERFACES_H diff --git a/lib/include/srslte/phy/agc/agc.h b/lib/include/srslte/phy/agc/agc.h index 0a6bba8c1..ab7bb2ed7 100644 --- a/lib/include/srslte/phy/agc/agc.h +++ b/lib/include/srslte/phy/agc/agc.h @@ -33,8 +33,8 @@ * Reference: *********************************************************************************************/ -#ifndef AGC_ -#define AGC_ +#ifndef SRSLTE_AGC_H +#define SRSLTE_AGC_H #include #include @@ -101,4 +101,4 @@ SRSLTE_API void srslte_agc_process(srslte_agc_t *q, cf_t *signal, uint32_t len); -#endif // AGC_ +#endif // SRSLTE_AGC_H diff --git a/lib/include/srslte/phy/ch_estimation/chest_common.h b/lib/include/srslte/phy/ch_estimation/chest_common.h index 8eb63aa73..276d9c55e 100644 --- a/lib/include/srslte/phy/ch_estimation/chest_common.h +++ b/lib/include/srslte/phy/ch_estimation/chest_common.h @@ -24,8 +24,8 @@ * */ -#ifndef CHEST_ -#define CHEST_ +#ifndef SRSLTE_CHEST_COMMON_H +#define SRSLTE_CHEST_COMMON_H #include #include "srslte/config.h" @@ -51,5 +51,5 @@ SRSLTE_API float srslte_chest_estimate_noise_pilots(cf_t *noisy, SRSLTE_API void srslte_chest_set_triangle_filter(float *fil, int filter_len); -#endif +#endif // SRSLTE_CHEST_COMMON_H diff --git a/lib/include/srslte/phy/ch_estimation/chest_dl.h b/lib/include/srslte/phy/ch_estimation/chest_dl.h index e7cc28bed..a521d653e 100644 --- a/lib/include/srslte/phy/ch_estimation/chest_dl.h +++ b/lib/include/srslte/phy/ch_estimation/chest_dl.h @@ -38,8 +38,8 @@ * Reference: *********************************************************************************************/ -#ifndef CHEST_DL_ -#define CHEST_DL_ +#ifndef SRSLTE_CHEST_DL_H +#define SRSLTE_CHEST_DL_H #include @@ -193,4 +193,4 @@ SRSLTE_API float srslte_chest_dl_get_rsrp(srslte_chest_dl_t *q); SRSLTE_API float srslte_chest_dl_get_rsrp_neighbour(srslte_chest_dl_t *q); -#endif +#endif // SRSLTE_CHEST_DL_H diff --git a/lib/include/srslte/phy/ch_estimation/chest_ul.h b/lib/include/srslte/phy/ch_estimation/chest_ul.h index 0571fec8c..df5c11db6 100644 --- a/lib/include/srslte/phy/ch_estimation/chest_ul.h +++ b/lib/include/srslte/phy/ch_estimation/chest_ul.h @@ -36,8 +36,8 @@ * Reference: *********************************************************************************************/ -#ifndef CHEST_UL_ -#define CHEST_UL_ +#ifndef SRSLTE_CHEST_UL_H +#define SRSLTE_CHEST_UL_H #include @@ -118,4 +118,4 @@ SRSLTE_API float srslte_chest_ul_get_noise_estimate(srslte_chest_ul_t *q); SRSLTE_API float srslte_chest_ul_get_snr(srslte_chest_ul_t *q); -#endif +#endif // SRSLTE_CHEST_UL_H diff --git a/lib/include/srslte/phy/ch_estimation/refsignal_dl.h b/lib/include/srslte/phy/ch_estimation/refsignal_dl.h index 9263073a9..6167d8d4e 100644 --- a/lib/include/srslte/phy/ch_estimation/refsignal_dl.h +++ b/lib/include/srslte/phy/ch_estimation/refsignal_dl.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.10 *********************************************************************************************/ -#ifndef SRSLTE_REFSIGNAL_DL_ -#define SRSLTE_REFSIGNAL_DL_ +#ifndef SRSLTE_REFSIGNAL_DL_H +#define SRSLTE_REFSIGNAL_DL_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -118,4 +118,4 @@ SRSLTE_API int srslte_refsignal_mbsfn_gen_seq(srslte_refsignal_t * q, uint32_t N_mbsfn_id); -#endif +#endif // SRSLTE_REFSIGNAL_DL_H diff --git a/lib/include/srslte/phy/ch_estimation/refsignal_ul.h b/lib/include/srslte/phy/ch_estimation/refsignal_ul.h index 9e1da9e50..7b393e8d9 100644 --- a/lib/include/srslte/phy/ch_estimation/refsignal_ul.h +++ b/lib/include/srslte/phy/ch_estimation/refsignal_ul.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.5 *********************************************************************************************/ -#ifndef SRSLTE_REFSIGNAL_UL_ -#define SRSLTE_REFSIGNAL_UL_ +#ifndef SRSLTE_REFSIGNAL_UL_H +#define SRSLTE_REFSIGNAL_UL_H #include "srslte/config.h" #include "srslte/phy/phch/pucch.h" @@ -209,4 +209,4 @@ SRSLTE_API uint32_t srslte_refsignal_srs_rb_L_cs(uint32_t bw_cfg, SRSLTE_API uint32_t srslte_refsignal_srs_M_sc(srslte_refsignal_ul_t *q); -#endif +#endif // SRSLTE_REFSIGNAL_UL_H diff --git a/lib/include/srslte/phy/channel/ch_awgn.h b/lib/include/srslte/phy/channel/ch_awgn.h index ace971961..3dbabcda7 100644 --- a/lib/include/srslte/phy/channel/ch_awgn.h +++ b/lib/include/srslte/phy/channel/ch_awgn.h @@ -37,8 +37,8 @@ #include "srslte/config.h" -#ifndef CH_AWGN_ -#define CH_AWGN_ +#ifndef SRSLTE_CH_AWGN_H +#define SRSLTE_CH_AWGN_H SRSLTE_API void srslte_ch_awgn_c(const cf_t* input, cf_t* output, @@ -54,4 +54,4 @@ SRSLTE_API float srslte_ch_awgn_get_variance(float ebno_db, float rate); -#endif +#endif // SRSLTE_CH_AWGN_H diff --git a/lib/include/srslte/phy/common/phy_common.h b/lib/include/srslte/phy/common/phy_common.h index c55713cfc..82c2dfaa8 100644 --- a/lib/include/srslte/phy/common/phy_common.h +++ b/lib/include/srslte/phy/common/phy_common.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 *********************************************************************************************/ -#ifndef _LTEBASE_ -#define _LTEBASE_ +#ifndef SRSLTE_PHY_COMMON_H +#define SRSLTE_PHY_COMMON_H #include #include @@ -305,4 +305,4 @@ SRSLTE_API char *srslte_mimotype2str(srslte_mimo_type_t mimo_type); SRSLTE_API uint32_t srslte_tti_interval(uint32_t tti1, uint32_t tti2); -#endif +#endif // SRSLTE_PHY_COMMON_H diff --git a/lib/include/srslte/phy/common/phy_logger.h b/lib/include/srslte/phy/common/phy_logger.h index d02efbb47..2f0805df8 100644 --- a/lib/include/srslte/phy/common/phy_logger.h +++ b/lib/include/srslte/phy/common/phy_logger.h @@ -29,8 +29,8 @@ * Description: Interface for logging output *****************************************************************************/ -#ifndef PHY_LOGGER_H -#define PHY_LOGGER_H +#ifndef SRSLTE_PHY_LOGGER_H +#define SRSLTE_PHY_LOGGER_H #include #include @@ -56,4 +56,4 @@ void srslte_phy_log_register_handler(void *ctx, phy_log_handler_t handler); } #endif // C++ -#endif // LOGGER_H +#endif // SRSLTE_PHY_LOGGER_H diff --git a/lib/include/srslte/phy/common/sequence.h b/lib/include/srslte/phy/common/sequence.h index 62934c7e0..346be1cda 100644 --- a/lib/include/srslte/phy/common/sequence.h +++ b/lib/include/srslte/phy/common/sequence.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.2 *********************************************************************************************/ -#ifndef LTESEQ_ -#define LTESEQ_ +#ifndef SRSLTE_SEQUENCE_H +#define SRSLTE_SEQUENCE_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -100,4 +100,4 @@ SRSLTE_API int srslte_sequence_pmch(srslte_sequence_t *seq, uint32_t mbsfn_id, uint32_t len); -#endif +#endif // SRSLTE_SEQUENCE_H diff --git a/lib/include/srslte/phy/common/timestamp.h b/lib/include/srslte/phy/common/timestamp.h index 8dd960b69..f4c505b4a 100644 --- a/lib/include/srslte/phy/common/timestamp.h +++ b/lib/include/srslte/phy/common/timestamp.h @@ -34,8 +34,8 @@ * Reference: *********************************************************************************************/ -#ifndef TIMESTAMP_ -#define TIMESTAMP_ +#ifndef SRSLTE_TIMESTAMP_H +#define SRSLTE_TIMESTAMP_H #include #include @@ -65,4 +65,4 @@ SRSLTE_API double srslte_timestamp_real(srslte_timestamp_t *t); SRSLTE_API uint32_t srslte_timestamp_uint32(srslte_timestamp_t *t); -#endif // TIMESTAMP_ +#endif // SRSLTE_TIMESTAMP_H diff --git a/lib/include/srslte/phy/dft/dft.h b/lib/include/srslte/phy/dft/dft.h index afe8024d2..e62362d8c 100644 --- a/lib/include/srslte/phy/dft/dft.h +++ b/lib/include/srslte/phy/dft/dft.h @@ -25,8 +25,8 @@ */ -#ifndef DFT_H_ -#define DFT_H_ +#ifndef SRSLTE_DFT_H +#define SRSLTE_DFT_H #include #include "srslte/config.h" @@ -157,5 +157,5 @@ SRSLTE_API void srslte_dft_run_r(srslte_dft_plan_t *plan, const float *in, float *out); -#endif // DFT_H_ +#endif // SRSLTE_DFT_H diff --git a/lib/include/srslte/phy/dft/dft_precoding.h b/lib/include/srslte/phy/dft/dft_precoding.h index 022593aa7..c1eb20ec6 100644 --- a/lib/include/srslte/phy/dft/dft_precoding.h +++ b/lib/include/srslte/phy/dft/dft_precoding.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.3.3 *********************************************************************************************/ -#ifndef DFTPREC_ -#define DFTPREC_ +#ifndef SRSLTE_DFT_PRECODING_H +#define SRSLTE_DFT_PRECODING_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -68,4 +68,4 @@ SRSLTE_API int srslte_dft_precoding(srslte_dft_precoding_t *q, uint32_t nof_prb, uint32_t nof_symbols); -#endif +#endif // SRSLTE_DFT_PRECODING_H diff --git a/lib/include/srslte/phy/dft/ofdm.h b/lib/include/srslte/phy/dft/ofdm.h index e48c240b9..6f31ed3ab 100644 --- a/lib/include/srslte/phy/dft/ofdm.h +++ b/lib/include/srslte/phy/dft/ofdm.h @@ -25,8 +25,8 @@ */ -#ifndef LTEFFT_ -#define LTEFFT_ +#ifndef SRSLTE_OFDM_H +#define SRSLTE_OFDM_H /********************************************************************************************** * File: ofdm.h @@ -158,4 +158,4 @@ SRSLTE_API void srslte_ofdm_set_non_mbsfn_region(srslte_ofdm_t *q, uint8_t non_mbsfn_region); -#endif +#endif // SRSLTE_OFDM_H diff --git a/lib/include/srslte/phy/enb/enb_dl.h b/lib/include/srslte/phy/enb/enb_dl.h index 232dc459c..2b11bd6e3 100644 --- a/lib/include/srslte/phy/enb/enb_dl.h +++ b/lib/include/srslte/phy/enb/enb_dl.h @@ -35,8 +35,8 @@ * Reference: *****************************************************************************/ -#ifndef ENBDL_H -#define ENBDL_H +#ifndef SRSLTE_ENB_DL_H +#define SRSLTE_ENB_DL_H #include @@ -195,4 +195,4 @@ SRSLTE_API void srslte_enb_dl_save_signal(srslte_enb_dl_t *q, uint16_t rnti, uint32_t cfi); -#endif +#endif // SRSLTE_ENB_DL_H diff --git a/lib/include/srslte/phy/enb/enb_ul.h b/lib/include/srslte/phy/enb/enb_ul.h index 8699a2a37..49d174807 100644 --- a/lib/include/srslte/phy/enb/enb_ul.h +++ b/lib/include/srslte/phy/enb/enb_ul.h @@ -35,8 +35,8 @@ * Reference: *****************************************************************************/ -#ifndef ENBUL_H -#define ENBUL_H +#ifndef SRSLTE_ENB_UL_H +#define SRSLTE_ENB_UL_H #include @@ -153,4 +153,4 @@ SRSLTE_API int srslte_enb_ul_detect_prach(srslte_enb_ul_t *q, float *peak2avg); -#endif +#endif // SRSLTE_ENB_UL_H diff --git a/lib/include/srslte/phy/fec/cbsegm.h b/lib/include/srslte/phy/fec/cbsegm.h index f89cb089d..7eee8320d 100644 --- a/lib/include/srslte/phy/fec/cbsegm.h +++ b/lib/include/srslte/phy/fec/cbsegm.h @@ -29,8 +29,8 @@ #include "srslte/config.h" -#ifndef CBSEGM_H -#define CBSEGM_H +#ifndef SRSLTE_CBSEGM_H +#define SRSLTE_CBSEGM_H #define SRSLTE_NOF_TC_CB_SIZES 188 @@ -56,4 +56,4 @@ SRSLTE_API bool srslte_cbsegm_cbsize_isvalid(uint32_t size); SRSLTE_API int srslte_cbsegm_cbindex(uint32_t long_cb); -#endif +#endif // SRSLTE_CBSEGM_H diff --git a/lib/include/srslte/phy/fec/convcoder.h b/lib/include/srslte/phy/fec/convcoder.h index 1d51cbcbc..99dfd333e 100644 --- a/lib/include/srslte/phy/fec/convcoder.h +++ b/lib/include/srslte/phy/fec/convcoder.h @@ -34,8 +34,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.1 *********************************************************************************************/ -#ifndef CONVCODER_ -#define CONVCODER_ +#ifndef SRSLTE_CONVCODER_H +#define SRSLTE_CONVCODER_H #include #include "srslte/config.h" @@ -53,4 +53,4 @@ SRSLTE_API int srslte_convcoder_encode(srslte_convcoder_t *q, uint32_t frame_length); -#endif +#endif // SRSLTE_CONVCODER_H diff --git a/lib/include/srslte/phy/fec/crc.h b/lib/include/srslte/phy/fec/crc.h index 89b4a122f..030e7c6bb 100644 --- a/lib/include/srslte/phy/fec/crc.h +++ b/lib/include/srslte/phy/fec/crc.h @@ -34,8 +34,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.1 *********************************************************************************************/ -#ifndef CRC_ -#define CRC_ +#ifndef SRSLTE_CRC_H +#define SRSLTE_CRC_H #include "srslte/config.h" #include @@ -73,4 +73,4 @@ SRSLTE_API uint32_t srslte_crc_checksum(srslte_crc_t *h, uint8_t *data, int len); -#endif +#endif // SRSLTE_CRC_H diff --git a/lib/include/srslte/phy/fec/rm_conv.h b/lib/include/srslte/phy/fec/rm_conv.h index 92e640e3a..9681ce827 100644 --- a/lib/include/srslte/phy/fec/rm_conv.h +++ b/lib/include/srslte/phy/fec/rm_conv.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.4.2 *********************************************************************************************/ -#ifndef RM_CONV_ -#define RM_CONV_ +#ifndef SRSLTE_RM_CONV_H +#define SRSLTE_RM_CONV_H #include "srslte/config.h" @@ -63,4 +63,4 @@ SRSLTE_API int srslte_rm_conv_rx_s(int16_t *input, int16_t *output, uint32_t out_len); -#endif +#endif // SRSLTE_RM_CONV_H diff --git a/lib/include/srslte/phy/fec/rm_turbo.h b/lib/include/srslte/phy/fec/rm_turbo.h index 182b49fb8..26f98944c 100644 --- a/lib/include/srslte/phy/fec/rm_turbo.h +++ b/lib/include/srslte/phy/fec/rm_turbo.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.4.1 *********************************************************************************************/ -#ifndef RM_TURBO_ -#define RM_TURBO_ +#ifndef SRSLTE_RM_TURBO_H +#define SRSLTE_RM_TURBO_H #include "srslte/config.h" @@ -85,4 +85,4 @@ SRSLTE_API int srslte_rm_turbo_rx_lut(int16_t *input, uint32_t rv_idx); -#endif +#endif // SRSLTE_RM_TURBO_H diff --git a/lib/include/srslte/phy/fec/softbuffer.h b/lib/include/srslte/phy/fec/softbuffer.h index 3949134d8..864fc1439 100644 --- a/lib/include/srslte/phy/fec/softbuffer.h +++ b/lib/include/srslte/phy/fec/softbuffer.h @@ -33,8 +33,8 @@ * Reference: *****************************************************************************/ -#ifndef SOFTBUFFER_ -#define SOFTBUFFER_ +#ifndef SRSLTE_SOFTBUFFER_H +#define SRSLTE_SOFTBUFFER_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -82,4 +82,4 @@ SRSLTE_API void srslte_softbuffer_tx_free(srslte_softbuffer_tx_t *p); -#endif +#endif // SRSLTE_SOFTBUFFER_H diff --git a/lib/include/srslte/phy/fec/tc_interl.h b/lib/include/srslte/phy/fec/tc_interl.h index ad46edd8f..c0ffaae58 100644 --- a/lib/include/srslte/phy/fec/tc_interl.h +++ b/lib/include/srslte/phy/fec/tc_interl.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2.3 *********************************************************************************************/ -#ifndef _TC_INTERL_H -#define _TC_INTERL_H +#ifndef SRSLTE_TC_INTERL_H +#define SRSLTE_TC_INTERL_H #include "srslte/config.h" #include @@ -55,4 +55,4 @@ SRSLTE_API int srslte_tc_interl_init(srslte_tc_interl_t *h, SRSLTE_API void srslte_tc_interl_free(srslte_tc_interl_t *h); -#endif +#endif // SRSLTE_TC_INTERL_H diff --git a/lib/include/srslte/phy/fec/turbocoder.h b/lib/include/srslte/phy/fec/turbocoder.h index 119e4f641..485e83ff3 100644 --- a/lib/include/srslte/phy/fec/turbocoder.h +++ b/lib/include/srslte/phy/fec/turbocoder.h @@ -35,8 +35,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2 *********************************************************************************************/ -#ifndef TURBOCODER_ -#define TURBOCODER_ +#ifndef SRSLTE_TURBOCODER_H +#define SRSLTE_TURBOCODER_H #include "srslte/config.h" #include "srslte/phy/fec/tc_interl.h" @@ -75,5 +75,5 @@ SRSLTE_API int srslte_tcod_encode_lut(srslte_tcod_t *h, SRSLTE_API void srslte_tcod_gentable(); -#endif +#endif // SRSLTE_TURBOCODER_H diff --git a/lib/include/srslte/phy/fec/turbodecoder.h b/lib/include/srslte/phy/fec/turbodecoder.h index ac05422bc..d882118aa 100644 --- a/lib/include/srslte/phy/fec/turbodecoder.h +++ b/lib/include/srslte/phy/fec/turbodecoder.h @@ -36,8 +36,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2 *********************************************************************************************/ -#ifndef TURBODECODER_ -#define TURBODECODER_ +#ifndef SRSLTE_TURBODECODER_H +#define SRSLTE_TURBODECODER_H #include "srslte/config.h" #include "srslte/phy/fec/tc_interl.h" @@ -117,4 +117,4 @@ SRSLTE_API int srslte_tdec_run_all_par(srslte_tdec_t * h, uint32_t nof_iterations, uint32_t long_cb); -#endif +#endif // SRSLTE_TURBODECODER_H diff --git a/lib/include/srslte/phy/fec/turbodecoder_gen.h b/lib/include/srslte/phy/fec/turbodecoder_gen.h index 4a023396c..2fefc22cc 100644 --- a/lib/include/srslte/phy/fec/turbodecoder_gen.h +++ b/lib/include/srslte/phy/fec/turbodecoder_gen.h @@ -36,8 +36,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2 *********************************************************************************************/ -#ifndef TURBODECODER_GEN_ -#define TURBODECODER_GEN_ +#ifndef SRSLTE_TURBODECODER_GEN_H +#define SRSLTE_TURBODECODER_GEN_H #include "srslte/config.h" #include "srslte/phy/fec/tc_interl.h" @@ -96,4 +96,4 @@ SRSLTE_API int srslte_tdec_gen_run_all(srslte_tdec_gen_t * h, uint32_t nof_iterations, uint32_t long_cb); -#endif +#endif // SRSLTE_TURBODECODER_GEN_H diff --git a/lib/include/srslte/phy/fec/turbodecoder_simd.h b/lib/include/srslte/phy/fec/turbodecoder_simd.h index a899a5964..35c8beef9 100644 --- a/lib/include/srslte/phy/fec/turbodecoder_simd.h +++ b/lib/include/srslte/phy/fec/turbodecoder_simd.h @@ -36,8 +36,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2 *********************************************************************************************/ -#ifndef TURBODECODER_SSE_ -#define TURBODECODER_SSE_ +#ifndef SRSLTE_TURBODECODER_SIMD_H +#define SRSLTE_TURBODECODER_SIMD_H #include "srslte/config.h" #include "srslte/phy/fec/tc_interl.h" @@ -119,4 +119,4 @@ SRSLTE_API int srslte_tdec_simd_run_all(srslte_tdec_simd_t * h, uint32_t nof_iterations, uint32_t long_cb); -#endif +#endif // SRSLTE_TURBODECODER_SIMD_H diff --git a/lib/include/srslte/phy/fec/turbodecoder_simd_inter.h b/lib/include/srslte/phy/fec/turbodecoder_simd_inter.h index c80785809..054fbc3cb 100644 --- a/lib/include/srslte/phy/fec/turbodecoder_simd_inter.h +++ b/lib/include/srslte/phy/fec/turbodecoder_simd_inter.h @@ -36,8 +36,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2 *********************************************************************************************/ -#ifndef TURBODECODER_SSE_INTER_ -#define TURBODECODER_SSE_INTER_ +#ifndef SRSLTE_TURBODECODER_SIMD_INTER_H +#define SRSLTE_TURBODECODER_SIMD_INTER_H /** This is an simd inter-frame parallel turbo decoder. Parallizes 8 code-blocks using SSE @@ -116,4 +116,4 @@ SRSLTE_API int srslte_tdec_simd_inter_run_all(srslte_tdec_simd_inter_t * h, uint32_t nof_cb, uint32_t long_cb); -#endif +#endif // SRSLTE_TURBODECODER_SIMD_INTER_H diff --git a/lib/include/srslte/phy/fec/turbodecoder_sse.h b/lib/include/srslte/phy/fec/turbodecoder_sse.h index 8b9f24372..9678fba9a 100644 --- a/lib/include/srslte/phy/fec/turbodecoder_sse.h +++ b/lib/include/srslte/phy/fec/turbodecoder_sse.h @@ -36,8 +36,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2 *********************************************************************************************/ -#ifndef TURBODECODER_SSE_ -#define TURBODECODER_SSE_ +#ifndef SRSLTE_TURBODECODER_SSE_ +#define SRSLTE_TURBODECODER_SSE_ #include "srslte/config.h" #include "srslte/phy/fec/tc_interl.h" @@ -98,4 +98,4 @@ SRSLTE_API int srslte_tdec_sse_run_all(srslte_tdec_sse_t * h, uint32_t nof_iterations, uint32_t long_cb); -#endif +#endif // SRSLTE_TURBODECODER_SSE_ diff --git a/lib/include/srslte/phy/fec/viterbi.h b/lib/include/srslte/phy/fec/viterbi.h index 689b636e9..0f6f0cd50 100644 --- a/lib/include/srslte/phy/fec/viterbi.h +++ b/lib/include/srslte/phy/fec/viterbi.h @@ -33,8 +33,8 @@ * Reference: *****************************************************************************/ -#ifndef VITERBI_ -#define VITERBI_ +#ifndef SRSLTE_VITERBI_H +#define SRSLTE_VITERBI_H #include #include "srslte/config.h" @@ -119,4 +119,4 @@ SRSLTE_API int srslte_viterbi_init_avx2(srslte_viterbi_t *q, -#endif +#endif // SRSLTE_VITERBI_H diff --git a/lib/include/srslte/phy/io/binsource.h b/lib/include/srslte/phy/io/binsource.h index a89a305ea..733449b25 100644 --- a/lib/include/srslte/phy/io/binsource.h +++ b/lib/include/srslte/phy/io/binsource.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef BINSOURCE_ -#define BINSOURCE_ +#ifndef SRSLTE_BINSOURCE_H +#define SRSLTE_BINSOURCE_H #include @@ -68,4 +68,4 @@ SRSLTE_API int srslte_binsource_generate(srslte_binsource_t* q, uint8_t *bits, int nbits); -#endif // BINSOURCE_ +#endif // SRSLTE_BINSOURCE_H diff --git a/lib/include/srslte/phy/io/filesink.h b/lib/include/srslte/phy/io/filesink.h index 921f1e440..b6fee3adf 100644 --- a/lib/include/srslte/phy/io/filesink.h +++ b/lib/include/srslte/phy/io/filesink.h @@ -34,8 +34,8 @@ * Reference: *****************************************************************************/ -#ifndef FILESINK_ -#define FILESINK_ +#ifndef SRSLTE_FILESINK_H +#define SRSLTE_FILESINK_H #include #include @@ -64,4 +64,4 @@ SRSLTE_API int srslte_filesink_write_multi(srslte_filesink_t *q, int nsamples, int nchannels); -#endif // FILESINK_ +#endif // SRSLTE_FILESINK_H diff --git a/lib/include/srslte/phy/io/filesource.h b/lib/include/srslte/phy/io/filesource.h index f515d7034..d4ad81f94 100644 --- a/lib/include/srslte/phy/io/filesource.h +++ b/lib/include/srslte/phy/io/filesource.h @@ -34,8 +34,8 @@ * Reference: *****************************************************************************/ -#ifndef FILESOURCE_ -#define FILESOURCE_ +#ifndef SRSLTE_FILESOURCE_H +#define SRSLTE_FILESOURCE_H #include #include @@ -67,4 +67,4 @@ SRSLTE_API int srslte_filesource_read_multi(srslte_filesource_t *q, int nsamples, int nof_channels); -#endif // FILESOURCE_ +#endif // SRSLTE_FILESOURCE_H diff --git a/lib/include/srslte/phy/io/format.h b/lib/include/srslte/phy/io/format.h index 81bf1f702..22c0e3973 100644 --- a/lib/include/srslte/phy/io/format.h +++ b/lib/include/srslte/phy/io/format.h @@ -25,8 +25,8 @@ */ -#ifndef FORMAT_ -#define FORMAT_ +#ifndef SRSLTE_FORMAT_H +#define SRSLTE_FORMAT_H typedef enum { SRSLTE_FLOAT, @@ -37,4 +37,4 @@ typedef enum { SRSLTE_COMPLEX_SHORT_BIN } srslte_datatype_t; -#endif // FORMAT_ +#endif // SRSLTE_FORMAT_H diff --git a/lib/include/srslte/phy/io/netsink.h b/lib/include/srslte/phy/io/netsink.h index 3339716c1..246c520bf 100644 --- a/lib/include/srslte/phy/io/netsink.h +++ b/lib/include/srslte/phy/io/netsink.h @@ -33,8 +33,8 @@ * Reference: *****************************************************************************/ -#ifndef NETSINK_ -#define NETSINK_ +#ifndef SRSLTE_NETSINK_H +#define SRSLTE_NETSINK_H #include #include @@ -71,4 +71,4 @@ SRSLTE_API int srslte_netsink_write(srslte_netsink_t *q, SRSLTE_API int srslte_netsink_set_nonblocking(srslte_netsink_t *q); -#endif // UDPSINK_ +#endif // SRSLTE_NETSINK_H diff --git a/lib/include/srslte/phy/io/netsource.h b/lib/include/srslte/phy/io/netsource.h index e10d8d644..ee0ca69da 100644 --- a/lib/include/srslte/phy/io/netsource.h +++ b/lib/include/srslte/phy/io/netsource.h @@ -33,8 +33,8 @@ * Reference: *****************************************************************************/ -#ifndef NETSOURCE_ -#define NETSOURCE_ +#ifndef SRSLTE_NETSOURCE_H +#define SRSLTE_NETSOURCE_H #include #include @@ -75,4 +75,4 @@ SRSLTE_API int srslte_netsource_read(srslte_netsource_t *q, SRSLTE_API int srslte_netsource_set_timeout(srslte_netsource_t *q, uint32_t microseconds); -#endif // UDPSOURCE_ +#endif // SRSLTE_NETSOURCE_H diff --git a/lib/include/srslte/phy/mimo/layermap.h b/lib/include/srslte/phy/mimo/layermap.h index 5daf51c14..d6328a7ad 100644 --- a/lib/include/srslte/phy/mimo/layermap.h +++ b/lib/include/srslte/phy/mimo/layermap.h @@ -34,8 +34,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.3.3 *****************************************************************************/ -#ifndef LAYERMAP_H_ -#define LAYERMAP_H_ +#ifndef SRSLTE_LAYERMAP_H +#define SRSLTE_LAYERMAP_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -91,4 +91,4 @@ SRSLTE_API int srslte_layerdemap_type(cf_t *x[SRSLTE_MAX_LAYERS], int nof_symbols[SRSLTE_MAX_CODEWORDS], srslte_mimo_type_t type); -#endif // LAYERMAP_H_ +#endif // SRSLTE_LAYERMAP_H diff --git a/lib/include/srslte/phy/mimo/precoding.h b/lib/include/srslte/phy/mimo/precoding.h index 27395085c..d363231e2 100644 --- a/lib/include/srslte/phy/mimo/precoding.h +++ b/lib/include/srslte/phy/mimo/precoding.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.3.4 *****************************************************************************/ -#ifndef PRECODING_H_ -#define PRECODING_H_ +#ifndef SRSLTE_PRECODING_H +#define SRSLTE_PRECODING_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -137,4 +137,4 @@ SRSLTE_API int srslte_precoding_cn(cf_t *h[SRSLTE_MAX_PORTS][SRSLTE_MAX_PORTS], float *cn); -#endif /* PRECODING_H_ */ +#endif // SRSLTE_PRECODING_H diff --git a/lib/include/srslte/phy/modem/demod_hard.h b/lib/include/srslte/phy/modem/demod_hard.h index 6da2b7b4d..689bcca42 100644 --- a/lib/include/srslte/phy/modem/demod_hard.h +++ b/lib/include/srslte/phy/modem/demod_hard.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1 *****************************************************************************/ -#ifndef DEMOD_HARD_ -#define DEMOD_HARD_ +#ifndef SRSLTE_DEMOD_HARD_H +#define SRSLTE_DEMOD_HARD_H #include #include @@ -57,4 +57,4 @@ SRSLTE_API int srslte_demod_hard_demodulate(srslte_demod_hard_t* q, uint8_t *bits, uint32_t nsymbols); -#endif // DEMOD_HARD_ +#endif // SRSLTE_DEMOD_HARD_H diff --git a/lib/include/srslte/phy/modem/demod_soft.h b/lib/include/srslte/phy/modem/demod_soft.h index 7ac4f0702..9ad065edc 100644 --- a/lib/include/srslte/phy/modem/demod_soft.h +++ b/lib/include/srslte/phy/modem/demod_soft.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1 *****************************************************************************/ -#ifndef DEMOD_SOFT_ -#define DEMOD_SOFT_ +#ifndef SRSLTE_DEMOD_SOFT_H +#define SRSLTE_DEMOD_SOFT_H #include #include @@ -53,4 +53,4 @@ SRSLTE_API int srslte_demod_soft_demodulate_s(srslte_mod_t modulation, short* llr, int nsymbols); -#endif // DEMOD_SOFT_ +#endif // SRSLTE_DEMOD_SOFT_H diff --git a/lib/include/srslte/phy/modem/mod.h b/lib/include/srslte/phy/modem/mod.h index 66aa997cb..a2f8299a1 100644 --- a/lib/include/srslte/phy/modem/mod.h +++ b/lib/include/srslte/phy/modem/mod.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1 *****************************************************************************/ -#ifndef MOD_ -#define MOD_ +#ifndef SRSLTE_MOD_H +#define SRSLTE_MOD_H #include #include @@ -52,4 +52,4 @@ SRSLTE_API int srslte_mod_modulate_bytes(srslte_modem_table_t* q, cf_t* symbols, uint32_t nbits); -#endif // MOD_ +#endif // SRSLTE_MOD_H diff --git a/lib/include/srslte/phy/modem/modem_table.h b/lib/include/srslte/phy/modem/modem_table.h index 20b0a0f88..09cea5e10 100644 --- a/lib/include/srslte/phy/modem/modem_table.h +++ b/lib/include/srslte/phy/modem/modem_table.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1 *****************************************************************************/ -#ifndef MODEM_TABLE_ -#define MODEM_TABLE_ +#ifndef SRSLTE_MODEM_TABLE_H +#define SRSLTE_MODEM_TABLE_H #include #include @@ -83,4 +83,4 @@ SRSLTE_API int srslte_modem_table_lte(srslte_modem_table_t* q, SRSLTE_API void srslte_modem_table_bytes(srslte_modem_table_t* q); -#endif // MODEM_TABLE_ +#endif // SRSLTE_MODEM_TABLE_H diff --git a/lib/include/srslte/phy/phch/cqi.h b/lib/include/srslte/phy/phch/cqi.h index b8cc80ece..4363ccaa7 100644 --- a/lib/include/srslte/phy/phch/cqi.h +++ b/lib/include/srslte/phy/phch/cqi.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.2.2.6, 5.2.3.3 *****************************************************************************/ -#ifndef CQI_ -#define CQI_ +#ifndef SRSLTE_CQI_H +#define SRSLTE_CQI_H #include @@ -179,4 +179,4 @@ SRSLTE_API int srslte_cqi_hl_get_no_subbands(int num_prbs); SRSLTE_API void srslte_cqi_to_str(const uint8_t *cqi_value, int cqi_len, char *str, int str_len); -#endif // CQI_ +#endif // SRSLTE_CQI_H diff --git a/lib/include/srslte/phy/phch/dci.h b/lib/include/srslte/phy/phch/dci.h index 79a79c4df..1a7bfbb0f 100644 --- a/lib/include/srslte/phy/phch/dci.h +++ b/lib/include/srslte/phy/phch/dci.h @@ -34,8 +34,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.3.3 *****************************************************************************/ -#ifndef DCI_ -#define DCI_ +#ifndef SRSLTE_DCI_H +#define SRSLTE_DCI_H #include diff --git a/lib/include/srslte/phy/phch/pbch.h b/lib/include/srslte/phy/phch/pbch.h index 4dc7ec727..1e0af67cd 100644 --- a/lib/include/srslte/phy/phch/pbch.h +++ b/lib/include/srslte/phy/phch/pbch.h @@ -34,8 +34,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.6 *****************************************************************************/ -#ifndef PBCH_ -#define PBCH_ +#ifndef SRSLTE_PBCH_H +#define SRSLTE_PBCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -115,4 +115,4 @@ SRSLTE_API void srslte_pbch_mib_pack(srslte_cell_t *cell, uint32_t sfn, uint8_t *msg); -#endif // PBCH_ +#endif // SRSLTE_PBCH_H diff --git a/lib/include/srslte/phy/phch/pcfich.h b/lib/include/srslte/phy/phch/pcfich.h index fbbb82c88..554a150a7 100644 --- a/lib/include/srslte/phy/phch/pcfich.h +++ b/lib/include/srslte/phy/phch/pcfich.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.7 *****************************************************************************/ -#ifndef PCFICH_ -#define PCFICH_ +#ifndef SRSLTE_PCFICH_H +#define SRSLTE_PCFICH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -108,4 +108,4 @@ SRSLTE_API int srslte_pcfich_encode(srslte_pcfich_t *q, cf_t *sf_symbols[SRSLTE_MAX_PORTS], uint32_t subframe); -#endif +#endif // SRSLTE_PCFICH_H diff --git a/lib/include/srslte/phy/phch/pdcch.h b/lib/include/srslte/phy/phch/pdcch.h index 423204996..14f7b07ab 100644 --- a/lib/include/srslte/phy/phch/pdcch.h +++ b/lib/include/srslte/phy/phch/pdcch.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.8 *****************************************************************************/ -#ifndef PDCCH_ -#define PDCCH_ +#ifndef SRSLTE_PDCCH_H +#define SRSLTE_PDCCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -186,4 +186,4 @@ SRSLTE_API uint32_t srslte_pdcch_common_locations_ncce(uint32_t nof_cce, uint32_t max_candidates); -#endif +#endif // SRSLTE_PDCCH_H diff --git a/lib/include/srslte/phy/phch/pdsch.h b/lib/include/srslte/phy/phch/pdsch.h index 1889078e6..8a733c992 100644 --- a/lib/include/srslte/phy/phch/pdsch.h +++ b/lib/include/srslte/phy/phch/pdsch.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4 *****************************************************************************/ -#ifndef PDSCH_ -#define PDSCH_ +#ifndef SRSLTE_PDSCH_H +#define SRSLTE_PDSCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -170,4 +170,4 @@ SRSLTE_API float srslte_pdsch_last_noi(srslte_pdsch_t *q); SRSLTE_API uint32_t srslte_pdsch_last_noi_cw(srslte_pdsch_t *q, uint32_t cw_idx); -#endif +#endif // SRSLTE_PDSCH_H diff --git a/lib/include/srslte/phy/phch/pdsch_cfg.h b/lib/include/srslte/phy/phch/pdsch_cfg.h index 569d1ef7e..3e4849014 100644 --- a/lib/include/srslte/phy/phch/pdsch_cfg.h +++ b/lib/include/srslte/phy/phch/pdsch_cfg.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4 *****************************************************************************/ -#ifndef PDSCHCFG_ -#define PDSCHCFG_ +#ifndef SRSLTE_PDSCH_CFG_H +#define SRSLTE_PDSCH_CFG_H #include "srslte/phy/phch/ra.h" #include "srslte/phy/fec/softbuffer.h" @@ -58,5 +58,5 @@ typedef struct SRSLTE_API { bool tb_cw_swap; } srslte_pdsch_cfg_t; -#endif +#endif // SRSLTE_PDSCH_CFG_H diff --git a/lib/include/srslte/phy/phch/phich.h b/lib/include/srslte/phy/phch/phich.h index 0645e22b1..d131dc637 100644 --- a/lib/include/srslte/phy/phch/phich.h +++ b/lib/include/srslte/phy/phch/phich.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.9 *****************************************************************************/ -#ifndef PHICH_ -#define PHICH_ +#ifndef SRSLTE_PHICH_H +#define SRSLTE_PHICH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -124,4 +124,4 @@ SRSLTE_API uint32_t srslte_phich_ngroups(srslte_phich_t *q); SRSLTE_API uint32_t srslte_phich_nsf(srslte_phich_t *q); -#endif // PHICH_ +#endif // SRSLTE_PHICH_H diff --git a/lib/include/srslte/phy/phch/pmch.h b/lib/include/srslte/phy/phch/pmch.h index dfff956f1..7d352e62a 100644 --- a/lib/include/srslte/phy/phch/pmch.h +++ b/lib/include/srslte/phy/phch/pmch.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.5 *****************************************************************************/ -#ifndef PMCH_ -#define PMCH_ +#ifndef SRSLTE_PMCH_H +#define SRSLTE_PMCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -149,4 +149,4 @@ SRSLTE_API float srslte_pmch_average_noi(srslte_pmch_t *q); SRSLTE_API uint32_t srslte_pmch_last_noi(srslte_pmch_t *q); -#endif +#endif // SRSLTE_PMCH_H diff --git a/lib/include/srslte/phy/phch/prach.h b/lib/include/srslte/phy/phch/prach.h index 3e3df01bb..087c52957 100644 --- a/lib/include/srslte/phy/phch/prach.h +++ b/lib/include/srslte/phy/phch/prach.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.7 *****************************************************************************/ -#ifndef PRACH_ -#define PRACH_ +#ifndef SRSLTE_PRACH_H +#define SRSLTE_PRACH_H #include #include @@ -174,4 +174,4 @@ SRSLTE_API int srslte_prach_free(srslte_prach_t *p); SRSLTE_API int srslte_prach_print_seqs(srslte_prach_t *p); -#endif // PRACH_ +#endif // SRSLTE_PRACH_H diff --git a/lib/include/srslte/phy/phch/pucch.h b/lib/include/srslte/phy/phch/pucch.h index 29785c09a..fbb185c91 100644 --- a/lib/include/srslte/phy/phch/pucch.h +++ b/lib/include/srslte/phy/phch/pucch.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.4 *****************************************************************************/ -#ifndef PUCCH_ -#define PUCCH_ +#ifndef SRSLTE_PUCCH_H +#define SRSLTE_PUCCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -211,4 +211,4 @@ SRSLTE_API bool srslte_n_pucch_isvalid(srslte_pucch_t *q, SRSLTE_API void srslte_pucch_cfg_default(srslte_pucch_cfg_t *cfg); -#endif +#endif // SRSLTE_PUCCH_H diff --git a/lib/include/srslte/phy/phch/pusch.h b/lib/include/srslte/phy/phch/pusch.h index 01db068a5..a5b8f04ae 100644 --- a/lib/include/srslte/phy/phch/pusch.h +++ b/lib/include/srslte/phy/phch/pusch.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.3 *****************************************************************************/ -#ifndef PUSCH_ -#define PUSCH_ +#ifndef SRSLTE_PUSCH_H +#define SRSLTE_PUSCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -149,4 +149,4 @@ SRSLTE_API float srslte_pusch_average_noi(srslte_pusch_t *q); SRSLTE_API uint32_t srslte_pusch_last_noi(srslte_pusch_t *q); -#endif +#endif // SRSLTE_PUSCH_H diff --git a/lib/include/srslte/phy/phch/pusch_cfg.h b/lib/include/srslte/phy/phch/pusch_cfg.h index 5d743d94c..ed3239cab 100644 --- a/lib/include/srslte/phy/phch/pusch_cfg.h +++ b/lib/include/srslte/phy/phch/pusch_cfg.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4 *****************************************************************************/ -#ifndef PUSCHCFG_ -#define PUSCHCFG_ +#ifndef SRSLTE_PUSCH_CFG_H +#define SRSLTE_PUSCH_CFG_H #include "srslte/phy/phch/ra.h" #include "srslte/phy/fec/softbuffer.h" @@ -57,5 +57,5 @@ typedef struct SRSLTE_API { uint32_t last_O_cqi; } srslte_pusch_cfg_t; -#endif +#endif // SRSLTE_PUSCH_CFG_H diff --git a/lib/include/srslte/phy/phch/ra.h b/lib/include/srslte/phy/phch/ra.h index 80097f78e..085f62b40 100644 --- a/lib/include/srslte/phy/phch/ra.h +++ b/lib/include/srslte/phy/phch/ra.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.213 version 10.0.1 Release 10 *****************************************************************************/ -#ifndef RB_ALLOC_H_ -#define RB_ALLOC_H_ +#ifndef SRSLTE_RA_H +#define SRSLTE_RA_H #include #include @@ -300,4 +300,4 @@ SRSLTE_API int srslte_dl_fill_ra_mcs_pmch(srslte_ra_mcs_t *mcs, uint32_t nprb); SRSLTE_API int srslte_dl_fill_ra_mcs(srslte_ra_mcs_t *mcs, uint32_t nprb); -#endif /* RB_ALLOC_H_ */ +#endif // SRSLTE_RA_H \ No newline at end of file diff --git a/lib/include/srslte/phy/phch/regs.h b/lib/include/srslte/phy/phch/regs.h index 8dd103f21..91e6f3338 100644 --- a/lib/include/srslte/phy/phch/regs.h +++ b/lib/include/srslte/phy/phch/regs.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 *****************************************************************************/ -#ifndef _REGS_H_ -#define _REGS_H_ +#ifndef SRSLTE_REGS_H +#define SRSLTE_REGS_H #include #include "srslte/config.h" @@ -136,6 +136,6 @@ SRSLTE_API int srslte_regs_pdcch_get_offset(srslte_regs_t *h, uint32_t start_reg, uint32_t nof_regs); -#endif // REGS_H_ +#endif // SRSLTE_REGS_H diff --git a/lib/include/srslte/phy/phch/sch.h b/lib/include/srslte/phy/phch/sch.h index e8066e4cd..4ef0328e7 100644 --- a/lib/include/srslte/phy/phch/sch.h +++ b/lib/include/srslte/phy/phch/sch.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 *****************************************************************************/ -#ifndef SCH_ -#define SCH_ +#ifndef SRSLTE_SCH_H +#define SRSLTE_SCH_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -159,4 +159,4 @@ SRSLTE_API uint32_t srslte_sch_find_Ioffset_cqi(float beta); SRSLTE_API uint32_t srslte_sch_find_Ioffset_ri(float beta); -#endif +#endif // SRSLTE_SCH_H diff --git a/lib/include/srslte/phy/phch/uci.h b/lib/include/srslte/phy/phch/uci.h index ebbd98238..4f211ff1a 100644 --- a/lib/include/srslte/phy/phch/uci.h +++ b/lib/include/srslte/phy/phch/uci.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.2.3, 5.2.4 *****************************************************************************/ -#ifndef UCI_ -#define UCI_ +#ifndef SRSLTE_UCI_H +#define SRSLTE_UCI_H #include "srslte/config.h" #include "srslte/phy/common/phy_common.h" @@ -153,4 +153,4 @@ SRSLTE_API int srslte_uci_decode_ack_ri(srslte_pusch_cfg_t *cfg, bool is_ri); -#endif +#endif // SRSLTE_UCI_H diff --git a/lib/include/srslte/phy/resampling/decim.h b/lib/include/srslte/phy/resampling/decim.h index 22445f1b2..1394c645a 100644 --- a/lib/include/srslte/phy/resampling/decim.h +++ b/lib/include/srslte/phy/resampling/decim.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef DECIM_H -#define DECIM_H +#ifndef SRSLTE_DECIM_H +#define SRSLTE_DECIM_H #include "srslte/config.h" @@ -48,4 +48,4 @@ SRSLTE_API void srslte_decim_f(float *input, int M, int len); -#endif // DECIM_H +#endif // SRSLTE_DECIM_H diff --git a/lib/include/srslte/phy/resampling/interp.h b/lib/include/srslte/phy/resampling/interp.h index 508b6e957..8cdb8218a 100644 --- a/lib/include/srslte/phy/resampling/interp.h +++ b/lib/include/srslte/phy/resampling/interp.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef INTERP_H -#define INTERP_H +#ifndef SRSLTE_INTERP_H +#define SRSLTE_INTERP_H #include #include @@ -133,4 +133,4 @@ SRSLTE_API void srslte_interp_linear_offset(srslte_interp_lin_t *q, uint32_t off_end); -#endif // INTERP_H +#endif // SRSLTE_INTERP_H diff --git a/lib/include/srslte/phy/resampling/resample_arb.h b/lib/include/srslte/phy/resampling/resample_arb.h index 4ebb8dc08..76d873041 100644 --- a/lib/include/srslte/phy/resampling/resample_arb.h +++ b/lib/include/srslte/phy/resampling/resample_arb.h @@ -34,8 +34,8 @@ * fredric j. harris *****************************************************************************/ -#ifndef RESAMPLE_ARB_ -#define RESAMPLE_ARB_ +#ifndef SRSLTE_RESAMPLE_ARB_H +#define SRSLTE_RESAMPLE_ARB_H #include #include @@ -65,4 +65,4 @@ SRSLTE_API int srslte_resample_arb_compute(srslte_resample_arb_t *q, cf_t *output, int n_in); -#endif //RESAMPLE_ARB_ +#endif // SRSLTE_RESAMPLE_ARB_ diff --git a/lib/include/srslte/phy/rf/rf.h b/lib/include/srslte/phy/rf/rf.h index da1600b66..664d273ff 100644 --- a/lib/include/srslte/phy/rf/rf.h +++ b/lib/include/srslte/phy/rf/rf.h @@ -24,8 +24,8 @@ * */ -#ifndef RF_H -#define RF_H +#ifndef SRSLTE_RF_H +#define SRSLTE_RF_H #include #include @@ -213,5 +213,5 @@ SRSLTE_API int srslte_rf_send_multi(srslte_rf_t *rf, bool is_start_of_burst, bool is_end_of_burst); -#endif +#endif // SRSLTE_RF_H diff --git a/lib/include/srslte/phy/rf/rf_utils.h b/lib/include/srslte/phy/rf/rf_utils.h index 7dddb20f4..4cfe16461 100644 --- a/lib/include/srslte/phy/rf/rf_utils.h +++ b/lib/include/srslte/phy/rf/rf_utils.h @@ -24,6 +24,8 @@ * */ +#ifndef SRSLTE_RF_UTILS_H +#define SRSLTE_RF_UTILS_H #include "srslte/srslte.h" #include "srslte/phy/rf/rf.h" @@ -62,4 +64,5 @@ SRSLTE_API int rf_search_and_decode_mib(srslte_rf_t *rf, srslte_cell_t *cell, float *cfo); +#endif // SRSLTE_RF_UTILS_H diff --git a/lib/include/srslte/phy/scrambling/scrambling.h b/lib/include/srslte/phy/scrambling/scrambling.h index 4fa74790a..c38bbe8c9 100644 --- a/lib/include/srslte/phy/scrambling/scrambling.h +++ b/lib/include/srslte/phy/scrambling/scrambling.h @@ -32,8 +32,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.3.1, 6.3.1 *****************************************************************************/ -#ifndef SCRAMBLING_ -#define SCRAMBLING_ +#ifndef SRSLTE_SCRAMBLING_H +#define SRSLTE_SCRAMBLING_H #include "srslte/config.h" #include "srslte/phy/common/sequence.h" @@ -76,4 +76,4 @@ SRSLTE_API void srslte_scrambling_c_offset(srslte_sequence_t *s, int offset, int len); -#endif // SCRAMBLING_ +#endif // SRSLTE_SCRAMBLING_H diff --git a/lib/include/srslte/phy/sync/cfo.h b/lib/include/srslte/phy/sync/cfo.h index 506732b74..b28d57d33 100644 --- a/lib/include/srslte/phy/sync/cfo.h +++ b/lib/include/srslte/phy/sync/cfo.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef CFO_ -#define CFO_ +#ifndef SRSLTE_CFO_H +#define SRSLTE_CFO_H #include @@ -67,4 +67,4 @@ SRSLTE_API void srslte_cfo_correct(srslte_cfo_t *h, cf_t *output, float freq); -#endif // CFO_ +#endif // SRSLTE_CFO_H diff --git a/lib/include/srslte/phy/sync/cp.h b/lib/include/srslte/phy/sync/cp.h index d9da03722..511efb426 100644 --- a/lib/include/srslte/phy/sync/cp.h +++ b/lib/include/srslte/phy/sync/cp.h @@ -24,8 +24,8 @@ * */ -#ifndef CP_ -#define CP_ +#ifndef SRSLTE_CP_H +#define SRSLTE_CP_H #include #include @@ -55,4 +55,4 @@ SRSLTE_API uint32_t srslte_cp_synch(srslte_cp_synch_t *q, SRSLTE_API cf_t srslte_cp_synch_corr_output(srslte_cp_synch_t *q, uint32_t offset); -#endif // CP_ +#endif // SRSLTE_CP_H diff --git a/lib/include/srslte/phy/sync/pss.h b/lib/include/srslte/phy/sync/pss.h index 922bc0286..520e2bcec 100644 --- a/lib/include/srslte/phy/sync/pss.h +++ b/lib/include/srslte/phy/sync/pss.h @@ -42,8 +42,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.11.1 *****************************************************************************/ -#ifndef PSS_ -#define PSS_ +#ifndef SRSLTE_PSS_H +#define SRSLTE_PSS_H #include #include @@ -176,4 +176,4 @@ SRSLTE_API int srslte_pss_chest(srslte_pss_t *q, SRSLTE_API float srslte_pss_cfo_compute(srslte_pss_t* q, const cf_t *pss_recv); -#endif // PSS_ +#endif // SRSLTE_PSS_H diff --git a/lib/include/srslte/phy/sync/sfo.h b/lib/include/srslte/phy/sync/sfo.h index f6f94c9a3..a42ced471 100644 --- a/lib/include/srslte/phy/sync/sfo.h +++ b/lib/include/srslte/phy/sync/sfo.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef SFO_ -#define SFO_ +#ifndef SRSLTE_SFO_H +#define SRSLTE_SFO_H #include "srslte/config.h" @@ -46,4 +46,4 @@ SRSLTE_API float srslte_sfo_estimate_period(int *t0, int len, float period); -#endif // SFO_ +#endif // SRSLTE_SFO_H diff --git a/lib/include/srslte/phy/sync/sss.h b/lib/include/srslte/phy/sync/sss.h index 9f77d1ce6..a0062d63b 100644 --- a/lib/include/srslte/phy/sync/sss.h +++ b/lib/include/srslte/phy/sync/sss.h @@ -33,8 +33,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.11.2 *****************************************************************************/ -#ifndef SSS_ -#define SSS_ +#ifndef SRSLTE_SSS_H +#define SRSLTE_SSS_H #include #include @@ -153,5 +153,5 @@ SRSLTE_API void srslte_sss_set_symbol_sz(srslte_sss_t *q, SRSLTE_API void srslte_sss_set_subframe_sz(srslte_sss_t *q, uint32_t subframe_sz); -#endif // SSS_ +#endif // SRSLTE_SSS_H diff --git a/lib/include/srslte/phy/sync/sync.h b/lib/include/srslte/phy/sync/sync.h index 232bc5fc4..f99bfc17a 100644 --- a/lib/include/srslte/phy/sync/sync.h +++ b/lib/include/srslte/phy/sync/sync.h @@ -42,8 +42,8 @@ * Reference: 3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.11.1, 6.11.2 *****************************************************************************/ -#ifndef SYNC_ -#define SYNC_ +#ifndef SRSLTE_SYNC_H +#define SRSLTE_SYNC_H #include #include @@ -240,5 +240,5 @@ SRSLTE_API bool srslte_sync_sss_detected(srslte_sync_t *q); SRSLTE_API void srslte_sync_cp_en(srslte_sync_t *q, bool enabled); -#endif // SYNC_ +#endif // SRSLTE_SYNC_H diff --git a/lib/include/srslte/phy/ue/ue_cell_search.h b/lib/include/srslte/phy/ue/ue_cell_search.h index bcabe1728..e99e916d4 100644 --- a/lib/include/srslte/phy/ue/ue_cell_search.h +++ b/lib/include/srslte/phy/ue/ue_cell_search.h @@ -40,8 +40,8 @@ * Reference: *****************************************************************************/ -#ifndef UE_CELLSEARCH_ -#define UE_CELLSEARCH_ +#ifndef SRSLTE_UE_CELL_SEARCH_H +#define SRSLTE_UE_CELL_SEARCH_H #include @@ -110,5 +110,5 @@ SRSLTE_API int srslte_ue_cellsearch_set_nof_valid_frames(srslte_ue_cellsearch_t -#endif // SYNC_FRAME_ +#endif // SRSLTE_UE_CELL_SEARCH_H diff --git a/lib/include/srslte/phy/ue/ue_dl.h b/lib/include/srslte/phy/ue/ue_dl.h index c5b0da52a..197a650b1 100644 --- a/lib/include/srslte/phy/ue/ue_dl.h +++ b/lib/include/srslte/phy/ue/ue_dl.h @@ -35,8 +35,8 @@ * Reference: *****************************************************************************/ -#ifndef UEDL_H -#define UEDL_H +#ifndef SRSLTE_UE_DL_H +#define SRSLTE_UE_DL_H #include @@ -254,4 +254,4 @@ SRSLTE_API void srslte_ue_dl_save_signal(srslte_ue_dl_t *q, uint32_t cfi); -#endif +#endif // SRSLTE_UE_DL_H diff --git a/lib/include/srslte/phy/ue/ue_mib.h b/lib/include/srslte/phy/ue/ue_mib.h index ee52b31d4..38f27d024 100644 --- a/lib/include/srslte/phy/ue/ue_mib.h +++ b/lib/include/srslte/phy/ue/ue_mib.h @@ -43,8 +43,8 @@ * Reference: *****************************************************************************/ -#ifndef UE_MIB_ -#define UE_MIB_ +#ifndef SRSLTE_UE_MIB_H +#define SRSLTE_UE_MIB_H #include @@ -129,5 +129,5 @@ SRSLTE_API int srslte_ue_mib_sync_decode(srslte_ue_mib_sync_t * q, -#endif // SYNC_FRAME_ +#endif // SRSLTE_UE_MIB_H diff --git a/lib/include/srslte/phy/ue/ue_phy.h b/lib/include/srslte/phy/ue/ue_phy.h index 369b96027..0a8217594 100644 --- a/lib/include/srslte/phy/ue/ue_phy.h +++ b/lib/include/srslte/phy/ue/ue_phy.h @@ -35,8 +35,8 @@ #include "srslte/srslte.h" #include "srslte/phy/utils/queue.h" -#ifndef UEPHY_H -#define UEPHY_H +#ifndef SRSLTE_UE_PHY_H +#define SRSLTE_UE_PHY_H #define SYNC_MODE_CV 0 #define SYNC_MODE_CALLBACK 1 @@ -165,4 +165,4 @@ private: }; } -#endif +#endif // SRSLTE_UE_PHY_H diff --git a/lib/include/srslte/phy/ue/ue_sync.h b/lib/include/srslte/phy/ue/ue_sync.h index a5e126e5f..3d9807aea 100644 --- a/lib/include/srslte/phy/ue/ue_sync.h +++ b/lib/include/srslte/phy/ue/ue_sync.h @@ -46,8 +46,8 @@ * Reference: *****************************************************************************/ -#ifndef UE_SYNC_ -#define UE_SYNC_ +#ifndef SRSLTE_UE_SYNC_H +#define SRSLTE_UE_SYNC_H #include @@ -255,5 +255,5 @@ SRSLTE_API void srslte_ue_sync_get_last_timestamp(srslte_ue_sync_t *q, srslte_timestamp_t *timestamp); -#endif // SYNC_FRAME_ +#endif // SRSLTE_UE_SYNC_H diff --git a/lib/include/srslte/phy/ue/ue_ul.h b/lib/include/srslte/phy/ue/ue_ul.h index 617833a61..98dae48b4 100644 --- a/lib/include/srslte/phy/ue/ue_ul.h +++ b/lib/include/srslte/phy/ue/ue_ul.h @@ -35,8 +35,8 @@ * Reference: *****************************************************************************/ -#ifndef UEUL_H -#define UEUL_H +#ifndef SRSLTE_UE_UL_H +#define SRSLTE_UE_UL_H #include "srslte/phy/common/phy_common.h" #include "srslte/phy/ch_estimation/chest_dl.h" @@ -210,4 +210,4 @@ SRSLTE_API bool srslte_ue_ul_srs_tx_enabled(srslte_refsignal_srs_cfg_t *srs_cfg, uint32_t tti); -#endif +#endif // SRSLTE_UE_UL_H diff --git a/lib/include/srslte/phy/utils/bit.h b/lib/include/srslte/phy/utils/bit.h index e4289b790..29fca8e9e 100644 --- a/lib/include/srslte/phy/utils/bit.h +++ b/lib/include/srslte/phy/utils/bit.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef BIT_ -#define BIT_ +#ifndef SRSLTE_BIT_H +#define SRSLTE_BIT_H #include #include @@ -108,5 +108,5 @@ SRSLTE_API uint32_t srslte_bit_diff(uint8_t *x, SRSLTE_API uint32_t srslte_bit_count(uint32_t n); -#endif // BIT_ +#endif // SRSLTE_BIT_H diff --git a/lib/include/srslte/phy/utils/cexptab.h b/lib/include/srslte/phy/utils/cexptab.h index f615ede22..b96b330a9 100644 --- a/lib/include/srslte/phy/utils/cexptab.h +++ b/lib/include/srslte/phy/utils/cexptab.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef CEXPTAB_ -#define CEXPTAB_ +#ifndef SRSLTE_CEXPTAB_H +#define SRSLTE_CEXPTAB_H #include #include @@ -58,4 +58,4 @@ SRSLTE_API void srslte_cexptab_gen_direct(cf_t *x, float freq, uint32_t len); -#endif // CEXPTAB_ +#endif // SRSLTE_CEXPTAB_H diff --git a/lib/include/srslte/phy/utils/convolution.h b/lib/include/srslte/phy/utils/convolution.h index a93dfb955..3f0cad7aa 100644 --- a/lib/include/srslte/phy/utils/convolution.h +++ b/lib/include/srslte/phy/utils/convolution.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef CONVOLUTION_H_ -#define CONVOLUTION_H_ +#ifndef SRSLTE_CONVOLUTION_H +#define SRSLTE_CONVOLUTION_H #include "srslte/config.h" #include "srslte/phy/dft/dft.h" @@ -94,4 +94,4 @@ SRSLTE_API uint32_t srslte_conv_same_cc(cf_t *input, uint32_t input_len, uint32_t filter_len); -#endif // CONVOLUTION_H_ +#endif // SRSLTE_CONVOLUTION_H diff --git a/lib/include/srslte/phy/utils/debug.h b/lib/include/srslte/phy/utils/debug.h index 52290ca11..9a07272b6 100644 --- a/lib/include/srslte/phy/utils/debug.h +++ b/lib/include/srslte/phy/utils/debug.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef DEBUG_H -#define DEBUG_H +#ifndef SRSLTE_DEBUG_H +#define SRSLTE_DEBUG_H #include #include "srslte/config.h" @@ -80,4 +80,4 @@ SRSLTE_API extern int handler_registered; void srslte_debug_handle_crash(int argc, char **argv); -#endif // DEBUG_H +#endif // SRSLTE_DEBUG_H diff --git a/lib/include/srslte/phy/utils/filter.h b/lib/include/srslte/phy/utils/filter.h index 70e00363c..a126e171b 100644 --- a/lib/include/srslte/phy/utils/filter.h +++ b/lib/include/srslte/phy/utils/filter.h @@ -32,8 +32,9 @@ * Reference: *****************************************************************************/ -#ifndef FILTER_H -#define FILTER_H +#ifndef SRSLTE_FILTER_H +#define SRSLTE_FILTER_H + #include #include #include "srslte/config.h" @@ -57,4 +58,4 @@ void srslte_filt_decim_cc_free(srslte_filt_cc_t *q); void srslte_filt_decim_cc_execute(srslte_filt_cc_t *q, cf_t *input, cf_t *downsampled_input, cf_t *output, int size); void srslte_downsample_cc(cf_t *input, cf_t *output, int M, int size) ; -#endif // FILTER_H \ No newline at end of file +#endif // SRSLTE_FILTER_H \ No newline at end of file diff --git a/lib/include/srslte/phy/utils/mat.h b/lib/include/srslte/phy/utils/mat.h index 339cfea23..a0f11abe3 100644 --- a/lib/include/srslte/phy/utils/mat.h +++ b/lib/include/srslte/phy/utils/mat.h @@ -103,4 +103,4 @@ SRSLTE_API void srslte_mat_2x2_mmse_avx(__m256 y0, __m256 y1, #endif /* LV_HAVE_AVX */ -#endif /* SRSLTE_MAT_H */ +#endif // SRSLTE_MAT_H diff --git a/lib/include/srslte/phy/utils/ringbuffer.h b/lib/include/srslte/phy/utils/ringbuffer.h index a93ebf181..b7a852155 100644 --- a/lib/include/srslte/phy/utils/ringbuffer.h +++ b/lib/include/srslte/phy/utils/ringbuffer.h @@ -1,6 +1,6 @@ -#ifndef RINGBUFFER_H -#define RINGBUFFER_H +#ifndef SRSLTE_RINGBUFFER_H +#define SRSLTE_RINGBUFFER_H #include "srslte/config.h" #include @@ -40,6 +40,6 @@ SRSLTE_API int srslte_ringbuffer_read(srslte_ringbuffer_t *q, SRSLTE_API void srslte_ringbuffer_stop(srslte_ringbuffer_t *q); -#endif +#endif // SRSLTE_RINGBUFFER_H diff --git a/lib/include/srslte/phy/utils/simd.h b/lib/include/srslte/phy/utils/simd.h index 3223c18a7..66295f2ce 100644 --- a/lib/include/srslte/phy/utils/simd.h +++ b/lib/include/srslte/phy/utils/simd.h @@ -24,8 +24,8 @@ * */ -#ifndef SRSLTE_SIMD_H_H -#define SRSLTE_SIMD_H_H +#ifndef SRSLTE_SIMD_H +#define SRSLTE_SIMD_H #ifdef LV_HAVE_SSE /* AVX, AVX2, FMA, AVX512 are in this group */ #ifndef __OPTIMIZE__ @@ -1636,4 +1636,4 @@ static inline simd_b_t srslte_simd_b_xor(simd_b_t a, simd_b_t b) { #endif /*SRSLTE_SIMD_B_SIZE */ -#endif //SRSLTE_SIMD_H_H +#endif // SRSLTE_SIMD_H diff --git a/lib/include/srslte/phy/utils/vector.h b/lib/include/srslte/phy/utils/vector.h index fbf000a70..1fcbe4235 100644 --- a/lib/include/srslte/phy/utils/vector.h +++ b/lib/include/srslte/phy/utils/vector.h @@ -32,8 +32,8 @@ * Reference: *****************************************************************************/ -#ifndef VECTOR_ -#define VECTOR_ +#ifndef SRSLTE_VECTOR_H +#define SRSLTE_VECTOR_H #ifdef __cplusplus extern "C" { @@ -159,4 +159,4 @@ SRSLTE_API void srslte_vec_interleave_add(const cf_t *x, const cf_t *y, cf_t *z, } #endif -#endif // VECTOR_ +#endif // SRSLTE_VECTOR_H diff --git a/lib/include/srslte/phy/utils/vector_simd.h b/lib/include/srslte/phy/utils/vector_simd.h index 8139d0e78..11c6ce1cd 100644 --- a/lib/include/srslte/phy/utils/vector_simd.h +++ b/lib/include/srslte/phy/utils/vector_simd.h @@ -24,8 +24,8 @@ * */ -#ifndef VECTORSIMD_ -#define VECTORSIMD_ +#ifndef SRSLTE_VECTOR_SIMD_H +#define SRSLTE_VECTOR_SIMD_H #ifdef __cplusplus extern "C" { @@ -139,4 +139,4 @@ SRSLTE_API uint32_t srslte_vec_max_ci_simd(const cf_t *x, const int len); } #endif -#endif +#endif // SRSLTE_VECTOR_SIMD_H diff --git a/lib/include/srslte/radio/radio.h b/lib/include/srslte/radio/radio.h index 143927730..26775777b 100644 --- a/lib/include/srslte/radio/radio.h +++ b/lib/include/srslte/radio/radio.h @@ -30,8 +30,8 @@ #include "srslte/phy/rf/rf.h" #include "srslte/common/trace.h" -#ifndef RADIO_H -#define RADIO_H +#ifndef SRSLTE_RADIO_H +#define SRSLTE_RADIO_H typedef struct { float tx_corr_dc_gain; @@ -180,4 +180,4 @@ namespace srslte { }; } -#endif +#endif // SRSLTE_RADIO_H diff --git a/lib/include/srslte/radio/radio_multi.h b/lib/include/srslte/radio/radio_multi.h index d83237619..efb1e31b6 100644 --- a/lib/include/srslte/radio/radio_multi.h +++ b/lib/include/srslte/radio/radio_multi.h @@ -34,8 +34,8 @@ extern "C" { #include "srslte/radio/radio.h" -#ifndef RADIO_MULTI_H -#define RADIO_MULTI_H +#ifndef SRSLTE_RADIO_MULTI_H +#define SRSLTE_RADIO_MULTI_H namespace srslte { @@ -51,4 +51,4 @@ namespace srslte { }; } -#endif +#endif // SRSLTE_RADIO_MULTI_H diff --git a/lib/include/srslte/srslte.h b/lib/include/srslte/srslte.h index 36af629d7..f87a1bf2c 100644 --- a/lib/include/srslte/srslte.h +++ b/lib/include/srslte/srslte.h @@ -25,8 +25,8 @@ */ -#ifndef _LTE_ -#define _LTE_ +#ifndef SRSLTE_SRSLTE_H +#define SRSLTE_SRSLTE_H #ifdef __cplusplus extern "C" { @@ -128,4 +128,4 @@ #undef I // Fix complex.h #define I nastiness when using C++ #endif -#endif +#endif // SRSLTE_SRSLTE_H diff --git a/lib/include/srslte/upper/pdcp.h b/lib/include/srslte/upper/pdcp.h index 584b231a3..436f35edd 100644 --- a/lib/include/srslte/upper/pdcp.h +++ b/lib/include/srslte/upper/pdcp.h @@ -24,8 +24,8 @@ * */ -#ifndef PDCP_H -#define PDCP_H +#ifndef SRSLTE_PDCP_H +#define SRSLTE_PDCP_H #include "srslte/common/log.h" #include "srslte/common/common.h" @@ -89,7 +89,7 @@ private: bool valid_lcid(uint32_t lcid); }; -} // namespace srsue +} // namespace srslte -#endif // PDCP_H +#endif // SRSLTE_PDCP_H diff --git a/lib/include/srslte/upper/pdcp_entity.h b/lib/include/srslte/upper/pdcp_entity.h index 0894b6578..e8a5d9561 100644 --- a/lib/include/srslte/upper/pdcp_entity.h +++ b/lib/include/srslte/upper/pdcp_entity.h @@ -24,8 +24,8 @@ * */ -#ifndef PDCP_ENTITY_H -#define PDCP_ENTITY_H +#ifndef SRSLTE_PDCP_ENTITY_H +#define SRSLTE_PDCP_ENTITY_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -144,7 +144,7 @@ void pdcp_unpack_data_pdu_short_sn(byte_buffer_t *sdu, uint32_t *sn); void pdcp_pack_data_pdu_long_sn(uint32_t sn, byte_buffer_t *sdu); void pdcp_unpack_data_pdu_long_sn(byte_buffer_t *sdu, uint32_t *sn); -} // namespace srsue +} // namespace srslte -#endif // PDCP_ENTITY_H +#endif // SRSLTE_PDCP_ENTITY_H diff --git a/lib/include/srslte/upper/rlc.h b/lib/include/srslte/upper/rlc.h index e9036a011..c4d57b9bb 100644 --- a/lib/include/srslte/upper/rlc.h +++ b/lib/include/srslte/upper/rlc.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_H -#define RLC_H +#ifndef SRSLTE_RLC_H +#define SRSLTE_RLC_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -105,4 +105,4 @@ private: } // namespace srsue -#endif // RLC_H +#endif // SRSLTE_RLC_H diff --git a/lib/include/srslte/upper/rlc_am.h b/lib/include/srslte/upper/rlc_am.h index 7601baefa..894f96ac5 100644 --- a/lib/include/srslte/upper/rlc_am.h +++ b/lib/include/srslte/upper/rlc_am.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_AM_H -#define RLC_AM_H +#ifndef SRSLTE_RLC_AM_H +#define SRSLTE_RLC_AM_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -220,7 +220,7 @@ std::string rlc_am_to_string(rlc_status_pdu_t *status); bool rlc_am_start_aligned(uint8_t fi); bool rlc_am_end_aligned(uint8_t fi); -} // namespace srsue +} // namespace srslte -#endif // RLC_AM_H +#endif // SRSLTE_RLC_AM_H diff --git a/lib/include/srslte/upper/rlc_common.h b/lib/include/srslte/upper/rlc_common.h index 494cc6174..9be390d31 100644 --- a/lib/include/srslte/upper/rlc_common.h +++ b/lib/include/srslte/upper/rlc_common.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_COMMON_H -#define RLC_COMMON_H +#ifndef SRSLTE_RLC_COMMON_H +#define SRSLTE_RLC_COMMON_H #include "srslte/upper/rlc_interface.h" @@ -176,4 +176,4 @@ public: } // namespace srslte -#endif // RLC_COMMON_H +#endif // SRSLTE_RLC_COMMON_H diff --git a/lib/include/srslte/upper/rlc_entity.h b/lib/include/srslte/upper/rlc_entity.h index de4a396fe..cd30d5999 100644 --- a/lib/include/srslte/upper/rlc_entity.h +++ b/lib/include/srslte/upper/rlc_entity.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_ENTITY_H -#define RLC_ENTITY_H +#ifndef SRSLTE_RLC_ENTITY_H +#define SRSLTE_RLC_ENTITY_H #include "srslte/common/log.h" #include "srslte/common/common.h" @@ -82,7 +82,7 @@ private: rlc_common *rlc; }; -} // namespace srsue +} // namespace srslte -#endif // RLC_ENTITY_H +#endif // SRSLTE_RLC_ENTITY_H diff --git a/lib/include/srslte/upper/rlc_interface.h b/lib/include/srslte/upper/rlc_interface.h index feddac1cc..8c869ceb9 100644 --- a/lib/include/srslte/upper/rlc_interface.h +++ b/lib/include/srslte/upper/rlc_interface.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_INTERFACE_H -#define RLC_INTERFACE_H +#ifndef SRSLTE_RLC_INTERFACE_H +#define SRSLTE_RLC_INTERFACE_H // for custom constructors #include "srslte/asn1/liblte_rrc.h" @@ -123,4 +123,4 @@ public: } // namespace srslte -#endif // RLC_INTERFACE_H +#endif // SRSLTE_RLC_INTERFACE_H diff --git a/lib/include/srslte/upper/rlc_metrics.h b/lib/include/srslte/upper/rlc_metrics.h index 0089ab5a6..ab6e83c02 100644 --- a/lib/include/srslte/upper/rlc_metrics.h +++ b/lib/include/srslte/upper/rlc_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef UE_RLC_METRICS_H -#define UE_RLC_METRICS_H +#ifndef SRSLTE_RLC_METRICS_H +#define SRSLTE_RLC_METRICS_H namespace srslte { @@ -36,6 +36,6 @@ struct rlc_metrics_t float ul_tput_mbps; }; -} // namespace srsue +} // namespace srslte -#endif // UE_RLC_METRICS_H +#endif // SRSLTE_RLC_METRICS_H diff --git a/lib/include/srslte/upper/rlc_tm.h b/lib/include/srslte/upper/rlc_tm.h index 4a55e33dd..5408cb835 100644 --- a/lib/include/srslte/upper/rlc_tm.h +++ b/lib/include/srslte/upper/rlc_tm.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_TM_H -#define RLC_TM_H +#ifndef SRSLTE_RLC_TM_H +#define SRSLTE_RLC_TM_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -78,4 +78,4 @@ private: } // namespace srsue -#endif // RLC_TM_H +#endif // SRSLTE_RLC_TM_H diff --git a/lib/include/srslte/upper/rlc_um.h b/lib/include/srslte/upper/rlc_um.h index 6d8eb6d08..8e6f527e2 100644 --- a/lib/include/srslte/upper/rlc_um.h +++ b/lib/include/srslte/upper/rlc_um.h @@ -24,8 +24,8 @@ * */ -#ifndef RLC_UM_H -#define RLC_UM_H +#ifndef SRSLTE_RLC_UM_H +#define SRSLTE_RLC_UM_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -153,4 +153,4 @@ bool rlc_um_end_aligned(uint8_t fi); } // namespace srsue -#endif // RLC_UM_H +#endif // SRSLTE_RLC_UM_H diff --git a/lib/include/srslte/version.h.in b/lib/include/srslte/version.h.in index 65a172725..f50a6f9bf 100644 --- a/lib/include/srslte/version.h.in +++ b/lib/include/srslte/version.h.in @@ -25,8 +25,8 @@ * */ -#ifndef VERSION_ -#define VERSION_ +#ifndef SRSLTE_VERSION_H_IN +#define SRSLTE_VERSION_H_IN // the configured options and settings for SRSLTE #define SRSLTE_VERSION_MAJOR @SRSLTE_VERSION_MAJOR@ diff --git a/srsenb/hdr/cfg_parser.h b/srsenb/hdr/cfg_parser.h index 56b5e6e63..d399ddae3 100644 --- a/srsenb/hdr/cfg_parser.h +++ b/srsenb/hdr/cfg_parser.h @@ -24,8 +24,8 @@ * */ -#ifndef CFG_PARSER_H -#define CFG_PARSER_H +#ifndef SRSENB_CFG_PARSER_H +#define SRSENB_CFG_PARSER_H #include "enb.h" diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h index 6d2a78b44..745096daa 100644 --- a/srsenb/hdr/enb.h +++ b/srsenb/hdr/enb.h @@ -30,8 +30,8 @@ * layers and helpers. *****************************************************************************/ -#ifndef ENB_H -#define ENB_H +#ifndef SRSENB_ENB_H +#define SRSENB_ENB_H #include #include @@ -219,5 +219,5 @@ private: } // namespace srsenb -#endif // UE_H +#endif // SRSENB_ENB_H diff --git a/srsenb/hdr/mac/mac.h b/srsenb/hdr/mac/mac.h index c99b733fb..af122e36b 100644 --- a/srsenb/hdr/mac/mac.h +++ b/srsenb/hdr/mac/mac.h @@ -24,8 +24,8 @@ * */ -#ifndef MAC_H -#define MAC_H +#ifndef SRSENB_MAC_H +#define SRSENB_MAC_H #include #include "srslte/common/log.h" @@ -211,6 +211,6 @@ private: }; -} // namespace srsue +} // namespace srsenb -#endif // MAC_H +#endif // SRSENB_MAC_H diff --git a/srsenb/hdr/mac/mac_metrics.h b/srsenb/hdr/mac/mac_metrics.h index e11eda350..d63734d2a 100644 --- a/srsenb/hdr/mac/mac_metrics.h +++ b/srsenb/hdr/mac/mac_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef ENB_MAC_METRICS_H -#define ENB_MAC_METRICS_H +#ifndef SRSENB_MAC_METRICS_H +#define SRSENB_MAC_METRICS_H namespace srsenb { @@ -51,4 +51,4 @@ struct mac_metrics_t } // namespace srsenb -#endif // ENB_MAC_METRICS_H +#endif // SRSENB_MAC_METRICS_H diff --git a/srsenb/hdr/mac/scheduler.h b/srsenb/hdr/mac/scheduler.h index 12c336c36..d964726d9 100644 --- a/srsenb/hdr/mac/scheduler.h +++ b/srsenb/hdr/mac/scheduler.h @@ -24,8 +24,8 @@ * */ -#ifndef SCHED_H -#define SCHED_H +#ifndef SRSENB_SCHEDULER_H +#define SRSENB_SCHEDULER_H #include #include "srslte/common/log.h" @@ -228,4 +228,4 @@ private: } -#endif +#endif // SRSENB_SCHEDULER_H diff --git a/srsenb/hdr/mac/scheduler_harq.h b/srsenb/hdr/mac/scheduler_harq.h index ec2aa43c0..7002653e3 100644 --- a/srsenb/hdr/mac/scheduler_harq.h +++ b/srsenb/hdr/mac/scheduler_harq.h @@ -24,8 +24,8 @@ * */ -#ifndef SCHED_HARQ_H -#define SCHED_HARQ_H +#ifndef SRSENB_SCHEDULER_HARQ_H +#define SRSENB_SCHEDULER_HARQ_H #include #include "srslte/common/log.h" @@ -125,4 +125,4 @@ private: } -#endif +#endif // SRSENB_SCHEDULER_HARQ_H diff --git a/srsenb/hdr/mac/scheduler_metric.h b/srsenb/hdr/mac/scheduler_metric.h index eda0b31ed..385d5803d 100644 --- a/srsenb/hdr/mac/scheduler_metric.h +++ b/srsenb/hdr/mac/scheduler_metric.h @@ -24,8 +24,8 @@ * */ -#ifndef SCHED_METRIC_H -#define SCHED_METRIC_H +#ifndef SRSENB_SCHEDULER_METRIC_H +#define SRSENB_SCHEDULER_METRIC_H #include "mac/scheduler.h" @@ -84,5 +84,5 @@ private: } -#endif +#endif // SRSENB_SCHEDULER_METRIC_H diff --git a/srsenb/hdr/mac/scheduler_ue.h b/srsenb/hdr/mac/scheduler_ue.h index 448e01954..90db552a6 100644 --- a/srsenb/hdr/mac/scheduler_ue.h +++ b/srsenb/hdr/mac/scheduler_ue.h @@ -24,8 +24,8 @@ * */ -#ifndef SCHED_UE_H -#define SCHED_UE_H +#ifndef SRSENB_SCHEDULER_UE_H +#define SRSENB_SCHEDULER_UE_H #include #include "srslte/common/log.h" @@ -194,4 +194,4 @@ private: } -#endif +#endif // SRSENB_SCHEDULER_UE_H diff --git a/srsenb/hdr/mac/ue.h b/srsenb/hdr/mac/ue.h index 3b81a10ec..405acd120 100644 --- a/srsenb/hdr/mac/ue.h +++ b/srsenb/hdr/mac/ue.h @@ -24,8 +24,8 @@ * */ -#ifndef UE_H -#define UE_H +#ifndef SRSENB_UE_H +#define SRSENB_UE_H #include "srslte/common/log.h" #include "srslte/common/pdu.h" @@ -167,5 +167,5 @@ private: } -#endif +#endif // SRSENB_UE_H diff --git a/srsenb/hdr/metrics_stdout.h b/srsenb/hdr/metrics_stdout.h index 563a866d3..f5af14e25 100644 --- a/srsenb/hdr/metrics_stdout.h +++ b/srsenb/hdr/metrics_stdout.h @@ -30,8 +30,8 @@ * Description: Metrics class printing to stdout. *****************************************************************************/ -#ifndef METRICS_STDOUT_H -#define METRICS_STDOUT_H +#ifndef SRSENB_METRICS_STDOUT_H +#define SRSENB_METRICS_STDOUT_H #include #include @@ -71,4 +71,4 @@ private: } // namespace srsenb -#endif // METRICS_STDOUT_H +#endif // SRSENB_METRICS_STDOUT_H diff --git a/srsenb/hdr/parser.h b/srsenb/hdr/parser.h index 492249e18..90425203f 100644 --- a/srsenb/hdr/parser.h +++ b/srsenb/hdr/parser.h @@ -24,8 +24,8 @@ * */ -#ifndef PARSER_H -#define PARSER_H +#ifndef SRSENB_PARSER_H +#define SRSENB_PARSER_H #include #include diff --git a/srsenb/hdr/phy/phch_common.h b/srsenb/hdr/phy/phch_common.h index 5ce9237bf..6adc926f3 100644 --- a/srsenb/hdr/phy/phch_common.h +++ b/srsenb/hdr/phy/phch_common.h @@ -24,8 +24,8 @@ * */ -#ifndef ENBPHCHCOMMON_H -#define ENBPHCHCOMMON_H +#ifndef SRSENB_PHCH_COMMON_H +#define SRSENB_PHCH_COMMON_H #include #include "srslte/interfaces/enb_interfaces.h" @@ -133,4 +133,4 @@ private: } // namespace srsenb -#endif // UEPHY_H +#endif // SRSENB_PHCH_COMMON_H diff --git a/srsenb/hdr/phy/phch_worker.h b/srsenb/hdr/phy/phch_worker.h index 789e2593a..35e0607ba 100644 --- a/srsenb/hdr/phy/phch_worker.h +++ b/srsenb/hdr/phy/phch_worker.h @@ -24,8 +24,8 @@ * */ -#ifndef ENBPHYWORKER_H -#define ENBPHYWORKER_H +#ifndef SRSENB_PHCH_WORKER_H +#define SRSENB_PHCH_WORKER_H #include @@ -137,5 +137,5 @@ private: } // namespace srsenb -#endif // ENBPHYWORKER_H +#endif // SRSENB_PHCH_WORKER_H diff --git a/srsenb/hdr/phy/phy.h b/srsenb/hdr/phy/phy.h index 99b23de0c..07c181741 100644 --- a/srsenb/hdr/phy/phy.h +++ b/srsenb/hdr/phy/phy.h @@ -24,8 +24,8 @@ * */ -#ifndef ENBPHY_H -#define ENBPHY_H +#ifndef SRSENB_PHY_H +#define SRSENB_PHY_H #include "srslte/common/log.h" #include "srslte/common/log_filter.h" @@ -99,4 +99,4 @@ private: } // namespace srsenb -#endif // UEPHY_H +#endif // SRSENB_PHY_H diff --git a/srsenb/hdr/phy/phy_metrics.h b/srsenb/hdr/phy/phy_metrics.h index ad3b96698..5a45baf5f 100644 --- a/srsenb/hdr/phy/phy_metrics.h +++ b/srsenb/hdr/phy/phy_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef ENB_PHY_METRICS_H -#define ENB_PHY_METRICS_H +#ifndef SRSENB_PHY_METRICS_H +#define SRSENB_PHY_METRICS_H namespace srsenb { @@ -56,4 +56,4 @@ struct phy_metrics_t } // namespace srsenb -#endif // ENB_PHY_METRICS_H +#endif // SRSENB_PHY_METRICS_H diff --git a/srsenb/hdr/phy/prach_worker.h b/srsenb/hdr/phy/prach_worker.h index dd1149dd4..8ca70aa60 100644 --- a/srsenb/hdr/phy/prach_worker.h +++ b/srsenb/hdr/phy/prach_worker.h @@ -24,8 +24,8 @@ * */ -#ifndef PRACH_WORKER_H -#define PRACH_WORKER_H +#ifndef SRSENB_PRACH_WORKER_H +#define SRSENB_PRACH_WORKER_H #include "srslte/interfaces/enb_interfaces.h" #include "srslte/common/log.h" @@ -85,4 +85,4 @@ private: uint32_t sf_cnt; }; } -#endif // PRACH_WORKER_H +#endif // SRSENB_PRACH_WORKER_H diff --git a/srsenb/hdr/phy/txrx.h b/srsenb/hdr/phy/txrx.h index 035f81f9c..9ba048c83 100644 --- a/srsenb/hdr/phy/txrx.h +++ b/srsenb/hdr/phy/txrx.h @@ -24,8 +24,8 @@ * */ -#ifndef ENBTXRX_H -#define ENBTXRX_H +#ifndef SRSENB_TXRX_H +#define SRSENB_TXRX_H #include "srslte/common/log.h" #include "srslte/common/threads.h" @@ -73,4 +73,4 @@ private: } // namespace srsenb -#endif // UEPHY_H +#endif // SRSENB_TXRX_H diff --git a/srsenb/hdr/upper/common_enb.h b/srsenb/hdr/upper/common_enb.h index d04869c54..2e0b28917 100644 --- a/srsenb/hdr/upper/common_enb.h +++ b/srsenb/hdr/upper/common_enb.h @@ -24,8 +24,8 @@ * */ -#ifndef COMMON_ENB_H -#define COMMON_ENB_H +#ifndef SRSENB_COMMON_ENB_H +#define SRSENB_COMMON_ENB_H /******************************************************************************* INCLUDES @@ -181,4 +181,4 @@ inline void uint16_to_uint8(uint16_t i, uint8_t *buf) } // namespace srsenb -#endif // COMMON_ENB_H +#endif // SRSENB_COMMON_ENB_H diff --git a/srsenb/hdr/upper/gtpu.h b/srsenb/hdr/upper/gtpu.h index 6958773b6..b3323ffe2 100644 --- a/srsenb/hdr/upper/gtpu.h +++ b/srsenb/hdr/upper/gtpu.h @@ -34,8 +34,8 @@ #include "srslte/srslte.h" #include "srslte/interfaces/enb_interfaces.h" -#ifndef GTPU_H -#define GTPU_H +#ifndef SRSENB_GTPU_H +#define SRSENB_GTPU_H namespace srsenb { @@ -127,4 +127,4 @@ private: } // namespace srsenb -#endif // GTPU_H +#endif // SRSENB_GTPU_H diff --git a/srsenb/hdr/upper/pdcp.h b/srsenb/hdr/upper/pdcp.h index 8c5b05275..45907e1f8 100644 --- a/srsenb/hdr/upper/pdcp.h +++ b/srsenb/hdr/upper/pdcp.h @@ -29,8 +29,8 @@ #include "srslte/interfaces/enb_interfaces.h" #include "srslte/upper/pdcp.h" -#ifndef PDCP_ENB_H -#define PDCP_ENB_H +#ifndef SRSENB_PDCP_H +#define SRSENB_PDCP_H namespace srsenb { @@ -113,4 +113,4 @@ private: } -#endif // PDCP_ENB_H +#endif // SRSENB_PDCP_H diff --git a/srsenb/hdr/upper/rlc.h b/srsenb/hdr/upper/rlc.h index b937cd216..98c3edfb3 100644 --- a/srsenb/hdr/upper/rlc.h +++ b/srsenb/hdr/upper/rlc.h @@ -29,8 +29,8 @@ #include "srslte/interfaces/enb_interfaces.h" #include "srslte/upper/rlc.h" -#ifndef RLC_ENB_H -#define RLC_ENB_H +#ifndef SRSENB_RLC_H +#define SRSENB_RLC_H namespace srsenb { @@ -96,4 +96,4 @@ private: } -#endif // RLC_H +#endif // SRSENB_RLC_H diff --git a/srsenb/hdr/upper/rrc.h b/srsenb/hdr/upper/rrc.h index 2935fd29f..49da1c0d9 100644 --- a/srsenb/hdr/upper/rrc.h +++ b/srsenb/hdr/upper/rrc.h @@ -24,8 +24,8 @@ * */ -#ifndef RRC_H -#define RRC_H +#ifndef SRSENB_RRC_H +#define SRSENB_RRC_H #include #include @@ -364,4 +364,4 @@ private: } // namespace srsenb -#endif // RRC_H +#endif // SRSENB_RRC_H diff --git a/srsenb/hdr/upper/rrc_metrics.h b/srsenb/hdr/upper/rrc_metrics.h index bce3ec95f..aba942f3f 100644 --- a/srsenb/hdr/upper/rrc_metrics.h +++ b/srsenb/hdr/upper/rrc_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef ENB_RRC_METRICS_H -#define ENB_RRC_METRICS_H +#ifndef SRSENB_RRC_METRICS_H +#define SRSENB_RRC_METRICS_H #include "upper/common_enb.h" @@ -55,4 +55,4 @@ struct rrc_metrics_t } // namespace srsenb -#endif // ENB_S1AP_METRICS_H +#endif // SRSENB_RRC_METRICS_H diff --git a/srsenb/hdr/upper/s1ap.h b/srsenb/hdr/upper/s1ap.h index 714035638..ad9137eec 100644 --- a/srsenb/hdr/upper/s1ap.h +++ b/srsenb/hdr/upper/s1ap.h @@ -24,8 +24,8 @@ * */ -#ifndef S1AP_H -#define S1AP_H +#ifndef SRSENB_S1AP_H +#define SRSENB_S1AP_H #include @@ -148,4 +148,4 @@ private: } // namespace srsenb -#endif // S1AP_H +#endif // SRSENB_S1AP_H diff --git a/srsenb/hdr/upper/s1ap_metrics.h b/srsenb/hdr/upper/s1ap_metrics.h index f77dc699c..b73b0afa0 100644 --- a/srsenb/hdr/upper/s1ap_metrics.h +++ b/srsenb/hdr/upper/s1ap_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef ENB_S1AP_METRICS_H -#define ENB_S1AP_METRICS_H +#ifndef SRSENB_S1AP_METRICS_H +#define SRSENB_S1AP_METRICS_H namespace srsenb { @@ -43,4 +43,4 @@ struct s1ap_metrics_t } // namespace srsenb -#endif // ENB_S1AP_METRICS_H +#endif // SRSENB_S1AP_METRICS_H diff --git a/srsepc/hdr/hss/hss.h b/srsepc/hdr/hss/hss.h index 818feae49..97e2d45c1 100644 --- a/srsepc/hdr/hss/hss.h +++ b/srsepc/hdr/hss/hss.h @@ -30,8 +30,8 @@ * interfaces and helpers. *****************************************************************************/ -#ifndef HSS_H -#define HSS_H +#ifndef SRSEPC_HSS_H +#define SRSEPC_HSS_H #include #include "srslte/common/log.h" @@ -124,4 +124,4 @@ private: } // namespace srsepc -#endif // MME_H +#endif // SRSEPC_HSS_H diff --git a/srsepc/hdr/mme/mme.h b/srsepc/hdr/mme/mme.h index c0eac0685..599059260 100644 --- a/srsepc/hdr/mme/mme.h +++ b/srsepc/hdr/mme/mme.h @@ -30,8 +30,8 @@ * interfaces and helpers. *****************************************************************************/ -#ifndef MME_H -#define MME_H +#ifndef SRSEPC_MME_H +#define SRSEPC_MME_H #include #include "srslte/common/log.h" @@ -89,4 +89,4 @@ private: } // namespace srsepc -#endif // MME_H +#endif // SRSEPC_MME_H diff --git a/srsepc/hdr/mme/mme_gtpc.h b/srsepc/hdr/mme/mme_gtpc.h index f41172cce..5f7ecc64c 100644 --- a/srsepc/hdr/mme/mme_gtpc.h +++ b/srsepc/hdr/mme/mme_gtpc.h @@ -23,8 +23,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef MME_GTPC_H -#define MME_GTPC_H +#ifndef SRSEPC_MME_GTPC_H +#define SRSEPC_MME_GTPC_H #include "srslte/common/log.h" #include "srslte/common/log_filter.h" @@ -78,4 +78,4 @@ private: }; } -#endif +#endif // SRSEPC_MME_GTPC_H diff --git a/srsepc/hdr/mme/s1ap.h b/srsepc/hdr/mme/s1ap.h index 31ea68436..6f3c64d5c 100644 --- a/srsepc/hdr/mme/s1ap.h +++ b/srsepc/hdr/mme/s1ap.h @@ -23,8 +23,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef S1AP_H -#define S1AP_H +#ifndef SRSEPC_S1AP_H +#define SRSEPC_S1AP_H #include "srslte/asn1/gtpc.h" #include "srslte/asn1/liblte_s1ap.h" @@ -153,4 +153,4 @@ s1ap::get_plmn() } //namespace srsepc -#endif //S1AP_H +#endif // SRSEPC_S1AP_H diff --git a/srsepc/hdr/mme/s1ap_common.h b/srsepc/hdr/mme/s1ap_common.h index 9fea71d3f..a71daada8 100644 --- a/srsepc/hdr/mme/s1ap_common.h +++ b/srsepc/hdr/mme/s1ap_common.h @@ -18,8 +18,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef S1AP_COMMON_H -#define S1AP_COMMON_H +#ifndef SRSEPC_S1AP_COMMON_H +#define SRSEPC_S1AP_COMMON_H #include "srslte/common/security.h" #include "srslte/asn1/gtpc_ies.h" @@ -162,4 +162,5 @@ typedef struct{ erab_ctx_t erabs_ctx[MAX_ERABS_PER_UE]; } ue_ctx_t; }//namespace -#endif + +#endif // SRSEPC_S1AP_COMMON_H diff --git a/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h b/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h index 6fc599101..31a4ce6ba 100644 --- a/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h +++ b/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h @@ -23,8 +23,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef S1AP_CTX_MNGMT_PROC_H -#define S1AP_CTX_MNGMT_PROC_H +#ifndef SRSEPC_S1AP_CTX_MNGMT_PROC_H +#define SRSEPC_S1AP_CTX_MNGMT_PROC_H #include "srslte/asn1/liblte_s1ap.h" #include "srslte/common/common.h" @@ -70,4 +70,4 @@ private: } //namespace srsepc -#endif //S1AP_MNGMT_PROC +#endif // SRSEPC_S1AP_CTX_MNGMT_PROC_H diff --git a/srsepc/hdr/mme/s1ap_mngmt_proc.h b/srsepc/hdr/mme/s1ap_mngmt_proc.h index 7f5771676..a8fd24df2 100644 --- a/srsepc/hdr/mme/s1ap_mngmt_proc.h +++ b/srsepc/hdr/mme/s1ap_mngmt_proc.h @@ -23,8 +23,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef S1AP_MNGMT_PROC_H -#define S1AP_MNGMT_PROC_H +#ifndef SRSEPC_S1AP_MNGMT_PROC_H +#define SRSEPC_S1AP_MNGMT_PROC_H #include "srslte/asn1/liblte_s1ap.h" #include "srslte/common/common.h" @@ -65,4 +65,4 @@ private: } //namespace srsepc -#endif //S1AP_MNGMT_PROC +#endif // SRSEPC_S1AP_MNGMT_PROC_H diff --git a/srsepc/hdr/mme/s1ap_nas_transport.h b/srsepc/hdr/mme/s1ap_nas_transport.h index 500f41565..a3fc5cccc 100644 --- a/srsepc/hdr/mme/s1ap_nas_transport.h +++ b/srsepc/hdr/mme/s1ap_nas_transport.h @@ -23,8 +23,8 @@ * and at http://www.gnu.org/licenses/. * */ -#ifndef S1AP_NAS_TRANSPORT_H -#define S1AP_NAS_TRANSPORT_H +#ifndef SRSEPC_S1AP_NAS_TRANSPORT_H +#define SRSEPC_S1AP_NAS_TRANSPORT_H #include "srslte/asn1/liblte_s1ap.h" #include "srslte/common/buffer_pool.h" @@ -130,4 +130,4 @@ private: mme_gtpc* m_mme_gtpc; }; } //namespace srsepc -#endif //S1AP_NAS_TRANSPORT +#endif // SRSEPC_S1AP_NAS_TRANSPORT_H diff --git a/srsepc/hdr/spgw/spgw.h b/srsepc/hdr/spgw/spgw.h index e82d3f6ea..98ad59403 100644 --- a/srsepc/hdr/spgw/spgw.h +++ b/srsepc/hdr/spgw/spgw.h @@ -30,8 +30,8 @@ * interfaces and helpers. *****************************************************************************/ -#ifndef SPGW_H -#define SPGW_H +#ifndef SRSEPC_SPGW_H +#define SRSEPC_SPGW_H #include #include "srslte/common/log.h" @@ -135,4 +135,4 @@ private: } // namespace srsepc -#endif // SGW_H +#endif // SRSEPC_SPGW_H diff --git a/srsue/hdr/mac/demux.h b/srsue/hdr/mac/demux.h index fb38990ec..c738a0fd3 100644 --- a/srsue/hdr/mac/demux.h +++ b/srsue/hdr/mac/demux.h @@ -24,8 +24,8 @@ * */ -#ifndef DEMUX_H -#define DEMUX_H +#ifndef SRSUE_DEMUX_H +#define SRSUE_DEMUX_H #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/pdu_queue.h" @@ -86,7 +86,7 @@ private: } // namespace srsue -#endif // DEMUX_H +#endif // SRSUE_DEMUX_H diff --git a/srsue/hdr/mac/dl_harq.h b/srsue/hdr/mac/dl_harq.h index cfdfdfc5f..c6f07251a 100644 --- a/srsue/hdr/mac/dl_harq.h +++ b/srsue/hdr/mac/dl_harq.h @@ -24,8 +24,8 @@ * */ -#ifndef DL_HARQ_H -#define DL_HARQ_H +#ifndef SRSUE_DL_HARQ_H +#define SRSUE_DL_HARQ_H #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) @@ -447,4 +447,4 @@ private: } // namespace srsue -#endif // DL_HARQ_H +#endif // SRSUE_DL_HARQ_H diff --git a/srsue/hdr/mac/dl_sps.h b/srsue/hdr/mac/dl_sps.h index 8ec83cb52..dd6328fdc 100644 --- a/srsue/hdr/mac/dl_sps.h +++ b/srsue/hdr/mac/dl_sps.h @@ -24,8 +24,8 @@ * */ -#ifndef DL_SPS_H -#define DL_SPS_H +#ifndef SRSUE_DL_SPS_H +#define SRSUE_DL_SPS_H #include "srslte/common/log.h" #include "srslte/common/timers.h" @@ -50,4 +50,4 @@ private: } // namespace srsue -#endif // DL_SPS_H +#endif // SRSUE_DL_SPS_H diff --git a/srsue/hdr/mac/mac.h b/srsue/hdr/mac/mac.h index f4b0ffe3a..0e427a8a7 100644 --- a/srsue/hdr/mac/mac.h +++ b/srsue/hdr/mac/mac.h @@ -24,8 +24,8 @@ * */ -#ifndef MAC_H -#define MAC_H +#ifndef SRSUE_MAC_H +#define SRSUE_MAC_H #include "srslte/common/log.h" #include "mac/dl_harq.h" @@ -200,4 +200,4 @@ private: } // namespace srsue -#endif // MAC_H +#endif // SRSUE_MAC_H diff --git a/srsue/hdr/mac/mac_metrics.h b/srsue/hdr/mac/mac_metrics.h index 91ce29cab..a201d2a7f 100644 --- a/srsue/hdr/mac/mac_metrics.h +++ b/srsue/hdr/mac/mac_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef UE_MAC_METRICS_H -#define UE_MAC_METRICS_H +#ifndef SRSUE_MAC_METRICS_H +#define SRSUE_MAC_METRICS_H namespace srsue { @@ -43,4 +43,4 @@ struct mac_metrics_t } // namespace srsue -#endif // UE_MAC_METRICS_H +#endif // SRSUE_MAC_METRICS_H diff --git a/srsue/hdr/mac/mux.h b/srsue/hdr/mac/mux.h index 17a854711..04f7e302b 100644 --- a/srsue/hdr/mac/mux.h +++ b/srsue/hdr/mac/mux.h @@ -24,8 +24,8 @@ * */ -#ifndef MUX_H -#define MUX_H +#ifndef SRSUE_MUX_H +#define SRSUE_MUX_H #include @@ -114,5 +114,5 @@ private: } // namespace srsue -#endif // MUX_H +#endif // SRSUE_MUX_H diff --git a/srsue/hdr/mac/proc.h b/srsue/hdr/mac/proc.h index 3fa864cb0..f3601385d 100644 --- a/srsue/hdr/mac/proc.h +++ b/srsue/hdr/mac/proc.h @@ -24,8 +24,8 @@ * */ -#ifndef PROC_H -#define PROC_H +#ifndef SRSUE_PROC_H +#define SRSUE_PROC_H #include @@ -56,4 +56,4 @@ private: } // namespace srsue -#endif // PROC_H +#endif // SRSUE_PROC_H diff --git a/srsue/hdr/mac/proc_bsr.h b/srsue/hdr/mac/proc_bsr.h index 656e9a7a3..9592df667 100644 --- a/srsue/hdr/mac/proc_bsr.h +++ b/srsue/hdr/mac/proc_bsr.h @@ -24,8 +24,8 @@ * */ -#ifndef PROCBSR_H -#define PROCBSR_H +#ifndef SRSUE_PROC_BSR_H +#define SRSUE_PROC_BSR_H #include @@ -88,4 +88,4 @@ private: } // namespace srsue -#endif // PROCBSR_H +#endif // SRSUE_PROC_BSR_H diff --git a/srsue/hdr/mac/proc_phr.h b/srsue/hdr/mac/proc_phr.h index 240a7bab7..b12280220 100644 --- a/srsue/hdr/mac/proc_phr.h +++ b/srsue/hdr/mac/proc_phr.h @@ -24,8 +24,8 @@ * */ -#ifndef PROCPHR_H -#define PROCPHR_H +#ifndef SRSUE_PROC_PHR_H +#define SRSUE_PROC_PHR_H #include #include "srslte/common/timers.h" @@ -74,4 +74,4 @@ private: } // namespace srsue -#endif // PROCPHR_H +#endif // SRSUE_PROC_PHR_H diff --git a/srsue/hdr/mac/proc_ra.h b/srsue/hdr/mac/proc_ra.h index de8a0671d..9163b8530 100644 --- a/srsue/hdr/mac/proc_ra.h +++ b/srsue/hdr/mac/proc_ra.h @@ -24,8 +24,8 @@ * */ -#ifndef PROCRA_H -#define PROCRA_H +#ifndef SRSUE_PROC_RA_H +#define SRSUE_PROC_RA_H #include @@ -216,4 +216,4 @@ private: } // namespace srsue -#endif // PROCRA_H +#endif // SRSUE_PROC_RA_H diff --git a/srsue/hdr/mac/proc_sr.h b/srsue/hdr/mac/proc_sr.h index 9425481dd..878f92fb5 100644 --- a/srsue/hdr/mac/proc_sr.h +++ b/srsue/hdr/mac/proc_sr.h @@ -24,8 +24,8 @@ * */ -#ifndef PROCSR_H -#define PROCSR_H +#ifndef SRSUE_PROC_SR_H +#define SRSUE_PROC_SR_H #include #include "srslte/interfaces/ue_interfaces.h" @@ -64,4 +64,4 @@ private: } // namespace srsue -#endif // PROCSR_H +#endif // SRSUE_PROC_SR_H diff --git a/srsue/hdr/mac/ul_harq.h b/srsue/hdr/mac/ul_harq.h index ee9bc6279..034c09cf6 100644 --- a/srsue/hdr/mac/ul_harq.h +++ b/srsue/hdr/mac/ul_harq.h @@ -24,8 +24,8 @@ * */ -#ifndef ULHARQ_H -#define ULHARQ_H +#ifndef SRSUE_UL_HARQ_H +#define SRSUE_UL_HARQ_H #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) @@ -429,4 +429,4 @@ private: } // namespace srsue -#endif // ULHARQ_H +#endif // SRSUE_UL_HARQ_H diff --git a/srsue/hdr/mac/ul_sps.h b/srsue/hdr/mac/ul_sps.h index 59af7f507..985b8470f 100644 --- a/srsue/hdr/mac/ul_sps.h +++ b/srsue/hdr/mac/ul_sps.h @@ -24,8 +24,8 @@ * */ -#ifndef ULSPS_H -#define ULSPS_H +#ifndef SRSUE_UL_SPS_H +#define SRSUE_UL_SPS_H #include "srslte/common/log.h" #include "srslte/common/timers.h" @@ -50,4 +50,4 @@ private: } // namespace srsue -#endif // ULSPS_H +#endif // SRSUE_UL_SPS_H diff --git a/srsue/hdr/metrics_csv.h b/srsue/hdr/metrics_csv.h index 72a9dc050..f07b0c119 100644 --- a/srsue/hdr/metrics_csv.h +++ b/srsue/hdr/metrics_csv.h @@ -29,8 +29,8 @@ * Description: Metrics class writing to CSV file. *****************************************************************************/ -#ifndef METRICS_CSV_H -#define METRICS_CSV_H +#ifndef SRSUE_METRICS_CSV_H +#define SRSUE_METRICS_CSV_H #include #include @@ -64,4 +64,4 @@ private: } // namespace srsue -#endif // METRICS_CSV_H +#endif // SRSUE_METRICS_CSV_H diff --git a/srsue/hdr/metrics_stdout.h b/srsue/hdr/metrics_stdout.h index 01f28f35e..2b0df9ca3 100644 --- a/srsue/hdr/metrics_stdout.h +++ b/srsue/hdr/metrics_stdout.h @@ -29,8 +29,8 @@ * Description: Metrics class printing to stdout. *****************************************************************************/ -#ifndef METRICS_STDOUT_H -#define METRICS_STDOUT_H +#ifndef SRSUE_METRICS_STDOUT_H +#define SRSUE_METRICS_STDOUT_H #include #include @@ -64,4 +64,4 @@ private: } // namespace srsue -#endif // METRICS_STDOUT_H +#endif // SRSUE_METRICS_STDOUT_H diff --git a/srsue/hdr/phy/phch_common.h b/srsue/hdr/phy/phch_common.h index f21738b6b..2f9b75569 100644 --- a/srsue/hdr/phy/phch_common.h +++ b/srsue/hdr/phy/phch_common.h @@ -24,8 +24,8 @@ * */ -#ifndef UEPHYWORKERCOMMON_H -#define UEPHYWORKERCOMMON_H +#ifndef SRSUE_PHCH_COMMON_H +#define SRSUE_PHCH_COMMON_H #define TX_MODE_CONTINUOUS 1 @@ -187,4 +187,4 @@ private: } // namespace srsue -#endif // UEPHYWORKERCOMMON_H +#endif // SRSUE_PDCH_COMMON_H diff --git a/srsue/hdr/phy/phch_recv.h b/srsue/hdr/phy/phch_recv.h index 378dfb8f9..7d3e2b25b 100644 --- a/srsue/hdr/phy/phch_recv.h +++ b/srsue/hdr/phy/phch_recv.h @@ -24,8 +24,8 @@ * */ -#ifndef UEPHYRECV_H -#define UEPHYRECV_H +#ifndef SRSUE_PHCH_RECV_H +#define SRSUE_PHCH_RECV_H #include @@ -340,4 +340,4 @@ private: } // namespace srsue -#endif // UEPHYRECV_H +#endif // SRSUE_PHCH_RECV_H diff --git a/srsue/hdr/phy/phch_worker.h b/srsue/hdr/phy/phch_worker.h index 28c4715ad..a5e2338c2 100644 --- a/srsue/hdr/phy/phch_worker.h +++ b/srsue/hdr/phy/phch_worker.h @@ -24,8 +24,8 @@ * */ -#ifndef UEPHYWORKER_H -#define UEPHYWORKER_H +#ifndef SRSUE_PHCH_WORKER_H +#define SRSUE_PHCH_WORKER_H #include #include "srslte/srslte.h" @@ -185,5 +185,5 @@ private: } // namespace srsue -#endif // UEPHYWORKER_H +#endif // SRSUE_PHCH_WORKER_H diff --git a/srsue/hdr/phy/phy.h b/srsue/hdr/phy/phy.h index 95140f8cd..1c03c4f87 100644 --- a/srsue/hdr/phy/phy.h +++ b/srsue/hdr/phy/phy.h @@ -24,8 +24,8 @@ * */ -#ifndef UEPHY_H -#define UEPHY_H +#ifndef SRSUE_PHY_H +#define SRSUE_PHY_H #include "srslte/srslte.h" #include "srslte/common/log_filter.h" @@ -187,4 +187,4 @@ private: } // namespace srsue -#endif // UEPHY_H +#endif // SRSUE_PHY_H diff --git a/srsue/hdr/phy/phy_metrics.h b/srsue/hdr/phy/phy_metrics.h index eafff2183..ce53c096c 100644 --- a/srsue/hdr/phy/phy_metrics.h +++ b/srsue/hdr/phy/phy_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef UE_PHY_METRICS_H -#define UE_PHY_METRICS_H +#ifndef SRSUE_PHY_METRICS_H +#define SRSUE_PHY_METRICS_H namespace srsue { @@ -65,4 +65,4 @@ struct phy_metrics_t } // namespace srsue -#endif // UE_PHY_METRICS_H +#endif // SRSUE_PHY_METRICS_H diff --git a/srsue/hdr/phy/prach.h b/srsue/hdr/phy/prach.h index 09be0c9b2..651203eb7 100644 --- a/srsue/hdr/phy/prach.h +++ b/srsue/hdr/phy/prach.h @@ -24,8 +24,8 @@ * */ -#ifndef UEPRACH_H -#define UEPRACH_H +#ifndef SRSUE_PRACH_H +#define SRSUE_PRACH_H #include @@ -87,4 +87,4 @@ namespace srsue { } // namespace srsue -#endif // UEPRACH_H +#endif // SRSUE_PRACH_H diff --git a/srsue/hdr/ue.h b/srsue/hdr/ue.h index 2aa7157e2..f66ac9fba 100644 --- a/srsue/hdr/ue.h +++ b/srsue/hdr/ue.h @@ -30,8 +30,8 @@ * layers and helpers. *****************************************************************************/ -#ifndef UE_H -#define UE_H +#ifndef SRSUE_UE_H +#define SRSUE_UE_H #include #include @@ -120,5 +120,5 @@ private: } // namespace srsue -#endif // UE_H +#endif // SRSUE_UE_H diff --git a/srsue/hdr/ue_base.h b/srsue/hdr/ue_base.h index 8e1a41478..802b7880d 100644 --- a/srsue/hdr/ue_base.h +++ b/srsue/hdr/ue_base.h @@ -29,8 +29,8 @@ * Description: Base class for UEs. *****************************************************************************/ -#ifndef UE_BASE_H -#define UE_BASE_H +#ifndef SRSUE_UE_BASE_H +#define SRSUE_UE_BASE_H #include #include @@ -183,5 +183,5 @@ private: } // namespace srsue -#endif // UE_BASE_H +#endif // SRSUE_UE_BASE_H diff --git a/srsue/hdr/ue_metrics_interface.h b/srsue/hdr/ue_metrics_interface.h index 20ee6f031..968b0de5a 100644 --- a/srsue/hdr/ue_metrics_interface.h +++ b/srsue/hdr/ue_metrics_interface.h @@ -24,8 +24,8 @@ * */ -#ifndef UE_METRICS_INTERFACE_H -#define UE_METRICS_INTERFACE_H +#ifndef SRSUE_UE_METRICS_INTERFACE_H +#define SRSUE_UE_METRICS_INTERFACE_H #include @@ -62,4 +62,4 @@ public: } // namespace srsue -#endif // UE_METRICS_INTERFACE_H +#endif // SRSUE_UE_METRICS_INTERFACE_H diff --git a/srsue/hdr/upper/gw.h b/srsue/hdr/upper/gw.h index aa5b2c70f..10ab50e56 100644 --- a/srsue/hdr/upper/gw.h +++ b/srsue/hdr/upper/gw.h @@ -24,8 +24,8 @@ * */ -#ifndef GW_H -#define GW_H +#ifndef SRSUE_GW_H +#define SRSUE_GW_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -94,4 +94,4 @@ private: } // namespace srsue -#endif // GW_H +#endif // SRSUE_GW_H diff --git a/srsue/hdr/upper/gw_metrics.h b/srsue/hdr/upper/gw_metrics.h index e596046c9..cce3af7ad 100644 --- a/srsue/hdr/upper/gw_metrics.h +++ b/srsue/hdr/upper/gw_metrics.h @@ -24,8 +24,8 @@ * */ -#ifndef UE_GW_METRICS_H -#define UE_GW_METRICS_H +#ifndef SRSUE_GW_METRICS_H +#define SRSUE_GW_METRICS_H namespace srsue { @@ -38,4 +38,4 @@ struct gw_metrics_t } // namespace srsue -#endif // UE_GW_METRICS_H +#endif // SRSUE_GW_METRICS_H diff --git a/srsue/hdr/upper/nas.h b/srsue/hdr/upper/nas.h index 8a1fd6ae3..5f431cc0a 100644 --- a/srsue/hdr/upper/nas.h +++ b/srsue/hdr/upper/nas.h @@ -24,8 +24,8 @@ * */ -#ifndef NAS_H -#define NAS_H +#ifndef SRSUE_NAS_H +#define SRSUE_NAS_H #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" @@ -220,4 +220,4 @@ private: } // namespace srsue -#endif // NAS_H +#endif // SRSUE_NAS_H diff --git a/srsue/hdr/upper/rrc.h b/srsue/hdr/upper/rrc.h index 5c9899eab..ba8fdd046 100644 --- a/srsue/hdr/upper/rrc.h +++ b/srsue/hdr/upper/rrc.h @@ -24,8 +24,8 @@ * */ -#ifndef RRC_H -#define RRC_H +#ifndef SRSUE_RRC_H +#define SRSUE_RRC_H #include "pthread.h" @@ -580,4 +580,4 @@ private: } // namespace srsue -#endif // RRC_H +#endif // SRSUE_RRC_H diff --git a/srsue/hdr/upper/rrc_common.h b/srsue/hdr/upper/rrc_common.h index 259d08fd7..912f39ddc 100644 --- a/srsue/hdr/upper/rrc_common.h +++ b/srsue/hdr/upper/rrc_common.h @@ -24,8 +24,8 @@ * */ -#ifndef RRC_COMMON_H -#define RRC_COMMON_H +#ifndef SRSUE_RRC_COMMON_H +#define SRSUE_RRC_COMMON_H namespace srsue { @@ -58,4 +58,4 @@ static const char rrc_state_text[RRC_STATE_N_ITEMS][100] = {"IDLE", } // namespace srsue -#endif // RRC_COMMON_H +#endif // SRSUE_RRC_COMMON_H diff --git a/srsue/hdr/upper/usim.h b/srsue/hdr/upper/usim.h index e37f58218..a5f703781 100644 --- a/srsue/hdr/upper/usim.h +++ b/srsue/hdr/upper/usim.h @@ -24,8 +24,8 @@ * */ -#ifndef USIM_H -#define USIM_H +#ifndef SRSUE_USIM_H +#define SRSUE_USIM_H #include #include "srslte/common/log.h" @@ -151,4 +151,4 @@ private: } // namespace srsue -#endif // USIM_H +#endif // SRSUE_USIM_H From 06d45592948acc5de3d14359792fd388c8bdff21 Mon Sep 17 00:00:00 2001 From: David Rupprecht Date: Sun, 1 Apr 2018 18:08:24 +0200 Subject: [PATCH 2/5] Change include path absolut to project dir --- .../srslte/interfaces/enb_metrics_interface.h | 12 ++++++------ srsenb/CMakeLists.txt | 2 +- srsenb/hdr/mac/mac.h | 6 +++--- srsenb/hdr/mac/scheduler_metric.h | 2 +- srsenb/hdr/mac/ue.h | 2 +- srsenb/hdr/phy/phch_worker.h | 2 +- srsenb/hdr/phy/phy.h | 6 +++--- srsenb/hdr/phy/txrx.h | 4 ++-- srsenb/hdr/upper/gtpu.h | 2 +- srsenb/hdr/upper/rrc.h | 2 +- srsenb/hdr/upper/rrc_metrics.h | 2 +- srsenb/hdr/upper/s1ap.h | 2 +- srsenb/src/enb.cc | 3 +-- srsenb/src/enb_cfg_parser.cc | 4 ++-- srsenb/src/enb_cfg_parser.h | 4 ++-- srsenb/src/mac/mac.cc | 2 +- srsenb/src/mac/scheduler.cc | 2 +- srsenb/src/mac/scheduler_harq.cc | 2 +- srsenb/src/mac/scheduler_metric.cc | 4 ++-- srsenb/src/mac/scheduler_ue.cc | 4 ++-- srsenb/src/mac/ue.cc | 2 +- srsenb/src/main.cc | 4 ++-- srsenb/src/metrics_stdout.cc | 2 +- srsenb/src/parser.cc | 2 +- srsenb/src/phy/phch_common.cc | 2 +- srsenb/src/phy/phch_worker.cc | 2 +- srsenb/src/phy/phy.cc | 2 +- srsenb/src/phy/prach_worker.cc | 2 +- srsenb/src/phy/txrx.cc | 4 ++-- srsenb/src/upper/gtpu.cc | 2 +- srsenb/src/upper/pdcp.cc | 4 ++-- srsenb/src/upper/rlc.cc | 4 ++-- srsenb/src/upper/rrc.cc | 3 +-- srsenb/src/upper/s1ap.cc | 4 ++-- srsenb/test/mac/scheduler_test.cc | 4 ++-- srsenb/test/upper/ip_test.cc | 4 ++-- srsenb/test/upper/plmn_test.cc | 2 +- srsepc/CMakeLists.txt | 2 +- srsepc/hdr/mme/mme_gtpc.h | 2 +- srsepc/hdr/mme/s1ap.h | 12 ++++++------ srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h | 4 ++-- srsepc/hdr/mme/s1ap_mngmt_proc.h | 2 +- srsepc/hdr/mme/s1ap_nas_transport.h | 6 +++--- srsepc/src/hss/hss.cc | 2 +- srsepc/src/main.cc | 6 +++--- srsepc/src/mme/mme.cc | 2 +- srsepc/src/mme/mme_gtpc.cc | 6 +++--- srsepc/src/mme/s1ap.cc | 2 +- srsepc/src/mme/s1ap_ctx_mngmt_proc.cc | 4 ++-- srsepc/src/mme/s1ap_mngmt_proc.cc | 4 ++-- srsepc/src/mme/s1ap_nas_transport.cc | 4 ++-- srsepc/src/spgw/spgw.cc | 4 ++-- srsue/CMakeLists.txt | 2 +- srsue/hdr/mac/dl_harq.h | 4 ++-- srsue/hdr/mac/mac.h | 18 +++++++++--------- srsue/hdr/mac/mux.h | 4 ++-- srsue/hdr/mac/proc_ra.h | 4 ++-- srsue/hdr/mac/ul_harq.h | 4 ++-- srsue/hdr/phy/phch_common.h | 2 +- srsue/hdr/phy/phch_recv.h | 6 +++--- srsue/hdr/phy/phch_worker.h | 2 +- srsue/hdr/phy/phy.h | 10 +++++----- srsue/src/mac/demux.cc | 4 ++-- srsue/src/mac/mac.cc | 2 +- srsue/src/mac/mux.cc | 4 ++-- srsue/src/mac/proc_bsr.cc | 6 +++--- srsue/src/mac/proc_phr.cc | 6 +++--- srsue/src/mac/proc_ra.cc | 6 +++--- srsue/src/mac/proc_sr.cc | 2 +- srsue/src/main.cc | 6 +++--- srsue/src/metrics_csv.cc | 2 +- srsue/src/metrics_stdout.cc | 2 +- srsue/src/phy/phch_common.cc | 2 +- srsue/src/phy/phch_recv.cc | 4 ++-- srsue/src/phy/phch_worker.cc | 2 +- srsue/src/phy/phy.cc | 2 +- srsue/src/phy/prach.cc | 4 ++-- srsue/src/ue.cc | 2 +- srsue/src/ue_base.cc | 4 ++-- srsue/src/upper/gw.cc | 2 +- srsue/src/upper/nas.cc | 2 +- srsue/src/upper/rrc.cc | 2 +- srsue/src/upper/usim.cc | 2 +- srsue/test/mac/mac_test.cc | 4 ++-- srsue/test/metrics_test.cc | 6 +++--- srsue/test/phy/ue_itf_test_prach.cc | 2 +- srsue/test/phy/ue_itf_test_sib1.cc | 2 +- srsue/test/upper/ip_test.cc | 6 +++--- srsue/test/upper/nas_test.cc | 8 ++++---- srsue/test/upper/usim_test.cc | 2 +- 90 files changed, 166 insertions(+), 168 deletions(-) diff --git a/lib/include/srslte/interfaces/enb_metrics_interface.h b/lib/include/srslte/interfaces/enb_metrics_interface.h index 6c8b2e740..4e540ab78 100644 --- a/lib/include/srslte/interfaces/enb_metrics_interface.h +++ b/lib/include/srslte/interfaces/enb_metrics_interface.h @@ -29,13 +29,13 @@ #include -#include "upper/common_enb.h" -#include "upper/s1ap_metrics.h" -#include "upper/rrc_metrics.h" -#include "../../../../srsue/hdr/upper/gw_metrics.h" +#include "srsenb/hdr/upper/common_enb.h" +#include "srsenb/hdr/upper/s1ap_metrics.h" +#include "srsenb/hdr/upper/rrc_metrics.h" +#include "srsue/hdr/upper/gw_metrics.h" #include "srslte/upper/rlc_metrics.h" -#include "mac/mac_metrics.h" -#include "phy/phy_metrics.h" +#include "srsenb/hdr/mac/mac_metrics.h" +#include "srsenb/hdr/phy/phy_metrics.h" namespace srsenb { diff --git a/srsenb/CMakeLists.txt b/srsenb/CMakeLists.txt index c836f36d5..f36987915 100644 --- a/srsenb/CMakeLists.txt +++ b/srsenb/CMakeLists.txt @@ -35,7 +35,7 @@ endif() include_directories( ${Boost_INCLUDE_DIRS} ${SEC_INCLUDE_DIRS} - ${PROJECT_SOURCE_DIR}/srsenb/hdr + ${PROJECT_SOURCE_DIR} ) link_directories( diff --git a/srsenb/hdr/mac/mac.h b/srsenb/hdr/mac/mac.h index af122e36b..5f541b443 100644 --- a/srsenb/hdr/mac/mac.h +++ b/srsenb/hdr/mac/mac.h @@ -36,10 +36,10 @@ #include "srslte/common/threads.h" #include "srslte/common/tti_sync_cv.h" #include "srslte/common/mac_pcap.h" -#include "mac/scheduler.h" -#include "mac/scheduler_metric.h" +#include "scheduler.h" +#include "scheduler_metric.h" #include "srslte/interfaces/enb_metrics_interface.h" -#include "mac/ue.h" +#include "ue.h" namespace srsenb { diff --git a/srsenb/hdr/mac/scheduler_metric.h b/srsenb/hdr/mac/scheduler_metric.h index 385d5803d..11e77b455 100644 --- a/srsenb/hdr/mac/scheduler_metric.h +++ b/srsenb/hdr/mac/scheduler_metric.h @@ -27,7 +27,7 @@ #ifndef SRSENB_SCHEDULER_METRIC_H #define SRSENB_SCHEDULER_METRIC_H -#include "mac/scheduler.h" +#include "scheduler.h" namespace srsenb { diff --git a/srsenb/hdr/mac/ue.h b/srsenb/hdr/mac/ue.h index 405acd120..e7fbd0c10 100644 --- a/srsenb/hdr/mac/ue.h +++ b/srsenb/hdr/mac/ue.h @@ -34,7 +34,7 @@ #include "srslte/interfaces/enb_interfaces.h" #include "srslte/interfaces/sched_interface.h" #include -#include "mac/mac_metrics.h" +#include "mac_metrics.h" namespace srsenb { diff --git a/srsenb/hdr/phy/phch_worker.h b/srsenb/hdr/phy/phch_worker.h index 35e0607ba..9821a2d1e 100644 --- a/srsenb/hdr/phy/phch_worker.h +++ b/srsenb/hdr/phy/phch_worker.h @@ -30,7 +30,7 @@ #include #include "srslte/srslte.h" -#include "phy/phch_common.h" +#include "phch_common.h" #define LOG_EXECTIME diff --git a/srsenb/hdr/phy/phy.h b/srsenb/hdr/phy/phy.h index 07c181741..74b28be11 100644 --- a/srsenb/hdr/phy/phy.h +++ b/srsenb/hdr/phy/phy.h @@ -29,9 +29,9 @@ #include "srslte/common/log.h" #include "srslte/common/log_filter.h" -#include "phy/txrx.h" -#include "phy/phch_worker.h" -#include "phy/phch_common.h" +#include "txrx.h" +#include "phch_worker.h" +#include "phch_common.h" #include "srslte/radio/radio.h" #include "srslte/interfaces/enb_interfaces.h" #include "srslte/common/task_dispatcher.h" diff --git a/srsenb/hdr/phy/txrx.h b/srsenb/hdr/phy/txrx.h index 9ba048c83..69a119900 100644 --- a/srsenb/hdr/phy/txrx.h +++ b/srsenb/hdr/phy/txrx.h @@ -31,8 +31,8 @@ #include "srslte/common/threads.h" #include "srslte/common/thread_pool.h" #include "srslte/radio/radio.h" -#include "phy/phch_common.h" -#include "phy/prach_worker.h" +#include "phch_common.h" +#include "prach_worker.h" namespace srsenb { diff --git a/srsenb/hdr/upper/gtpu.h b/srsenb/hdr/upper/gtpu.h index b3323ffe2..892068757 100644 --- a/srsenb/hdr/upper/gtpu.h +++ b/srsenb/hdr/upper/gtpu.h @@ -29,7 +29,7 @@ #include "srslte/common/buffer_pool.h" #include "srslte/common/log.h" -#include "upper/common_enb.h" +#include "common_enb.h" #include "srslte/common/threads.h" #include "srslte/srslte.h" #include "srslte/interfaces/enb_interfaces.h" diff --git a/srsenb/hdr/upper/rrc.h b/srsenb/hdr/upper/rrc.h index 49da1c0d9..cadb4af43 100644 --- a/srsenb/hdr/upper/rrc.h +++ b/srsenb/hdr/upper/rrc.h @@ -36,7 +36,7 @@ #include "srslte/common/timeout.h" #include "srslte/common/log.h" #include "srslte/interfaces/enb_interfaces.h" -#include "upper/common_enb.h" +#include "common_enb.h" #include "rrc_metrics.h" namespace srsenb { diff --git a/srsenb/hdr/upper/rrc_metrics.h b/srsenb/hdr/upper/rrc_metrics.h index aba942f3f..7c388da01 100644 --- a/srsenb/hdr/upper/rrc_metrics.h +++ b/srsenb/hdr/upper/rrc_metrics.h @@ -27,7 +27,7 @@ #ifndef SRSENB_RRC_METRICS_H #define SRSENB_RRC_METRICS_H -#include "upper/common_enb.h" +#include "common_enb.h" namespace srsenb { diff --git a/srsenb/hdr/upper/s1ap.h b/srsenb/hdr/upper/s1ap.h index ad9137eec..35369790f 100644 --- a/srsenb/hdr/upper/s1ap.h +++ b/srsenb/hdr/upper/s1ap.h @@ -35,7 +35,7 @@ #include "srslte/common/msg_queue.h" #include "srslte/common/threads.h" #include "srslte/interfaces/enb_interfaces.h" -#include "upper/common_enb.h" +#include "common_enb.h" #include "srslte/asn1/liblte_s1ap.h" #include "s1ap_metrics.h" diff --git a/srsenb/src/enb.cc b/srsenb/src/enb.cc index 2d3466522..85cda6185 100644 --- a/srsenb/src/enb.cc +++ b/srsenb/src/enb.cc @@ -25,8 +25,7 @@ */ #include -#include -#include "enb.h" +#include "srsenb/hdr/enb.h" namespace srsenb { diff --git a/srsenb/src/enb_cfg_parser.cc b/srsenb/src/enb_cfg_parser.cc index b63c46058..af2ade941 100644 --- a/srsenb/src/enb_cfg_parser.cc +++ b/srsenb/src/enb_cfg_parser.cc @@ -26,10 +26,10 @@ #include "srslte/asn1/liblte_common.h" #include "srslte/asn1/liblte_rrc.h" -#include "cfg_parser.h" +#include "srsenb/hdr/cfg_parser.h" #include "srslte/srslte.h" -#include "parser.h" +#include "srsenb/hdr/parser.h" #include "enb_cfg_parser.h" namespace srsenb { diff --git a/srsenb/src/enb_cfg_parser.h b/srsenb/src/enb_cfg_parser.h index d68fb87d8..912c9bf19 100644 --- a/srsenb/src/enb_cfg_parser.h +++ b/srsenb/src/enb_cfg_parser.h @@ -33,9 +33,9 @@ #include #include #include -#include "parser.h" +#include "srsenb/hdr/parser.h" -#include "upper/rrc.h" +#include "srsenb/hdr/upper/rrc.h" #include "srslte/asn1/liblte_rrc.h" namespace srsenb { diff --git a/srsenb/src/mac/mac.cc b/srsenb/src/mac/mac.cc index 8b76cc4f3..463da2e25 100644 --- a/srsenb/src/mac/mac.cc +++ b/srsenb/src/mac/mac.cc @@ -36,7 +36,7 @@ #include #include "srslte/common/log.h" -#include "mac/mac.h" +#include "srsenb/hdr/mac/mac.h" //#define WRITE_SIB_PCAP diff --git a/srsenb/src/mac/scheduler.cc b/srsenb/src/mac/scheduler.cc index 2e0504193..53b3cd939 100644 --- a/srsenb/src/mac/scheduler.cc +++ b/srsenb/src/mac/scheduler.cc @@ -28,7 +28,7 @@ #include "srslte/srslte.h" #include "srslte/common/pdu.h" -#include "mac/scheduler.h" +#include "srsenb/hdr/mac/scheduler.h" #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/mac/scheduler_harq.cc b/srsenb/src/mac/scheduler_harq.cc index ad7986436..c860c7a14 100644 --- a/srsenb/src/mac/scheduler_harq.cc +++ b/srsenb/src/mac/scheduler_harq.cc @@ -28,7 +28,7 @@ #include "srslte/srslte.h" #include "srslte/common/pdu.h" -#include "mac/scheduler.h" +#include "srsenb/hdr/mac/scheduler.h" #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/mac/scheduler_metric.cc b/srsenb/src/mac/scheduler_metric.cc index 1d9cdb954..a15faebbd 100644 --- a/srsenb/src/mac/scheduler_metric.cc +++ b/srsenb/src/mac/scheduler_metric.cc @@ -25,8 +25,8 @@ */ #include -#include "mac/scheduler_harq.h" -#include "mac/scheduler_metric.h" +#include "srsenb/hdr/mac/scheduler_harq.h" +#include "srsenb/hdr/mac/scheduler_metric.h" #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/mac/scheduler_ue.cc b/srsenb/src/mac/scheduler_ue.cc index 6948f922a..6cb4462e8 100644 --- a/srsenb/src/mac/scheduler_ue.cc +++ b/srsenb/src/mac/scheduler_ue.cc @@ -28,8 +28,8 @@ #include "srslte/srslte.h" #include "srslte/common/pdu.h" -#include "mac/scheduler_ue.h" -#include "mac/scheduler.h" +#include "srsenb/hdr/mac/scheduler_ue.h" +#include "srsenb/hdr/mac/scheduler.h" #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/mac/ue.cc b/srsenb/src/mac/ue.cc index d6fe07d0a..39e8c88e2 100644 --- a/srsenb/src/mac/ue.cc +++ b/srsenb/src/mac/ue.cc @@ -28,7 +28,7 @@ #include #include "srslte/interfaces/enb_interfaces.h" -#include "mac/ue.h" +#include "srsenb/hdr/mac/ue.h" #define Error(fmt, ...) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/main.cc b/srsenb/src/main.cc index 3aedda25a..45dd028b0 100644 --- a/srsenb/src/main.cc +++ b/srsenb/src/main.cc @@ -36,8 +36,8 @@ #include #include -#include "enb.h" -#include "metrics_stdout.h" +#include "srsenb/hdr/enb.h" +#include "srsenb/hdr/metrics_stdout.h" using namespace std; using namespace srsenb; diff --git a/srsenb/src/metrics_stdout.cc b/srsenb/src/metrics_stdout.cc index 5687f25e1..ca9137a24 100644 --- a/srsenb/src/metrics_stdout.cc +++ b/srsenb/src/metrics_stdout.cc @@ -24,7 +24,7 @@ * */ -#include "metrics_stdout.h" +#include "srsenb/hdr/metrics_stdout.h" #include #include diff --git a/srsenb/src/parser.cc b/srsenb/src/parser.cc index 82e088ab2..8a85789e9 100644 --- a/srsenb/src/parser.cc +++ b/srsenb/src/parser.cc @@ -24,7 +24,7 @@ * */ -#include "parser.h" +#include "srsenb/hdr/parser.h" #include namespace srsenb { diff --git a/srsenb/src/phy/phch_common.cc b/srsenb/src/phy/phch_common.cc index 99bfc3d29..ce8026ca5 100644 --- a/srsenb/src/phy/phch_common.cc +++ b/srsenb/src/phy/phch_common.cc @@ -27,7 +27,7 @@ #include "srslte/common/threads.h" #include "srslte/common/log.h" -#include "phy/txrx.h" +#include "srsenb/hdr/phy/txrx.h" #include diff --git a/srsenb/src/phy/phch_worker.cc b/srsenb/src/phy/phch_worker.cc index 5524be442..7ae174502 100644 --- a/srsenb/src/phy/phch_worker.cc +++ b/srsenb/src/phy/phch_worker.cc @@ -29,7 +29,7 @@ #include "srslte/common/threads.h" #include "srslte/common/log.h" -#include "phy/phch_worker.h" +#include "srsenb/hdr/phy/phch_worker.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/phy/phy.cc b/srsenb/src/phy/phy.cc index 08b89d77f..120a3c7b5 100644 --- a/srsenb/src/phy/phy.cc +++ b/srsenb/src/phy/phy.cc @@ -34,7 +34,7 @@ #include "srslte/common/threads.h" #include "srslte/common/log.h" -#include "phy/phy.h" +#include "srsenb/hdr/phy/phy.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/phy/prach_worker.cc b/srsenb/src/phy/prach_worker.cc index b4bd7da3f..a42849bbe 100644 --- a/srsenb/src/phy/prach_worker.cc +++ b/srsenb/src/phy/prach_worker.cc @@ -25,7 +25,7 @@ */ #include "srslte/srslte.h" -#include "phy/prach_worker.h" +#include "srsenb/hdr/phy/prach_worker.h" namespace srsenb { diff --git a/srsenb/src/phy/txrx.cc b/srsenb/src/phy/txrx.cc index 32c8aea00..7f6503b06 100644 --- a/srsenb/src/phy/txrx.cc +++ b/srsenb/src/phy/txrx.cc @@ -29,8 +29,8 @@ #include "srslte/common/threads.h" #include "srslte/common/log.h" -#include "phy/txrx.h" -#include "phy/phch_worker.h" +#include "srsenb/hdr/phy/txrx.h" +#include "srsenb/hdr/phy/phch_worker.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsenb/src/upper/gtpu.cc b/srsenb/src/upper/gtpu.cc index 2336f9047..0b0df8de2 100644 --- a/srsenb/src/upper/gtpu.cc +++ b/srsenb/src/upper/gtpu.cc @@ -24,7 +24,7 @@ * */ -#include "upper/gtpu.h" +#include "srsenb/hdr/upper/gtpu.h" #include #include #include diff --git a/srsenb/src/upper/pdcp.cc b/srsenb/src/upper/pdcp.cc index d3ed88c4e..99289ec4d 100644 --- a/srsenb/src/upper/pdcp.cc +++ b/srsenb/src/upper/pdcp.cc @@ -24,8 +24,8 @@ * */ -#include "upper/pdcp.h" -#include "upper/common_enb.h" +#include "srsenb/hdr/upper/pdcp.h" +#include "srsenb/hdr/upper/common_enb.h" namespace srsenb { diff --git a/srsenb/src/upper/rlc.cc b/srsenb/src/upper/rlc.cc index 0b7babbac..72d269c6c 100644 --- a/srsenb/src/upper/rlc.cc +++ b/srsenb/src/upper/rlc.cc @@ -24,8 +24,8 @@ * */ -#include "upper/rlc.h" -#include "upper/common_enb.h" +#include "srsenb/hdr/upper/rlc.h" +#include "srsenb/hdr/upper/common_enb.h" namespace srsenb { diff --git a/srsenb/src/upper/rrc.cc b/srsenb/src/upper/rrc.cc index 9fe1773f7..f47656c6d 100644 --- a/srsenb/src/upper/rrc.cc +++ b/srsenb/src/upper/rrc.cc @@ -26,10 +26,9 @@ #include "srslte/interfaces/sched_interface.h" #include "srslte/asn1/liblte_rrc.h" -#include "upper/rrc.h" +#include "srsenb/hdr/upper/rrc.h" #include "srslte/srslte.h" #include "srslte/asn1/liblte_mme.h" -#include "upper/rrc.h" using srslte::byte_buffer_t; using srslte::bit_buffer_t; diff --git a/srsenb/src/upper/s1ap.cc b/srsenb/src/upper/s1ap.cc index a3d937a57..b48e8a248 100644 --- a/srsenb/src/upper/s1ap.cc +++ b/srsenb/src/upper/s1ap.cc @@ -24,8 +24,8 @@ * */ -#include "upper/s1ap.h" -#include "upper/common_enb.h" +#include "srsenb/hdr/upper/s1ap.h" +#include "srsenb/hdr/upper/common_enb.h" #include #include diff --git a/srsenb/test/mac/scheduler_test.cc b/srsenb/test/mac/scheduler_test.cc index 73dd531b0..50d4cb409 100644 --- a/srsenb/test/mac/scheduler_test.cc +++ b/srsenb/test/mac/scheduler_test.cc @@ -26,8 +26,8 @@ #include -#include "mac/mac.h" -#include "phy/phy.h" +#include "srsenb/hdr/mac/mac.h" +#include "srsenb/hdr/phy/phy.h" #include "srslte/interfaces/enb_interfaces.h" #include "srslte/interfaces/sched_interface.h" diff --git a/srsenb/test/upper/ip_test.cc b/srsenb/test/upper/ip_test.cc index 8052ed4d7..9361a9901 100644 --- a/srsenb/test/upper/ip_test.cc +++ b/srsenb/test/upper/ip_test.cc @@ -36,8 +36,8 @@ #include #include -#include "mac/mac.h" -#include "phy/phy.h" +#include "srsenb/hdr/mac/mac.h" +#include "srsenb/hdr/phy/phy.h" #include "srslte/common/threads.h" #include "srslte/interfaces/enb_interfaces.h" #include "srslte/common/common.h" diff --git a/srsenb/test/upper/plmn_test.cc b/srsenb/test/upper/plmn_test.cc index ddf68d130..c8e9bdd69 100644 --- a/srsenb/test/upper/plmn_test.cc +++ b/srsenb/test/upper/plmn_test.cc @@ -8,7 +8,7 @@ */ #include -#include "upper/common_enb.h" +#include "srsenb/hdr/upper/common_enb.h" #include "srslte/asn1/liblte_rrc.h" void rrc_plmn_test() diff --git a/srsepc/CMakeLists.txt b/srsepc/CMakeLists.txt index 0006e5191..2b54d4a1e 100644 --- a/srsepc/CMakeLists.txt +++ b/srsepc/CMakeLists.txt @@ -35,7 +35,7 @@ endif() include_directories( ${Boost_INCLUDE_DIRS} ${SEC_INCLUDE_DIRS} - ${PROJECT_SOURCE_DIR}/srsepc/hdr + ${PROJECT_SOURCE_DIR} ) link_directories( diff --git a/srsepc/hdr/mme/mme_gtpc.h b/srsepc/hdr/mme/mme_gtpc.h index 5f7ecc64c..ad2181c85 100644 --- a/srsepc/hdr/mme/mme_gtpc.h +++ b/srsepc/hdr/mme/mme_gtpc.h @@ -30,7 +30,7 @@ #include "srslte/common/log_filter.h" #include "srslte/common/buffer_pool.h" #include "srslte/asn1/gtpc.h" -#include "mme/s1ap_common.h" +#include "s1ap_common.h" namespace srsepc { diff --git a/srsepc/hdr/mme/s1ap.h b/srsepc/hdr/mme/s1ap.h index 6f3c64d5c..5036c18cd 100644 --- a/srsepc/hdr/mme/s1ap.h +++ b/srsepc/hdr/mme/s1ap.h @@ -40,12 +40,12 @@ #include #include #include -#include "mme/s1ap_common.h" -#include "mme/s1ap_mngmt_proc.h" -#include "mme/s1ap_nas_transport.h" -#include "mme/s1ap_ctx_mngmt_proc.h" -#include "mme/mme_gtpc.h" -#include "hss/hss.h" +#include "s1ap_common.h" +#include "s1ap_mngmt_proc.h" +#include "s1ap_nas_transport.h" +#include "s1ap_ctx_mngmt_proc.h" +#include "mme_gtpc.h" +#include "srsepc/hdr/hss/hss.h" namespace srsepc{ diff --git a/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h b/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h index 31a4ce6ba..e6182269f 100644 --- a/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h +++ b/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h @@ -28,9 +28,9 @@ #include "srslte/asn1/liblte_s1ap.h" #include "srslte/common/common.h" -#include "mme/s1ap_common.h" +#include "s1ap_common.h" #include "srslte/common/log_filter.h" -#include "mme/mme_gtpc.h" +#include "mme_gtpc.h" #include "srslte/common/buffer_pool.h" namespace srsepc{ diff --git a/srsepc/hdr/mme/s1ap_mngmt_proc.h b/srsepc/hdr/mme/s1ap_mngmt_proc.h index a8fd24df2..859a647e4 100644 --- a/srsepc/hdr/mme/s1ap_mngmt_proc.h +++ b/srsepc/hdr/mme/s1ap_mngmt_proc.h @@ -28,7 +28,7 @@ #include "srslte/asn1/liblte_s1ap.h" #include "srslte/common/common.h" -#include "mme/s1ap_common.h" +#include "s1ap_common.h" #include "srslte/common/log_filter.h" namespace srsepc{ diff --git a/srsepc/hdr/mme/s1ap_nas_transport.h b/srsepc/hdr/mme/s1ap_nas_transport.h index a3fc5cccc..9df615914 100644 --- a/srsepc/hdr/mme/s1ap_nas_transport.h +++ b/srsepc/hdr/mme/s1ap_nas_transport.h @@ -28,10 +28,10 @@ #include "srslte/asn1/liblte_s1ap.h" #include "srslte/common/buffer_pool.h" -#include "mme/s1ap_common.h" +#include "s1ap_common.h" #include "srslte/asn1/gtpc.h" -#include "hss/hss.h" -#include "mme/mme_gtpc.h" +#include "srsepc/hdr/hss/hss.h" +#include "mme_gtpc.h" namespace srsepc{ diff --git a/srsepc/src/hss/hss.cc b/srsepc/src/hss/hss.cc index 703928270..d9a55960b 100644 --- a/srsepc/src/hss/hss.cc +++ b/srsepc/src/hss/hss.cc @@ -28,7 +28,7 @@ #include #include #include -#include "hss/hss.h" +#include "srsepc/hdr/hss/hss.h" #include "srslte/common/security.h" using namespace srslte; diff --git a/srsepc/src/main.cc b/srsepc/src/main.cc index 539b1b245..e2c006750 100644 --- a/srsepc/src/main.cc +++ b/srsepc/src/main.cc @@ -28,9 +28,9 @@ #include #include #include "srslte/common/bcd_helpers.h" -#include "mme/mme.h" -#include "hss/hss.h" -#include "spgw/spgw.h" +#include "srsepc/hdr/mme/mme.h" +#include "srsepc/hdr/hss/hss.h" +#include "srsepc/hdr/spgw/spgw.h" using namespace std; using namespace srsepc; diff --git a/srsepc/src/mme/mme.cc b/srsepc/src/mme/mme.cc index 4c63b5f6a..1a385d8dc 100644 --- a/srsepc/src/mme/mme.cc +++ b/srsepc/src/mme/mme.cc @@ -29,7 +29,7 @@ #include #include #include -#include "mme/mme.h" +#include "srsepc/hdr/mme/mme.h" namespace srsepc{ diff --git a/srsepc/src/mme/mme_gtpc.cc b/srsepc/src/mme/mme_gtpc.cc index e25ea05d1..1f53338c0 100644 --- a/srsepc/src/mme/mme_gtpc.cc +++ b/srsepc/src/mme/mme_gtpc.cc @@ -26,9 +26,9 @@ #include #include "srslte/asn1/gtpc.h" -#include "mme/mme_gtpc.h" -#include "mme/s1ap.h" -#include "spgw/spgw.h" +#include "srsepc/hdr/mme/mme_gtpc.h" +#include "srsepc/hdr/mme/s1ap.h" +#include "srsepc/hdr/spgw/spgw.h" namespace srsepc{ diff --git a/srsepc/src/mme/s1ap.cc b/srsepc/src/mme/s1ap.cc index 0dce45c41..639725ee5 100644 --- a/srsepc/src/mme/s1ap.cc +++ b/srsepc/src/mme/s1ap.cc @@ -27,7 +27,7 @@ #include #include #include "srslte/common/bcd_helpers.h" -#include "mme/s1ap.h" +#include "srsepc/hdr/mme/s1ap.h" #include "srslte/asn1/gtpc.h" #include "srslte/common/liblte_security.h" diff --git a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc index 2938b128c..5500fa561 100644 --- a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc +++ b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc @@ -26,8 +26,8 @@ //#include "srslte/upper/s1ap_common.h" #include "srslte/common/bcd_helpers.h" -#include "mme/s1ap.h" -#include "mme/s1ap_ctx_mngmt_proc.h" +#include "srsepc/hdr/mme/s1ap.h" +#include "srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h" #include "srslte/common/liblte_security.h" diff --git a/srsepc/src/mme/s1ap_mngmt_proc.cc b/srsepc/src/mme/s1ap_mngmt_proc.cc index 4d4b16528..079eca100 100644 --- a/srsepc/src/mme/s1ap_mngmt_proc.cc +++ b/srsepc/src/mme/s1ap_mngmt_proc.cc @@ -26,8 +26,8 @@ //#include "srslte/upper/s1ap_common.h" #include "srslte/common/bcd_helpers.h" -#include "mme/s1ap.h" -#include "mme/s1ap_mngmt_proc.h" +#include "srsepc/hdr/mme/s1ap.h" +#include "srsepc/hdr/mme/s1ap_mngmt_proc.h" namespace srsepc{ diff --git a/srsepc/src/mme/s1ap_nas_transport.cc b/srsepc/src/mme/s1ap_nas_transport.cc index 183815fc6..687ced63b 100644 --- a/srsepc/src/mme/s1ap_nas_transport.cc +++ b/srsepc/src/mme/s1ap_nas_transport.cc @@ -27,8 +27,8 @@ #include #include #include // for printing uint64_t -#include "mme/s1ap.h" -#include "mme/s1ap_nas_transport.h" +#include "srsepc/hdr/mme/s1ap.h" +#include "srsepc/hdr/mme/s1ap_nas_transport.h" #include "srslte/common/security.h" #include "srslte/common/liblte_security.h" diff --git a/srsepc/src/spgw/spgw.cc b/srsepc/src/spgw/spgw.cc index 1ef33a8f0..eec7bb4ec 100644 --- a/srsepc/src/spgw/spgw.cc +++ b/srsepc/src/spgw/spgw.cc @@ -33,8 +33,8 @@ #include #include #include -#include "spgw/spgw.h" -#include "mme/mme_gtpc.h" +#include "srsepc/hdr/spgw/spgw.h" +#include "srsepc/hdr/mme/mme_gtpc.h" #include "srslte/upper/gtpu.h" namespace srsepc{ diff --git a/srsue/CMakeLists.txt b/srsue/CMakeLists.txt index 85f391d6b..07a5f6b8f 100644 --- a/srsue/CMakeLists.txt +++ b/srsue/CMakeLists.txt @@ -31,7 +31,7 @@ endif() include_directories( ${Boost_INCLUDE_DIRS} ${SEC_INCLUDE_DIRS} - ${PROJECT_SOURCE_DIR}/srsue/hdr + ${PROJECT_SOURCE_DIR} ) link_directories( diff --git a/srsue/hdr/mac/dl_harq.h b/srsue/hdr/mac/dl_harq.h index c6f07251a..37eadad91 100644 --- a/srsue/hdr/mac/dl_harq.h +++ b/srsue/hdr/mac/dl_harq.h @@ -34,8 +34,8 @@ #include "srslte/common/log.h" #include "srslte/common/timers.h" -#include "mac/demux.h" -#include "mac/dl_sps.h" +#include "demux.h" +#include "dl_sps.h" #include "srslte/common/mac_pcap.h" #include "srslte/interfaces/ue_interfaces.h" diff --git a/srsue/hdr/mac/mac.h b/srsue/hdr/mac/mac.h index 0e427a8a7..7b119c27b 100644 --- a/srsue/hdr/mac/mac.h +++ b/srsue/hdr/mac/mac.h @@ -28,16 +28,16 @@ #define SRSUE_MAC_H #include "srslte/common/log.h" -#include "mac/dl_harq.h" -#include "mac/ul_harq.h" +#include "dl_harq.h" +#include "ul_harq.h" #include "srslte/common/timers.h" -#include "mac/mac_metrics.h" -#include "mac/proc_ra.h" -#include "mac/proc_sr.h" -#include "mac/proc_bsr.h" -#include "mac/proc_phr.h" -#include "mac/mux.h" -#include "mac/demux.h" +#include "mac_metrics.h" +#include "proc_ra.h" +#include "proc_sr.h" +#include "proc_bsr.h" +#include "proc_phr.h" +#include "mux.h" +#include "demux.h" #include "srslte/common/mac_pcap.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/tti_sync_cv.h" diff --git a/srsue/hdr/mac/mux.h b/srsue/hdr/mac/mux.h index 04f7e302b..2e621360f 100644 --- a/srsue/hdr/mac/mux.h +++ b/srsue/hdr/mac/mux.h @@ -34,8 +34,8 @@ #include "srslte/common/log.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/pdu.h" -#include "mac/proc_bsr.h" -#include "mac/proc_phr.h" +#include "proc_bsr.h" +#include "proc_phr.h" /* Logical Channel Multiplexing and Prioritization + Msg3 Buffer */ diff --git a/srsue/hdr/mac/proc_ra.h b/srsue/hdr/mac/proc_ra.h index 9163b8530..833173b75 100644 --- a/srsue/hdr/mac/proc_ra.h +++ b/srsue/hdr/mac/proc_ra.h @@ -31,8 +31,8 @@ #include "srslte/common/log.h" #include "srslte/common/timers.h" -#include "mac/mux.h" -#include "mac/demux.h" +#include "mux.h" +#include "demux.h" #include "srslte/common/pdu.h" #include "srslte/common/mac_pcap.h" diff --git a/srsue/hdr/mac/ul_harq.h b/srsue/hdr/mac/ul_harq.h index 034c09cf6..6fb27be8a 100644 --- a/srsue/hdr/mac/ul_harq.h +++ b/srsue/hdr/mac/ul_harq.h @@ -34,8 +34,8 @@ #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/log.h" -#include "mac/mux.h" -#include "mac/ul_sps.h" +#include "mux.h" +#include "ul_sps.h" #include "srslte/common/mac_pcap.h" #include "srslte/common/timers.h" #include "srslte/common/interfaces_common.h" diff --git a/srsue/hdr/phy/phch_common.h b/srsue/hdr/phy/phch_common.h index 2f9b75569..c9a1cd6a1 100644 --- a/srsue/hdr/phy/phch_common.h +++ b/srsue/hdr/phy/phch_common.h @@ -37,7 +37,7 @@ #include "srslte/interfaces/ue_interfaces.h" #include "srslte/radio/radio.h" #include "srslte/common/log.h" -#include "phy/phy_metrics.h" +#include "phy_metrics.h" namespace srsue { diff --git a/srsue/hdr/phy/phch_recv.h b/srsue/hdr/phy/phch_recv.h index 7d3e2b25b..f18f52833 100644 --- a/srsue/hdr/phy/phch_recv.h +++ b/srsue/hdr/phy/phch_recv.h @@ -35,9 +35,9 @@ #include "srslte/common/thread_pool.h" #include "srslte/common/tti_sync_cv.h" #include "srslte/radio/radio_multi.h" -#include "phy/prach.h" -#include "phy/phch_worker.h" -#include "phy/phch_common.h" +#include "prach.h" +#include "phch_worker.h" +#include "phch_common.h" #include "srslte/interfaces/ue_interfaces.h" namespace srsue { diff --git a/srsue/hdr/phy/phch_worker.h b/srsue/hdr/phy/phch_worker.h index a5e2338c2..53848905b 100644 --- a/srsue/hdr/phy/phch_worker.h +++ b/srsue/hdr/phy/phch_worker.h @@ -31,7 +31,7 @@ #include "srslte/srslte.h" #include "srslte/common/thread_pool.h" #include "srslte/common/trace.h" -#include "phy/phch_common.h" +#include "phch_common.h" #define LOG_EXECTIME diff --git a/srsue/hdr/phy/phy.h b/srsue/hdr/phy/phy.h index 1c03c4f87..828a6b7e1 100644 --- a/srsue/hdr/phy/phy.h +++ b/srsue/hdr/phy/phy.h @@ -29,11 +29,11 @@ #include "srslte/srslte.h" #include "srslte/common/log_filter.h" -#include "phy/phy_metrics.h" -#include "phy/phch_recv.h" -#include "phy/prach.h" -#include "phy/phch_worker.h" -#include "phy/phch_common.h" +#include "phy_metrics.h" +#include "phch_recv.h" +#include "prach.h" +#include "phch_worker.h" +#include "phch_common.h" #include "srslte/radio/radio.h" #include "srslte/common/task_dispatcher.h" #include "srslte/common/trace.h" diff --git a/srsue/src/mac/demux.cc b/srsue/src/mac/demux.cc index 3ddd98b69..3e0d2f44f 100644 --- a/srsue/src/mac/demux.cc +++ b/srsue/src/mac/demux.cc @@ -30,8 +30,8 @@ #define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__) #define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__) -#include "mac/mac.h" -#include "mac/demux.h" +#include "srsue/hdr/mac/mac.h" +#include "srsue/hdr/mac/demux.h" #include "srslte/interfaces/ue_interfaces.h" namespace srsue { diff --git a/srsue/src/mac/mac.cc b/srsue/src/mac/mac.cc index 2531faafc..4033df888 100644 --- a/srsue/src/mac/mac.cc +++ b/srsue/src/mac/mac.cc @@ -35,7 +35,7 @@ #include #include "srslte/common/log.h" -#include "mac/mac.h" +#include "srsue/hdr/mac/mac.h" #include "srslte/common/pcap.h" diff --git a/srsue/src/mac/mux.cc b/srsue/src/mac/mux.cc index 33d048957..6d1edbebf 100644 --- a/srsue/src/mac/mux.cc +++ b/srsue/src/mac/mux.cc @@ -29,8 +29,8 @@ #define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__) #define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__) -#include "mac/mux.h" -#include "mac/mac.h" +#include "srsue/hdr/mac/mux.h" +#include "srsue/hdr/mac/mac.h" #include #include diff --git a/srsue/src/mac/proc_bsr.cc b/srsue/src/mac/proc_bsr.cc index f68b6eee8..19b214a74 100644 --- a/srsue/src/mac/proc_bsr.cc +++ b/srsue/src/mac/proc_bsr.cc @@ -29,9 +29,9 @@ #define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__) #define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__) -#include "mac/proc_bsr.h" -#include "mac/mac.h" -#include "mac/mux.h" +#include "srsue/hdr/mac/proc_bsr.h" +#include "srsue/hdr/mac/mac.h" +#include "srsue/hdr/mac/mux.h" namespace srsue { diff --git a/srsue/src/mac/proc_phr.cc b/srsue/src/mac/proc_phr.cc index 3eb7c82f5..69a5c0de3 100644 --- a/srsue/src/mac/proc_phr.cc +++ b/srsue/src/mac/proc_phr.cc @@ -29,9 +29,9 @@ #define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__) #define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__) -#include "mac/proc_phr.h" -#include "mac/mac.h" -#include "mac/mux.h" +#include "srsue/hdr/mac/proc_phr.h" +#include "srsue/hdr/mac/mac.h" +#include "srsue/hdr/mac/mux.h" #include "srslte/interfaces/ue_interfaces.h" diff --git a/srsue/src/mac/proc_ra.cc b/srsue/src/mac/proc_ra.cc index 3860fd809..d5efbea4f 100644 --- a/srsue/src/mac/proc_ra.cc +++ b/srsue/src/mac/proc_ra.cc @@ -33,9 +33,9 @@ #include #include -#include "mac/proc_ra.h" -#include "mac/mac.h" -#include "mac/mux.h" +#include "srsue/hdr/mac/proc_ra.h" +#include "srsue/hdr/mac/mac.h" +#include "srsue/hdr/mac/mux.h" /* Random access procedure as specified in Section 5.1 of 36.321 */ diff --git a/srsue/src/mac/proc_sr.cc b/srsue/src/mac/proc_sr.cc index cb31a1c6d..57cd8bdd5 100644 --- a/srsue/src/mac/proc_sr.cc +++ b/srsue/src/mac/proc_sr.cc @@ -29,7 +29,7 @@ #define Info(fmt, ...) log_h->info(fmt, ##__VA_ARGS__) #define Debug(fmt, ...) log_h->debug(fmt, ##__VA_ARGS__) -#include "mac/proc_sr.h" +#include "srsue/hdr/mac/proc_sr.h" namespace srsue { diff --git a/srsue/src/main.cc b/srsue/src/main.cc index 30a3e3b00..a30892cc7 100644 --- a/srsue/src/main.cc +++ b/srsue/src/main.cc @@ -36,10 +36,10 @@ #include #include -#include "ue.h" +#include "srsue/hdr/ue.h" #include "srslte/srslte.h" -#include "metrics_stdout.h" -#include "metrics_csv.h" +#include "srsue/hdr/metrics_stdout.h" +#include "srsue/hdr/metrics_csv.h" #include "srslte/common/metrics_hub.h" #include "srslte/version.h" diff --git a/srsue/src/metrics_csv.cc b/srsue/src/metrics_csv.cc index 54702dc26..360c678f5 100644 --- a/srsue/src/metrics_csv.cc +++ b/srsue/src/metrics_csv.cc @@ -25,7 +25,7 @@ * */ -#include "metrics_csv.h" +#include "srsue/hdr/metrics_csv.h" #include #include diff --git a/srsue/src/metrics_stdout.cc b/srsue/src/metrics_stdout.cc index c8f373284..5d33f967d 100644 --- a/srsue/src/metrics_stdout.cc +++ b/srsue/src/metrics_stdout.cc @@ -25,7 +25,7 @@ * */ -#include "metrics_stdout.h" +#include "srsue/hdr/metrics_stdout.h" #include #include diff --git a/srsue/src/phy/phch_common.cc b/srsue/src/phy/phch_common.cc index 3c3cf1641..13cca2ec8 100644 --- a/srsue/src/phy/phch_common.cc +++ b/srsue/src/phy/phch_common.cc @@ -27,7 +27,7 @@ #include #include #include "srslte/srslte.h" -#include "phy/phch_common.h" +#include "srsue/hdr/phy/phch_common.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsue/src/phy/phch_recv.cc b/srsue/src/phy/phch_recv.cc index 49b0af307..01e63cecd 100644 --- a/srsue/src/phy/phch_recv.cc +++ b/srsue/src/phy/phch_recv.cc @@ -28,8 +28,8 @@ #include #include "srslte/srslte.h" #include "srslte/common/log.h" -#include "phy/phch_worker.h" -#include "phy/phch_recv.h" +#include "srsue/hdr/phy/phch_worker.h" +#include "srsue/hdr/phy/phch_recv.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc index 47fdb9591..7ac2ed040 100644 --- a/srsue/src/phy/phch_worker.cc +++ b/srsue/src/phy/phch_worker.cc @@ -26,7 +26,7 @@ #include #include -#include "phy/phch_worker.h" +#include "srsue/hdr/phy/phch_worker.h" #include "srslte/srslte.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/asn1/liblte_rrc.h" diff --git a/srsue/src/phy/phy.cc b/srsue/src/phy/phy.cc index 27b389a4e..90dbc2833 100644 --- a/srsue/src/phy/phy.cc +++ b/srsue/src/phy/phy.cc @@ -36,7 +36,7 @@ #include "srslte/common/threads.h" #include "srslte/common/log.h" -#include "phy/phy.h" +#include "srsue/hdr/phy/phy.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__) diff --git a/srsue/src/phy/prach.cc b/srsue/src/phy/prach.cc index a1bf96c85..5025e6b5d 100644 --- a/srsue/src/phy/prach.cc +++ b/srsue/src/phy/prach.cc @@ -30,8 +30,8 @@ #include "srslte/srslte.h" #include "srslte/common/log.h" -#include "phy/prach.h" -#include "phy/phy.h" +#include "srsue/hdr/phy/prach.h" +#include "srsue/hdr/phy/phy.h" #include "srslte/interfaces/ue_interfaces.h" #define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__) diff --git a/srsue/src/ue.cc b/srsue/src/ue.cc index ca8c9002b..fe59bee91 100644 --- a/srsue/src/ue.cc +++ b/srsue/src/ue.cc @@ -25,7 +25,7 @@ */ -#include "ue.h" +#include "srsue/hdr/ue.h" #include "srslte/srslte.h" #include #include diff --git a/srsue/src/ue_base.cc b/srsue/src/ue_base.cc index 71430fc9f..c4b4a2a52 100644 --- a/srsue/src/ue_base.cc +++ b/srsue/src/ue_base.cc @@ -24,8 +24,8 @@ * */ -#include "ue_base.h" -#include "ue.h" +#include "srsue/hdr/ue_base.h" +#include "srsue/hdr/ue.h" #include "srslte/srslte.h" #include "srslte/build_info.h" #include diff --git a/srsue/src/upper/gw.cc b/srsue/src/upper/gw.cc index fbf4bca9f..34db4a226 100644 --- a/srsue/src/upper/gw.cc +++ b/srsue/src/upper/gw.cc @@ -25,7 +25,7 @@ */ -#include "../../hdr/upper/gw.h" +#include "srsue/hdr/upper/gw.h" #include #include diff --git a/srsue/src/upper/nas.cc b/srsue/src/upper/nas.cc index 5b7f40920..882f1d977 100644 --- a/srsue/src/upper/nas.cc +++ b/srsue/src/upper/nas.cc @@ -31,7 +31,7 @@ #include #include #include "srslte/asn1/liblte_rrc.h" -#include "upper/nas.h" +#include "srsue/hdr/upper/nas.h" #include "srslte/common/security.h" #include "srslte/common/bcd_helpers.h" diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc index 53e85fac8..05286e05c 100644 --- a/srsue/src/upper/rrc.cc +++ b/srsue/src/upper/rrc.cc @@ -32,7 +32,7 @@ #include #include // for printing uint64_t #include -#include "upper/rrc.h" +#include "srsue/hdr/upper/rrc.h" #include "srslte/asn1/liblte_rrc.h" #include "srslte/common/security.h" #include "srslte/common/bcd_helpers.h" diff --git a/srsue/src/upper/usim.cc b/srsue/src/upper/usim.cc index d344734ba..ca9075edb 100644 --- a/srsue/src/upper/usim.cc +++ b/srsue/src/upper/usim.cc @@ -26,7 +26,7 @@ #include -#include "upper/usim.h" +#include "srsue/hdr/upper/usim.h" #include "srslte/common/bcd_helpers.h" using namespace srslte; diff --git a/srsue/test/mac/mac_test.cc b/srsue/test/mac/mac_test.cc index 3d21720d4..820c4617e 100644 --- a/srsue/test/mac/mac_test.cc +++ b/srsue/test/mac/mac_test.cc @@ -30,10 +30,10 @@ #include "srslte/asn1/liblte_rrc.h" #include "srslte/radio/radio_multi.h" -#include "phy/phy.h" +#include "srsue/hdr/phy/phy.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/log_filter.h" -#include "mac/mac.h" +#include "srsue/hdr/mac/mac.h" #include "srslte/common/mac_pcap.h" diff --git a/srsue/test/metrics_test.cc b/srsue/test/metrics_test.cc index 52a5f98f9..4a23a55cf 100644 --- a/srsue/test/metrics_test.cc +++ b/srsue/test/metrics_test.cc @@ -29,10 +29,10 @@ #include #include #include -#include "ue_metrics_interface.h" +#include "srsue/hdr/ue_metrics_interface.h" #include "srslte/common/metrics_hub.h" -#include "metrics_stdout.h" -#include "metrics_csv.h" +#include "srsue/hdr/metrics_stdout.h" +#include "srsue/hdr/metrics_csv.h" using namespace srsue; diff --git a/srsue/test/phy/ue_itf_test_prach.cc b/srsue/test/phy/ue_itf_test_prach.cc index 810278c7c..e161139f9 100644 --- a/srsue/test/phy/ue_itf_test_prach.cc +++ b/srsue/test/phy/ue_itf_test_prach.cc @@ -27,7 +27,7 @@ #include #include "srslte/phy/utils/debug.h" -#include "phy/phy.h" +#include "srsue/hdr/phy/phy.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/common/log_filter.h" #include "srslte/radio/radio_multi.h" diff --git a/srsue/test/phy/ue_itf_test_sib1.cc b/srsue/test/phy/ue_itf_test_sib1.cc index 23f8566be..f302fd7aa 100644 --- a/srsue/test/phy/ue_itf_test_sib1.cc +++ b/srsue/test/phy/ue_itf_test_sib1.cc @@ -27,7 +27,7 @@ #include #include "srslte/phy/utils/debug.h" -#include "phy/phy.h" +#include "srsue/hdr/phy/phy.h" #include "srslte/common/log_filter.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/radio/radio_multi.h" diff --git a/srsue/test/upper/ip_test.cc b/srsue/test/upper/ip_test.cc index afed88ebc..a4f9743cc 100644 --- a/srsue/test/upper/ip_test.cc +++ b/srsue/test/upper/ip_test.cc @@ -16,15 +16,15 @@ #include #include "srslte/phy/utils/debug.h" -#include "mac/mac.h" -#include "phy/phy.h" +#include "srsue/hdr/mac/mac.h" +#include "srsue/hdr/phy/phy.h" #include "srslte/common/threads.h" #include "srslte/common/common.h" #include "srslte/common/buffer_pool.h" #include "srslte/common/logger_file.h" #include "srslte/common/log_filter.h" #include "srslte/upper/rlc.h" -#include "upper/rrc.h" +#include "srsue/hdr/upper/rrc.h" #include "srslte/radio/radio_multi.h" #define START_TUNTAP diff --git a/srsue/test/upper/nas_test.cc b/srsue/test/upper/nas_test.cc index 2fb3efe95..51fc9f83b 100644 --- a/srsue/test/upper/nas_test.cc +++ b/srsue/test/upper/nas_test.cc @@ -26,11 +26,11 @@ #include #include -#include "upper/usim.h" -#include "upper/nas.h" +#include "srsue/hdr/upper/usim.h" +#include "srsue/hdr/upper/nas.h" #include "srslte/upper/rlc.h" -#include "upper/rrc.h" -#include "mac/mac.h" +#include "srsue/hdr/upper/rrc.h" +#include "srsue/hdr/mac/mac.h" #include "srslte/common/log_filter.h" #include "srslte/upper/pdcp_entity.h" #include "srslte/upper/pdcp.h" diff --git a/srsue/test/upper/usim_test.cc b/srsue/test/upper/usim_test.cc index bf60e124c..225bee36d 100644 --- a/srsue/test/upper/usim_test.cc +++ b/srsue/test/upper/usim_test.cc @@ -25,7 +25,7 @@ */ #include -#include "upper/usim.h" +#include "srsue/hdr/upper/usim.h" #include "srslte/common/log_filter.h" #include From 2dcd6695bce523e74b31dbcd13731cad89423975 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Tue, 3 Apr 2018 10:48:52 +0200 Subject: [PATCH 3/5] remove obsolete config.h --- lib/include/srslte/common/config.h | 57 ------------------------------ 1 file changed, 57 deletions(-) delete mode 100644 lib/include/srslte/common/config.h diff --git a/lib/include/srslte/common/config.h b/lib/include/srslte/common/config.h deleted file mode 100644 index 3231355fa..000000000 --- a/lib/include/srslte/common/config.h +++ /dev/null @@ -1,57 +0,0 @@ -/** - * - * \section COPYRIGHT - * - * Copyright 2013-2015 Software Radio Systems Limited - * - * \section LICENSE - * - * This file is part of the srsUE library. - * - * srsUE is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * srsUE 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 Affero General Public License for more details. - * - * A copy of the GNU Affero 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/. - * - */ - -#ifndef CONFIG_H -#define CONFIG_H - -// Generic helper definitions for shared library support -#if defined _WIN32 || defined __CYGWIN__ - #define SRSAPPS_IMPORT __declspec(dllimport) - #define SRSAPPS_EXPORT __declspec(dllexport) - #define SRSAPPS_LOCAL -#else - #if __GNUC__ >= 4 - #define SRSAPPS_IMPORT __attribute__ ((visibility ("default"))) - #define SRSAPPS_EXPORT __attribute__ ((visibility ("default"))) - #else - #define SRSAPPS_IMPORT - #define SRSAPPS_EXPORT - #define SRSAPPS_LOCAL - #endif -#endif - -// Define SRSAPPS_API -// is used for the public API symbols. -#ifdef SRSAPPS_DLL_EXPORTS // defined if we are building the SRSAPPS DLL (instead of using it) - #define SRSAPPS_EXPORT -#else - #define SRSAPPS_IMPORT -#endif - -// cf_t definition -typedef _Complex float cf_t; - -#endif // CONFIG_H From 4e05266ea8cf8b6d1d05376b3a9162471a978474 Mon Sep 17 00:00:00 2001 From: Joseph Giovatto Date: Mon, 2 Apr 2018 12:25:31 -0400 Subject: [PATCH 4/5] added printf format check for hex logs --- lib/include/srslte/common/log.h | 12 ++++++++---- lib/include/srslte/common/log_filter.h | 8 ++++---- lib/src/common/log_filter.cc | 16 ++++++++-------- srsenb/src/phy/phch_worker.cc | 4 ++-- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/lib/include/srslte/common/log.h b/lib/include/srslte/common/log.h index 45c359629..5ef3107f9 100644 --- a/lib/include/srslte/common/log.h +++ b/lib/include/srslte/common/log.h @@ -129,10 +129,14 @@ public: virtual void debug(const char * message, ...) __attribute__ ((format (printf, 2, 3))) = 0; // Same with hex dump - virtual void error_hex(uint8_t *hex, int size, std::string message, ...){error("error_hex not implemented.\n");} - virtual void warning_hex(uint8_t *hex, int size, std::string message, ...){error("warning_hex not implemented.\n");} - virtual void info_hex(uint8_t *hex, int size, std::string message, ...){error("info_hex not implemented.\n");} - virtual void debug_hex(uint8_t *hex, int size, std::string message, ...){error("debug_hex not implemented.\n");} + virtual void error_hex(uint8_t *hex, int size, const char *, ...) __attribute__((format (printf, 4, 5))) + {error("error_hex not implemented.\n");} + virtual void warning_hex(uint8_t *hex, int size, const char *, ...) __attribute__((format (printf, 4, 5))) + {error("warning_hex not implemented.\n");} + virtual void info_hex(uint8_t *hex, int size, const char *, ...) __attribute__((format (printf, 4, 5))) + {error("info_hex not implemented.\n");} + virtual void debug_hex(uint8_t *hex, int size, const char *, ...) __attribute__((format (printf, 4, 5))) + {error("debug_hex not implemented.\n");} protected: std::string get_service_name() { return service_name; } diff --git a/lib/include/srslte/common/log_filter.h b/lib/include/srslte/common/log_filter.h index 430a59199..ac01d7cd4 100644 --- a/lib/include/srslte/common/log_filter.h +++ b/lib/include/srslte/common/log_filter.h @@ -63,10 +63,10 @@ public: void info(const char * message, ...); void debug(const char * message, ...); - void error_hex(uint8_t *hex, int size, std::string message, ...); - void warning_hex(uint8_t *hex, int size, std::string message, ...); - void info_hex(uint8_t *hex, int size, std::string message, ...); - void debug_hex(uint8_t *hex, int size, std::string message, ...); + void error_hex(uint8_t *hex, int size, const char * message, ...); + void warning_hex(uint8_t *hex, int size, const char * message, ...); + void info_hex(uint8_t *hex, int size, const char * message, ...); + void debug_hex(uint8_t *hex, int size, const char * message, ...); class time_itf { public: diff --git a/lib/src/common/log_filter.cc b/lib/src/common/log_filter.cc index b79e222e7..ff9809a6b 100644 --- a/lib/src/common/log_filter.cc +++ b/lib/src/common/log_filter.cc @@ -190,45 +190,45 @@ void log_filter::debug(const char * message, ...) { } } -void log_filter::error_hex(uint8_t *hex, int size, std::string message, ...) { +void log_filter::error_hex(uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_ERROR) { char *args_msg; va_list args; va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) + if(vasprintf(&args_msg, message, args) > 0) all_log(LOG_LEVEL_ERROR, tti, args_msg, hex, size); va_end(args); free(args_msg); } } -void log_filter::warning_hex(uint8_t *hex, int size, std::string message, ...) { +void log_filter::warning_hex(uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_WARNING) { char *args_msg; va_list args; va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) + if(vasprintf(&args_msg, message, args) > 0) all_log(LOG_LEVEL_WARNING, tti, args_msg, hex, size); va_end(args); free(args_msg); } } -void log_filter::info_hex(uint8_t *hex, int size, std::string message, ...) { +void log_filter::info_hex(uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_INFO) { char *args_msg; va_list args; va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) + if(vasprintf(&args_msg, message, args) > 0) all_log(LOG_LEVEL_INFO, tti, args_msg, hex, size); va_end(args); free(args_msg); } } -void log_filter::debug_hex(uint8_t *hex, int size, std::string message, ...) { +void log_filter::debug_hex(uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_DEBUG) { char *args_msg; va_list args; va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) + if(vasprintf(&args_msg, message, args) > 0) all_log(LOG_LEVEL_DEBUG, tti, args_msg, hex, size); va_end(args); free(args_msg); diff --git a/srsenb/src/phy/phch_worker.cc b/srsenb/src/phy/phch_worker.cc index 5524be442..db7a13b32 100644 --- a/srsenb/src/phy/phch_worker.cc +++ b/srsenb/src/phy/phch_worker.cc @@ -602,8 +602,8 @@ int phch_worker::decode_pusch(srslte_enb_ul_pusch_t *grants, uint32_t nof_pusch) } */ log_h->info_hex(grants[i].data, phy_grant.mcs.tbs / 8, - "PUSCH: rnti=0x%x, prb=(%d,%d), tbs=%d, mcs=%d, rv=%d, snr=%.1f dB, n_iter=%d, crc=%s%s%s%s%s%s%s\n", - rnti, phy_grant.n_prb[0], phy_grant.n_prb[0] + phy_grant.L_prb, + "PUSCH: rnti=0x%x, prb=(%d,%d), tbs=%d, mcs=%d, idx=%d, rv=%d, snr=%.1f dB, n_iter=%d, crc=%s%s%s%s%s%s%s%s\n", + rnti, phy_grant.n_prb[0], phy_grant.n_prb[0], phy_grant.L_prb, phy_grant.mcs.tbs / 8, phy_grant.mcs.idx, grants[i].grant.rv_idx, snr_db, srslte_pusch_last_noi(&enb_ul.pusch), From 802f8b716f910993dd07f0e5b4cb901107179382 Mon Sep 17 00:00:00 2001 From: Joseph Giovatto Date: Mon, 2 Apr 2018 16:05:14 -0400 Subject: [PATCH 5/5] set msg and hex buf to const * --- lib/include/srslte/common/log_filter.h | 14 +++++++------- lib/src/common/log_filter.cc | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/include/srslte/common/log_filter.h b/lib/include/srslte/common/log_filter.h index ac01d7cd4..9addc9ec2 100644 --- a/lib/include/srslte/common/log_filter.h +++ b/lib/include/srslte/common/log_filter.h @@ -63,10 +63,10 @@ public: void info(const char * message, ...); void debug(const char * message, ...); - void error_hex(uint8_t *hex, int size, const char * message, ...); - void warning_hex(uint8_t *hex, int size, const char * message, ...); - void info_hex(uint8_t *hex, int size, const char * message, ...); - void debug_hex(uint8_t *hex, int size, const char * message, ...); + void error_hex(const uint8_t *hex, int size, const char * message, ...); + void warning_hex(const uint8_t *hex, int size, const char * message, ...); + void info_hex(const uint8_t *hex, int size, const char * message, ...); + void debug_hex(const uint8_t *hex, int size, const char * message, ...); class time_itf { public: @@ -89,11 +89,11 @@ private: logger_stdout def_logger_stdout; - void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg); - void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg, uint8_t *hex, int size); + void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, const char *msg); + void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, const char *msg, const uint8_t *hex, int size); void all_log_line(srslte::LOG_LEVEL_ENUM level, uint32_t tti, std::string file, int line, char *msg); std::string now_time(); - std::string hex_string(uint8_t *hex, int size); + std::string hex_string(const uint8_t *hex, int size); }; } // namespace srsue diff --git a/lib/src/common/log_filter.cc b/lib/src/common/log_filter.cc index ff9809a6b..a86a36f1e 100644 --- a/lib/src/common/log_filter.cc +++ b/lib/src/common/log_filter.cc @@ -68,7 +68,7 @@ void log_filter::init(std::string layer, logger *logger_, bool tti) void log_filter::all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, - char *msg) + const char *msg) { if(logger_h) { std::stringstream ss; @@ -97,8 +97,8 @@ void log_filter::all_log(srslte::LOG_LEVEL_ENUM level, void log_filter::all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, - char *msg, - uint8_t *hex, + const char *msg, + const uint8_t *hex, int size) { if(logger_h) { @@ -190,7 +190,7 @@ void log_filter::debug(const char * message, ...) { } } -void log_filter::error_hex(uint8_t *hex, int size, const char * message, ...) { +void log_filter::error_hex(const uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_ERROR) { char *args_msg; va_list args; @@ -201,7 +201,7 @@ void log_filter::error_hex(uint8_t *hex, int size, const char * message, ...) { free(args_msg); } } -void log_filter::warning_hex(uint8_t *hex, int size, const char * message, ...) { +void log_filter::warning_hex(const uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_WARNING) { char *args_msg; va_list args; @@ -212,7 +212,7 @@ void log_filter::warning_hex(uint8_t *hex, int size, const char * message, ...) free(args_msg); } } -void log_filter::info_hex(uint8_t *hex, int size, const char * message, ...) { +void log_filter::info_hex(const uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_INFO) { char *args_msg; va_list args; @@ -223,7 +223,7 @@ void log_filter::info_hex(uint8_t *hex, int size, const char * message, ...) { free(args_msg); } } -void log_filter::debug_hex(uint8_t *hex, int size, const char * message, ...) { +void log_filter::debug_hex(const uint8_t *hex, int size, const char * message, ...) { if (level >= LOG_LEVEL_DEBUG) { char *args_msg; va_list args; @@ -277,7 +277,7 @@ std::string log_filter::now_time() return std::string(buffer); } -std::string log_filter::hex_string(uint8_t *hex, int size) +std::string log_filter::hex_string(const uint8_t *hex, int size) { std::stringstream ss; int c = 0;