Commit 45dfcbe6 authored by Thomas Schlichter's avatar Thomas Schlichter

remove unused global variable sl_ahead

parent 0b4b6b95
...@@ -568,7 +568,7 @@ int wakeup_rxtx(PHY_VARS_eNB *eNB, ...@@ -568,7 +568,7 @@ int wakeup_rxtx(PHY_VARS_eNB *eNB,
LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms; LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
int ret; int ret;
LOG_D(PHY,"ENTERED wakeup_rxtx, %d.%d\n",ru_proc->frame_rx,ru_proc->tti_rx); 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 // 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); AssertFatal((ret=pthread_mutex_lock(&L1_proc->mutex)) == 0,"mutex_lock returns %d\n", ret);
......
...@@ -68,7 +68,6 @@ static int DEFRUTPCORES[] = {-1,-1,-1,-1}; ...@@ -68,7 +68,6 @@ static int DEFRUTPCORES[] = {-1,-1,-1,-1};
#include <nfapi/oai_integration/vendor_ext.h> #include <nfapi/oai_integration/vendor_ext.h>
#include "executables/nr-softmodem-common.h" #include "executables/nr-softmodem-common.h"
int sl_ahead;
static void NRRCconfig_RU(configmodule_interface_t *cfg); static void NRRCconfig_RU(configmodule_interface_t *cfg);
/*************************************************************/ /*************************************************************/
......
...@@ -99,7 +99,6 @@ nrUE_params_t nrUE_params = {0}; ...@@ -99,7 +99,6 @@ nrUE_params_t nrUE_params = {0};
pthread_cond_t nfapi_sync_cond; pthread_cond_t nfapi_sync_cond;
pthread_mutex_t nfapi_sync_mutex; pthread_mutex_t nfapi_sync_mutex;
int nfapi_sync_var=-1; //!< protected by mutex \ref 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_cond_t sync_cond;
pthread_mutex_t sync_mutex; pthread_mutex_t sync_mutex;
int sync_var=-1; //!< protected by mutex \ref sync_mutex. int sync_var=-1; //!< protected by mutex \ref sync_mutex.
......
...@@ -352,7 +352,6 @@ void set_softmodem_sighandler(void); ...@@ -352,7 +352,6 @@ void set_softmodem_sighandler(void);
extern uint64_t downlink_frequency[MAX_NUM_CCs][4]; extern uint64_t downlink_frequency[MAX_NUM_CCs][4];
extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
extern int usrp_tx_thread; extern int usrp_tx_thread;
extern int sl_ahead;
extern int sf_ahead; extern int sf_ahead;
extern int oai_exit; extern int oai_exit;
......
...@@ -107,7 +107,6 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; ...@@ -107,7 +107,6 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
double cpuf; double cpuf;
char *uecap_file; char *uecap_file;
int sl_ahead = 0;
//uint8_t nfapi_mode = 0; //uint8_t nfapi_mode = 0;
uint64_t downlink_frequency[MAX_NUM_CCs][4]; uint64_t downlink_frequency[MAX_NUM_CCs][4];
THREAD_STRUCT thread_struct; THREAD_STRUCT thread_struct;
......
...@@ -83,7 +83,6 @@ openair0_config_t openair0_cfg[MAX_CARDS]; ...@@ -83,7 +83,6 @@ openair0_config_t openair0_cfg[MAX_CARDS];
//uint8_t nfapi_mode=0; //uint8_t nfapi_mode=0;
uint64_t downlink_frequency[MAX_NUM_CCs][4]; uint64_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
int sl_ahead = 0;
uint32_t N_RB_DL = 106; uint32_t N_RB_DL = 106;
NR_IF_Module_t *NR_IF_Module_init(int Mod_id) { return (NULL); } NR_IF_Module_t *NR_IF_Module_init(int Mod_id) { return (NULL); }
......
...@@ -106,9 +106,6 @@ RAN_CONTEXT_t RC; ...@@ -106,9 +106,6 @@ RAN_CONTEXT_t RC;
char *uecap_file; char *uecap_file;
int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
int sf_ahead = 4;
int slot_ahead=6 ;
int sl_ahead = 0;
double cpuf; double cpuf;
//uint8_t nfapi_mode = 0; //uint8_t nfapi_mode = 0;
uint64_t downlink_frequency[MAX_NUM_CCs][4]; uint64_t downlink_frequency[MAX_NUM_CCs][4];
......
...@@ -257,7 +257,6 @@ printf("rxdata in benetel_fh_if4p5_south_in %p\n", &ru->common.rxdataF[antenna][ ...@@ -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); //printf("BENETEL: %s (f.sf %d.%d)\n", __FUNCTION__, *frame, *slot);
RU_proc_t *proc = &ru->proc; RU_proc_t *proc = &ru->proc;
extern int sl_ahead;
int f = *frame; int f = *frame;
int sl = *slot; int sl = *slot;
...@@ -272,8 +271,8 @@ printf("rxdata in benetel_fh_if4p5_south_in %p\n", &ru->common.rxdataF[antenna][ ...@@ -272,8 +271,8 @@ printf("rxdata in benetel_fh_if4p5_south_in %p\n", &ru->common.rxdataF[antenna][
if (get_nprocs()<=4) { if (get_nprocs()<=4) {
// why? what if there are more? // why? what if there are more?
proc->tti_tx = (sl+sl_ahead)%20; proc->tti_tx = (sl+ru->sl_ahead)%20;
proc->frame_tx = (sl>(19-sl_ahead)) ? (f+1)&1023 : f; proc->frame_tx = (sl>(19-ru->sl_ahead)) ? (f+1)&1023 : f;
} }
} }
......
...@@ -203,7 +203,6 @@ void oran_fh_if4p5_south_in(RU_t *ru, int *frame, int *slot) ...@@ -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_info.prach_buf = ru->prach_rxsigF[0]; // index: [prach_oca][ant_id]
RU_proc_t *proc = &ru->proc; RU_proc_t *proc = &ru->proc;
extern int sl_ahead;
int f, sl; int f, sl;
LOG_D(PHY, "Read rxdataF %p,%p\n", ru_info.rxdataF[0], ru_info.rxdataF[1]); LOG_D(PHY, "Read rxdataF %p,%p\n", ru_info.rxdataF[0], ru_info.rxdataF[1]);
start_meas(&ru->rx_fhaul); start_meas(&ru->rx_fhaul);
...@@ -217,8 +216,8 @@ void oran_fh_if4p5_south_in(RU_t *ru, int *frame, int *slot) ...@@ -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); int slots_per_frame = 10 << (ru->openair0_cfg.nr_scs_for_raster);
proc->tti_rx = sl; proc->tti_rx = sl;
proc->frame_rx = f; proc->frame_rx = f;
proc->tti_tx = (sl + sl_ahead) % slots_per_frame; proc->tti_tx = (sl + ru->sl_ahead) % slots_per_frame;
proc->frame_tx = (sl > (slots_per_frame - 1 - sl_ahead)) ? (f + 1) & 1023 : f; proc->frame_tx = (sl > (slots_per_frame - 1 - ru->sl_ahead)) ? (f + 1) & 1023 : f;
if (proc->first_rx == 0) { if (proc->first_rx == 0) {
if (proc->tti_rx != *slot) { if (proc->tti_rx != *slot) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment