Commit 05710206 authored by Raymond Knopp's avatar Raymond Knopp

minor modifications in T_defs.h and for constant power (i.e. no DTX in TX subframes for TDD)

parent 895f54a9
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
/* let's have 100 RBs functional for the basic simulator */ /* let's have 100 RBs functional for the basic simulator */
# define T_BUFFER_MAX (1024*64*2) # define T_BUFFER_MAX (1024*64*2)
#else #else
# define T_BUFFER_MAX (1024*64) # define T_BUFFER_MAX (1024*64*2)
#endif #endif
/* size of the local cache for messages (must be pow(2,something)) */ /* size of the local cache for messages (must be pow(2,something)) */
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
/* we don't need much space for the basic simulator */ /* we don't need much space for the basic simulator */
# define T_CACHE_SIZE 1024 # define T_CACHE_SIZE 1024
#else #else
# define T_CACHE_SIZE (8192 * 2) # define T_CACHE_SIZE (8192 )
#endif #endif
/* maximum number of bytes a message can contain */ /* maximum number of bytes a message can contain */
......
...@@ -361,13 +361,15 @@ void fill_subframe_mask(PHY_VARS_eNB *eNB) { ...@@ -361,13 +361,15 @@ void fill_subframe_mask(PHY_VARS_eNB *eNB) {
proc.subframe_tx=sf; proc.subframe_tx=sf;
eNB->dlsch[0][0]->harq_ids[0][sf]=0; eNB->dlsch[0][0]->harq_ids[0][sf]=0;
eNB->dlsch[0][0]->rnti=0x1234; eNB->dlsch[0][0]->rnti=0x1234;
dlsch_harq->nb_rb=12; dlsch_harq->nb_rb=48;
dlsch_harq->rb_alloc[0]=0xfff; dlsch_harq->rb_alloc[0]=0xffffffffffff;
dlsch_harq->Qm=2; dlsch_harq->Qm=2;
dlsch_harq->Nl=1; dlsch_harq->Nl=1;
dlsch_harq->pdsch_start=1; dlsch_harq->pdsch_start=1;
dlsch_harq->mimo_mode=(eNB->frame_parms.nb_antenna_ports_eNB>1) ? ALAMOUTI : SISO; dlsch_harq->mimo_mode=(eNB->frame_parms.nb_antenna_ports_eNB>1) ? ALAMOUTI : SISO;
pdsch_procedures(eNB,&proc,0,eNB->dlsch[0][0]); dlsch_harq->dl_power_off = 1;
computeRhoB_eNB(4,eNB->frame_parms.pdsch_config_common.p_b,eNB->frame_parms.nb_antenna_ports_eNB,eNB->dlsch[0][0],dlsch_harq->dl_power_off);
pdsch_procedures(eNB,&proc,0,eNB->dlsch[0][0],NULL);
} }
} }
eNB->common_vars.txdataF = dummy_tx; eNB->common_vars.txdataF = dummy_tx;
...@@ -422,6 +424,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB, ...@@ -422,6 +424,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
eNB->first_run_I0_measurements = eNB->first_run_I0_measurements =
1; ///This flag used to be static. With multiple eNBs this does no longer work, hence we put it in the structure. However it has to be initialized with 1, which is performed here. 1; ///This flag used to be static. With multiple eNBs this does no longer work, hence we put it in the structure. However it has to be initialized with 1, which is performed here.
eNB->use_DTX=0;
if (NFAPI_MODE!=NFAPI_MODE_VNF) { if (NFAPI_MODE!=NFAPI_MODE_VNF) {
common_vars->rxdata = (int32_t **)NULL; common_vars->rxdata = (int32_t **)NULL;
common_vars->txdataF = (int32_t **)malloc16(NB_ANTENNA_PORTS_ENB*sizeof(int32_t *)); common_vars->txdataF = (int32_t **)malloc16(NB_ANTENNA_PORTS_ENB*sizeof(int32_t *));
......
...@@ -480,6 +480,8 @@ void pdsch_procedures(PHY_VARS_eNB *eNB, ...@@ -480,6 +480,8 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,
subframe<<1); subframe<<1);
stop_meas(&eNB->dlsch_scrambling_stats); stop_meas(&eNB->dlsch_scrambling_stats);
start_meas(&eNB->dlsch_modulation_stats); start_meas(&eNB->dlsch_modulation_stats);
if (frame==0) LOG_I(PHY,"Generating pdsch for %d.%d starting in symbol %d, Qm %d, nb_rb %d, rbmask %x\n",
frame,subframe,dlsch_harq->pdsch_start,dlsch_harq->Qm,dlsch_harq->nb_rb,dlsch_harq->rb_alloc[0]);
dlsch_modulation(eNB, dlsch_modulation(eNB,
eNB->common_vars.txdataF, eNB->common_vars.txdataF,
AMP, AMP,
......
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