commit before merge with nick

openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c

@@ -143,7 +143,7 @@ int NB_generate_eNB_dlsch_params_from_dci(PHY_VARS_eNB *eNB,
                                        DCI_CONTENT *DCI_Content,
                                        uint16_t rnti,
                                        DCI_format_NB_t dci_format,
-                                       LTE_eNB_DLSCH_t *dlsch,
+									   LTE_eNB_DLSCH_t *dlsch,
                                        NB_DL_FRAME_PARMS *frame_parms,
                                        uint8_t aggregation,
                                        uint8_t Num_dci

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -16,10 +16,10 @@ void PHY_config_req(PHY_Config_t* config_INFO){
 		NB_phy_config_mib_eNB(config_INFO->mod_id,
 							  config_INFO->CC_id,
 							  config_INFO->frequency_band_indicator,
-							  config_INFO->sch_config.physical_cell_id.value,
-							  config_INFO->subframe_config.dl_cyclic_prefix_type.value,
-							  config_INFO->subframe_config.ul_cyclic_prefix_type.value,
-							  config_INFO->rf_config.tx_antenna_ports.value,
+							  config_INFO->cfg->sch_config.physical_cell_id.value,
+							  config_INFO->cfg->subframe_config.dl_cyclic_prefix_type.value,
+							  config_INFO->cfg->subframe_config.ul_cyclic_prefix_type.value,
+							  config_INFO->cfg->rf_config.tx_antenna_ports.value,
 							  config_INFO->dl_CarrierFreq,
 							  config_INFO->ul_CarrierFreq);
 	}
@@ -29,9 +29,9 @@ void PHY_config_req(PHY_Config_t* config_INFO){
 		//Common Configuration included in SIB2-NB
 		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,
-							   &config_INFO->uplink_reference_signal_config,
+						       &config_INFO->cfg->nb_iot_config, // FIXME to be evaluated is should be passed a pointer
+						       &config_INFO->cfg->rf_config,
+							   &config_INFO->cfg->uplink_reference_signal_config,
 							   &config_INFO->extra_phy_parms
 							   );
 	}

openair2/PHY_INTERFACE/IF_Module_nb_iot.h

@@ -77,14 +77,20 @@ typedef struct{
 	uint32_t ul_CarrierFreq;
 
 
-	/*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;
-	nfapi_sch_config_t sch_config;
-	nfapi_nb_iot_config_t nb_iot_config;
-	nfapi_l23_config_t l23_config;
+	/*FAPI style config. parameters
+	 *
+	 * useful config message contents:
+	 * -nfapi_uplink_reference_signal_config_t uplink_reference_signal_config
+	 * -nfapi_subframe_config_t subframe_config;
+	 * -nfapi_rf_config_t rf_config;
+	 * -nfapi_sch_config_t sch_config;
+	 * -nfapi_nb_iot_config_t nb_iot_config;
+	 * -nfapi_l23_config_t l23_config;
+	 *
+	 * */
+	//XXX where allocate memory??
+	nfapi_config_request_t* cfg;
+
 
 	/*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

openair2/RRC/LITE/vars_nb_iot.c

@@ -69,7 +69,7 @@ unsigned short Data_to_read;
 eNB_RRC_INST_NB *eNB_rrc_inst_NB;
 uint8_t DRB2LCHAN_NB[2];//max can be 2 DRBs for NB_IoT --> it used for saving the LCID of DRBs
 
-//structure for FAPI-like configuration
+//structure for FAPI-like configuration (memory for this is allocated in init_SI)
 PHY_Config_t *config_INFO;
 
 BOOLEAN_t logicalChannelSR_Prohibit = 1;

targets/SIMU/USER/init_lte.c

@@ -148,6 +148,8 @@ PHY_VARS_eNB* init_lte_eNB(LTE_DL_FRAME_PARMS *frame_parms,
   return (PHY_vars_eNB);
 }
 
+
+/*this is a function just for initialization of NB-IoT stuff*/
 void init_lte_eNB_NB(
 					PHY_VARS_eNB  *PHY_vars_eNB,
 					NB_DL_FRAME_PARMS *frame_parms,