L2 nfapi test(noS1) working

executables/nr-gnb.c

@@ -83,7 +83,7 @@
 
 
 #include "T.h"
-
+#include "nfapi/oai_integration/vendor_ext.h"
 //#define DEBUG_THREADS 1
 
 //#define USRP_DEBUG 1
@@ -155,7 +155,7 @@ clock_gettime(CLOCK_MONOTONIC, &current);
 
   // *******************************************************************
   // 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);

executables/nr-softmodem.c

@@ -85,6 +85,7 @@ 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;
@@ -942,7 +943,7 @@ if(!IS_SOFTMODEM_NOS1)
 
   printf("NFAPI MODE:%s\n", nfapi_mode_str);
 
-  if (nfapi_mode==2) // VNF
+  if (nfapi_mode==NFAPI_MODE_VNF) // VNF
     wait_nfapi_init("main?");
 
   printf("START MAIN THREADS\n");
@@ -971,7 +972,7 @@ if(!IS_SOFTMODEM_NOS1)
 
   config_sync_var=0;
 
-  if (nfapi_mode==1) { // PNF
+  if (nfapi_mode==NFAPI_MODE_PNF) { // PNF
     wait_nfapi_init("main?");
   }
 
@@ -991,7 +992,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/ocp-gnb.c

@@ -955,7 +955,7 @@ int main( int argc, char **argv ) {
   AssertFatal(nfapi_mode < 3,"");
   printf("NFAPI MODE:%s\n", nfapi_mode_str[nfapi_mode]);
 
-  if (nfapi_mode==NFAPI_MODE_VNF) // VNF
+  if (nfapi_mode==2) // VNF
     wait_nfapi_init("main?");
 
   for (int i=0; i<RC.nb_nr_L1_inst; i++)
@@ -964,7 +964,7 @@ int main( int argc, char **argv ) {
   printf("About to Init RU threads RC.nb_RU:%d\n", RC.nb_RU);
   config_sync_var=0;
 
-  if (nfapi_mode==NFAPI_MODE_PNF) { // PNF
+  if (nfapi_mode==1) { // PNF
     wait_nfapi_init("main?");
   }