some updates to resolve compiling errors after rebase

executables/nr-softmodem.h

@@ -33,7 +33,7 @@
   {"uecap_file",            CONFIG_HLP_UECAP_FILE,     0,                .strptr=&uecap_file,                 .defstrval="./uecap_ports1.xml",  TYPE_STRING, 0},        \
   {"s" ,                    CONFIG_HLP_SNR,            0,                .dblptr=&snr_dB,                     .defdblval=25,                    TYPE_DOUBLE, 0},        \
   {"P" ,                    CONFIG_HLP_PROPD,          0,                .u64ptr=&RFsim_PropDelay,            .defintval=0,                     TYPE_UINT64, 0},        \
-  {"gnb_k2" ,               CONFIG_HLP_GNBK2,          0,                .u16ptr=&NTN_gNB_k2,                 .defintval=0,vv                   TYPE_UINT16, 0},        \
+  {"gnb_k2" ,               CONFIG_HLP_GNBK2,          0,                .u16ptr=&NTN_gNB_k2,                 .defintval=0,                     TYPE_UINT16, 0},        \
   {"ul_sched_f" ,           CONFIG_HLP_ULSCHEDF,       0,                .u16ptr=&max_ul_sched_frame,         .defintval=1,                     TYPE_UINT16, 0},        \
 }
 // clang-format on

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -249,7 +249,7 @@ void ue_ta_procedures(PHY_VARS_NR_UE *ue, int slot_tx, int frame_tx)
 
     ue->timing_advance += (ue->ta_command - 31) * bw_scaling;
 
-    LOG_I(PHY, "In %s: "[UE %d] [%d.%d] Got timing advance command %u from MAC, new value is %d\n",
+    LOG_I(PHY, "In %s: [UE %d] [%d.%d] Got timing advance command %u from MAC, new value is %d\n",
            __FUNCTION__,
           ue->Mod_id,
           frame_tx,

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1410,6 +1410,7 @@ int nr_get_sf_retxBSRTimer(uint8_t sf_offset) {
 // Note: Msg3 tx in the uplink symbols of mixed slot
 int nr_ue_pusch_scheduler(NR_UE_MAC_INST_t *mac, uint8_t is_Msg3, frame_t current_frame, int current_slot, frame_t *frame_tx, int *slot_tx, long k2)
 {
+  k2 = k2+NTN_UE_k2;
   AssertFatal(k2 > DURATION_RX_TO_TX,
               "Slot offset K2 (%ld) needs to be higher than DURATION_RX_TO_TX (%d). Please set min_rxtxtime at least to %d in gNB config file or gNBs.[0].min_rxtxtime=%d via command line.\n",
               k2,
@@ -1426,8 +1427,7 @@ int nr_ue_pusch_scheduler(NR_UE_MAC_INST_t *mac, uint8_t is_Msg3, frame_t curren
   // k2 as per 3GPP TS 38.214 version 15.9.0 Release 15 ch 6.1.2.1.1
   // PUSCH time domain resource allocation is higher layer configured from uschTimeDomainAllocationList in either pusch-ConfigCommon
 
-  k2 = k2+NTN_UE_k2;
-  
+
   if (is_Msg3) {
 
     switch (mu) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -262,7 +262,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, sub_frame_
    */
   AssertFatal(MAX_NUM_CCs == 1, "only 1 CC supported\n");
   const int current_index = ul_buffer_index(frame, slot, *scc->ssbSubcarrierSpacing, gNB->UL_tti_req_ahead_size);
-  copy_ul_tti_req(&sched_info->UL_tti_req, &gNB->UL_tti_req_ahead[0][current_index]);
+  copy_ul_tti_req(&sched_info->UL_tti_req, &gNB->UL_tti_req_ahead[0][frame%MAX_NUM_UL_SCHED_FRAME][current_index]);
 
   stop_meas(&gNB->eNB_scheduler);
   NR_SCHED_UNLOCK(&gNB->sched_lock);

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -21,6 +21,9 @@
 
 #include "rrc_gNB_radio_bearers.h"
 #include "oai_asn1.h"
+#include <softmodem-common.h>
+
+#include "executables/softmodem-common.h"
 
 rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create)
 {