investigating pack/unpack

nfapi/oai_integration/nfapi_vnf.c

@@ -1019,7 +1019,8 @@ int param_resp_cb(nfapi_vnf_config_t *config, int p5_idx, nfapi_nr_param_respons
   pnf_info *pnf = vnf->pnfs;
   phy_info *phy = pnf->phys;
   struct sockaddr_in pnf_p7_sockaddr;
-  nfapi_nr_config_request_scf_t *req = &RC.nrmac[0]->config[0];
+  nfapi_nr_config_request_scf_t *req = &RC.nrmac[0]->config[0]; // check
+
   phy->remote_port = resp->nfapi_config.p7_pnf_port.value;
   memcpy(&pnf_p7_sockaddr.sin_addr.s_addr, &(resp->nfapi_config.p7_pnf_address_ipv4.address[0]), 4);
   phy->remote_addr = inet_ntoa(pnf_p7_sockaddr.sin_addr);
@@ -1055,7 +1056,7 @@ int param_resp_cb(nfapi_vnf_config_t *config, int p5_idx, nfapi_nr_param_respons
       req->num_tlv++;
     }
   }
-
+  
   vendor_ext_tlv_2 ve2;
   memset(&ve2, 0, sizeof(ve2));
   ve2.tl.tag = VENDOR_EXT_TLV_2_TAG;

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

@@ -473,6 +473,9 @@ typedef struct {
   nfapi_nr_nfapi_t              nfapi_config;
 } nfapi_nr_param_response_scf_t;
 
+//------------------------------//
+//3.3.2 CONFIG
+
 /* CONFIG.REQUEST */
 typedef struct {
   nfapi_p4_p5_message_header_t  header;
@@ -491,9 +494,15 @@ typedef struct {
   nfapi_nr_nfapi_t              nfapi_config;
 } nfapi_nr_config_request_scf_t;
 
+
 /* CONFIG.RESPONSE */
 typedef struct {
   // TODO: add here
+  nfapi_p4_p5_message_header_t  header;
+  nfapi_nr_param_errors_e error_code;
+  uint8_t num_invalid_tlvs;
+
+   nfapi_vendor_extension_tlv_t  vendor_extension;
 } nfapi_nr_config_response_scf_t;
 
 //------------------------------//

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/vnf/src/vnf_interface.c

@@ -546,7 +546,7 @@ int nfapi_vnf_config_req(nfapi_vnf_config_t* config, int p5_idx, nfapi_nr_config
 
 	if(phy == NULL)
 	{
-		NFAPI_TRACE(NFAPI_TRACE_WARN, "%s failed to find phy inforation phy_id:%d\n", __FUNCTION__, req->header.phy_id);
+		NFAPI_TRACE(NFAPI_TRACE_WARN, "%s failed to find phy information phy_id:%d\n", __FUNCTION__, req->header.phy_id);
 		return -1;
 	}
 

openair1/PHY/INIT/nr_init.c

@@ -463,13 +463,14 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
   fp->dl_CarrierFreq = ((dl_bw_khz>>1) + gNB_config->carrier_config.dl_frequency.value)*1000 ;
 
   int32_t dlul_offset = 0;
-  lte_frame_type_t frame_type = 0;
+  lte_frame_type_t frame_type = 0; // FDD
   
   get_band(fp->dl_CarrierFreq,&fp->nr_band,&dlul_offset,&frame_type);
 
   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 ;
 
+  printf("\n%d\t%d\t%d\n", fp->ul_CarrierFreq, fp->dl_CarrierFreq, dlul_offset );
   AssertFatal(fp->ul_CarrierFreq==(fp->dl_CarrierFreq+dlul_offset), "Disagreement in uplink frequency for band %d\n", fp->nr_band);
   
   fp->threequarter_fs = openair0_cfg[0].threequarter_fs;

openair1/PHY/NR_REFSIG/scrambling_luts.c

@@ -42,6 +42,7 @@ void init_byte2m64(void) {
     byte2m64_im[s] = _mm_insert_pi16(byte2m64_im[s],(1-2*((s>>5)&1)),2);
     byte2m64_re[s] = _mm_insert_pi16(byte2m64_re[s],(1-2*((s>>6)&1)),3);
     byte2m64_im[s] = _mm_insert_pi16(byte2m64_im[s],(1-2*((s>>7)&1)),3);
+     /*
      printf("init_scrambling_luts: s %x (%d) ((%d,%d),(%d,%d),(%d,%d),(%d,%d))\n",
 	    ((uint16_t*)&s)[0],
 	    (1-2*(s&1)),
@@ -49,6 +50,7 @@ void init_byte2m64(void) {
 	    ((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]);    
+      */
 
   }
 }

openair1/PHY/defs_common.h

@@ -99,7 +99,6 @@
 
 #define NB_RX_ANTENNAS_MAX 64
 
-
 typedef enum {TDD=1,FDD=0} lte_frame_type_t;
 
 typedef enum {EXTENDED=1,NORMAL=0} lte_prefix_type_t;