Merge branch 'episys-merge' into episys/trial-merge-to-master

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

@@ -37,7 +37,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/public_inc/nfapi_pnf_interface.h

@@ -25,8 +25,14 @@ extern "C" {
 #include "nfapi_interface.h"
 #include "debug.h"
 #include <openair2/PHY_INTERFACE/IF_Module.h>
+#include "nfapi_nr_interface.h"
+#include "nfapi_nr_interface_scf.h"
 
 #include <sys/types.h>
+#include "openair1/PHY/defs_gNB.h"
+
+
+
 
 /*! This enum is used to describe the states of the pnf 
  */
@@ -121,6 +127,7 @@ typedef struct nfapi_pnf_config
 	 * 	The client is expected to send the PNF_PARAM.response after receiving the
 	 *  PNF_PARAM.request. This can be done in the call back. 
 	 */
+	int (*pnf_nr_param_req)(nfapi_pnf_config_t* config, nfapi_nr_pnf_param_request_t* req);
 	int (*pnf_param_req)(nfapi_pnf_config_t* config, nfapi_pnf_param_request_t* req);
 	
 	/*! A callback for the PNF_CONFIG.request
@@ -133,7 +140,8 @@ typedef struct nfapi_pnf_config
 	 *  PNF_CONFIG.request. This can be done in the call back. 
 	 */
 	int (*pnf_config_req)(nfapi_pnf_config_t* config, nfapi_pnf_config_request_t* req);
-	
+	int (*pnf_nr_config_req)(nfapi_pnf_config_t* config, nfapi_nr_pnf_config_request_t* req);
+
 	/*! A callback for the PNF_START.request
 	 *  \param config A pointer to the pnf configuration
 	 *  \param req A data structure for the decoded PNF_CONFIG.request. This will have
@@ -144,7 +152,8 @@ typedef struct nfapi_pnf_config
 	 *  PNF_START.request. This can be done in the call back. 
 	 */
 	int (*pnf_start_req)(nfapi_pnf_config_t* config, nfapi_pnf_start_request_t* req);
-	
+	int (*pnf_nr_start_req)(nfapi_pnf_config_t* config, nfapi_nr_pnf_start_request_t* req);
+
 	/*! A callback for the PNF_STOP.request
 	 *  \param config A pointer to the pnf configuration
 	 *  \param req A data structure for the decoded PNF_STOP.request. This will have
@@ -167,7 +176,8 @@ typedef struct nfapi_pnf_config
 	 *  PARAM.request. This can be done in the call back. 
 	 */
 	int (*param_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_param_request_t* req);
-	
+	int (*nr_param_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_nr_param_request_scf_t* req);
+
 	/*! A callback for the CONFIG.request
 	 *  \param config A pointer to the pnf configuration
 	 *  \param phy A pointer to the pnf phy configuration
@@ -179,6 +189,7 @@ typedef struct nfapi_pnf_config
 	 *  CONFIG.request. This can be done in the call back. 
 	 */
 	int (*config_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_config_request_t* req);
+	int (*nr_config_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_nr_config_request_scf_t* req);
 	
 	/*! A callback for the START.request
 	 *  \param config A pointer to the pnf configuration
@@ -190,8 +201,8 @@ typedef struct nfapi_pnf_config
 	 * 	The client is expected to send the START.response after the client has received the
 	 *  first subframe indication from FAPI.
 	 */
-	int (*start_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_start_request_t* req);
-	
+	int (*start_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy,  nfapi_start_request_t* req);
+	int (*nr_start_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy,  nfapi_nr_start_request_scf_t* req);
 	/*! A callback for the STOP.request
 	 *  \param config A pointer to the pnf configuration
 	 *  \param phy A pointer to the pnf phy configuration
@@ -203,7 +214,8 @@ typedef struct nfapi_pnf_config
 	 *  STOP.request. This can be done in the call back. 
 	 */
 	int (*stop_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_stop_request_t* req);
-	
+	int (*nr_stop_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_nr_stop_request_t* req);
+
 	/*! A callback for the MEASUREMENT.request
 	 *  \param config A pointer to the pnf configuration
 	 *  \param phy A pointer to the pnf phy configuration
@@ -355,6 +367,7 @@ int nfapi_pnf_config_destroy(nfapi_pnf_config_t* config);
  * \endcode
  */
 int nfapi_pnf_start(nfapi_pnf_config_t* config);
+int nfapi_nr_pnf_start(nfapi_pnf_config_t* config);
 
 /*! Stop the PNF library. 
  * \param config A pointer to the pnf configuration
@@ -371,6 +384,8 @@ int nfapi_pnf_stop(nfapi_pnf_config_t* config);
  * 
  */
 int nfapi_pnf_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_pnf_param_response_t* resp);
+int nfapi_nr_pnf_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_nr_pnf_param_response_t* resp);
+
 
 /*! Send the PNF_CONFIG.response
  * \param config A pointer to a pnf configuraiton
@@ -379,6 +394,7 @@ int nfapi_pnf_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_pnf_param_respons
  * 
  */
 int nfapi_pnf_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_pnf_config_response_t* resp);
+int nfapi_nr_pnf_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_nr_pnf_config_response_t* resp);
 
 /*! Send the PNF_START.response
  * \param config A pointer to a pnf configuraiton
@@ -387,7 +403,7 @@ int nfapi_pnf_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_pnf_config_respo
  * 
  */
 int nfapi_pnf_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_pnf_start_response_t* resp);
-
+int nfapi_nr_pnf_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_nr_pnf_start_response_t* resp);
 /*! Send the PNF_STOP.response
  * \param config A pointer to a pnf configuraiton
  * \param resp A pointer to the message structure
@@ -403,6 +419,7 @@ int nfapi_pnf_pnf_stop_resp(nfapi_pnf_config_t* config, nfapi_pnf_stop_response_
  * 
  */
 int nfapi_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_param_response_t* resp);
+int nfapi_nr_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_nr_param_response_scf_t* resp);
 
 /*! Send the CONFIG.response
  * \param config A pointer to a pnf configuraiton
@@ -411,7 +428,7 @@ int nfapi_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_param_response_t* res
  * 
  */
 int nfapi_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_config_response_t* resp);
-
+int nfapi_nr_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_nr_config_response_scf_t* resp);
 /*! Send the START.response
  * \param config A pointer to a pnf configuraiton
  * \param resp A pointer to the message structure
@@ -419,6 +436,7 @@ int nfapi_pnf_config_resp(nfapi_pnf_config_t* config, nfapi_config_response_t* r
  * 
  */
 int nfapi_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_start_response_t* resp);
+int nfapi_nr_pnf_start_resp(nfapi_pnf_config_t* config, nfapi_nr_start_response_scf_t* resp);
 
 /*! Send the STOP.response
  * \param config A pointer to a pnf configuraiton
@@ -550,6 +568,22 @@ typedef struct
 	nfapi_ue_release_request_t* ue_release_req;
 } nfapi_pnf_p7_subframe_buffer_t;
 
+typedef struct 
+{
+	//uint16_t sfn_slot
+	int16_t sfn;
+	int16_t slot;
+	//TODO: Change P7 structs to NR
+	nfapi_nr_dl_tti_request_t* dl_tti_req;//nfapi_dl_config_request_t* dl_config_req; 
+	nfapi_nr_ul_tti_request_t* ul_tti_req;//nfapi_ul_config_request_t* ul_config_req;
+	nfapi_nr_ul_dci_request_t* ul_dci_req;//nfapi_hi_dci0_request_t* hi_dci0_req;
+	nfapi_nr_tx_data_request_t* tx_data_req;//nfapi_tx_request_t* tx_req;
+
+	//TODO: check these two later
+	//nfapi_lbt_dl_config_request_t* lbt_dl_config_req;
+	//nfapi_ue_release_request_t* ue_release_req;
+} nfapi_pnf_p7_slot_buffer_t;
+
 typedef struct nfapi_pnf_p7_config nfapi_pnf_p7_config_t;
 
 /*! The nfapi PNF PHY P7 configuration information created using the nfapi_pnf_p7_create function
@@ -602,6 +636,8 @@ typedef struct nfapi_pnf_p7_config
 	/*! The dummy subframe buffer structure that should be used in case there
 	 * are no 'valid' subframe messages */
 	nfapi_pnf_p7_subframe_buffer_t dummy_subframe;
+
+	nfapi_pnf_p7_slot_buffer_t dummy_slot; // defining a slot equivalent for now
 	
 	/*! Configuration options for the p7 pack unpack functions*/
 	nfapi_p7_codec_config_t codec_config;
@@ -611,6 +647,7 @@ typedef struct nfapi_pnf_p7_config
 
 	// tdb : if these should be public
 	uint16_t subframe_buffer_size;
+	uint16_t slot_buffer_size;
 	uint8_t timing_info_mode_periodic; // 0:false 1:true
 	uint8_t timing_info_mode_aperiodic; // 0:false 1:true
 	uint8_t timing_info_period; // 1..225 in subframes
@@ -620,6 +657,7 @@ typedef struct nfapi_pnf_p7_config
 	 * \param req A pointer to the dl config request message structure
 	 * \return not currently used
 	 */
+	int (*dl_tti_req_fn)(gNB_L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_nr_dl_tti_request_t* req);
 	int (*dl_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_dl_config_request_t* req);
 	
 	/*! A callback for the UL_CONFIG.request
@@ -627,6 +665,7 @@ typedef struct nfapi_pnf_p7_config
 	 * \param req A pointer to the ul config request message structure
 	 * \return not currently used	
 	 */
+	int (*ul_tti_req_fn)(gNB_L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_nr_ul_tti_request_t* req);
 	int (*ul_config_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_ul_config_request_t* req);
 	
 	/*! A callback for the HI_DCI0.request
@@ -634,8 +673,9 @@ typedef struct nfapi_pnf_p7_config
 	 * \param req A pointer to the hi dci0 request message structure
 	 * \return not currently used
 	 */
+	int (*ul_dci_req_fn)(gNB_L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_nr_ul_dci_request_t* req);
 	int (*hi_dci0_req)(L1_rxtx_proc_t *proc,nfapi_pnf_p7_config_t* config, nfapi_hi_dci0_request_t* req);
-	
+
 	/*! A callback for the TX_REQ.request
 	 * \param config A poiner to the PNF P7 config
 	 * \param req A pointer to the tx request message structure
@@ -645,6 +685,7 @@ typedef struct nfapi_pnf_p7_config
 	 * will 'keep' the pointers until they are transmitted the callee should set the pointers in the req to 0
 	 * and then use the p7 codec config free function to release the pdu's when appropriate. 
 	 */
+	int (*tx_data_req_fn)(nfapi_pnf_p7_config_t* config, nfapi_nr_tx_data_request_t* req);
 	int (*tx_req)(nfapi_pnf_p7_config_t* config, nfapi_tx_request_t* req);
 	
 	/*! A callback for the LBT_DL_CONFIG.request
@@ -708,6 +749,7 @@ int nfapi_pnf_p7_config_destroy(nfapi_pnf_p7_config_t* config);
  * This function will not return until nfapi_pnf_p7_stop is called.
  */
 int nfapi_pnf_p7_start(nfapi_pnf_p7_config_t* config);
+int nfapi_nr_pnf_p7_start(nfapi_pnf_p7_config_t* config);
 
 /*! Stop the PNF P7 library. 
  * \param config A pointer to a PNF P7 config
@@ -717,6 +759,21 @@ int nfapi_pnf_p7_start(nfapi_pnf_p7_config_t* config);
  */
 int nfapi_pnf_p7_stop(nfapi_pnf_p7_config_t* config);
 
+/*! NR Slot indication
+ * message copied from nfapi_pnf_p7_subframe_ind
+ * \param config A pointer to a PNF P7 config
+ * \param phy_id The phy_id for the phy instance
+ * \param sfn_sf The SFN and SF in the format of FAPI
+ * \return 0 means success, -1 means failure
+ * 
+ * The client should call the subframe indication every 1ms. The PNF will
+ * respond by invoking the pnf p7 subframe callbacks with the messages from the subframe buffer
+ *
+ * If messages are not in the subframe buffer, they dummy subframe messages will be sent
+ */
+int nfapi_pnf_p7_slot_ind(nfapi_pnf_p7_config_t* config, uint16_t phy_id, uint16_t sfn, uint16_t slot);
+
+
 /*! Subframe indication
  * \param config A pointer to a PNF P7 config
  * \param phy_id The phy_id for the phy instance

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

@@ -1,12 +1,12 @@
 /*
  * Copyright 2017 Cisco Systems, Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "nfapi/open-nFAPI/pnf/inc/pnf_p7.h"
+#include "nfapi_nr_interface.h"
+#include "nfapi_nr_interface_scf.h"
 
 nfapi_pnf_config_t* nfapi_pnf_config_create()
 {
@@ -31,11 +32,11 @@ nfapi_pnf_config_t* nfapi_pnf_config_create()
 	memset(_this, 0, sizeof(pnf_t));
 
 	_this->sctp = 1;	// enable sctp
-	
+
 	_this->_public.vnf_p5_port = NFAPI_P5_SCTP_PORT;
-	
+
 	_this->_public.malloc = &malloc;
-	_this->_public.free = &free;	
+	_this->_public.free = &free;
 
 	_this->_public.codec_config.allocate = &malloc;
 	_this->_public.codec_config.deallocate = &free;
@@ -82,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
@@ -97,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
@@ -130,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
@@ -149,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
@@ -167,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)
@@ -175,12 +265,26 @@ int nfapi_pnf_param_resp(nfapi_pnf_config_t* config, nfapi_param_response_t* res
 		NFAPI_TRACE(NFAPI_TRACE_ERROR, "%s: NULL parameters\n", __FUNCTION__);
 		return -1;
 	}
-	
+
 	pnf_t* _this = (pnf_t*)(config);
 
 	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)
@@ -209,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)
@@ -236,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)
@@ -430,4 +591,3 @@ int nfapi_pnf_vendor_extension(nfapi_pnf_config_t* config, nfapi_p4_p5_message_h
 
 	return pnf_pack_and_send_p5_message(_this, msg, msg_len);
 }
-

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);