Skip to content

O
OpenXG-RAN
Commit 390c648a authored by Francesco Mani's avatar Francesco Mani
Browse files
Options

bugfix in time domain assigment

parent 39b22f17
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @ 390c648a
...@@ -474,6 +474,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp, ...@@ -474,6 +474,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp,
nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15, nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
dci_pdu_rel15_t *dci_pdu_rel15, dci_pdu_rel15_t *dci_pdu_rel15,
int *dci_formats, int *rnti_types, int *dci_formats, int *rnti_types,
int time_domain_assignment,
int n_ubwp, int bwp_id) { int n_ubwp, int bwp_id) {
switch(dci_formats[(pdcch_pdu_rel15->numDlDci)-1]) { switch(dci_formats[(pdcch_pdu_rel15->numDlDci)-1]) {
...@@ -482,7 +483,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp, ...@@ -482,7 +483,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp,
pusch_pdu->rb_start, pusch_pdu->rb_start,
NRRIV2BW(ubwp->bwp_Common->genericParameters.locationAndBandwidth,275)); NRRIV2BW(ubwp->bwp_Common->genericParameters.locationAndBandwidth,275));
dci_pdu_rel15->time_domain_assignment.val = 2; // row index used here instead of SLIV; dci_pdu_rel15->time_domain_assignment.val = time_domain_assignment;
dci_pdu_rel15->frequency_hopping_flag.val = pusch_pdu->frequency_hopping; dci_pdu_rel15->frequency_hopping_flag.val = pusch_pdu->frequency_hopping;
dci_pdu_rel15->mcs = 9; dci_pdu_rel15->mcs = 9;
...@@ -511,7 +512,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp, ...@@ -511,7 +512,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp,
else else
AssertFatal(1==0,"Only frequency resource allocation type 1 is currently supported\n"); AssertFatal(1==0,"Only frequency resource allocation type 1 is currently supported\n");
// time domain assignment // time domain assignment
dci_pdu_rel15->time_domain_assignment.val = 2; dci_pdu_rel15->time_domain_assignment.val = time_domain_assignment;
// mcs // mcs
dci_pdu_rel15->mcs = pusch_pdu->mcs_index; dci_pdu_rel15->mcs = pusch_pdu->mcs_index;
// tpc command for pusch // tpc command for pusch
......
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @ 390c648a
...@@ -137,6 +137,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp, ...@@ -137,6 +137,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp,
nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15, nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
dci_pdu_rel15_t *dci_pdu_rel15, dci_pdu_rel15_t *dci_pdu_rel15,
int *dci_formats, int *rnti_types, int *dci_formats, int *rnti_types,
int time_domain_assignment,
int n_ubwp, int bwp_id); int n_ubwp, int bwp_id);
void configure_fapi_dl_Tx(module_id_t Mod_idP, void configure_fapi_dl_Tx(module_id_t Mod_idP,
......
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