In NR_UL_indication function call gNB_dlsch_ulsch_scheduler

cmake_targets/CMakeLists.txt

@@ -1342,6 +1342,7 @@ set(MAC_DIR ${OPENAIR2_DIR}/LAYER2/MAC)
 set(NR_MAC_DIR ${OPENAIR2_DIR}/LAYER2/NR_MAC_gNB)
 set(NR_UE_MAC_DIR ${OPENAIR2_DIR}/LAYER2/NR_MAC_UE)
 set(PHY_INTERFACE_DIR ${OPENAIR2_DIR}/PHY_INTERFACE)
+set(NR_PHY_INTERFACE_DIR ${OPENAIR2_DIR}/NR_PHY_INTERFACE)
 set(NR_UE_PHY_INTERFACE_DIR ${OPENAIR2_DIR}/NR_UE_PHY_INTERFACE)
 set(RLC_DIR ${OPENAIR2_DIR}/LAYER2/RLC)
 set(RLC_UM_DIR ${OPENAIR2_DIR}/LAYER2/RLC/UM_v9.3.0)
@@ -1467,6 +1468,7 @@ set (MAC_SRC
   ${NR_PHY_INTERFACE_DIR}/NR_IF_Module.c
   ${NR_MAC_DIR}/main.c
   ${NR_MAC_DIR}/config.c
+  ${NR_MAC_DIR}/gNB_scheduler.c
   ${NR_MAC_DIR}/gNB_scheduler_bch.c
  )
 

openair2/LAYER2/NR_MAC_gNB/mac.h

@@ -122,13 +122,24 @@ typedef struct gNB_MAC_INST_s {
   nfapi_dl_config_request_pdu_t   dl_config_pdu_list[NFAPI_CC_MAX][MAX_NUM_DL_PDU];
   /// Preallocated UL pdu list
   nfapi_ul_config_request_pdu_t   ul_config_pdu_list[NFAPI_CC_MAX][MAX_NUM_UL_PDU];
+  /// Preallocated UL pdu list for ULSCH (n+k delay)
+  nfapi_ul_config_request_pdu_t   ul_config_pdu_list_tmp[NFAPI_CC_MAX][10][MAX_NUM_UL_PDU];
+  /// NFAPI "Temporary" UL Config Request Structure, holds future UL_config requests
+  nfapi_ul_config_request_t       UL_req_tmp[NFAPI_CC_MAX][10];
+  /// Preallocated HI_DCI0 pdu list
+  nfapi_hi_dci0_request_pdu_t     hi_dci0_pdu_list[NFAPI_CC_MAX][MAX_NUM_HI_DCI0_PDU];
   /// NFAPI HI/DCI0 Config Request Structure
-  nfapi_hi_dci0_request_t HI_DCI0_req[NFAPI_CC_MAX];
+  nfapi_hi_dci0_request_t         HI_DCI0_req[NFAPI_CC_MAX];
+  /// Prealocated TX pdu list
+  nfapi_tx_request_pdu_t          tx_request_pdu[NFAPI_CC_MAX][MAX_NUM_TX_REQUEST_PDU];
   /// NFAPI DL PDU structure
-  nfapi_tx_request_t TX_req[NFAPI_CC_MAX];
+  nfapi_tx_request_t              TX_req[NFAPI_CC_MAX];
 
   UE_list_t UE_list;
 
+  /// UL handle
+  uint32_t ul_handle;
+
     // MAC function execution peformance profiler
   /// processing time of eNB scheduler
   time_stats_t eNB_scheduler;

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -281,15 +281,16 @@ void NR_UL_indication(NR_UL_IND_t *UL_info)
   if (nfapi_mode != 1)
   {
     if (ifi->CC_mask == ((1<<MAX_NUM_CCs)-1)) {
-
+      /*
       eNB_dlsch_ulsch_scheduler(module_id,
           (UL_info->frame+((UL_info->subframe>(9-sf_ahead))?1:0)) % 1024,
           (UL_info->subframe+sf_ahead)%10);
-      /*
+      */
+      
       gNB_dlsch_ulsch_scheduler(module_id,
           (UL_info->frame+((UL_info->subframe>(9-sf_ahead))?1:0)) % 1024,
           (UL_info->subframe+sf_ahead)%10);
-      */
+      
       ifi->CC_mask            = 0;
 
       sched_info->module_id   = module_id;