Merge conflicts resolved

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -36,7 +36,7 @@
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "common/ran_context.h"
 #include "executables/softmodem-common.h"
-#include "../../..//nfapi/oai_integration/vendor_ext.h" 
+#include "nfapi/oai_integration/vendor_ext.h" 
 #define MAX_IF_MODULES 100
 //#define UL_HARQ_PRINT
 
@@ -104,7 +104,8 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
   }
 
   UL_info->uci_ind.num_ucis = 0;
-}
+} 
+  //UL indication functions 
   // if(nfapi_mode == NFAPI_MODE_PNF) {
   //   if (UL_info->crc_ind.number_crcs>0) {
   //     //LOG_D(PHY,"UL_info->crc_ind.crc_indication_body.number_of_crcs:%d CRC_IND:SFN/SF:%d\n", UL_info->crc_ind.crc_indication_body.number_of_crcs, NFAPI_SFNSF2DEC(UL_info->crc_ind.sfn_sf));
@@ -220,12 +221,11 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
           (UL_info->slot+sl_ahead)%10);
       */
       nfapi_nr_config_request_scf_t *cfg = &mac->config[CC_id];
-      
       int spf = get_spf(cfg);
-
       gNB_dlsch_ulsch_scheduler(module_id,
 				(UL_info->frame+((UL_info->slot>(spf-1-sl_ahead))?1:0)) % 1024,
 				(UL_info->slot+sl_ahead)%spf);
+
       ifi->CC_mask            = 0;
       sched_info->module_id   = module_id;
       sched_info->CC_id       = CC_id;
@@ -240,6 +240,7 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
 #ifdef DUMP_FAPI
       dump_dl(sched_info);
 #endif
+
       if (ifi->NR_Schedule_response) {
         AssertFatal(ifi->NR_Schedule_response!=NULL,
                     "nr_schedule_response is null (mod %d, cc %d)\n",
@@ -247,6 +248,7 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
                     CC_id);
         ifi->NR_Schedule_response(sched_info);
       }
+
       LOG_D(PHY,"NR_Schedule_response: SFN_SF:%d%d dl_pdus:%d\n",
 	    sched_info->frame,
 	    sched_info->slot,