From 19033ca822cd86a699afd71d8645ab0b8a7e0596 Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Tue, 16 Jul 2024 21:48:37 +0200 Subject: [PATCH] Remove num_missed_slots from softmodems and some extra unused functions from NRUE. --- executables/lte-softmodem.c | 2 -- executables/lte-softmodem.h | 1 - executables/lte-uesoftmodem.c | 2 -- executables/nr-softmodem-common.h | 1 - executables/nr-softmodem.c | 2 -- executables/nr-uesoftmodem.c | 24 ------------------------ 6 files changed, 32 deletions(-) diff --git a/executables/lte-softmodem.c b/executables/lte-softmodem.c index e5530765a5..4b278bec4b 100644 --- a/executables/lte-softmodem.c +++ b/executables/lte-softmodem.c @@ -143,8 +143,6 @@ char channels[128] = "0"; int rx_input_level_dBm; int otg_enabled; -uint64_t num_missed_slots=0; // counter for the number of missed slots - RU_t **RCconfig_RU(int nb_RU,int nb_L1_inst,PHY_VARS_eNB ***eNB,uint64_t *ru_mask,pthread_mutex_t *ru_mutex,pthread_cond_t *ru_cond); RU_t **RCconfig_RU(int nb_RU,int nb_L1_inst,PHY_VARS_eNB ***eNB,uint64_t *ru_mask,pthread_mutex_t *ru_mutex,pthread_cond_t *ru_cond); diff --git a/executables/lte-softmodem.h b/executables/lte-softmodem.h index 2bd7576e16..678327ddb5 100644 --- a/executables/lte-softmodem.h +++ b/executables/lte-softmodem.h @@ -122,7 +122,6 @@ extern uint64_t downlink_frequency[MAX_NUM_CCs][4]; extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; extern int rx_input_level_dBm; -extern uint64_t num_missed_slots; // counter for the number of missed slots extern int oaisim_flag; extern int oai_exit; diff --git a/executables/lte-uesoftmodem.c b/executables/lte-uesoftmodem.c index 600722f651..9336698bac 100644 --- a/executables/lte-uesoftmodem.c +++ b/executables/lte-uesoftmodem.c @@ -143,8 +143,6 @@ int rx_input_level_dBm; static LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]; -uint64_t num_missed_slots=0; // counter for the number of missed slots - // prototypes from function implemented in lte-ue.c, probably should be elsewhere in a include file. extern void init_UE_stub_single_thread(int nb_inst,int eMBMS_active, int uecap_xer_in, char *emul_iface); extern PHY_VARS_UE *init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms, uint8_t UE_id, uint8_t abstraction_flag); diff --git a/executables/nr-softmodem-common.h b/executables/nr-softmodem-common.h index 56d92497cc..1ef5e4ecfe 100644 --- a/executables/nr-softmodem-common.h +++ b/executables/nr-softmodem-common.h @@ -134,7 +134,6 @@ extern uint64_t downlink_frequency[MAX_NUM_CCs][4]; extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; extern int rx_input_level_dBm; -extern uint64_t num_missed_slots; // counter for the number of missed slots extern int oaisim_flag; extern int oai_exit; diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c index 958161252a..9f67b1cada 100644 --- a/executables/nr-softmodem.c +++ b/executables/nr-softmodem.c @@ -141,8 +141,6 @@ int rx_input_level_dBm; int otg_enabled; -uint64_t num_missed_slots=0; // counter for the number of missed slots - #include extern void reset_opp_meas(void); diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c index a4e02a56aa..7575d37e3b 100644 --- a/executables/nr-uesoftmodem.c +++ b/executables/nr-uesoftmodem.c @@ -151,7 +151,6 @@ double cpuf; int chain_offset = 0; int card_offset = 0; -uint64_t num_missed_slots = 0; // counter for the number of missed slots int numerology = 0; int oaisim_flag = 0; int emulate_rf = 0; @@ -160,29 +159,6 @@ uint32_t N_RB_DL = 106; // NTN cellSpecificKoffset-r17, but in slots for DL SCS unsigned int NTN_UE_Koffset = 0; -/*---------------------BMC: timespec helpers -----------------------------*/ - -struct timespec min_diff_time = { .tv_sec = 0, .tv_nsec = 0 }; -struct timespec max_diff_time = { .tv_sec = 0, .tv_nsec = 0 }; - -struct timespec clock_difftime(struct timespec start, struct timespec end) { - struct timespec temp; - - if ((end.tv_nsec-start.tv_nsec)<0) { - temp.tv_sec = end.tv_sec-start.tv_sec-1; - temp.tv_nsec = 1000000000+end.tv_nsec-start.tv_nsec; - } else { - temp.tv_sec = end.tv_sec-start.tv_sec; - temp.tv_nsec = end.tv_nsec-start.tv_nsec; - } - - return temp; -} - -void print_difftimes(void) { - LOG_I(HW,"difftimes min = %lu ns ; max = %lu ns\n", min_diff_time.tv_nsec, max_diff_time.tv_nsec); -} - int create_tasks_nrue(uint32_t ue_nb) { LOG_D(NR_RRC, "%s(ue_nb:%d)\n", __FUNCTION__, ue_nb); itti_wait_ready(1);