# Conflicts:
#   executables/nr-uesoftmodem.c

MR !1272 : \[DOC\] NR feature set update  
MR !1244 : \[DOC\] Update SA tutorial  
MR !1269 : \[CI\] dashboard creds and executor change  
MR !1262 : \[CI\] jenkins pipe to write test results to mysql  
MR !1250 : NR_NSA_no_msg3_retransmission  
MR !1264 : NR_UE_IF_FREQ (IF frequency command line option at OAI UE)

I have removed more irrelevant comments and
updated a few logs.

Merge remote-tracking branch 'origin/episys/mel/merge_develop_cfra_working_9_14_21' into eurecom-episys-merge-nsa

Merge branch 'episys/mel/merge_to_cfra_working_9_14_21' into 'episys/mel/merge_develop_cfra_working_9_14_21'

Added slot_ind queue and handling slot_inds in VNF

See merge request aburger/openairinterface5g!61

This commit continues to clean up the reminader
of the changed files in the merge req 1274.
The changes include log updates, comment removals,
etc.

This commit includes about 1/3 of the code clean up
in preparation for the merge to the OAI develop
branch. Several of the changes are white space changes,
removing of logs, comment removals, and updating any
changed code for our use-case to be clear for NSA mode.

Merge branch 'episys/david/sync_between_dl_tti_req_and_tx_data_req' into 'episys/mel/merge_develop_cfra_working_9_14_21'

Episys/david/sync between dl tti req and tx data req

See merge request aburger/openairinterface5g!60

Also, the ul_slot was not properly wrapping.
It was increased to a value greater than the
largest slot value.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

But, we are not going to process the tx_request
unless we are waiting for the RAR OR if the RNTI
from the previous DCI matches.

In this commit, we create a new flag in the MAC
instance which is set to true if the recevied
DL DCI PDU's RNTI value matches the current UEs
RNTI value. If the RNTI value does not match,
then we should not process the recevied tx_request.
This check should only take place after the CFRA
procedure is complete.

Previously, we thought that filling the UCI ind
after we got the pdsch payload would stop the
 harq_pid from going inactive, but this was not
the case. The harq_pid is getting set to inactive
too early because of the sf_slot ahead value. The
fix for this will come in the next commit.

The harq_pid is set to inactive during the scheduling
of ACK/NACK, but this is happening before tx_req (PDSCH)
is recevied. We update the global harq_pid then use it
once we get the PDSCH PDU, then we set it to inactive.
Also, the global previously wasnt being set properly because
a memset was changing the def_dci_re15 struct. We now
memset after we update the harq_pid global.