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

Cosmetic changes

Browse Source
This commit is contained in:
luis_pereira87
2022-06-13 23:20:37 +01:00
parent 983760e9a4
commit 7cee46777f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+8 -6
View File
@@ -2887,15 +2887,17 @@ void nr_mac_update_timers(module_id_t module_id,
const int current_bwp_id = sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0; const int current_bwp_id = sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0;
const int current_ubwp_id = sched_ctrl->active_ubwp ? sched_ctrl->active_ubwp->bwp_Id : 0; const int current_ubwp_id = sched_ctrl->active_ubwp ? sched_ctrl->active_ubwp->bwp_Id : 0;
if (UE->Msg3_dcch_dtch) { if (UE->Msg3_dcch_dtch) {
// Must use Initial Downlink BWP when there is RA with Msg3 through DCCH // 3GPP TS 38.321 Section 5.15 Bandwidth Part (BWP) operation
// Currently there are no PRACH occasions configured for any Dedicated BWP, so UE will switch to the initialDownlinkBWP
sched_ctrl->active_bwp = NULL; sched_ctrl->active_bwp = NULL;
if (current_bwp_id != 0) { if (current_bwp_id != 0) {
LOG_I(NR_MAC, "Changing to Initial DL-BWP\n"); LOG_I(NR_MAC, "(%d.%d) Switching to initialDownlinkBWP\n", frame, slot);
} }
// Must use Initial Uplink BWP when there is RA with Msg3 through DCCH // 3GPP TS 38.321 Section 5.15 Bandwidth Part (BWP) operation
// Currently there are no PRACH occasions configured for any Dedicated BWP, so UE will switch to the initialUplinkBWP
sched_ctrl->active_ubwp = NULL; sched_ctrl->active_ubwp = NULL;
if (current_ubwp_id != 0) { if (current_ubwp_id != 0) {
LOG_I(NR_MAC, "Changing to Initial UL-BWP\n"); LOG_I(NR_MAC, "(%d.%d) Switching to initialUplinkBWP\n", frame, slot);
} }
UE->Msg3_dcch_dtch = false; UE->Msg3_dcch_dtch = false;
} else if (spCellConfigDedicated && } else if (spCellConfigDedicated &&
@@ -2904,11 +2906,11 @@ void nr_mac_update_timers(module_id_t module_id,
spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList) { spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList) {
sched_ctrl->active_bwp = spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[*spCellConfigDedicated->firstActiveDownlinkBWP_Id - 1]; sched_ctrl->active_bwp = spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[*spCellConfigDedicated->firstActiveDownlinkBWP_Id - 1];
if (*spCellConfigDedicated->firstActiveDownlinkBWP_Id != current_bwp_id) { if (*spCellConfigDedicated->firstActiveDownlinkBWP_Id != current_bwp_id) {
LOG_I(NR_MAC, "Changing to DL-BWP %li\n", sched_ctrl->active_bwp->bwp_Id); LOG_I(NR_MAC, "(%d.%d) Switching to DL-BWP %li\n", frame, slot, sched_ctrl->active_bwp->bwp_Id);
} }
sched_ctrl->active_ubwp = spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id - 1]; sched_ctrl->active_ubwp = spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id - 1];
if (*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id != current_ubwp_id) { if (*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id != current_ubwp_id) {
LOG_I(NR_MAC, "Changing to UL-BWP %li\n", sched_ctrl->active_ubwp->bwp_Id); LOG_I(NR_MAC, "(%d.%d) Switching to UL-BWP %li\n", frame, slot, sched_ctrl->active_ubwp->bwp_Id);
} }
} }
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+1 -1
View File
@@ -716,8 +716,8 @@ typedef struct {
int m; int m;
// UE selected beam index // UE selected beam index
uint8_t UE_beam_index; uint8_t UE_beam_index;
bool Msg4_ACKed;
bool Msg3_dcch_dtch; bool Msg3_dcch_dtch;
bool Msg4_ACKed;
/// Sched CSI-RS: scheduling decisions /// Sched CSI-RS: scheduling decisions
NR_gNB_UCI_STATS_t uci_statS; NR_gNB_UCI_STATS_t uci_statS;
float ul_thr_ue; float ul_thr_ue;