review of PHY_Config_t structure parameters for FAPI-like approach. Implement...

review of PHY_Config_t structure parameters for FAPI-like approach. Implement the FAPI required parameters and adding some extras in separate structure. Code compile

openair1/PHY/INIT/defs_nb_iot.h

@@ -61,7 +61,9 @@ void NB_phy_config_mib_eNB(int     Mod_id,
 void NB_phy_config_sib2_eNB(uint8_t Mod_id,
                          int CC_id,
                          nfapi_nb_iot_config_t *config,
-							nfapi_rf_config_t *rf_config
+						 nfapi_rf_config_t *rf_config,
+						 nfapi_uplink_reference_signal_config_t* ul_nrs_config,
+						 extra_phyConfigCommon_t* extra_phy_parms
                          );
 
 void NB_phy_config_dedicated_eNB(module_id_t Mod_id,

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -30,7 +30,10 @@ void PHY_config_req(PHY_Config_t* config_INFO){
 		NB_phy_config_sib2_eNB(config_INFO->mod_id,
 							   config_INFO->CC_id,
 						       &config_INFO->nb_iot_config, // FIXME to be evaluated is should be passed a pointer
-						       &config_INFO->rf_config); // FIXME to be evaluated is should be passed a pointer
+						       &config_INFO->rf_config,
+							   &config_INFO->uplink_reference_signal_config,
+							   &config_INFO->extra_phy_parms
+							   );
 	}
 
 	if(config_INFO->get_DEDICATED!= 0)

openair2/LAYER2/MAC/main.c

@@ -436,7 +436,6 @@ int l2_init(LTE_DL_FRAME_PARMS *frame_parms,int eMBMS_active, char *uecap_xer,ui
 {
 
 
-
   LOG_I(MAC,"[MAIN] MAC_INIT_GLOBAL_PARAM IN...\n");
   //    NB_NODE=2;
   //    NB_INST=2;

openair2/PHY_INTERFACE/IF_Module_nb_iot.c

@@ -6,21 +6,18 @@
 
 
 //called at initialization of L2
-//TODO: define the input
 IF_Module_t* IF_Module_init_L2(void) //southbound IF-Module Interface
 {
-	//register the IF Module to MAC
+	//mapping the IF-Module function to L2 definition
 	if_inst->UL_indication = UL_indication;
 
 	return if_inst;
 }
 
-//called at initialization of L1
-//TODO: define the input
+//called at initialization of L1 (phy_init_lte_eNB)
 IF_Module_t* IF_Module_init_L1(void) //northbound IF-Module Interface
 {
-	//fill the Sched_Rsp_t
-	//fill the PHY_Config_t -->already done in rrc_mac_config
+	//mapping the IF-module function to L1 definition
 	if_inst->schedule_response = schedule_response;
 	if_inst->PHY_config_req  = PHY_config_req;
 

openair2/PHY_INTERFACE/IF_Module_nb_iot.h

@@ -20,6 +20,36 @@
 
 // P5 FAPI-like configuration structures
 
+/*MP: MISSED COMMON CONFIG. of SIB2-NB in FAPI SPECS (may non needed)*/
+typedef struct{
+	//nprach_config
+	uint16_t nprach_config_0_subcarrier_MSG3_range_start;
+	uint16_t nprach_config_1_subcarrier_MSG3_range_start;
+	uint16_t nprach_config_2_subcarrier_MSG3_range_start;
+	uint16_t nprach_config_0_max_num_preamble_attempt_CE;
+	uint16_t nprach_config_1_max_num_preamble_attempt_CE;
+	uint16_t nprach_config_2_max_num_preamble_attempt_CE;
+	uint16_t nprach_config_0_npdcch_num_repetitions_RA;
+	uint16_t nprach_config_1_npdcch_num_repetitions_RA;
+	uint16_t nprach_config_2_npdcch_num_repetitions_RA;
+	uint16_t nprach_config_0_npdcch_startSF_CSS_RA;
+	uint16_t nprach_config_1_npdcch_startSF_CSS_RA;
+	uint16_t nprach_config_2_npdcch_startSF_CSS_RA;
+	uint16_t nprach_config_0_npdcch_offset_RA;
+	uint16_t nprach_config_1_npdcch_offset_RA;
+	uint16_t nprach_config_2_npdcch_offset_RA;
+
+	//npusch ConfigCommon (carried by the NULSCH PDU in FAPI--> so maybe not a static parameter)
+	//not used
+	ACK_NACK_NumRepetitions_NB_r13_t *ack_nack_numRepetitions_MSG4; //pointer to the first cell of a list of ack_nack_num_repetitions
+
+    //ulPowerControlCommon (UE side)
+    uint16_t p0_nominal_npusch;
+	uint16_t alpha;
+	uint16_t delta_preamle_MSG3;
+
+}extra_phyConfigCommon_t;
+
 typedef struct{
 
 	/*OAI config. parameters*/
@@ -36,7 +66,7 @@ typedef struct{
 
 	//In 3GPP specs (TS 36.101 Table 5.7.3-1 and ch 5.7.3F) see also SIB2-NB freqInfo.ul-carrierFreq
 	//this parameters should be evaluated based of the EUTRA Absolute Radio Frequency Channel Number (EARFCN)
-	//in FAPI this value is given inside th BROADCAST DETECT request (P4 Network Monito Mode procedure)
+	//in FAPI this value is given inside the BROADCAST DETECT request (P4 Network Monitor Mode procedure)
 	//in OAI we set the dl_CarrierFrequenci at configuration time (see COMMON/rrc_messages_types.h)
 	//then adding an offset for the ul_CarrierFreq ( see RU-RAU split approach - init_SI)
 	uint32_t dl_CarrierFreq;
@@ -44,6 +74,7 @@ typedef struct{
 
 
 	/*FAPI style config. parameters*/
+
 	nfapi_uplink_reference_signal_config_t uplink_reference_signal_config;
 	nfapi_subframe_config_t subframe_config;
 	nfapi_rf_config_t rf_config;
@@ -51,9 +82,14 @@ typedef struct{
 	nfapi_nb_iot_config_t nb_iot_config;
 	nfapi_l23_config_t l23_config;
 
-	/*Dedicated configuration --> not supported by FAPI?*/
+	/*Dedicated configuration -->not supported by FAPI
+	 * In OAI at least are needed when we manage the phy_procedures_eNB_TX in which we call the phy_config_dedicated_eNB_step2
+	 * that use the physicalConfigDedicated info previously stored in the PHY_VARS_eNB structure through the phy_config_dedicated procedure
+	 */
 	PhysicalConfigDedicated_NB_r13_t *phy_config_dedicated;
 
+	/*MP: MISSED COMMON CONFIG. of SIB2-NB in FAPI SPECS (may non needed)*/
+	extra_phyConfigCommon_t extra_phy_parms;
 
 }PHY_Config_t;
 

openair2/PHY_INTERFACE/nfapi_interface.h

@@ -855,37 +855,6 @@ typedef struct {
 	nfapi_uint16_tlv_t dl_gap_threshold;
 	nfapi_uint16_tlv_t dl_gap_periodicity;
 	nfapi_uint16_tlv_t dl_gap_duration_coefficient;
-
-	///MP: MISSED COMMON CONFIG. of SIB2-NB in FAPI SPECS
-
-			//nprach_config
-			uint16_t nprach_config_0_subcarrier_MSG3_range_start;
-			uint16_t nprach_config_1_subcarrier_MSG3_range_start;
-			uint16_t nprach_config_2_subcarrier_MSG3_range_start;
-			uint16_t nprach_config_0_max_num_preamble_attempt_CE;
-			uint16_t nprach_config_1_max_num_preamble_attempt_CE;
-			uint16_t nprach_config_2_max_num_preamble_attempt_CE;
-			uint16_t nprach_config_0_npdcch_num_repetitions_RA;
-			uint16_t nprach_config_1_npdcch_num_repetitions_RA;
-			uint16_t nprach_config_2_npdcch_num_repetitions_RA;
-			uint16_t nprach_config_0_npdcch_startSF_CSS_RA;
-			uint16_t nprach_config_1_npdcch_startSF_CSS_RA;
-			uint16_t nprach_config_2_npdcch_startSF_CSS_RA;
-			uint16_t nprach_config_0_npdcch_offset_RA;
-			uint16_t nprach_config_1_npdcch_offset_RA;
-			uint16_t nprach_config_2_npdcch_offset_RA;
-
-			//npusch ConfigCommon
-			ACK_NACK_NumRepetitions_NB_r13_t *ack_nack_numRepetitions_MSG4; //pointer to the first cell of a list of ack_nack_num_repetitions
-
-			//ulPowerControlCommon
-			uint16_t p0_nominal_npusch;
-			uint16_t alpha;
-			uint16_t delta_preamle_MSG3;
-
-
-
-
 } nfapi_nb_iot_config_t;
 
 #define NFAPI_NB_IOT_CONFIG_OPERATING_MODE_TAG 0x00A5