Skip to content

O
OpenXG-RAN
Commit f1a6c30a authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Isolate DMRS N_PRB_DMRS in ULSCH

parent 93fd90e2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @ f1a6c30a
...@@ -611,6 +611,9 @@ void nr_schedule_ulsch(module_id_t module_id, ...@@ -611,6 +611,9 @@ void nr_schedule_ulsch(module_id_t module_id,
for(int i = StartSymbolIndex; i < StartSymbolIndex + NrOfSymbols; i++) for(int i = StartSymbolIndex; i < StartSymbolIndex + NrOfSymbols; i++)
num_dmrs_symb += (ul_dmrs_symb_pos >> i) & 1; num_dmrs_symb += (ul_dmrs_symb_pos >> i) & 1;
const uint8_t num_dmrs_cdm_grps_no_data = 1; const uint8_t num_dmrs_cdm_grps_no_data = 1;
const uint8_t N_PRB_DMRS = dmrs_config_type == 0
? num_dmrs_cdm_grps_no_data * 6
: num_dmrs_cdm_grps_no_data * 4;
uint8_t mcs_table = 0; uint8_t mcs_table = 0;
if (transform_precoding) if (transform_precoding)
...@@ -744,12 +747,6 @@ void nr_schedule_ulsch(module_id_t module_id, ...@@ -744,12 +747,6 @@ void nr_schedule_ulsch(module_id_t module_id,
pusch_pdu->pusch_data.new_data_indicator = cur_harq->ndi; pusch_pdu->pusch_data.new_data_indicator = cur_harq->ndi;
pusch_pdu->pusch_data.rv_index = nr_rv_round_map[cur_harq->round]; pusch_pdu->pusch_data.rv_index = nr_rv_round_map[cur_harq->round];
uint8_t N_PRB_DMRS;
if (pusch_pdu->dmrs_config_type == 0)
N_PRB_DMRS = pusch_pdu->num_dmrs_cdm_grps_no_data*6;
else
N_PRB_DMRS = pusch_pdu->num_dmrs_cdm_grps_no_data*4;
pusch_pdu->pusch_data.tb_size = nr_compute_tbs(pusch_pdu->qam_mod_order, pusch_pdu->pusch_data.tb_size = nr_compute_tbs(pusch_pdu->qam_mod_order,
pusch_pdu->target_code_rate, pusch_pdu->target_code_rate,
pusch_pdu->rb_size, pusch_pdu->rb_size,
......
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