diff --git a/executables/lte-enb.c b/executables/lte-enb.c index 477ff5cd68..39f72db86c 100644 --- a/executables/lte-enb.c +++ b/executables/lte-enb.c @@ -568,7 +568,7 @@ int wakeup_rxtx(PHY_VARS_eNB *eNB, LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms; int ret; LOG_D(PHY,"ENTERED wakeup_rxtx, %d.%d\n",ru_proc->frame_rx,ru_proc->tti_rx); - // wake up TX for subframe n+sl_ahead + // wake up TX for subframe n+sf_ahead // lock the TX mutex and make sure the thread is ready AssertFatal((ret=pthread_mutex_lock(&L1_proc->mutex)) == 0,"mutex_lock returns %d\n", ret); diff --git a/executables/nr-ru.c b/executables/nr-ru.c index d608415e7e..d87acf1bbe 100644 --- a/executables/nr-ru.c +++ b/executables/nr-ru.c @@ -68,7 +68,6 @@ static int DEFRUTPCORES[] = {-1,-1,-1,-1}; #include #include "executables/nr-softmodem-common.h" -int sl_ahead; static void NRRCconfig_RU(configmodule_interface_t *cfg); /*************************************************************/ diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c index d5896bbffd..d3362a4851 100644 --- a/executables/nr-uesoftmodem.c +++ b/executables/nr-uesoftmodem.c @@ -99,7 +99,6 @@ nrUE_params_t nrUE_params = {0}; pthread_cond_t nfapi_sync_cond; pthread_mutex_t nfapi_sync_mutex; int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex -int sf_ahead = 6; //??? value ??? pthread_cond_t sync_cond; pthread_mutex_t sync_mutex; int sync_var=-1; //!< protected by mutex \ref sync_mutex. diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h index e593a78210..2e7aaacc21 100644 --- a/executables/softmodem-common.h +++ b/executables/softmodem-common.h @@ -352,7 +352,6 @@ void set_softmodem_sighandler(void); extern uint64_t downlink_frequency[MAX_NUM_CCs][4]; extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; extern int usrp_tx_thread; -extern int sl_ahead; extern int sf_ahead; extern int oai_exit; diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c index 95a5b9ea64..236913d3f8 100644 --- a/openair1/SIMULATION/NR_PHY/dlsim.c +++ b/openair1/SIMULATION/NR_PHY/dlsim.c @@ -107,7 +107,6 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; double cpuf; char *uecap_file; -int sl_ahead = 0; //uint8_t nfapi_mode = 0; uint64_t downlink_frequency[MAX_NUM_CCs][4]; THREAD_STRUCT thread_struct; diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c index 5eab1c6974..39e692fba9 100644 --- a/openair1/SIMULATION/NR_PHY/prachsim.c +++ b/openair1/SIMULATION/NR_PHY/prachsim.c @@ -83,7 +83,6 @@ openair0_config_t openair0_cfg[MAX_CARDS]; //uint8_t nfapi_mode=0; uint64_t downlink_frequency[MAX_NUM_CCs][4]; int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; -int sl_ahead = 0; uint32_t N_RB_DL = 106; NR_IF_Module_t *NR_IF_Module_init(int Mod_id) { return (NULL); } diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c index ffc6690b42..301beb19f5 100644 --- a/openair1/SIMULATION/NR_PHY/ulsim.c +++ b/openair1/SIMULATION/NR_PHY/ulsim.c @@ -106,9 +106,6 @@ RAN_CONTEXT_t RC; char *uecap_file; int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; -int sf_ahead = 4; -int slot_ahead=6 ; -int sl_ahead = 0; double cpuf; //uint8_t nfapi_mode = 0; uint64_t downlink_frequency[MAX_NUM_CCs][4]; diff --git a/radio/ETHERNET/benetel/5g/benetel.c b/radio/ETHERNET/benetel/5g/benetel.c index 90fce2e206..996d568767 100644 --- a/radio/ETHERNET/benetel/5g/benetel.c +++ b/radio/ETHERNET/benetel/5g/benetel.c @@ -257,7 +257,6 @@ printf("rxdata in benetel_fh_if4p5_south_in %p\n", &ru->common.rxdataF[antenna][ //printf("BENETEL: %s (f.sf %d.%d)\n", __FUNCTION__, *frame, *slot); RU_proc_t *proc = &ru->proc; - extern int sl_ahead; int f = *frame; int sl = *slot; @@ -272,8 +271,8 @@ printf("rxdata in benetel_fh_if4p5_south_in %p\n", &ru->common.rxdataF[antenna][ if (get_nprocs()<=4) { // why? what if there are more? - proc->tti_tx = (sl+sl_ahead)%20; - proc->frame_tx = (sl>(19-sl_ahead)) ? (f+1)&1023 : f; + proc->tti_tx = (sl+ru->sl_ahead)%20; + proc->frame_tx = (sl>(19-ru->sl_ahead)) ? (f+1)&1023 : f; } } diff --git a/radio/fhi_72/oran_isolate.c b/radio/fhi_72/oran_isolate.c index f922df40bb..d3f4fa1796 100644 --- a/radio/fhi_72/oran_isolate.c +++ b/radio/fhi_72/oran_isolate.c @@ -203,7 +203,6 @@ void oran_fh_if4p5_south_in(RU_t *ru, int *frame, int *slot) ru_info.prach_buf = ru->prach_rxsigF[0]; // index: [prach_oca][ant_id] RU_proc_t *proc = &ru->proc; - extern int sl_ahead; int f, sl; LOG_D(PHY, "Read rxdataF %p,%p\n", ru_info.rxdataF[0], ru_info.rxdataF[1]); start_meas(&ru->rx_fhaul); @@ -217,8 +216,8 @@ void oran_fh_if4p5_south_in(RU_t *ru, int *frame, int *slot) int slots_per_frame = 10 << (ru->openair0_cfg.nr_scs_for_raster); proc->tti_rx = sl; proc->frame_rx = f; - proc->tti_tx = (sl + sl_ahead) % slots_per_frame; - proc->frame_tx = (sl > (slots_per_frame - 1 - sl_ahead)) ? (f + 1) & 1023 : f; + proc->tti_tx = (sl + ru->sl_ahead) % slots_per_frame; + proc->frame_tx = (sl > (slots_per_frame - 1 - ru->sl_ahead)) ? (f + 1) & 1023 : f; if (proc->first_rx == 0) { if (proc->tti_rx != *slot) {