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

Remove a change about MSG2 and MSG4 because this is used not only in L2 FAPI simulator but also in real eNB.

Browse Source
This commit is contained in:
Y_Tomita
2018-10-24 10:00:33 +09:00
parent f7bf5905a0
commit 58c6520218
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+3 -9
View File
@@ -501,9 +501,7 @@ generate_Msg2(module_id_t module_idP, int CC_idP, frame_t frameP,
#endif #endif
{ {
// In case of nFAPI, sometimes timing of eNB and UE become different. if ((ra->Msg2_frame == frameP) && (ra->Msg2_subframe == subframeP)) {
// So if nfapi_mode == 2(VNF) , this function don't check timing to avoid Attach failure.
if (((ra->Msg2_frame == frameP) && (ra->Msg2_subframe == subframeP)) || (nfapi_mode == 2)) {
LOG_D(MAC, LOG_D(MAC,
"[eNB %d] CC_id %d Frame %d, subframeP %d: Generating RAR DCI, state %d\n", "[eNB %d] CC_id %d Frame %d, subframeP %d: Generating RAR DCI, state %d\n",
module_idP, CC_idP, frameP, subframeP, ra->state); module_idP, CC_idP, frameP, subframeP, ra->state);
@@ -1012,9 +1010,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
{ {
// This is normal LTE case // This is normal LTE case
LOG_D(MAC, "generate_Msg4 1 ra->Msg4_frame SFN/SF: %d.%d, frameP SFN/SF: %d.%d FOR eNB_Mod: %d \n", ra->Msg4_frame, ra->Msg4_subframe, frameP, subframeP, module_idP); LOG_D(MAC, "generate_Msg4 1 ra->Msg4_frame SFN/SF: %d.%d, frameP SFN/SF: %d.%d FOR eNB_Mod: %d \n", ra->Msg4_frame, ra->Msg4_subframe, frameP, subframeP, module_idP);
// In case of nFAPI, sometimes timing of eNB and UE become different. if ((ra->Msg4_frame == frameP) && (ra->Msg4_subframe == subframeP)) {
// So if nfapi_mode == 2(VNF) , this function don't check timing to avoid Attach failure.
if (((ra->Msg4_frame == frameP) && (ra->Msg4_subframe == subframeP))||((nfapi_mode == 2)&&(cc->tdd_Config == NULL))) {
// Get RRCConnectionSetup for Piggyback // Get RRCConnectionSetup for Piggyback
/*rrc_sdu_length = mac_rrc_data_req(module_idP, CC_idP, frameP, CCCH, 1, // 1 transport block /*rrc_sdu_length = mac_rrc_data_req(module_idP, CC_idP, frameP, CCCH, 1, // 1 transport block
@@ -1425,9 +1421,7 @@ schedule_RA(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
if (ra->state == MSG2) if (ra->state == MSG2)
generate_Msg2(module_idP, CC_id, frameP, subframeP, ra); generate_Msg2(module_idP, CC_id, frameP, subframeP, ra);
// In case of nFAPI, sometimes timing of eNB and UE become different. else if (ra->state == MSG4 && ra->Msg4_frame == frameP && ra->Msg4_subframe == subframeP )
// So if nfapi_mode == 2(VNF) , this function don't check timing to avoid Attach failure.
else if ((ra->state == MSG4 && ra->Msg4_frame == frameP && ra->Msg4_subframe == subframeP ) || (nfapi_mode == 2 && ra->state == MSG4))
generate_Msg4(module_idP, CC_id, frameP, subframeP, ra); generate_Msg4(module_idP, CC_id, frameP, subframeP, ra);
else if (ra->state == WAITMSG4ACK) else if (ra->state == WAITMSG4ACK)
check_Msg4_retransmission(module_idP, CC_id, frameP, check_Msg4_retransmission(module_idP, CC_id, frameP,