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

bugfixes

Browse Source
This commit is contained in:
Francesco Mani
2020-07-21 16:25:19 +02:00
parent ce846e6f7f
commit e76593f73f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+2
View File
@@ -1960,6 +1960,8 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc,
dci_pdu->frequency_hopping_flag.nbits = 1; dci_pdu->frequency_hopping_flag.nbits = 1;
size += 1; size += 1;
} }
else
dci_pdu->frequency_hopping_flag.nbits = 0;
// 1st DAI // 1st DAI
if (secondaryCellGroup->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook==NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic) if (secondaryCellGroup->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook==NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic)
dci_pdu->dai[0].nbits = 2; dci_pdu->dai[0].nbits = 2;
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+5 -2
View File
@@ -497,7 +497,7 @@ void config_uldci(NR_BWP_Uplink_t *ubwp,
dci_pdu_rel15->rv = pusch_pdu->pusch_data.rv_index; dci_pdu_rel15->rv = pusch_pdu->pusch_data.rv_index;
dci_pdu_rel15->harq_pid = pusch_pdu->pusch_data.harq_process_id; dci_pdu_rel15->harq_pid = pusch_pdu->pusch_data.harq_process_id;
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->dai[0].val = ???; //TODO dci_pdu_rel15->dai[0].val = 0; //TODO
// bwp indicator // bwp indicator
if (n_ubwp < 4) if (n_ubwp < 4)
dci_pdu_rel15->bwp_indicator.val = bwp_id; dci_pdu_rel15->bwp_indicator.val = bwp_id;
@@ -878,7 +878,10 @@ void schedule_fapi_ul_pdu(int Mod_idP,
if (pusch_Config->resourceAllocation==NR_PUSCH_Config__resourceAllocation_resourceAllocationType1) { if (pusch_Config->resourceAllocation==NR_PUSCH_Config__resourceAllocation_resourceAllocationType1) {
pusch_pdu->resource_alloc = 1; //type 1 pusch_pdu->resource_alloc = 1; //type 1
pusch_pdu->rb_start = 0; pusch_pdu->rb_start = 0;
pusch_pdu->rb_size = 50; if (get_softmodem_params()->phy_test==1)
pusch_pdu->rb_size = 50;
else
pusch_pdu->rb_size = 5;
} }
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");