maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 2 layer MIMO in nr_dlsim after last merge with develop

Browse Source
This commit is contained in:
Thomas Schlichter
2021-04-28 18:06:14 +02:00
parent 2ec2486ae4
commit 5f6be27f5d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/NR_PHY/dlsim.c
+10 -10
View File
@@ -215,9 +215,9 @@ void update_ptrs_config(NR_CellGroupConfig_t *secondaryCellGroup, uint16_t *rbSi
void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dmrs_arg); void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dmrs_arg);
extern void fix_scd(NR_ServingCellConfig_t *scd);// forward declaration extern void fix_scd(NR_ServingCellConfig_t *scd);// forward declaration
/* specific dlsim DL preprocessor: uses rbStart/rbSize/mcs from command line of /* specific dlsim DL preprocessor: uses rbStart/rbSize/mcs/nrOfLayers from command line of
dlsim, does not search for CCE/PUCCH occasion but simply sets to 0 */ dlsim, does not search for CCE/PUCCH occasion but simply sets to 0 */
int g_mcsIndex = -1, g_mcsTableIdx = 0, g_rbStart = -1, g_rbSize = -1; int g_mcsIndex = -1, g_mcsTableIdx = 0, g_rbStart = -1, g_rbSize = -1, g_nrOfLayers = 1;
void nr_dlsim_preprocessor(module_id_t module_id, void nr_dlsim_preprocessor(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot) { sub_frame_t slot) {
@@ -262,7 +262,7 @@ void nr_dlsim_preprocessor(module_id_t module_id,
ps->N_PRB_DMRS * ps->N_DMRS_SLOT, ps->N_PRB_DMRS * ps->N_DMRS_SLOT,
0 /* N_PRB_oh, 0 for initialBWP */, 0 /* N_PRB_oh, 0 for initialBWP */,
0 /* tb_scaling */, 0 /* tb_scaling */,
1 /* nrOfLayers */) g_nrOfLayers)
>> 3; >> 3;
/* the simulator assumes the HARQ PID is equal to the slot number */ /* the simulator assumes the HARQ PID is equal to the slot number */
@@ -316,7 +316,7 @@ int main(int argc, char **argv)
// char fname[40], vname[40]; // char fname[40], vname[40];
int trial, n_trials = 1, n_errors = 0, n_false_positive = 0; int trial, n_trials = 1, n_errors = 0, n_false_positive = 0;
//int n_errors2, n_alamouti; //int n_errors2, n_alamouti;
uint8_t nrOfLayers = 1,n_tx=1,n_rx=1; uint8_t n_tx=1,n_rx=1;
uint8_t round; uint8_t round;
uint8_t num_rounds = 4; uint8_t num_rounds = 4;
@@ -479,11 +479,11 @@ int main(int argc, char **argv)
break; break;
*/ */
case 'x': case 'x':
nrOfLayers=atoi(optarg); g_nrOfLayers=atoi(optarg);
if ((nrOfLayers!=1) && if ((g_nrOfLayers!=1) &&
(nrOfLayers!=2)) { (g_nrOfLayers!=2)) {
printf("Unsupported nr Of Layers %d\n",nrOfLayers); printf("Unsupported nr Of Layers %d\n",g_nrOfLayers);
exit(-1); exit(-1);
} }
@@ -992,7 +992,7 @@ int main(int argc, char **argv)
gNB_mac->UE_info.num_pdcch_cand[0][i] = 0; gNB_mac->UE_info.num_pdcch_cand[0][i] = 0;
if (css_flag == 0) { if (css_flag == 0) {
nr_schedule_ue_spec(0, frame, slot, nrOfLayers); nr_schedule_ue_spec(0, frame, slot, g_nrOfLayers);
} else { } else {
nr_schedule_css_dlsch_phytest(0,frame,slot); nr_schedule_css_dlsch_phytest(0,frame,slot);
} }
@@ -1138,7 +1138,7 @@ int main(int argc, char **argv)
} }
nr_ue_dcireq(&dcireq); //to be replaced with function pointer later nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
UE_harq_process->Nl = nrOfLayers; UE_harq_process->Nl = g_nrOfLayers;
nr_ue_scheduled_response(&scheduled_response); nr_ue_scheduled_response(&scheduled_response);
phy_procedures_nrUE_RX(UE, phy_procedures_nrUE_RX(UE,
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
-1
View File
@@ -781,7 +781,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
const rnti_t rnti = UE_info->rnti[UE_id]; const rnti_t rnti = UE_info->rnti[UE_id];
/* POST processing */ /* POST processing */
const int nrOfLayers = 1;
const uint16_t R = sched_pdsch->R; const uint16_t R = sched_pdsch->R;
const uint8_t Qm = sched_pdsch->Qm; const uint8_t Qm = sched_pdsch->Qm;
const uint32_t TBS = sched_pdsch->tb_size; const uint32_t TBS = sched_pdsch->tb_size;