minor modifications to make NFAPI PNF run again

nfapi/oai_integration/nfapi.c

@@ -62,7 +62,7 @@ char *nfapi_get_strmode(void) {
 }
 
 void nfapi_logmode() {
-  LOG_I(ENB_APP,"nfapi running mode: %s\n",nfapi_get_strmode());
+  LOG_I(ENB_APP,"nfapi running mode: %s (%d)\n",nfapi_get_strmode(),nfapi_params.nfapi_mode);
 }
 
 nfapi_mode_t nfapi_getmode(void) {

nfapi/oai_integration/nfapi_pnf.c

@@ -1366,7 +1366,7 @@ void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr,
   printf("%s() PNF\n\n\n\n\n\n", __FUNCTION__);
 
   if(NFAPI_MODE!=NFAPI_UE_STUB_PNF) {
-    nfapi_setmode(NFAPI_PNF);  // PNF!
+    nfapi_setmode(NFAPI_MODE_PNF);  // PNF!
   }
 
   nfapi_pnf_config_t *config = nfapi_pnf_config_create();

openair2/ENB_APP/enb_config.c

@@ -156,8 +156,6 @@ void RCconfig_L1(void) {
         // This is used by init_eNB_afterRU()
         RC.nb_CC = (int *)malloc((1+RC.nb_inst)*sizeof(int));
         RC.nb_CC[0]=1;
-        RC.nb_inst =1; // DJP - feptx_prec uses num_eNB but phy_init_RU uses nb_inst
-        LOG_I(PHY,"%s() NFAPI PNF mode - RC.nb_inst=1 this is because phy_init_RU() uses that to index and not RC.num_eNB - why the 2 similar variables?\n", __FUNCTION__);
         LOG_I(PHY,"%s() NFAPI PNF mode - RC.nb_CC[0]=%d for init_eNB_afterRU()\n", __FUNCTION__, RC.nb_CC[0]);
         LOG_I(PHY,"%s() NFAPI PNF mode - RC.nb_macrlc_inst:%d because used by mac_top_init_eNB()\n", __FUNCTION__, RC.nb_macrlc_inst);
         //mac_top_init_eNB();