Merge remote-tracking branch 'origin/develop' into episys-merge

Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.

cmake_targets/CMakeLists.txt

@@ -1976,6 +1976,7 @@ set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_entity.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
+  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_security_nea2.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/asn1_utils.c
   )
 
@@ -2141,7 +2142,23 @@ set (MCE_APP_SRC
   ${OPENAIR2_DIR}/MCE_APP/mce_app.c
   ${OPENAIR2_DIR}/MCE_APP/mce_config.c
   )
+set (MISC_NFAPI_LTE
+ ${OPENAIR1_DIR}/SCHED/nfapi_lte_dummy.c
+ )
+
+
+add_library(MISC_NFAPI_LTE_LIB
+  ${MISC_NFAPI_LTE}
+ )
 
+set (MISC_NFAPI_NR
+ ${OPENAIR1_DIR}/SCHED/nfapi_nr_dummy.c
+ )
+
+
+add_library(MISC_NFAPI_NR_LIB
+  ${MISC_NFAPI_NR}
+ )
 add_library(L2
   ${L2_SRC}
   ${MAC_SRC}
@@ -2894,7 +2911,7 @@ add_dependencies(lte-softmodem rrc_flag s1ap_flag x2_flag oai_iqplayer)
 target_link_libraries (lte-softmodem
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB 
-  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7
+  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB LFDS7
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
   -Wl,--end-group z dl)
   
@@ -2935,7 +2952,7 @@ add_dependencies(ocp-enb rrc_flag s1ap_flag x2_flag oai_iqplayer coding params_l
 target_link_libraries (ocp-enb
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB X2AP_LIB X2AP_ENB M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_LIB SCHED_RU_LIB 
-  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7 SIMU_COMMON
+  PHY_COMMON PHY PHY_RU LFDS L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB LFDS7 SIMU_COMMON
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} ${FSPT_MSG_LIB} ${PROTO_AGENT_LIB}
   -Wl,--end-group z dl)
 target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES} ${LIB_LMS_LIBRARIES} ${T_LIB})
@@ -3005,7 +3022,7 @@ target_link_libraries (lte-uesoftmodem
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB F1AP F1AP_LIB
   GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
-  PHY_UE PHY_RU LFDS L2_UE L2_LTE LFDS7 SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
+  PHY_UE PHY_RU LFDS L2_UE L2_LTE LFDS7 SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${ATLAS_LIBRARIES}
   -Wl,--end-group z dl)
 
@@ -3132,6 +3149,8 @@ target_link_libraries (nr-uesoftmodem
   -Wl,--start-group
   RRC_LIB NR_RRC_LIB NGAP_LIB NGAP_GNB SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB
   PHY_COMMON PHY_NR_COMMON PHY_UE PHY_NR_UE PHY_RU LFDS NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB
+  NFAPI_USER_LIB MISC_NFAPI_NR_LIB S1AP_LIB S1AP_ENB
+  ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES} 
   NFAPI_USER_LIB S1AP_LIB S1AP_ENB
   ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} LFDS7 ${ATLAS_LIBRARIES} LIB_5GNAS_GNB
   -Wl,--end-group z dl)

cmake_targets/autotests/test_case_list.xml

@@ -1292,7 +1292,9 @@
                                  (Test8: DMRS Type B, 3 DMRS, 2 PTRS, 3 Interpolated Symbols),
                                  (Test9: SC-FDMA, 50 PRBs),
                                  (Test10: SC-FDMA, 75 PRBs),
-                                 (Test11: SC-FDMA, 3 DMRS)</desc>
+                                 (Test11: SC-FDMA, 216 PRBs),
+                                 (Test12: SC-FDMA, 273 PRBs),
+                                 (Test13: SC-FDMA, 3 DMRS)</desc>
       <pre_compile_prog></pre_compile_prog>
       <compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
       <compile_prog_args> --phy_simulators  -c </compile_prog_args>
@@ -1307,10 +1309,13 @@
                       -n100 -s5 -T 2 1 2 -U 2 0 2
                       -n100 -s5 -T 2 2 2 -U 2 1 2
                       -n100 -s5 -a4 -b8 -T 2 1 2 -U 2 1 3
-                      -n100 -s20 -Z
-                      -n100 -s20 -Z -r75
-                      -n100 -s20 -Z -U 2 0 2</main_exec_args>
-      <tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11</tags>
+                      -n100 -s2 -Z
+                      -n100 -s2 -Z -r75
+                      -n100 -s2 -Z -r216 -R217
+                      -n100 -s2 -Z -r270 -R273
+                      -n100 -s2 -Z -U 2 0 2</main_exec_args>
+
+      <tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13</tags>
       <search_expr_true>PUSCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
       <nruns>3</nruns>

common/config/config_load_configmodule.c

@@ -43,7 +43,7 @@
 #include "config_userapi.h"
 #include "../utils/LOG/log.h"
 #define CONFIG_SHAREDLIBFORMAT "libparams_%s.so"
-
+#include "nfapi/oai_integration/vendor_ext.h"
 
 int load_config_sharedlib(configmodule_interface_t *cfgptr) {
   void *lib_handle;
@@ -331,9 +331,10 @@ void end_configmodule(void) {
     printf ("[CONFIG] free %u config value pointers\n",cfgptr->numptrs);
 
     for(int i=0; i<cfgptr->numptrs ; i++) {
-      if (cfgptr->ptrs[i] != NULL) {
+      if (cfgptr->ptrs[i] != NULL && cfgptr->ptrsAllocated[i] == true) {
         free(cfgptr->ptrs[i]);
         cfgptr->ptrs[i]=NULL;
+	cfgptr->ptrsAllocated[i] = false;
       }
     }
 

common/config/config_load_configmodule.h

@@ -36,6 +36,8 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include "common/config/config_paramdesc.h"
 #include "common/utils/T/T.h"
 #define CONFIG_MAX_OOPT_PARAMS    10     // maximum number of parameters in the -O option (-O <cfgmode>:P1:P2...
@@ -74,6 +76,7 @@ typedef struct configmodule_interface {
   uint32_t numptrs;
   uint32_t rtflags;
   char     *ptrs[CONFIG_MAX_ALLOCATEDPTRS];
+  bool ptrsAllocated[CONFIG_MAX_ALLOCATEDPTRS];
 } configmodule_interface_t;
 
 #ifdef CONFIG_LOADCONFIG_MAIN

common/config/config_userapi.c

@@ -62,6 +62,7 @@ char *config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) {
 
       if ( (cfgoptions->paramflags & PARAMFLAG_NOFREE) == 0) {
         config_get_if()->ptrs[config_get_if()->numptrs] = (char *)ptr;
+	config_get_if()->ptrsAllocated[config_get_if()->numptrs] = true;
         config_get_if()->numptrs++;
       }
     } else {
@@ -82,7 +83,9 @@ char *config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) {
   }
 
   if (*ptr == NULL) {
-    *ptr = malloc(length>40?length:40); // LTS: dummy fix, waiting Francois full fix in 4G branch
+    *ptr = malloc(length>40?length:40);
+    // LTS: dummy fix, waiting Francois full fix in 4G branch
+    // the issue is we don't know at this point the size we will get
 
     if ( *ptr != NULL) {
       memset(*ptr,0,length);

common/config/libconfig/config_libconfig.c

@@ -346,6 +346,7 @@ int config_libconfig_init(char *cfgP[], int numP) {
   libconfig_privdata.configfile = strdup((char *)cfgP[0]);
   config_get_if()->numptrs=0;
   memset(config_get_if()->ptrs,0,sizeof(void *) * CONFIG_MAX_ALLOCATEDPTRS);
+  memset(config_get_if()->ptrsAllocated, 0, sizeof(config_get_if()->ptrsAllocated));
 
   /* Read the file. If there is an error, report it and exit. */
   if(! config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile)) {

common/utils/LOG/log.c

@@ -90,16 +90,19 @@ int write_file_matlab(const char *fname,
 					  void *data,
 					  int length,
 					  int dec,
-					  char format)
+					  unsigned int format)
 {
   FILE *fp=NULL;
   int i;
 
+  AssertFatal((format&~MATLAB_RAW) <16,"");
+
   if (data == NULL)
     return -1;
 
   //printf("Writing %d elements of type %d to %s\n",length,format,fname);
 
+
   if (format == 10 || format ==11 || format == 12 || format == 13 || format == 14) {
     fp = fopen(fname,"a+");
   } else if (format != 10 && format !=11  && format != 12 && format != 13 && format != 14) {
@@ -111,6 +114,32 @@ int write_file_matlab(const char *fname,
     return(-1);
   }
 
+  if ( (format&MATLAB_RAW) == MATLAB_RAW ) {
+    int sz[16]={sizeof(short), 2*sizeof(short),
+		sizeof(int), 2*sizeof(int),
+		sizeof(char), 2*sizeof(char),
+		sizeof(long long), 
+		sizeof(double), 2*sizeof(double),
+		sizeof(unsigned char),
+		sizeof(short),
+		sizeof(short),
+		sizeof(short),
+		sizeof(short),
+		sizeof(short),
+		sizeof(short)
+    };
+    int eltSz= sz[format&~MATLAB_RAW];
+    if (dec==1) 
+      fwrite(data, eltSz, length, fp);
+    else 
+      for (i=0; i<length; i+=dec)
+	fwrite(data+i*eltSz, eltSz, 1, fp);
+    
+    fclose(fp);
+    return(0);	
+  }
+
+
   if (format != 10 && format !=11  && format != 12 && format != 13 && format != 14)
     fprintf(fp,"%s = [",vname);
 
@@ -216,6 +245,8 @@ int write_file_matlab(const char *fname,
     case 12 : // case eren for log2_maxh real unsigned 8 bit
       fprintf(fp,"%d \n",((unsigned char *)&data)[0]);
       break;
+  default:
+    AssertFatal(false, "unknown dump format: %d\n", format);
   }
 
   if (format != 10 && format !=11 && format !=12 && format != 13 && format != 15) {

common/utils/LOG/log.h

@@ -345,7 +345,25 @@ typedef struct {
 @param dec    decimation level
 @param format data format (0 = real 16-bit, 1 = complex 16-bit,2 real 32-bit, 3 complex 32-bit,4 = real 8-bit, 5 = complex 8-bit)
 */
-int32_t write_file_matlab(const char *fname, const char *vname, void *data, int length, int dec, char format);
+#define MATLAB_RAW (1<<31)
+#define MATLAB_SHORT 0
+#define MATLAB_CSHORT 1
+#define MATLAB_INT 2
+#define MATLAB_CINT 3
+#define MATLAB_INT8 4
+#define MATLAB_CINT8 5
+#define MATLAB_LLONG 6
+#define MATLAB_DOUBLE 7
+#define MATLAB_CDOUBLE 8
+#define MATLAB_UINT8 9
+#define MATLEB_EREN1 10
+#define MATLEB_EREN2 11
+#define MATLEB_EREN3 12
+#define MATLAB_CSHORT_BRACKET1 13
+#define MATLAB_CSHORT_BRACKET2 14
+#define MATLAB_CSHORT_BRACKET3 15
+  
+int32_t write_file_matlab(const char *fname, const char *vname, void *data, int length, int dec, unsigned int format);
 
 /*----------------macro definitions for reading log configuration from the config module */
 #define CONFIG_STRING_LOG_PREFIX                           "log_config"

executables/main-ocp.c

@@ -74,6 +74,7 @@ int config_sync_var=-1;
 volatile int oai_exit = 0;
 double cpuf;
 uint16_t sf_ahead=4;
+//uint16_t slot_ahead=6;
 int otg_enabled;
 uint64_t  downlink_frequency[MAX_NUM_CCs][4];
 int32_t   uplink_frequency_offset[MAX_NUM_CCs][4];

executables/nr-gnb.c

@@ -84,7 +84,7 @@
 
 
 #include "T.h"
-
+#include "nfapi/oai_integration/vendor_ext.h"
 //#define DEBUG_THREADS 1
 
 //#define USRP_DEBUG 1
@@ -137,6 +137,7 @@ void wakeup_prach_gNB(PHY_VARS_gNB *gNB, RU_t *ru, int frame, int subframe);
 
 extern uint8_t nfapi_mode;
 extern void oai_subframe_ind(uint16_t sfn, uint16_t sf);
+extern void oai_slot_ind(uint16_t sfn, uint16_t slot);
 extern void add_subframe(uint16_t *frameP, uint16_t *subframeP, int offset);
 
 //#define TICK_TO_US(ts) (ts.diff)
@@ -151,13 +152,14 @@ static inline int rxtx(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int frame_t
 
   // *******************************************************************
   // NFAPI not yet supported for NR - this code has to be revised
-  if (nfapi_mode == 1) {
+  if (NFAPI_MODE == NFAPI_MODE_PNF) {
     // I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
     //add_subframe(&frame, &subframe, 4);
     //oai_subframe_ind(proc->frame_tx, proc->subframe_tx);
     //LOG_D(PHY, "oai_subframe_ind(frame:%u, subframe:%d) - NOT CALLED ********\n", frame, subframe);
     start_meas(&nfapi_meas);
-    oai_subframe_ind(frame_rx, slot_rx);
+    // oai_subframe_ind(frame_rx, slot_rx);
+    oai_slot_ind(frame_rx, slot_rx);
     stop_meas(&nfapi_meas);
 
     /*if (gNB->UL_INFO.rx_ind.rx_indication_body.number_of_pdus||

executables/nr-ru.c

@@ -114,6 +114,7 @@ int attach_rru(RU_t *ru);
 int connect_rau(RU_t *ru);
 
 uint16_t sf_ahead;
+uint16_t slot_ahead;
 uint16_t sl_ahead;
 
 extern int emulate_rf;

executables/nr-softmodem.c

@@ -85,12 +85,13 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "x2ap_eNB.h"
 #include "ngap_gNB.h"
 #include "gnb_paramdef.h"
+#include "nfapi/oai_integration/vendor_ext.h"
 
 pthread_cond_t nfapi_sync_cond;
 pthread_mutex_t nfapi_sync_mutex;
 int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
 
-uint8_t nfapi_mode = 0; // Default to monolithic mode
+extern uint8_t nfapi_mode; // Default to monolithic mode
 
 pthread_cond_t sync_cond;
 pthread_mutex_t sync_mutex;
@@ -811,7 +812,7 @@ if(!IS_SOFTMODEM_NOS1)
     AssertFatal(create_gNB_tasks(1) == 0,"cannot create ITTI tasks\n");
   } else {
     printf("No ITTI, Initializing L1\n");
-    RCconfig_L1();
+    RCconfig_NR_L1();
   }
 
   /* Start the agent. If it is turned off in the configuration, it won't start */
@@ -832,7 +833,7 @@ if(!IS_SOFTMODEM_NOS1)
 
   usleep(1000);
 
-  if (nfapi_mode) {
+  if (NFAPI_MODE) {
     printf("NFAPI*** - mutex and cond created - will block shortly for completion of PNF connection\n");
     pthread_cond_init(&sync_cond,NULL);
     pthread_mutex_init(&sync_mutex, NULL);
@@ -840,7 +841,7 @@ if(!IS_SOFTMODEM_NOS1)
 
   const char *nfapi_mode_str = "<UNKNOWN>";
 
-  switch(nfapi_mode) {
+  switch(NFAPI_MODE) {
     case 0:
       nfapi_mode_str = "MONOLITHIC";
       break;
@@ -860,7 +861,7 @@ if(!IS_SOFTMODEM_NOS1)
 
   printf("NFAPI MODE:%s\n", nfapi_mode_str);
 
-  if (nfapi_mode==2) // VNF
+  if (NFAPI_MODE==NFAPI_MODE_VNF)
     wait_nfapi_init("main?");
 
   printf("START MAIN THREADS\n");
@@ -889,7 +890,7 @@ if(!IS_SOFTMODEM_NOS1)
 
   config_sync_var=0;
 
-  if (nfapi_mode==1) { // PNF
+  if (NFAPI_MODE==NFAPI_MODE_PNF) {
     wait_nfapi_init("main?");
   }
 
@@ -909,7 +910,7 @@ if(!IS_SOFTMODEM_NOS1)
     load_softscope("nr",&p);
   }
 
-  if (nfapi_mode != 1 && nfapi_mode != 2) {
+  if (NFAPI_MODE != NFAPI_MODE_PNF && NFAPI_MODE != NFAPI_MODE_VNF) {
     printf("Not NFAPI mode - call init_eNB_afterRU()\n");
     init_eNB_afterRU();
   } else {

executables/nr-uesoftmodem.c

@@ -557,11 +557,14 @@ int main( int argc, char **argv ) {
 
   
   init_NR_UE_threads(1);
-  config_check_unknown_cmdlineopt(CONFIG_CHECKALLSECTIONS);
   printf("UE threads created by %ld\n", gettid());
   
   // wait for end of program
   printf("TYPE <CTRL-C> TO TERMINATE\n");
+  // Sleep a while before checking all parameters have been used
+  // Some are used directly in external threads, asynchronously
+  sleep(20);
+  config_check_unknown_cmdlineopt(CONFIG_CHECKALLSECTIONS);
 
   while(true)
     sleep(3600);

executables/softmodem-common.c

@@ -39,11 +39,14 @@
 #include "executables/thread-common.h"
 #include "common/utils/LOG/log.h"
 #include "softmodem-common.h"
+#include "nfapi/oai_integration/vendor_ext.h"
+
 
 static softmodem_params_t softmodem_params;
 char *parallel_config=NULL;
 char *worker_config=NULL;
 
+uint8_t nfapi_mode=0;
 
 static mapping softmodem_funcs[] = MAPPING_SOFTMODEM_FUNCTIONS;
 static struct timespec start;
@@ -143,6 +146,7 @@ void get_common_options(uint32_t execmask) {
   if(parallel_config != NULL) set_parallel_conf(parallel_config);
 
   if(worker_config != NULL)   set_worker_conf(worker_config);
+  nfapi_setmode(nfapi_mode);
 }
 void softmodem_printresources(int sig, telnet_printfunc_t pf) {
   struct rusage usage;

executables/softmodem-common.h

@@ -91,6 +91,7 @@ extern "C"
 #define CONFIG_HLP_RFSIM         "Run in rf simulator mode (also known as basic simulator)\n"
 #define CONFIG_HLP_NOKRNMOD      "(noS1 only): Use tun instead of namesh module \n"
 #define CONFIG_HLP_DISABLNBIOT   "disable nb-iot, even if defined in config\n"
+#define CONFIG_HLP_NFAPI         "Change the nFAPI mode for NR\n"
 
 /*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters common to eNodeB and UE                                                          */
@@ -112,6 +113,7 @@ extern "C"
 #define SEND_DMRSSYNC       softmodem_params.send_dmrs_sync
 #define USIM_TEST           softmodem_params.usim_test
 #define USE_256QAM_TABLE    softmodem_params.use_256qam_table
+#define NFAPI               softmodem_params.nfapi
 
 #define DEFAULT_RFCONFIG_FILE    "/usr/local/etc/syriq/ue.band7.tm1.PRB100.NR40.dat";
 
@@ -142,6 +144,7 @@ extern "C"
     {"nokrnmod",             CONFIG_HLP_NOKRNMOD,     PARAMFLAG_BOOL, uptr:&nokrnmod,                     defintval:0,           TYPE_INT,    0},                     \
     {"nbiot-disable",        CONFIG_HLP_DISABLNBIOT,  PARAMFLAG_BOOL, uptr:&nonbiot,                      defuintval:0,          TYPE_INT,    0},                     \
     {"use-256qam-table",     CONFIG_HLP_256QAM,       PARAMFLAG_BOOL, iptr:&USE_256QAM_TABLE,             defintval:0,           TYPE_INT,    0},                     \
+    {"nfapi",                CONFIG_HLP_NFAPI,        0,              u8ptr:&nfapi_mode,                       defintval:0,           TYPE_UINT8,  0},                     \
   }
 
   
@@ -229,6 +232,7 @@ typedef struct {
   int            hw_timing_advance;
   uint32_t       send_dmrs_sync;
   int            use_256qam_table;
+  uint8_t        nfapi;
 } softmodem_params_t;
 
 extern uint64_t get_softmodem_optmask(void);
@@ -240,6 +244,7 @@ extern char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr);
 extern void set_softmodem_sighandler(void);
 extern uint64_t downlink_frequency[MAX_NUM_CCs][4];
 extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
+extern uint8_t nfapi_mode;
 #ifdef __cplusplus
 }
 #endif

nfapi/CHANGES.md

+# Changelog
+

nfapi/nrNFAPI.md

+# Procedure to run nFAPI in 5G NR
+
+## Conributed by 5G Testbed IISC 
+### Developers: Sudhakar B,Mahesh K,Gokul S,Aniq U.R
+
+## Procedure to Build gNB and UE
+
+The regular commands to build gNB and UE can be used
+```
+sudo ./build_oai --gNB --UE
+
+```
+## Procedure to run NR nFAPI using RF-Simulator
+
+### VNF command
+```
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf --nfapi 2 --noS1 --phy-test
+
+```
+### PNF command
+```
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf --nfapi 1 --rfsim --phy-test --rfsimulator.serveraddr server
+
+```
+### UE command
+```
+sudo RFSIMULATOR=127.0.0.1 ./nr-uesoftmodem --rfsim --phy-test --rrc_config_path . -d
+
+```
+## Procedure to run NR nFAPI using Hardware
+Will be updated as we have not yet currently tested on hardware
+
+## Notes
+* In order to acheive the synchronization between VNF and PNF and receive the P7 messages within the timing window the order in which we should run the modules on different terminals is UE->VNF->PNF
+* Currently only downlink is functional and working as we are still working on uplink functionality

nfapi/oai_integration/nfapi_pnf.h

@@ -23,5 +23,8 @@
 #define NFAPI_PNF_H__
 int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind);
 void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
+void configure_nr_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
+
 void oai_subframe_ind(uint16_t sfn, uint16_t sf);
+void oai_slot_ind(uint16_t sfn, uint16_t slot);
 #endif

nfapi/oai_integration/nfapi_vnf.h

@@ -23,5 +23,5 @@
 #define NFAPI_VNF_H__
 
 void configure_nfapi_vnf(char *vnf_addr, int vnf_p5_port);
-
+void configure_nr_nfapi_vnf(char *vnf_addr, int vnf_p5_port);
 #endif

nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h

@@ -120,6 +120,17 @@ typedef struct {
 } nfapi_tl_t;
 #define NFAPI_TAG_LENGTH_PACKED_LEN 4
 
+// Convenience methods to convert between SFN/SLOT formats
+#define NFAPI_SFNSLOT2DEC(_sfn,_slot) ( _sfn*20 + _slot  )  // total count of slots
+#define NFAPI_SFNSLOTDEC2SFNSLOT(_sfnslot_dec) ((((_sfnslot_dec) / 20) << 4) | (((_sfnslot_dec) - (((_sfnslot_dec) / 20) * 10)) & 0x3F))
+
+#define NFAPI_SFNSLOT2SFN(_sfnslot) ((_sfnslot) >> 6)
+#define NFAPI_SFNSLOT2SLOT(_sfnslot) ((_sfnslot) & 0x3F)
+#define NFAPI_SFNSLOTDEC2SFN(_sfnslot_dec) ((_sfnslot_dec) / 20)
+#define NFAPI_SFNSLOTDEC2SLOT(_sfnslot_dec) ((_sfnslot_dec) % 20)
+
+#define NFAPI_MAX_SFNSLOTDEC 1024*20 // 20 is for numerology 1
+
 // Convenience methods to convert between SFN/SFN formats
 #define NFAPI_SFNSF2DEC(_sfnsf) ((((_sfnsf) >> 4) * 10) + ((_sfnsf) & 0xF))
 #define NFAPI_SFNSFDEC2SFNSF(_sfnsf_dec) ((((_sfnsf_dec) / 10) << 4) | (((_sfnsf_dec) - (((_sfnsf_dec) / 10) * 10)) & 0xF))
@@ -176,7 +187,6 @@ typedef enum {
 	NFAPI_DL_NODE_SYNC,
 	NFAPI_TIMING_INFO,
 
-
 	NFAPI_RSSI_REQUEST = 0x0200,
 	NFAPI_RSSI_RESPONSE,
 	NFAPI_RSSI_INDICATION,
@@ -587,6 +597,26 @@ typedef struct {
 #define NFAPI_PNF_PHY_RF_TAG 0x1003
 
 // Generic strucutre for single tlv value.
+typedef struct {
+	nfapi_tl_t tl;
+	int32_t value;
+} nfapi_int32_tlv_t;
+
+typedef struct {
+	nfapi_tl_t tl;
+	uint32_t value;
+} nfapi_uint32_tlv_t;
+
+typedef struct {
+	nfapi_tl_t tl;
+	int64_t value;
+} nfapi_int64_tlv_t;
+
+typedef struct {
+	nfapi_tl_t tl;
+	uint64_t value;
+} nfapi_uint64_tlv_t;
+
 typedef struct {
 	nfapi_tl_t tl;
 	uint16_t value;
@@ -1106,6 +1136,7 @@ typedef struct {
 
 typedef struct {
 	nfapi_p4_p5_message_header_t header;
+	uint8_t num_tlvs;
 	nfapi_pnf_phy_rf_config_t pnf_phy_rf_config;
 	nfapi_vendor_extension_tlv_t vendor_extension;
 } nfapi_pnf_config_request_t;
@@ -2466,7 +2497,7 @@ typedef struct {
 typedef struct {
 	nfapi_p7_message_header_t header;
 	uint32_t t1;
-	int32_t delta_sfn_sf;
+	int32_t delta_sfn_sf;	
 	nfapi_vendor_extension_tlv_t vendor_extension;
 } nfapi_dl_node_sync_t;
 
@@ -2481,22 +2512,50 @@ typedef struct {
 typedef struct {
 	nfapi_p7_message_header_t header;
 	uint32_t last_sfn_sf;
+
 	uint32_t time_since_last_timing_info;
 	uint32_t dl_config_jitter;
 	uint32_t tx_request_jitter;
 	uint32_t ul_config_jitter;
 	uint32_t hi_dci0_jitter;
+
 	int32_t dl_config_latest_delay;
 	int32_t tx_request_latest_delay;
 	int32_t ul_config_latest_delay;
 	int32_t hi_dci0_latest_delay;
+
 	int32_t dl_config_earliest_arrival;
 	int32_t tx_request_earliest_arrival;
 	int32_t ul_config_earliest_arrival;
 	int32_t hi_dci0_earliest_arrival;
+	
 	nfapi_vendor_extension_tlv_t vendor_extension;
 } nfapi_timing_info_t;
 
+typedef struct {
+	nfapi_p7_message_header_t header;
+	
+	uint32_t last_sfn;
+	uint32_t last_slot;
+	uint32_t time_since_last_timing_info;
+	
+	uint32_t dl_tti_jitter;
+	uint32_t tx_data_request_jitter;
+	uint32_t ul_tti_jitter;
+	uint32_t ul_dci_jitter;
+
+	int32_t dl_tti_latest_delay;
+	int32_t tx_data_request_latest_delay;
+	int32_t ul_tti_latest_delay;
+	int32_t ul_dci_latest_delay;
+	
+	int32_t dl_tti_earliest_arrival;
+	int32_t tx_data_request_earliest_arrival;
+	int32_t ul_tti_earliest_arrival;
+	int32_t ul_dci_earliest_arrival;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_timing_info_t;
+
 typedef struct {
 	nfapi_tl_t tl;
 	uint32_t handle;
@@ -3653,6 +3712,50 @@ typedef struct {
 	nfapi_vendor_extension_tlv_t vendor_extension;
 } nfapi_nmm_stop_response_t;
 
+typedef struct
+{
+  // TODO: see if this needs to be uncommented
+
+  // These TLVs are used to setup the transport connection between VNF and PNF
+  nfapi_ipv4_address_t p7_vnf_address_ipv4;
+  nfapi_ipv6_address_t p7_vnf_address_ipv6;
+  nfapi_uint16_tlv_t p7_vnf_port;
+
+  nfapi_ipv4_address_t p7_pnf_address_ipv4;
+  nfapi_ipv6_address_t p7_pnf_address_ipv6;
+  nfapi_uint16_tlv_t p7_pnf_port;
+
+  nfapi_uint8_tlv_t timing_window; //Value: 0 → 30,000 microseconds 
+  nfapi_uint8_tlv_t timing_info_mode;
+  nfapi_uint8_tlv_t timing_info_period;
+
+  nfapi_uint32_tlv_t dl_tti_timing_offset;
+  nfapi_uint32_tlv_t ul_tti_timing_offset;
+  nfapi_uint32_tlv_t ul_dci_timing_offset;
+  nfapi_uint32_tlv_t tx_data_timing_offset;
+  
+   // These TLVs are used to setup the transport connection between VNF and PNF
+  /*
+  nfapi_uint8_tlv_t dl_ue_per_sf;
+  nfapi_uint8_tlv_t ul_ue_per_sf;
+
+  // These TLVs are used by PNF to report its RF capabilities to the VNF software
+  nfapi_rf_bands_t rf_bands;
+*/
+  // These TLVs are used by the VNF to configure the synchronization with the PNF.
+ 
+
+  // These TLVs are used by the VNF to configure the RF in the PNF
+  //nfapi_uint16_tlv_t max_transmit_power;
+  //nfapi_uint32_tlv_t nrarfcn;
+
+  // nfapi_nmm_frequency_bands_t nmm_gsm_frequency_bands;
+  // nfapi_nmm_frequency_bands_t nmm_umts_frequency_bands;
+  // nfapi_nmm_frequency_bands_t nmm_lte_frequency_bands;
+  // nfapi_uint8_tlv_t nmm_uplink_rssi_supported;
+
+} nfapi_nr_nfapi_t;
+
 //
 // Configuration options for the encode decode functions
 //
@@ -3864,6 +3967,7 @@ int nfapi_p4_message_unpack(void *pMessageBuf, uint32_t messageBufLen, void *pUn
  * 
  */
 int nfapi_p5_message_pack(void *pMessageBuf, uint32_t messageBufLen, void *pPackedBuf, uint32_t packedBufLen, nfapi_p4_p5_codec_config_t* config);
+int nfapi_nr_p5_message_pack(void *pMessageBuf, uint32_t messageBufLen, void *pPackedBuf, uint32_t packedBufLen, nfapi_p4_p5_codec_config_t* config);
 
 /*! \brief Decodes an NFAPI P5 message header
  *  \param pMessageBuf A pointer to an encoded P5 message header
@@ -3887,6 +3991,7 @@ int nfapi_p5_message_header_unpack(void *pMessageBuf, uint32_t messageBufLen, vo
  *
  * The function will decode a byte stream pointed to by pMessageBuf into a nfapi p5 message structure pointer to by pUnpackedBuf 
  */
+int nfapi_nr_p5_message_unpack(void *pMessageBuf, uint32_t messageBufLen, void *pUnpackedBuf, uint32_t unpackedBufLen, nfapi_p4_p5_codec_config_t* config);
 int nfapi_p5_message_unpack(void *pMessageBuf, uint32_t messageBufLen, void *pUnpackedBuf, uint32_t unpackedBufLen, nfapi_p4_p5_codec_config_t* config);
 
 /*! \brief Encodes an NFAPI P7 message to a buffer
@@ -3900,6 +4005,7 @@ int nfapi_p5_message_unpack(void *pMessageBuf, uint32_t messageBufLen, void *pUn
  * 
  */
 int nfapi_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packedBufLen, nfapi_p7_codec_config_t* config);
+int nfapi_nr_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packedBufLen, nfapi_p7_codec_config_t* config);
 
 /*! \brief Decodes an NFAPI P7 message header
  *  \param pMessageBuf A pointer to an encoded P7 message header
@@ -3925,6 +4031,7 @@ int nfapi_p7_message_header_unpack(void *pMessageBuf, uint32_t messageBufLen, vo
  * The function will decode a byte stream pointed to by pMessageBuf into a nfapi p7 message structure pointer to by pUnpackedBuf 
  */
 int nfapi_p7_message_unpack(void *pMessageBuf, uint32_t messageBufLen, void *pUnpackedBuf, uint32_t unpackedBufLen, nfapi_p7_codec_config_t* config);
+int nfapi_nr_p7_message_unpack(void *pMessageBuf, uint32_t messageBufLen, void *pUnpackedBuf, uint32_t unpackedBufLen, nfapi_p7_codec_config_t* config);
 
 /*! \brief Calculates the checksum of a  message
  *

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h

@@ -10,7 +10,7 @@
 #define _NFAPI_NR_INTERFACE_H_
 
 #include "nfapi_interface.h"
-#include <nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h>
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h"
 
 #define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
 #define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
@@ -22,62 +22,32 @@
 // nFAPI enums
 
 
-
 //These TLVs are used exclusively by nFAPI
-typedef struct
-{
-  // These TLVs are used to setup the transport connection between VNF and PNF
-  // nfapi_ipv4_address_t p7_vnf_address_ipv4;
-  // nfapi_ipv6_address_t p7_vnf_address_ipv6;
-  // nfapi_uint16_tlv_t p7_vnf_port;
-
-  // nfapi_ipv4_address_t p7_pnf_address_ipv4;
-  // nfapi_ipv6_address_t p7_pnf_address_ipv6;
-  // nfapi_uint16_tlv_t p7_pnf_port;
-  
-  // // These TLVs are used to setup the transport connection between VNF and PNF
-  // nfapi_uint8_tlv_t dl_ue_per_sf;
-  // nfapi_uint8_tlv_t ul_ue_per_sf;
-
-  // These TLVs are used by PNF to report its RF capabilities to the VNF software
-  nfapi_rf_bands_t rf_bands;
-
-  // These TLVs are used by the VNF to configure the synchronization with the PNF.
-  // nfapi_uint8_tlv_t timing_window;
-  // nfapi_uint8_tlv_t timing_info_mode;
-  // nfapi_uint8_tlv_t timing_info_period;
-
-  // These TLVs are used by the VNF to configure the RF in the PNF
-  // nfapi_uint16_tlv_t max_transmit_power;
-  nfapi_uint32_tlv_t nrarfcn;
-
-  // nfapi_nmm_frequency_bands_t nmm_gsm_frequency_bands;
-  // nfapi_nmm_frequency_bands_t nmm_umts_frequency_bands;
-  // nfapi_nmm_frequency_bands_t nmm_lte_frequency_bands;
-  // nfapi_uint8_tlv_t nmm_uplink_rssi_supported;
-
-} nfapi_nr_nfapi_t;
-
-#define NFAPI_NR_NFAPI_P7_VNF_ADDRESS_IPV4_TAG 0x5100
-#define NFAPI_NR_NFAPI_P7_VNF_ADDRESS_IPV6_TAG 0x5101
-#define NFAPI_NR_NFAPI_P7_VNF_PORT_TAG 0x5102
-#define NFAPI_NR_NFAPI_P7_PNF_ADDRESS_IPV4_TAG 0x5103
-#define NFAPI_NR_NFAPI_P7_PNF_ADDRESS_IPV6_TAG 0x5104
-#define NFAPI_NR_NFAPI_P7_PNF_PORT_TAG 0x5105
+#define NFAPI_NR_NFAPI_P7_VNF_ADDRESS_IPV4_TAG 0x0100
+#define NFAPI_NR_NFAPI_P7_VNF_ADDRESS_IPV6_TAG 0x0101
+#define NFAPI_NR_NFAPI_P7_VNF_PORT_TAG 0x0102
+#define NFAPI_NR_NFAPI_P7_PNF_ADDRESS_IPV4_TAG 0x0103
+#define NFAPI_NR_NFAPI_P7_PNF_ADDRESS_IPV6_TAG 0x0104
+#define NFAPI_NR_NFAPI_P7_PNF_PORT_TAG 0x0105
+#define NFAPI_NR_NFAPI_DL_TTI_TIMING_OFFSET 0x0106
+#define NFAPI_NR_NFAPI_UL_TTI_TIMING_OFFSET 0x0107
+#define NFAPI_NR_NFAPI_UL_DCI_TIMING_OFFSET 0x0108
+#define NFAPI_NR_NFAPI_TX_DATA_TIMING_OFFSET 0x0109
+#define NFAPI_NR_NFAPI_TIMING_WINDOW_TAG 0x011E
+#define NFAPI_NR_NFAPI_TIMING_INFO_MODE_TAG 0x011F
+#define NFAPI_NR_NFAPI_TIMING_INFO_PERIOD_TAG 0x0120
 
+/*
 #define NFAPI_NR_NFAPI_DOWNLINK_UES_PER_SUBFRAME_TAG 0x510A
 #define NFAPI_NR_NFAPI_UPLINK_UES_PER_SUBFRAME_TAG 0x510B
 #define NFAPI_NR_NFAPI_RF_BANDS_TAG 0x5114
-#define NFAPI_NR_NFAPI_TIMING_WINDOW_TAG 0x511E
-#define NFAPI_NR_NFAPI_TIMING_INFO_MODE_TAG 0x511F
-#define NFAPI_NR_NFAPI_TIMING_INFO_PERIOD_TAG 0x5120
 #define NFAPI_NR_NFAPI_MAXIMUM_TRANSMIT_POWER_TAG 0x5128
 #define NFAPI_NR_NFAPI_NRARFCN_TAG 0x5129
 #define NFAPI_NR_NFAPI_NMM_GSM_FREQUENCY_BANDS_TAG 0x5130
 #define NFAPI_NR_NFAPI_NMM_UMTS_FREQUENCY_BANDS_TAG 0x5131
 #define NFAPI_NR_NFAPI_NMM_LTE_FREQUENCY_BANDS_TAG 0x5132
 #define NFAPI_NR_NFAPI_NMM_UPLINK_RSSI_SUPPORTED_TAG 0x5133
-
+*/
 // P5 Message Structures
 
 typedef struct {
@@ -323,7 +293,7 @@ typedef enum {
 
 typedef enum {
   NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED=0,
-  NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED
+  NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED=1 
 } nfapi_nr_cce_reg_mapping_type_e;
 
 typedef enum {

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h

@@ -11,6 +11,7 @@
 
 #include "stddef.h"
 #include "nfapi_interface.h"
+#include "nfapi_nr_interface.h"
 
 #define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
 #define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
@@ -24,25 +25,7 @@
 #define NFAPI_MAX_NUM_CB 8
 
 // Extension to the generic structures for single tlv values
-typedef struct {
-	nfapi_tl_t tl;
-	int32_t value;
-} nfapi_int32_tlv_t;
-
-typedef struct {
-	nfapi_tl_t tl;
-	uint32_t value;
-} nfapi_uint32_tlv_t;
 
-typedef struct {
-	nfapi_tl_t tl;
-	int64_t value;
-} nfapi_int64_tlv_t;
-
-typedef struct {
-	nfapi_tl_t tl;
-	uint64_t value;
-} nfapi_uint64_tlv_t;
 
 typedef enum {
   NFAPI_NR_DMRS_TYPE1=0,
@@ -76,35 +59,42 @@ typedef enum {
   NFAPI_NR_PHY_MSG_TYPE_STOP_REQUEST=   0X05,
   NFAPI_NR_PHY_MSG_TYPE_STOP_INDICATION=0X06,
   NFAPI_NR_PHY_MSG_TYPE_ERROR_INDICATION=0X07,
+  NFAPI_NR_PHY_MSG_TYPE_START_RESPONSE=0X010D,
+  NFAPI_NR_PHY_MSG_TYPE_STOP_RESPONSE=0X010F,
   //RESERVED 0X08 ~ 0X7F
   NFAPI_NR_PHY_MSG_TYPE_DL_TTI_REQUEST= 0X80,
   NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST= 0X81,
   NFAPI_NR_PHY_MSG_TYPE_SLOT_INDICATION=0X82,
   NFAPI_NR_PHY_MSG_TYPE_UL_DCI_REQUEST= 0X83,
-  NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST=0X54,
+  NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST=0X84, // CHANGED TO 0X84
   NFAPI_NR_PHY_MSG_TYPE_RX_DATA_INDICATION=0X85,
   NFAPI_NR_PHY_MSG_TYPE_CRC_INDICATION= 0X86,
   NFAPI_NR_PHY_MSG_TYPE_UCI_INDICATION= 0X87,
   NFAPI_NR_PHY_MSG_TYPE_SRS_INDICATION= 0X88,
-  NFAPI_NR_PHY_MSG_TYPE_RACH_INDICATION= 0X89
+  NFAPI_NR_PHY_MSG_TYPE_RACH_INDICATION= 0X89,
   //RESERVED 0X8a ~ 0xff
+  NFAPI_NR_PHY_MSG_TYPE_PNF_PARAM_REQUEST = 0x0100,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_PARAM_RESPONSE = 0x0101,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_CONFIG_REQUEST= 0x0102,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_CONFIG_RESPONSE= 0x0103,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_START_REQUEST= 0x0104,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_START_RESPONSE= 0x0105,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_STOP_REQUEST= 0x0106,
+	NFAPI_NR_PHY_MSG_TYPE_PNF_STOP_RESPONSE= 0x0107,
+
+  NFAPI_NR_PHY_MSG_TYPE_UL_NODE_SYNC = 0x0180,
+	NFAPI_NR_PHY_MSG_TYPE_DL_NODE_SYNC,
+	NFAPI_NR_PHY_MSG_TYPE_TIMING_INFO
 } nfapi_nr_phy_msg_type_e;
 
 // SCF222_5G-FAPI_PHY_SPI_Specificayion.pdf Section 3.3
 
 //3.3.1 PARAM
 
-//same with nfapi_param_request_t
-typedef struct {
-	nfapi_p4_p5_message_header_t header;
-	nfapi_vendor_extension_tlv_t vendor_extension;
-} nfapi_nr_param_request_t;
 
-typedef enum {
-  NFAPI_NR_PARAM_MSG_OK = 0, 
-	NFAPI_NR_PARAM_MSG_INVALID_STATE
 
-} nfapi_nr_param_errors_e;
+//same with nfapi_param_request_t
+
 
 /*typedef struct {
   nfapi_nr_param_errors_e error_code;
@@ -278,12 +268,6 @@ typedef struct
 //-------------------------------------------//
 //3.3.2 CONFIG
 
-
-typedef enum {
-  NFAPI_NR_CONFIG_MSG_OK = 0,
-  NFAPI_NR_CONFIG_MSG_INVALID_CONFIG  //The configuration provided has missing mandatory TLVs, or TLVs that are invalid or unsupported in this state.
-} nfapi_nr_config_errors_e;
-
 /*typedef struct {
 	nfapi_nr_config_errors_e error_code;
   uint8_t number_of_invalid_tlvs_that_can_only_be_configured_in_idle;
@@ -465,9 +449,108 @@ typedef struct
 
 } nfapi_nr_measurement_config_t;
 
+// ERROR enums
+typedef enum {    // Table 2-22
+  NFAPI_NR_PARAM_MSG_OK = 0, 
+	NFAPI_NR_PARAM_MSG_INVALID_STATE
+} nfapi_nr_param_errors_e;
+
+typedef enum {    // Table 2-25
+  NFAPI_NR_CONFIG_MSG_OK = 0,
+  NFAPI_NR_CONFIG_MSG_INVALID_STATE, //The CONFIG.request was received when the PHY was not in the IDLE state or the CONFIGURED state.
+  NFAPI_NR_CONFIG_MSG_INVALID_CONFIG  //The configuration provided has missing mandatory TLVs, or TLVs that are invalid or unsupported in this state.
+} nfapi_nr_config_errors_e;
+
+typedef enum {    // Table 2-27
+  NFAPI_NR_START_MSG_OK = 0,       
+	NFAPI_NR_START_MSG_INVALID_STATE
+} nfapi_nr_start_errors_e;
+
+//PNF P5 NR 
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_param_request_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	uint32_t error_code;
+	nfapi_pnf_param_general_t pnf_param_general;
+	nfapi_pnf_phy_t pnf_phy;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_param_response_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	uint8_t num_tlvs;
+	nfapi_pnf_phy_rf_config_t pnf_phy_rf_config;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_config_request_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	uint32_t error_code;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_config_response_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_start_request_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	uint32_t error_code;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_start_response_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_stop_request_t;
+
+typedef struct {
+	nfapi_p4_p5_message_header_t header;
+	uint32_t error_code;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_pnf_stop_response_t;
+
+
+/* PARAM.REQUEST */
+typedef struct {
+  nfapi_p4_p5_message_header_t  header;
+	nfapi_vendor_extension_tlv_t  vendor_extension;
+} nfapi_nr_param_request_scf_t;
+
+/* PARAM.RESPONSE */
+typedef struct {
+  nfapi_p4_p5_message_header_t  header;
+  uint8_t       error_code;
+  
+  uint8_t                       num_tlv;
+  nfapi_vendor_extension_tlv_t  vendor_extension;
+
+  nfapi_nr_cell_param_t         cell_param;
+  nfapi_nr_carrier_param_t      carrier_param;
+  nfapi_nr_pdcch_param_t        pdcch_param;
+  nfapi_nr_pucch_param_t        pucch_param;
+  nfapi_nr_pdsch_param_t        pdsch_param;
+  nfapi_nr_pusch_param_t        pusch_param;
+  nfapi_nr_prach_param_t        prach_param;
+  nfapi_nr_measurement_param_t  measurement_param;
+  nfapi_nr_nfapi_t              nfapi_config;
+} nfapi_nr_param_response_scf_t;
+
+//------------------------------//
+//3.3.2 CONFIG
 
+/* CONFIG.REQUEST */
 typedef struct {
-  uint8_t num_tlv;
+  nfapi_p4_p5_message_header_t  header;
+
+  uint8_t                       num_tlv;
+  nfapi_vendor_extension_tlv_t  vendor_extension;
+
   nfapi_nr_carrier_config_t     carrier_config;
   nfapi_nr_cell_config_t        cell_config;
   nfapi_nr_ssb_config_t         ssb_config;
@@ -475,20 +558,32 @@ typedef struct {
   nfapi_nr_ssb_table_t          ssb_table;
   nfapi_nr_tdd_table_t          tdd_table;
   nfapi_nr_measurement_config_t measurement_config;
+  nfapi_nr_nfapi_t              nfapi_config;
 } nfapi_nr_config_request_scf_t;
 
 
+/* CONFIG.RESPONSE */
+typedef struct {
+  nfapi_p4_p5_message_header_t  header;
+  uint8_t error_code;
+  //uint8_t num_invalid_tlvs;
+  // TODO: add list of invalid/unsupported TLVs (see Table 3.18)
+   nfapi_vendor_extension_tlv_t  vendor_extension;
+} nfapi_nr_config_response_scf_t;
+
 //------------------------------//
 //3.3.3 START
 
 typedef struct {
 	nfapi_p4_p5_message_header_t header;
 	nfapi_vendor_extension_tlv_t vendor_extension;
-} nfapi_nr_start_request_t;
+} nfapi_nr_start_request_scf_t;
 
-typedef enum {
-	NFAPI_NR_START_MSG_INVALID_STATE
-} nfapi_nr_start_errors_e;
+typedef struct {
+  nfapi_p4_p5_message_header_t header;
+  nfapi_nr_start_errors_e error_code;
+  nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_start_response_scf_t;
 
 //3.3.4 STOP
 
@@ -497,6 +592,7 @@ typedef struct {
 	nfapi_vendor_extension_tlv_t vendor_extension;
 } nfapi_nr_stop_request_t;
 
+
 typedef struct {
 	nfapi_p4_p5_message_header_t header;
 	nfapi_vendor_extension_tlv_t vendor_extension;
@@ -580,7 +676,7 @@ typedef struct {
 	uint16_t sfn; //0->1023   
   uint16_t slot;//0->319
   
-} nfapi_nr_slot_indication_t;
+} nfapi_nr_slot_indication_scf_t;
 
 // 3.4.2 
 
@@ -619,8 +715,10 @@ typedef struct {
   uint16_t prgSize;
   /// Number of STD ant ports (parallel streams) feeding into the digBF Value: 0->255
   uint8_t digBFInterfaces;
+  // Depends on numPRGs
   uint16_t PMIdx[275];
-  uint16_t *beamIdx[275];
+  // Depends on digBFInterfaces
+  uint16_t beamIdx[256];
 } nfapi_nr_tx_precoding_and_beamforming_t;
 
 //table 3-37 
@@ -941,6 +1039,7 @@ typedef struct {
 } nfapi_nr_dl_tti_request_pdu_t;
 
 #define NFAPI_NR_MAX_DL_TTI_PDUS 32 
+
 typedef struct {
   /// Number of PDUs that are included in this message. All PDUs in the message are numbered in order. Value 0 -> 255
   uint8_t nPDUs;
@@ -954,11 +1053,28 @@ typedef struct {
   uint8_t PduIdx[256][12];
 } nfapi_nr_dl_tti_request_body_t;
 
+
+typedef struct {
+	nfapi_p7_message_header_t header;
+	uint32_t t1;
+	int32_t delta_sfn_slot;
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_dl_node_sync_t;
+
+typedef struct {
+	nfapi_p7_message_header_t header;
+	uint32_t t1;
+	uint32_t t2;
+	uint32_t t3;	
+	nfapi_vendor_extension_tlv_t vendor_extension;
+} nfapi_nr_ul_node_sync_t;
+
+
 typedef struct {
   nfapi_p7_message_header_t header;
   /// System Frame Number (0-1023)
   uint16_t SFN;
-  /// Slot number (0-319)
+  /// Slot number (0-19)
   uint16_t Slot;
   nfapi_nr_dl_tti_request_body_t dl_tti_request_body;
   nfapi_vendor_extension_tlv_t vendor_extension;
@@ -973,7 +1089,7 @@ typedef struct
   nfapi_nr_dl_tti_ssb_pdu_t* ssb_pdu;
 } nfapi_nr_dl_pdu_configuration_t;
 */
-  /*
+ /* 
 typedef struct 
 {
   uint16_t pdu_type;//0: PDCCH PDU 1: PDSCH PDU 2: CSI-RS PDU 3: SSB PDU, 
@@ -1272,6 +1388,7 @@ typedef struct
 } nfapi_nr_ul_tti_request_number_of_groups_t;
 
 typedef struct {
+  nfapi_p7_message_header_t header;
   uint16_t SFN; //0->1023   
   uint16_t Slot;//0->319
   uint8_t n_pdus;//Number of PDUs that are included in this message. All PDUs in the message are numbered in order. Value 0 -> 255
@@ -1318,6 +1435,7 @@ typedef struct {
 } nfapi_nr_ul_dci_request_pdus_t;
 
 typedef struct {
+  nfapi_p7_message_header_t header;
   uint16_t SFN;
   uint16_t Slot;
   uint8_t  numPdus;
@@ -1363,6 +1481,7 @@ typedef struct
 #define NFAPI_NR_MAX_TX_REQUEST_PDUS 16
 typedef struct
 {
+  nfapi_p7_message_header_t header;
   uint16_t SFN;
   uint16_t Slot;
   uint16_t Number_of_PDUs;

nfapi/open-nFAPI/nfapi/src/nfapi.c

@@ -712,7 +712,7 @@ int unpack_tlv_list(unpack_tlv_t unpack_fns[], uint16_t size, uint8_t **ppReadPa
 
 		for(idx = 0; idx < size; ++idx)
 		{
-			if(unpack_fns[idx].tag == generic_tl.tag)
+			if(unpack_fns[idx].tag == generic_tl.tag) // match the extracted tag value with all the tags in unpack_fn list
 			{
 				tagMatch = 1;
 				nfapi_tl_t* tl = (nfapi_tl_t*)(unpack_fns[idx].tlv);

nfapi/open-nFAPI/pnf/inc/pnf.h

@@ -38,7 +38,9 @@ typedef struct {
 
 int pnf_connect(pnf_t *pnf);
 int pnf_message_pump(pnf_t *pnf);
+int pnf_nr_message_pump(pnf_t *pnf);
 
+int pnf_nr_pack_and_send_p5_message(pnf_t* pnf, nfapi_p4_p5_message_header_t* msg, uint32_t msg_len);
 int pnf_pack_and_send_p5_message(pnf_t* pnf, nfapi_p4_p5_message_header_t* msg, uint32_t msg_len);
 int pnf_pack_and_send_p4_message(pnf_t* pnf, nfapi_p4_p5_message_header_t* msg, uint32_t msg_len);
 int pnf_send_message(pnf_t* pnf, uint8_t* msg, uint32_t msg_len, uint16_t stream_id);

nfapi/open-nFAPI/pnf/inc/pnf_p7.h

@@ -29,15 +29,37 @@
 
 typedef struct {
 	uint16_t dl_conf_ontime;
+	uint16_t dl_tti_ontime;
 	uint16_t dl_conf_late;
+	uint16_t dl_tti_late;
 	uint16_t ul_conf_ontime;
+	uint16_t ul_tti_ontime;
 	uint16_t ul_conf_late;
+	uint16_t ul_tti_late;
 	uint16_t hi_dci0_ontime;
 	uint16_t hi_dci0_late;
+	uint16_t ul_dci_ontime;
+	uint16_t ul_dci_late;
 	uint16_t tx_ontime;
 	uint16_t tx_late;
+	uint16_t tx_data_ontime;
+	uint16_t tx_data_late;
 } pnf_p7_stats_t;
 
+
+typedef struct { // TODO: replace with the stats
+	uint16_t dl_tti_ontime;
+	uint16_t dl_tti_late;
+	uint16_t ul_tti_ontime;
+	uint16_t ul_tti_late;
+	uint16_t ul_dci_ontime;
+	uint16_t ul_dci_late;
+	uint16_t tx_data_ontime;
+	uint16_t tx_data_late;
+} pnf_p7_nr_stats_t;
+
+
+
 typedef struct {
 	uint8_t* buffer;
 	uint16_t length;
@@ -82,7 +104,7 @@ typedef struct {
 	pthread_mutex_t pack_mutex; // should we allow the client to specifiy
 
 	nfapi_pnf_p7_subframe_buffer_t subframe_buffer[30/*NFAPI_MAX_TIMING_WINDOW_SIZE*/];
-
+    nfapi_pnf_p7_slot_buffer_t slot_buffer[30/*NFAPI_MAX_TIMING_WINDOW_SIZE*/];
 	uint32_t sequence_number;
 	uint16_t max_num_segments;
 
@@ -94,6 +116,12 @@ typedef struct {
 	uint16_t sfn_sf;
 	uint32_t sf_start_time_hr;
 	int32_t sfn_sf_shift;
+	
+	uint16_t sfn;
+	uint16_t slot;
+	uint16_t sfn_slot;
+	uint32_t slot_start_time_hr;
+	int32_t slot_shift;
 
 	uint8_t timing_info_period_counter;
 	uint8_t timing_info_aperiodic_send; // 0:false 1:true
@@ -104,18 +132,26 @@ typedef struct {
 	uint32_t ul_config_jitter;
 	uint32_t hi_dci0_jitter;
 	uint32_t tx_jitter;
+    
+	//P7 NR
+	uint32_t dl_tti_jitter;
+	uint32_t ul_tti_jitter;
+	uint32_t ul_dci_jitter;
+	uint32_t tx_data_jitter;
 
 	uint32_t tick;
 	pnf_p7_stats_t stats;
+	pnf_p7_nr_stats_t nr_stats;
 
 } pnf_p7_t;
 
 int pnf_p7_message_pump(pnf_p7_t* pnf_p7);
-
+int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7);
 int pnf_p7_pack_and_send_p7_message(pnf_p7_t* pnf_p7, nfapi_p7_message_header_t* msg, uint32_t msg_len);
 int pnf_p7_send_message(pnf_p7_t* pnf_p7, uint8_t* msg, uint32_t msg_len);
 
 
+int pnf_p7_slot_ind(pnf_p7_t* config, uint16_t phy_id, uint16_t sfn, uint16_t slot);
 int pnf_p7_subframe_ind(pnf_p7_t* config, uint16_t phy_id, uint16_t sfn_sf);
 
 pnf_p7_rx_message_t* pnf_p7_rx_reassembly_queue_add_segment(pnf_p7_t* pnf_p7, pnf_p7_rx_reassembly_queue_t* queue, uint32_t rx_hr_time, uint16_t sequence_number, uint16_t segment_number, uint8_t m, uint8_t* data, uint16_t data_len);

nfapi/open-nFAPI/pnf/src/pnf_interface.c

@@ -19,6 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include "nfapi_nr_interface.h"
+#include "nfapi_nr_interface_scf.h"
 
 nfapi_pnf_config_t* nfapi_pnf_config_create()
 {
@@ -81,6 +83,40 @@ int nfapi_pnf_start(nfapi_pnf_config_t* config)
 	return 0;
 }
 
+int nfapi_nr_pnf_start(nfapi_pnf_config_t* config)
+{
+	// Verify that config is not null
+	if(config == 0)
+		return -1;
+
+	// Make sure to set the defined trace function before using NFAPI_TRACE
+	if(config->trace)
+		nfapi_trace_g = config->trace;
+
+	NFAPI_TRACE(NFAPI_TRACE_INFO, "%s\n", __FUNCTION__);
+
+	pnf_t* _this = (pnf_t*)(config);
+
+	while (_this->terminate == 0)
+	{
+		int connect_result = pnf_connect(_this);
+
+		if(connect_result > 0)
+		{
+			pnf_nr_message_pump(_this);
+		}
+		else if(connect_result < 0)
+		{
+			return connect_result;
+		}
+
+		sleep(1);
+	}
+	NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() terminate=1 - EXITTING............\n", __FUNCTION__);
+
+	return 0;
+}
+
 int nfapi_pnf_stop(nfapi_pnf_config_t* config)
 {
 	// Verify that config is not null
@@ -96,6 +132,21 @@ int nfapi_pnf_stop(nfapi_pnf_config_t* config)
 	return 0;
 }
 
+
+int nfapi_nr_pnf_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_nr_pnf_param_response_t* resp)
+{
+	// ensure it's valid
+	if (config == NULL || resp == NULL)
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
+		return -1;
+	}
+
+	pnf_t* _this = (pnf_t*)(config);
+
+	return pnf_nr_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_nr_pnf_param_response_t));
+}
+
 int nfapi_pnf_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_pnf_param_response_t* resp)
 {
 	// ensure it's valid
@@ -129,6 +180,27 @@ int nfapi_pnf_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_pnf_config_respo
 	return pnf_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_pnf_config_response_t));
 }
 
+
+int nfapi_nr_pnf_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_nr_pnf_config_response_t* resp)
+{
+	// ensure it's valid
+	if (config == NULL || resp == NULL)
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
+		return -1;
+	}
+
+	if(resp->error_code == NFAPI_MSG_OK)
+	{
+		config->state = NFAPI_PNF_CONFIGURED;
+	}
+
+	pnf_t* _this = (pnf_t*)(config);
+
+	return pnf_nr_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_nr_pnf_config_response_t));
+}
+
+
 int nfapi_pnf_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_pnf_start_response_t* resp)
 {
 	// ensure it's valid
@@ -148,6 +220,26 @@ int nfapi_pnf_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_pnf_start_respons
 	return pnf_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_pnf_start_response_t));
 }
 
+int nfapi_nr_pnf_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_nr_pnf_start_response_t* resp)
+{
+	// ensure it's valid
+	if (config == NULL || resp == NULL)
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
+		return -1;
+	}
+
+	if(resp->error_code == NFAPI_MSG_OK)
+	{
+		config->state = NFAPI_PNF_RUNNING;
+	}
+
+	pnf_t* _this = (pnf_t*)(config);
+
+	return pnf_nr_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_nr_pnf_start_response_t));
+}
+
+
 int nfapi_pnf_pnf_stop_resp(nfapi_pnf_config_t* config, nfapi_pnf_stop_response_t* resp)
 {
 	// ensure it's valid
@@ -166,7 +258,6 @@ int nfapi_pnf_pnf_stop_resp(nfapi_pnf_config_t* config, nfapi_pnf_stop_response_
 
 	return pnf_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_pnf_stop_response_t));
 }
-
 int nfapi_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_param_response_t* resp)
 {
 	if (config == NULL || resp == NULL)
@@ -180,6 +271,20 @@ int nfapi_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_param_response_t* res
 	return pnf_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_param_response_t));
 }
 
+
+int nfapi_nr_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_nr_param_response_scf_t* resp)
+{
+	if (config == NULL || resp == NULL)
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
+		return -1;
+	}
+	
+	pnf_t* _this = (pnf_t*)(config);
+
+	return pnf_nr_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_nr_param_response_scf_t));
+}
+
 int nfapi_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_config_response_t* resp)
 {
 	if (config == NULL || resp == NULL)
@@ -208,6 +313,35 @@ int nfapi_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_config_response_t* r
 	return pnf_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_config_response_t));
 }
 
+int nfapi_nr_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_nr_config_response_scf_t* resp)
+{
+	if (config == NULL || resp == NULL)
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
+		return -1;
+	}
+
+	pnf_t* _this = (pnf_t*)(config);
+
+	nfapi_pnf_phy_config_t* phy = nfapi_pnf_phy_config_find(config, resp->header.phy_id);
+
+	if(phy)
+	{
+		if(resp->error_code == NFAPI_NR_CONFIG_MSG_OK)
+		{
+			phy->state = NFAPI_PNF_PHY_CONFIGURED;
+		}
+	}
+	else
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: unknow phy id %d\n", __FUNCTION__, resp->header.phy_id);
+		return -1;
+	}
+
+	return pnf_nr_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_nr_config_response_scf_t));
+}
+
+
 int nfapi_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_start_response_t* resp)
 {
 	if (config == NULL || resp == NULL)
@@ -235,6 +369,34 @@ int nfapi_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_start_response_t* res
 	return pnf_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_start_response_t));
 }
 
+int nfapi_nr_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_nr_start_response_scf_t* resp)
+{
+	if (config == NULL || resp == NULL)
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
+		return -1;
+	}
+
+	pnf_t* _this = (pnf_t*)(config);
+
+	nfapi_pnf_phy_config_t* phy = nfapi_pnf_phy_config_find(config, resp->header.phy_id);
+	if(phy)
+	{
+		if(resp->error_code == NFAPI_NR_START_MSG_OK)
+		{
+			phy->state = NFAPI_PNF_PHY_RUNNING;
+		}
+	}
+	else
+	{
+		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: unknown phy id %d\n", __FUNCTION__, resp->header.phy_id);
+		return -1;
+	}
+
+	return pnf_nr_pack_and_send_p5_message(_this, &(resp->header), sizeof(nfapi_nr_start_response_scf_t));
+}
+
+
 int nfapi_pnf_stop_resp(nfapi_pnf_config_t* config, nfapi_stop_response_t* resp)
 {
 	if (config == NULL || resp == NULL)

nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c

@@ -31,7 +31,7 @@ nfapi_pnf_p7_config_t* nfapi_pnf_p7_config_create()
 	_this->_public.segment_size = 1400;
 	_this->max_num_segments = 8;
 	
-	_this->_public.subframe_buffer_size = 8;
+	_this->_public.subframe_buffer_size = 8;// TODO: Initialize the slot_buffer size
 	_this->_public.timing_info_mode_periodic = 1;
 	_this->_public.timing_info_period = 32;
 	_this->_public.timing_info_mode_aperiodic = 1;
@@ -76,6 +76,26 @@ int nfapi_pnf_p7_start(nfapi_pnf_p7_config_t* config)
 	return 0;
 }
 
+int nfapi_nr_pnf_p7_start(nfapi_pnf_p7_config_t* config)
+{
+	// Verify that config is not null
+	if(config == 0)
+		return -1;
+
+	// Make sure to set the defined trace function before using NFAPI_TRACE
+	if(config->trace)
+		nfapi_trace_g = config->trace;
+
+	pnf_p7_t* _this = (pnf_p7_t*)(config);
+
+	NFAPI_TRACE(NFAPI_TRACE_INFO, "%s\n", __FUNCTION__);
+
+	pnf_nr_p7_message_pump(_this);
+
+	return 0;
+}
+
+
 int nfapi_pnf_p7_stop(nfapi_pnf_p7_config_t* config)
 {
 	// Verify that config is not null
@@ -88,6 +108,16 @@ int nfapi_pnf_p7_stop(nfapi_pnf_p7_config_t* config)
 	return 0;
 }
 
+int nfapi_pnf_p7_slot_ind(nfapi_pnf_p7_config_t* config, uint16_t phy_id, uint16_t sfn, uint16_t slot)
+{
+	// Verify that config is not null
+	if(config == 0)
+		return -1;
+	
+	pnf_p7_t* _this = (pnf_p7_t*)(config);
+
+	return pnf_p7_slot_ind(_this, phy_id, sfn, slot);
+}
 
 int nfapi_pnf_p7_subframe_ind(nfapi_pnf_p7_config_t* config, uint16_t phy_id, uint16_t sfn_sf)
 {

nfapi/open-nFAPI/pnf/tests/pnf_cunit_main.c

@@ -48,6 +48,9 @@ typedef struct phy_info
 	uint8_t enabled;
 	uint16_t phy_id;
 	uint16_t sfn_sf;
+	uint16_t sfn;
+	uint16_t slot;
+	
 
 	pthread_t thread;
 
@@ -1207,6 +1210,12 @@ void send_dl_subframe_msgs_interleaved(int p7Sock, int phy_id, struct sockaddr_i
 	//free(req.tx_request_body.tx_pdu_list);
 }
 
+void send_slot_indication(phy_info_t* phy_info)
+{
+	// DONE: add sfn and slot as members in the phy_info
+	nfapi_pnf_p7_slot_ind(phy_info->config, phy_info->phy_id, phy_info->sfn, phy_info->slot);
+}
+
 void send_subframe_indication(phy_info_t* phy_info)
 {
 	nfapi_pnf_p7_subframe_ind(phy_info->config, phy_info->phy_id, phy_info->sfn_sf);

nfapi/open-nFAPI/vnf/inc/vnf.h

@@ -35,9 +35,13 @@ typedef struct
 
 
 int vnf_pack_and_send_p5_message(vnf_t* vnf, uint16_t p5_idx, nfapi_p4_p5_message_header_t* msg, uint16_t msg_len);
+int vnf_nr_pack_and_send_p5_message(vnf_t* vnf, uint16_t p5_idx, nfapi_p4_p5_message_header_t* msg, uint16_t msg_len);
+
 int vnf_pack_and_send_p4_message(vnf_t* vnf, uint16_t p5_idx, nfapi_p4_p5_message_header_t* msg, uint16_t msg_len);
 
 int vnf_read_dispatch_message(nfapi_vnf_config_t* config, nfapi_vnf_pnf_info_t* pnf);
+int vnf_nr_read_dispatch_message(nfapi_vnf_config_t* config, nfapi_vnf_pnf_info_t* pnf);
+
 
 void nfapi_vnf_phy_info_list_add(nfapi_vnf_config_t* config, nfapi_vnf_phy_info_t* info);
 nfapi_vnf_phy_info_t* nfapi_vnf_phy_info_list_find(nfapi_vnf_config_t* config, uint16_t phy_id);

nfapi/open-nFAPI/vnf/inc/vnf_p7.h

@@ -77,6 +77,9 @@ typedef struct nfapi_vnf_p7_connection_info {
 	int32_t sf_offset_filtered;
 	int32_t sf_offset_trend;
 	int32_t sf_offset;
+	int32_t slot_offset;
+	int32_t slot_offset_trend;
+	int32_t slot_offset_filtered;
 	uint16_t zero_count;
 	int32_t adjustment;
 	int32_t insync_minor_adjustment;
@@ -85,8 +88,10 @@ typedef struct nfapi_vnf_p7_connection_info {
 	uint32_t previous_t1;
 	uint32_t previous_t2;
 	int32_t previous_sf_offset_filtered;
-
+	int32_t previous_slot_offset_filtered;
 	int sfn_sf;
+	int sfn;
+	int slot;
 
 	int socket;
 	struct sockaddr_in local_addr;
@@ -111,6 +116,7 @@ typedef struct {
 	nfapi_vnf_p7_connection_info_t* p7_connections;
 	int socket;
 	uint32_t sf_start_time_hr;
+	uint32_t slot_start_time_hr;
 	uint8_t* rx_message_buffer; // would this be better put in the p7 conenction info?
 	uint16_t rx_message_buffer_size;
 	
@@ -120,14 +126,19 @@ uint32_t vnf_get_current_time_hr(void);
 
 uint16_t increment_sfn_sf(uint16_t sfn_sf);
 int vnf_sync(vnf_p7_t* vnf_p7, nfapi_vnf_p7_connection_info_t* p7_info);
+int vnf_nr_sync(vnf_p7_t* vnf_p7, nfapi_vnf_p7_connection_info_t* p7_info);
+
 int send_mac_subframe_indications(vnf_p7_t* config);
+int send_mac_slot_indications(vnf_p7_t* config);
 int vnf_p7_read_dispatch_message(vnf_p7_t* vnf_p7 );
+int vnf_nr_p7_read_dispatch_message(vnf_p7_t* vnf_p7 );
 
 void vnf_p7_connection_info_list_add(vnf_p7_t* vnf_p7, nfapi_vnf_p7_connection_info_t* node);
 nfapi_vnf_p7_connection_info_t* vnf_p7_connection_info_list_find(vnf_p7_t* vnf_p7, uint16_t phy_id);
 nfapi_vnf_p7_connection_info_t* vnf_p7_connection_info_list_delete(vnf_p7_t* vnf_p7, uint16_t phy_id);
 
 int vnf_p7_pack_and_send_p7_msg(vnf_p7_t* vnf_p7, nfapi_p7_message_header_t* header);
+int vnf_nr_p7_pack_and_send_p7_msg(vnf_p7_t* vnf_p7, nfapi_p7_message_header_t* header);
 
 void vnf_p7_release_msg(vnf_p7_t* vnf_p7, nfapi_p7_message_header_t* header);
 void vnf_p7_release_pdu(vnf_p7_t* vnf_p7, void* pdu);

nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h

@@ -19,6 +19,7 @@
 
 #include "nfapi_interface.h"
 #include "nfapi_nr_interface_scf.h"
+#include "nfapi_nr_interface.h"
 
 #include "debug.h"
 
@@ -120,6 +121,7 @@ typedef struct nfapi_vnf_config
 	 * 
 	 *  \todo Do we need to send the address information of the PNF?
 	 */
+	int (*pnf_nr_connection_indication)(nfapi_vnf_config_t* config, int p5_idx);
 	int (*pnf_connection_indication)(nfapi_vnf_config_t* config, int p5_idx);
 	
 	/*! \brief Callback indicating that a pnf has lost connection 
@@ -160,6 +162,7 @@ typedef struct nfapi_vnf_config
 	 *  then the substructure pointers should be set to 0 and then the client should
 	 *  use the codec_config.deallocate function to release it at a future point
 	 */
+	int (*pnf_nr_param_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_pnf_param_response_t* resp);
 	int (*pnf_param_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_param_response_t* resp);
 	
 	/*! A callback for the PNF_CONFIG.resp 
@@ -182,7 +185,8 @@ typedef struct nfapi_vnf_config
 	 *  use the codec_config.deallocate function to release it at a future point
 	 */
 	int (*pnf_config_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_config_response_t* resp);
-	
+	int (*pnf_nr_config_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_pnf_config_response_t* resp);
+
 	/*! A callback for the PNF_START.resp
 	 *  \param config A pointer to the vnf configuration
 	 *  \param p5_idx The p5 index used to indicate a particular pnf p5 connection
@@ -203,7 +207,8 @@ typedef struct nfapi_vnf_config
 	 *  use the codec_config.deallocate function to release it at a future point
 	 */
 	int (*pnf_start_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_start_response_t* resp);
-	
+	int (*pnf_nr_start_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_pnf_start_response_t* resp);
+
 	/*! A callback for the PNF_STOP.resp
 	 *  \param config A pointer to the vnf configuration
 	 *  \param p5_idx The p5 index used to indicate a particular pnf p5 connection
@@ -249,6 +254,7 @@ typedef struct nfapi_vnf_config
 	 *  use the codec_config.deallocate function to release it at a future point
 	 */
 	int (*param_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_response_t* resp);
+	int (*nr_param_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_param_response_scf_t* resp);
 	
 	/*! A callback for the CONFIG.response
      *  \param config A pointer to the vnf configuration
@@ -266,8 +272,9 @@ typedef struct nfapi_vnf_config
 	 *  then the substructure pointers should be set to 0 and then the client should
 	 *  use the codec_config.deallocate function to release it at a future point
 	 */
+	int (*nr_config_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_config_response_scf_t* resp);
 	int (*config_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_config_response_t* resp);
-	
+
 	/*! A callback for the START.resp
      *  \param config A pointer to the vnf configuration
 	 *  \param p5_idx The p5 index used to indicate a particular pnf p5 connection
@@ -285,6 +292,7 @@ typedef struct nfapi_vnf_config
 	 *  use the codec_config.deallocate function to release it at a future point
 	 */
 	int (*start_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_start_response_t* resp);
+	int (*nr_start_resp)(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_start_response_scf_t* resp);
 	
 	/*! A callback for the STOP.resp
      *  \param config A pointer to the vnf configuration
@@ -469,6 +477,8 @@ void nfapi_vnf_config_destory(nfapi_vnf_config_t* config);
  * 
  * This function will not return untill nfapi_vnf_stop is called
  */
+int nfapi_nr_vnf_start(nfapi_vnf_config_t* config);
+
 int nfapi_vnf_start(nfapi_vnf_config_t* config);
 
 /*! Stop the VNF library. 
@@ -500,6 +510,7 @@ int nfapi_vnf_allocate_phy(nfapi_vnf_config_t* config, int p5_idx, uint16_t* phy
  * \return  0 means success, -1 failure
  */
 int nfapi_vnf_pnf_param_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_param_request_t* req);
+int nfapi_nr_vnf_pnf_param_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_pnf_param_request_t* req);
 
 /*! Send the PNF_CONFIG.request
  * \param config A pointer to a vnf config
@@ -508,6 +519,7 @@ int nfapi_vnf_pnf_param_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_pnf_pa
  * \return  0 means success, -1 failure
  */
 int nfapi_vnf_pnf_config_req(nfapi_vnf_config_t* config,int p5_idx, nfapi_pnf_config_request_t* req);
+int nfapi_nr_vnf_pnf_config_req(nfapi_vnf_config_t* config,int p5_idx, nfapi_nr_pnf_config_request_t* req);
 
 /*! Send the PNF_START.request
  * \param config A pointer to a vnf config
@@ -516,6 +528,7 @@ int nfapi_vnf_pnf_config_req(nfapi_vnf_config_t* config,int p5_idx, nfapi_pnf_co
  * \return  0 means success, -1 failure
  */
 int nfapi_vnf_pnf_start_req(nfapi_vnf_config_t* config,int p5_idx, nfapi_pnf_start_request_t* req);
+int nfapi_nr_vnf_pnf_start_req(nfapi_vnf_config_t* config,int p5_idx, nfapi_nr_pnf_start_request_t* req);
 
 /*! Send the PNF_STOP.request
  * \param config A pointer to a vnf config
@@ -532,6 +545,7 @@ int nfapi_vnf_pnf_stop_req(nfapi_vnf_config_t* config,int p5_idx, nfapi_pnf_stop
  * \return  0 means success, -1 failure
  */
 int nfapi_vnf_param_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_request_t* req);
+int nfapi_nr_vnf_param_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_param_request_scf_t* req);
 
 /*! Send the CONFIG.request
  * \param config A pointer to a vnf config
@@ -539,6 +553,7 @@ int nfapi_vnf_param_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_param_requ
  * \param req A pointer to a CONFIG.request message structure
  * \return  0 means success, -1 failure
  */
+int nfapi_nr_vnf_config_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_config_request_scf_t* req);
 int nfapi_vnf_config_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_config_request_t* req);
 
 /*! Send the START.request
@@ -548,6 +563,7 @@ int nfapi_vnf_config_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_config_re
  * \return  0 means success, -1 failure
  */
 int nfapi_vnf_start_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_start_request_t* req);
+int nfapi_nr_vnf_start_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_start_request_scf_t* req);
 
 /*! Send the STOP.request
  * \param config A pointer to a vnf config
@@ -692,6 +708,7 @@ typedef struct nfapi_vnf_p7_config
 	 */
 	
 	int (*subframe_indication)(struct nfapi_vnf_p7_config* config, uint16_t phy_id, uint16_t sfn_sf);
+	int (*slot_indication)(struct nfapi_vnf_p7_config* config, uint16_t phy_id, uint16_t sfn, uint16_t slot);
 
 	/*! A callback for the HARQ.indication
      *  \param config A pointer to the vnf p7 configuration
@@ -885,6 +902,8 @@ void nfapi_vnf_p7_config_destory(nfapi_vnf_p7_config_t* config);
  */
  
 int nfapi_vnf_p7_start(nfapi_vnf_p7_config_t* config);
+int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t* config);
+
 
 /*! Stop the VNF P7 library. 
  *  \param config A pointer to an vnf p7 configuration structure
@@ -950,7 +969,7 @@ int nfapi_vnf_p7_nr_dl_config_req(nfapi_vnf_p7_config_t* config, nfapi_nr_dl_tti
  *  may be released after this function call has returned or at a later pointer
  */
 int nfapi_vnf_p7_ul_config_req(nfapi_vnf_p7_config_t* config, nfapi_ul_config_request_t* req);
-
+int nfapi_vnf_p7_ul_tti_req(nfapi_vnf_p7_config_t* config, nfapi_nr_ul_tti_request_t* req);
 /*! Send the HI_DCI0.request
  *  \param config A pointer to the vnf p7 configuration
  *  \param req A data structure for the decoded HI_DCI0.request.
@@ -960,7 +979,7 @@ int nfapi_vnf_p7_ul_config_req(nfapi_vnf_p7_config_t* config, nfapi_ul_config_re
  *  may be released after this function call has returned or at a later pointer
  */
 int nfapi_vnf_p7_hi_dci0_req(nfapi_vnf_p7_config_t* config, nfapi_hi_dci0_request_t* req);
-
+int nfapi_vnf_p7_ul_dci_req(nfapi_vnf_p7_config_t* config, nfapi_nr_ul_dci_request_t* req);
 /*! Send the TX.req
  *  \param config A pointer to the vnf p7 configuration
  *  \param req A data structure for the decoded HI_DCI0.request.
@@ -970,7 +989,7 @@ int nfapi_vnf_p7_hi_dci0_req(nfapi_vnf_p7_config_t* config, nfapi_hi_dci0_reques
  *  may be released after this function call has returned or at a later pointer
  */
 int nfapi_vnf_p7_tx_req(nfapi_vnf_p7_config_t* config, nfapi_tx_request_t* req);
-
+int nfapi_vnf_p7_tx_data_req(nfapi_vnf_p7_config_t* config, nfapi_nr_tx_data_request_t* req);
 /*! Send the LBT_DL_CONFIG.requst
  *  \param config A pointer to the vnf p7 configuration
  *  \param req A data structure for the decoded LBT_DL_CONFIG.request.

openair1/PHY/INIT/nr_init.c

@@ -381,6 +381,13 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
 
 
 }
+
+//Adding nr_schedule_handler
+void install_nr_schedule_handlers(NR_IF_Module_t *if_inst)
+{
+  if_inst->NR_PHY_config_req = nr_phy_config_request;
+  if_inst->NR_Schedule_response = nr_schedule_response;
+}
 /*
 void install_schedule_handlers(IF_Module_t *if_inst)
 {
@@ -459,7 +466,10 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
   uint64_t ul_bw_khz = (12*gNB_config->carrier_config.ul_grid_size[gNB_config->ssb_config.scs_common.value].value)*(15<<gNB_config->ssb_config.scs_common.value);
   fp->ul_CarrierFreq = ((ul_bw_khz>>1) + gNB_config->carrier_config.uplink_frequency.value)*1000 ;
 
-  fp->nr_band = *RC.nrmac[Mod_id]->common_channels[0].ServingCellConfigCommon->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0];
+  //fp->nr_band = *RC.nrmac[Mod_id]->common_channels[0].ServingCellConfigCommon->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0];
+  lte_frame_type_t frame_type = 0; // FDD
+  
+  get_band(fp->dl_CarrierFreq,&fp->nr_band,&dlul_offset,&frame_type); //RC.nrmac[Mod_id] cannot be accessed in NFAPI
 
   get_delta_duplex(fp->nr_band, gNB_config->ssb_config.scs_common.value, &dlul_offset);
   dlul_offset *= 1000;
@@ -499,6 +509,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
   LOG_I(PHY,"gNB %d configured\n",Mod_id);
 }
 
+
 void init_nr_transport(PHY_VARS_gNB *gNB) {
   int i;
   int j;

openair1/PHY/NR_REFSIG/scrambling_luts.c

@@ -51,7 +51,7 @@ void init_byte2m64(void) {
 	    ((int16_t*)&byte2m64_re[s])[0],((int16_t*)&byte2m64_im[s])[0],    
 	    ((int16_t*)&byte2m64_re[s])[1],((int16_t*)&byte2m64_im[s])[1],    
 	    ((int16_t*)&byte2m64_re[s])[2],((int16_t*)&byte2m64_im[s])[2],    
-	    ((int16_t*)&byte2m64_re[s])[3],((int16_t*)&byte2m64_im[s])[3]);    
+	    ((int16_t*)&byte2m64_re[s])[3],((int16_t*)&byte2m64_im[s])[3]);  
 
   }
 }

openair1/PHY/TOOLS/nr_phy_scope.c

@@ -225,6 +225,8 @@ static void oai_xygraph(OAIgraph_t *graph, float *x, float *y, int len, int laye
 }
 
 static void genericWaterFall (OAIgraph_t *graph, scopeSample_t *values, const int datasize, const int divisions, const char *label) {
+  if ( values == NULL )
+     return;
   fl_winset(FL_ObjWin(graph->graph));
   const int samplesPerPixel=datasize/graph->w;
   int displayPart=graph->waterFallh-ScaleZone;

openair1/SCHED/fapi_l1.h

@@ -31,6 +31,7 @@
  */
 
 #include "PHY/defs_eNB.h"
+#include "PHY/defs_gNB.h"
 #include "PHY/phy_extern.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "SCHED/sched_eNB.h"

openair1/SCHED_NR/fapi_nr_l1.h

@@ -36,6 +36,11 @@
 #include "nfapi_nr_interface.h"
 #include "nfapi_nr_interface_scf.h"
 
+// added
+void handle_nr_nfapi_ssb_pdu(PHY_VARS_gNB *gNB,
+						int frame,int slot,
+						nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdu);
+
 void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO);
 
 void handle_nfapi_nr_pdcch_pdu(PHY_VARS_gNB *gNB,
@@ -48,3 +53,8 @@ void handle_nr_nfapi_pdsch_pdu(PHY_VARS_gNB *gNB,int frame,int slot,
 
 
 void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int UE_id, uint8_t harq_pid, uint8_t crc_flag);
+//added
+
+void handle_nfapi_nr_ul_dci_pdu(PHY_VARS_gNB *gNB,
+			       int frame, int slot,
+			       nfapi_nr_ul_dci_request_pdus_t *ul_dci_request_pdu);

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -161,7 +161,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
   }
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_gNB_COMMON_TX,1);
-  if (nfapi_mode == 0 || nfapi_mode == 1) { 
+  if (NFAPI_MODE == NFAPI_MONOLITHIC || NFAPI_MODE == NFAPI_MODE_PNF) { 
     if ((!(frame%ssb_frame_periodicity)))  // generate SSB only for given frames according to SSB periodicity
       nr_common_signal_procedures(gNB,frame, slot);
   }

openair1/SCHED_NR_UE/harq_nr.c

@@ -295,7 +295,7 @@ harq_result_t uplink_harq_process(NR_UE_ULSCH_t *ulsch, int harq_pid, int ndi, u
 
   /* 38.321 5.4.2.1  2>  if the uplink grant was received on PDCCH for the C-RNTI and the HARQ buffer of the identified process is empty */
   if ((ulsch->harq_processes[harq_pid]->first_tx == 1) && (rnti_type == _C_RNTI_)) {  /* no transmission yet on this process so consider its harq buffer as empty */
-    ulsch->harq_processes[harq_pid]->first_tx = 0;
+   ulsch->harq_processes[harq_pid]->first_tx = 0;
     ulsch->harq_processes[harq_pid]->pusch_pdu.pusch_data.new_data_indicator = ndi;             /* store first value of ndi */
     ulsch->harq_processes[harq_pid]->round = 0;
     ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 1;

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -56,7 +56,7 @@ UE_nr_rxtx_proc_t proc;
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
 
 double cpuf;
-uint8_t nfapi_mode = 0;
+//uint8_t nfapi_mode = 0;
 uint16_t NB_UE_INST = 1;
 
 uint8_t const nr_rv_round_map[4] = {0, 2, 1, 3};