From 8855ca03d371cfe4d1e212dc98bda9905b49afbf Mon Sep 17 00:00:00 2001 From: Guy De Souza Date: Mon, 29 Oct 2018 14:36:12 +0100 Subject: [PATCH] new scheduling params --- nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h | 1 + openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h index 3d39fbb10a..e7cd720e80 100644 --- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h +++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h @@ -557,6 +557,7 @@ typedef struct { uint8_t start_symbol; uint8_t nb_symbols; uint8_t mcs_idx; + uint8_t ndi; uint8_t nb_codewords; uint8_t nb_layers; uint16_t coding_rate; diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c index 365801482b..308e261a7a 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c @@ -75,12 +75,15 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP, nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_pdu_rel15 = &dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15; dlsch_pdu_rel15->start_prb = 0; - dlsch_pdu_rel15->n_prb = 40; + dlsch_pdu_rel15->n_prb = 106; dlsch_pdu_rel15->start_symbol = 8; dlsch_pdu_rel15->nb_symbols = 6; dlsch_pdu_rel15->rnti = rnti; dlsch_pdu_rel15->nb_layers =1; dlsch_pdu_rel15->nb_codewords = 1; + dlsch_pdu_rel15->mcs_idx = 26; + dlsch_pdu_rel15->ndi = 1; + dlsch_pdu_rel15->redundancy_version = 0; nr_configure_css_dci_from_mib(&gNB->pdcch_type0_params, kHz30, kHz30, nr_FR1, 0, 0, @@ -91,7 +94,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP, pdu_rel15->frequency_domain_assignment = get_RIV(dlsch_pdu_rel15->start_prb, dlsch_pdu_rel15->n_prb, cfg->rf_config.dl_carrier_bandwidth.value); pdu_rel15->time_domain_assignment = get_SLIV(dlsch_pdu_rel15->start_symbol, dlsch_pdu_rel15->nb_symbols); pdu_rel15->vrb_to_prb_mapping = 1; - pdu_rel15->mcs = 12; + pdu_rel15->mcs = 26; pdu_rel15->tb_scaling = 1; pdu_rel15->ra_preamble_index = 25;