From 17bb19c7befbe709fc4f13c39e9a5aa4a39a2d7c Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Thu, 23 Jan 2025 11:52:57 +0100 Subject: [PATCH] Remove unused LOCALIZATION compile option --- CMakeLists.txt | 1 - openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h | 12 +----------- openair1/PHY/TOOLS/tools_defs.h | 7 ------- openair1/PHY/defs_L1_NB_IoT.h | 8 +------- openair1/PHY/impl_defs_lte_NB_IoT.h | 6 ------ openair2/RRC/LTE/rrc_UE.c | 4 ---- openair2/RRC/LTE/rrc_defs.h | 11 ----------- 7 files changed, 2 insertions(+), 47 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15e79dcd72..cf2ea4311c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,7 +506,6 @@ add_boolean_option(ENABLE_VCD_FIFO False "time measurements of proc cal ########################## # PHY options ########################## -add_boolean_option(LOCALIZATION False "???" ON) add_integer_option(MAX_NUM_CCs 1 "????" ON) add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator" ON) add_boolean_option(DEBUG_PHY False "Enable PHY layer debugging options" ON) diff --git a/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h b/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h index 7ee3be6701..44eac0ff0c 100644 --- a/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h +++ b/openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h @@ -756,17 +756,7 @@ typedef struct { /// num active cba group uint8_t num_active_cba_groups; /// allocated CBA RNTI for this ulsch - uint16_t cba_rnti[4];//NUM_MAX_CBA_GROUP]; - #ifdef LOCALIZATION - /// epoch timestamp in millisecond - int32_t reference_timestamp_ms; - /// aggregate physical states every n millisecond - int32_t aggregation_period_ms; - /// a set of lists used for localization - struct list loc_rss_list[10], loc_rssi_list[10], loc_subcarrier_rss_list[10], loc_timing_advance_list[10], loc_timing_update_list[10]; - struct list tot_loc_rss_list, tot_loc_rssi_list, tot_loc_subcarrier_rss_list, tot_loc_timing_advance_list, tot_loc_timing_update_list; - #endif - + uint16_t cba_rnti[4]; // NUM_MAX_CBA_GROUP]; } NB_IoT_eNB_NULSCH_t; #define NPBCH_A 34 diff --git a/openair1/PHY/TOOLS/tools_defs.h b/openair1/PHY/TOOLS/tools_defs.h index d7e738a9f4..b456fab82b 100644 --- a/openair1/PHY/TOOLS/tools_defs.h +++ b/openair1/PHY/TOOLS/tools_defs.h @@ -726,13 +726,6 @@ int32_t sub_cpx_vector16(int16_t *x, */ int32_t signal_energy(int32_t *,uint32_t); -#ifdef LOCALIZATION -/*!\fn int32_t signal_energy(int *,uint32_t); -\brief Computes the signal energy per subcarrier -*/ -int32_t subcarrier_energy(int32_t *,uint32_t, int32_t *subcarrier_energy, uint16_t rx_power_correction); -#endif - /*!\fn uint32_t signal_energy_nodc(c16_t *,uint32_t); \brief Computes the signal energy per subcarrier, without DC removal */ diff --git a/openair1/PHY/defs_L1_NB_IoT.h b/openair1/PHY/defs_L1_NB_IoT.h index 163e9e3d2b..04808bc172 100644 --- a/openair1/PHY/defs_L1_NB_IoT.h +++ b/openair1/PHY/defs_L1_NB_IoT.h @@ -663,13 +663,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s { time_stats_t ulsch_tc_gamma_stats; time_stats_t ulsch_tc_ext_stats; time_stats_t ulsch_tc_intl1_stats; - time_stats_t ulsch_tc_intl2_stats; - -#ifdef LOCALIZATION - /// time state for localization - time_stats_t localization_stats; -#endif - + time_stats_t ulsch_tc_intl2_stats; int32_t pucch1_stats_cnt[NUMBER_OF_UE_MAX_NB_IoT][10]; int32_t pucch1_stats[NUMBER_OF_UE_MAX_NB_IoT][10*1024]; int32_t pucch1_stats_thres[NUMBER_OF_UE_MAX_NB_IoT][10*1024]; diff --git a/openair1/PHY/impl_defs_lte_NB_IoT.h b/openair1/PHY/impl_defs_lte_NB_IoT.h index 50b66409ed..b9e5965452 100644 --- a/openair1/PHY/impl_defs_lte_NB_IoT.h +++ b/openair1/PHY/impl_defs_lte_NB_IoT.h @@ -748,12 +748,6 @@ typedef struct { /// \brief llr values. /// - first index: ? [0..1179743] (hard coded) int16_t *llr; -#ifdef LOCALIZATION - /// number of active subcarrier for a specific UE - int32_t active_subcarrier; - /// subcarrier power in dBm - int32_t *subcarrier_power; -#endif } NB_IoT_eNB_PUSCH; #define PBCH_A_NB_IoT 24 diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c index 0e62ce00cf..1e12543604 100644 --- a/openair2/RRC/LTE/rrc_UE.c +++ b/openair2/RRC/LTE/rrc_UE.c @@ -6301,10 +6301,6 @@ rrc_rx_tx_ue( ) //----------------------------------------------------------------------------- { -#ifdef LOCALIZATION - double estimated_distance; - protocol_ctxt_t ctxt; -#endif VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_RX_TX,VCD_FUNCTION_IN); // check timers diff --git a/openair2/RRC/LTE/rrc_defs.h b/openair2/RRC/LTE/rrc_defs.h index d180c47c87..959abc11f9 100644 --- a/openair2/RRC/LTE/rrc_defs.h +++ b/openair2/RRC/LTE/rrc_defs.h @@ -752,17 +752,6 @@ typedef struct eNB_RRC_INST_s { hash_table_t *initial_id2_s1ap_ids; // key is content is rrc_ue_s1ap_ids_t hash_table_t *s1ap_id2_s1ap_ids ; // key is content is rrc_ue_s1ap_ids_t -#ifdef LOCALIZATION - /// localization type, 0: power based, 1: time based - uint8_t loc_type; - /// epoch timestamp in millisecond, RRC - int32_t reference_timestamp_ms; - /// aggregate physical states every n millisecond - int32_t aggregation_period_ms; - /// localization list for aggregated measurements from PHY - struct list loc_list; -#endif - //RRC configuration RrcConfigurationReq configuration;