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

bugfix in set_dl_mcs

Browse Source
This commit is contained in:
francescomani
2021-07-06 17:45:10 +02:00
parent 1de542eb35
commit c72156aa07
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+2 -2
View File
@@ -372,8 +372,8 @@ void nr_processULSegment(void* arg) {
rv_index, rv_index,
(ulsch_harq->round==0)?1:0, (ulsch_harq->round==0)?1:0,
E, E,
ulsch_harq->F, ulsch_harq->F,
Kr-ulsch_harq->F-2*(p_decoderParms->Z))==-1) { Kr-ulsch_harq->F-2*(p_decoderParms->Z))==-1) {
stop_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats); stop_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats);
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+2 -1
View File
@@ -866,7 +866,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++; UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++;
LOG_D(NR_MAC, LOG_D(NR_MAC,
"%4d.%2d RNTI %04x start %3d RBs %3d startSymbol %2d nb_symbol %2d MCS %2d TBS %4d HARQ PID %2d round %d NDI %d\n", "%4d.%2d RNTI %04x start %3d RBs %3d startSymbol %2d nb_symbol %2d MCS %2d nrOfLayers %d TBS %4d HARQ PID %2d round %d NDI %d\n",
frame, frame,
slot, slot,
rnti, rnti,
@@ -875,6 +875,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
ps->startSymbolIndex, ps->startSymbolIndex,
ps->nrOfSymbols, ps->nrOfSymbols,
sched_pdsch->mcs, sched_pdsch->mcs,
nrOfLayers,
TBS, TBS,
current_harq_pid, current_harq_pid,
harq->round, harq->round,
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+3 -3
View File
@@ -159,15 +159,15 @@ void set_dl_mcs(NR_sched_pdsch_t *sched_pdsch,
switch (cqi_table) { switch (cqi_table) {
case 0: case 0:
target_qm = cqi_table1[cqi_idx][0]; target_qm = cqi_table1[cqi_idx][0];
target_coderate = cqi_table1[cqi_idx][0]; target_coderate = cqi_table1[cqi_idx][1];
break; break;
case 1: case 1:
target_qm = cqi_table2[cqi_idx][0]; target_qm = cqi_table2[cqi_idx][0];
target_coderate = cqi_table2[cqi_idx][0]; target_coderate = cqi_table2[cqi_idx][1];
break; break;
case 2: case 2:
target_qm = cqi_table3[cqi_idx][0]; target_qm = cqi_table3[cqi_idx][0];
target_coderate = cqi_table3[cqi_idx][0]; target_coderate = cqi_table3[cqi_idx][1];
break; break;
default: default:
AssertFatal(1==0,"Invalid cqi table index %d\n",cqi_table); AssertFatal(1==0,"Invalid cqi table index %d\n",cqi_table);