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

Merge branch 'issue255_256_257_tmp' into ues_test

Browse Source
This commit is contained in:
Xu Bo
2018-01-27 04:14:06 +00:00
parent 664d1a4b5f 0dcc3dceaf
commit ef4aee1e28
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler.c
+1 -1
View File
@@ -533,7 +533,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
pdcch_order_table[cc[CC_id].mib->message.dl_Bandwidth];
DL_req[CC_id].dl_config_request_body.number_dci++;
DL_req[CC_id].dl_config_request_body.number_pdu++;
LOG_I(MAC,
LOG_D(MAC,
"UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d \n",
UE_id, rnti,
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer,
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+12
View File
@@ -123,6 +123,10 @@ rx_sdu(const module_id_t enb_mod_idP,
round_UL[CC_idP][harq_pid] < 8, "round >= 8\n");
if (sduP != NULL) {
UE_list->UE_sched_ctrl[UE_id].ul_inactivity_timer = 0;
if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 0) {
LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d clear to 0\n", UE_id, rntiP,
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
}
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
UE_list->UE_sched_ctrl[UE_id].ul_scheduled &=
(~(1 << harq_pid));
@@ -285,6 +289,10 @@ rx_sdu(const module_id_t enb_mod_idP,
*/
UE_id = old_UE_id;
UE_list->UE_sched_ctrl[UE_id].ul_inactivity_timer = 0;
if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 0) {
LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d clear to 0\n", UE_id, old_rnti,
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
}
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 0;
@@ -1176,6 +1184,10 @@ schedule_ulsch_rnti(module_id_t module_idP,
// inform RRC of failure and clear timer
mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP,
subframeP, rnti);
if (UE_list->UE_sched_ctrl[UE_id].ul_failure_timer > 0) {
LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d clear to 0\n", UE_id, rnti,
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer);
}
UE_list->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync = 1;
}