bugfix: reset DCI count before adding one
The management of uplink failure generates a DCI to send a RA PDCCH order. It calls add_ue_spec_dci which increases DCI_pdu[CC_id]->Num_ue_spec_dci, but this was reset to 0 *after* the DCI generation. Let's reset *before*. Bug reported by Liang Yong on openair5g-user mailing list.
This commit is contained in:
@@ -121,6 +121,17 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
|
|||||||
memset(eNB_mac_inst[module_idP].common_channels[CC_id].vrb_map,0,100);
|
memset(eNB_mac_inst[module_idP].common_channels[CC_id].vrb_map,0,100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// clear DCI and BCCH contents before scheduling
|
||||||
|
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
|
||||||
|
DCI_pdu[CC_id]->Num_common_dci = 0;
|
||||||
|
DCI_pdu[CC_id]->Num_ue_spec_dci = 0;
|
||||||
|
#ifdef Rel10
|
||||||
|
eNB_mac_inst[module_idP].common_channels[CC_id].mcch_active =0;
|
||||||
|
#endif
|
||||||
|
eNB_mac_inst[module_idP].frame = frameP;
|
||||||
|
eNB_mac_inst[module_idP].subframe = subframeP;
|
||||||
|
}
|
||||||
|
|
||||||
// refresh UE list based on UEs dropped by PHY in previous subframe
|
// refresh UE list based on UEs dropped by PHY in previous subframe
|
||||||
i = UE_list->head;
|
i = UE_list->head;
|
||||||
|
|
||||||
@@ -318,22 +329,6 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// clear DCI and BCCH contents before scheduling
|
|
||||||
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
|
|
||||||
DCI_pdu[CC_id]->Num_common_dci = 0;
|
|
||||||
DCI_pdu[CC_id]->Num_ue_spec_dci = 0;
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef Rel10
|
|
||||||
eNB_mac_inst[module_idP].common_channels[CC_id].mcch_active =0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
eNB_mac_inst[module_idP].frame = frameP;
|
|
||||||
eNB_mac_inst[module_idP].subframe = subframeP;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* #ifndef DISABLE_SF_TRIGGER */
|
/* #ifndef DISABLE_SF_TRIGGER */
|
||||||
/* //Send subframe trigger to the controller */
|
/* //Send subframe trigger to the controller */
|
||||||
/* if (mac_agent_registered[module_idP]) { */
|
/* if (mac_agent_registered[module_idP]) { */
|
||||||
|
|||||||
Reference in New Issue
Block a user