Commit bd672b42 authored by Michele Paffetti's avatar Michele Paffetti

cleaning part of the code for commn configuration in do_sib2_NB function. code compile

parent c4925a1d
...@@ -200,7 +200,7 @@ typedef struct RrcConfigurationReq_s { ...@@ -200,7 +200,7 @@ typedef struct RrcConfigurationReq_s {
long rach_macContentionResolutionTimer_NB[MAX_NUM_CCs]; long rach_macContentionResolutionTimer_NB[MAX_NUM_CCs];
long rach_powerRampingStep_NB[MAX_NUM_CCs]; long rach_powerRampingStep_NB[MAX_NUM_CCs];
long rach_preambleInitialReceivedTargetPower_NB[MAX_NUM_CCs]; long rach_preambleInitialReceivedTargetPower_NB[MAX_NUM_CCs];
long preambleTransMax_CE_NB[MAX_NUM_CCs]; //da ricontrollare se va bene il tipo long rach_preambleTransMax_CE_NB[MAX_NUM_CCs];
//BCCH //BCCH
long bcch_modificationPeriodCoeff_NB[MAX_NUM_CCs]; long bcch_modificationPeriodCoeff_NB[MAX_NUM_CCs];
//PCCH //PCCH
...@@ -209,7 +209,7 @@ typedef struct RrcConfigurationReq_s { ...@@ -209,7 +209,7 @@ typedef struct RrcConfigurationReq_s {
long pcch_npdcch_NumRepetitionPaging_NB[MAX_NUM_CCs]; long pcch_npdcch_NumRepetitionPaging_NB[MAX_NUM_CCs];
//NPRACH //NPRACH
long nprach_CP_Length[MAX_NUM_CCs]; long nprach_CP_Length[MAX_NUM_CCs];
long nprach_rsrp_range_NB[MAX_NUM_CCs]; long nprach_rsrp_range[MAX_NUM_CCs];
long nprach_Periodicity[MAX_NUM_CCs]; long nprach_Periodicity[MAX_NUM_CCs];
long nprach_StartTime[MAX_NUM_CCs]; long nprach_StartTime[MAX_NUM_CCs];
long nprach_SubcarrierOffset[MAX_NUM_CCs]; long nprach_SubcarrierOffset[MAX_NUM_CCs];
...@@ -235,9 +235,9 @@ typedef struct RrcConfigurationReq_s { ...@@ -235,9 +235,9 @@ typedef struct RrcConfigurationReq_s {
long dl_GapPeriodicity_NB[MAX_NUM_CCs]; long dl_GapPeriodicity_NB[MAX_NUM_CCs];
long dl_GapDurationCoeff_NB[MAX_NUM_CCs]; long dl_GapDurationCoeff_NB[MAX_NUM_CCs];
//Uplink power control Common //Uplink power control Common
long npusch_p0_NominalNPUSCH_r13[MAX_NUM_CCs]; long npusch_p0_NominalNPUSCH[MAX_NUM_CCs];
long npusch_alpha_r13[MAX_NUM_CCs]; long npusch_alpha[MAX_NUM_CCs];
long deltaPreambleMsg3_r13[MAX_NUM_CCs]; long deltaPreambleMsg3[MAX_NUM_CCs];
//UE timers and constants //UE timers and constants
long ue_TimersAndConstants_t300_NB[MAX_NUM_CCs]; long ue_TimersAndConstants_t300_NB[MAX_NUM_CCs];
long ue_TimersAndConstants_t301_NB[MAX_NUM_CCs]; long ue_TimersAndConstants_t301_NB[MAX_NUM_CCs];
......
...@@ -91,11 +91,12 @@ void PHY_config_req(PHY_Config_t* config_INFO){ ...@@ -91,11 +91,12 @@ void PHY_config_req(PHY_Config_t* config_INFO){
int IF_Module_init(IF_Module_t *if_inst){ int IF_Module_init(IF_Module_t *if_inst){
//at initialization of the IF module assign the function to be pointed to the function pointer
if_inst->UL_indication = UL_indication; if_inst->UL_indication = UL_indication;
if_inst->schedule_response = schedule_response; if_inst->schedule_response = schedule_response;
if_inst->PHY_config_req = PHY_config_req; if_inst->PHY_config_req = PHY_config_req;
//create the UL_IND_t , Sched_Resp_t and PHY_Config_t structures //create the UL_IND_t , Sched_Resp_t and PHY_Config_t structures ???
return 0; return 0;
} }
......
...@@ -321,9 +321,12 @@ typedef struct{ ...@@ -321,9 +321,12 @@ typedef struct{
/*IF_Module_t*/ /*IF_Module_t*/
typedef struct IF_Module_s{ typedef struct IF_Module_s{
//define the function pointer
void (*UL_indication)(UL_IND_t UL_INFO); void (*UL_indication)(UL_IND_t UL_INFO);
void (*schedule_response)(Sched_Rsp_t Sched_INFO); void (*schedule_response)(Sched_Rsp_t Sched_INFO);
void (*PHY_config_req)(PHY_Config_t config_INFO); void (*PHY_config_req)(PHY_Config_t config_INFO);
}IF_Module_t; }IF_Module_t;
/*Initial */ /*Initial */
......
...@@ -226,7 +226,7 @@ int NB_rrc_mac_config_req_eNB( ...@@ -226,7 +226,7 @@ int NB_rrc_mac_config_req_eNB(
config_INFO->get_COMMON = 1; config_INFO->get_COMMON = 1;
LOG_I(MAC,"[CONFIG]SIB2/3-NB Contents (partial)\n"); LOG_I(MAC,"[CONFIG]SIB2/3-NB radioResourceConfigCommon Contents (partial)\n");
LOG_I(MAC,"[CONFIG]npusch_ConfigCommon_r13.dmrs_Config_r13->threeTone_CyclicShift_r13= %ld\n", radioResourceConfigCommon->npusch_ConfigCommon_r13.dmrs_Config_r13->threeTone_CyclicShift_r13); LOG_I(MAC,"[CONFIG]npusch_ConfigCommon_r13.dmrs_Config_r13->threeTone_CyclicShift_r13= %ld\n", radioResourceConfigCommon->npusch_ConfigCommon_r13.dmrs_Config_r13->threeTone_CyclicShift_r13);
LOG_I(MAC,"[CONFIG]npusch_ConfigCommon_r13.dmrs_Config_r13->sixTone_CyclicShift_r13= %ld\n", radioResourceConfigCommon->npusch_ConfigCommon_r13.dmrs_Config_r13->sixTone_CyclicShift_r13); LOG_I(MAC,"[CONFIG]npusch_ConfigCommon_r13.dmrs_Config_r13->sixTone_CyclicShift_r13= %ld\n", radioResourceConfigCommon->npusch_ConfigCommon_r13.dmrs_Config_r13->sixTone_CyclicShift_r13);
......
...@@ -78,7 +78,8 @@ uint8_t do_MIB_NB( ...@@ -78,7 +78,8 @@ uint8_t do_MIB_NB(
uint8_t do_SIB1_NB(uint8_t Mod_id, int CC_id, uint8_t do_SIB1_NB(uint8_t Mod_id, int CC_id,
rrc_eNB_carrier_data_NB_t *carrier, rrc_eNB_carrier_data_NB_t *carrier,
RrcConfigurationReq *configuration RrcConfigurationReq *configuration,
uint32_t frame
); );
/** /**
......
...@@ -1632,13 +1632,13 @@ init_SI_NB( ...@@ -1632,13 +1632,13 @@ init_SI_NB(
//MIB //MIB
eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].MIB_NB = (uint8_t*) malloc16(32); //MIB is 34 bits=5bytes needed eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].MIB_NB = (uint8_t*) malloc16(32); //MIB is 34 bits=5bytes needed
//FIXME do_MIB_NB parameters
if (eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].MIB_NB) if (eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].MIB_NB)
{ {
eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].sizeof_MIB_NB = eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].sizeof_MIB_NB =
do_MIB_NB(&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id], do_MIB_NB(&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id],
configuration->N_RB_DL[CC_id], configuration->N_RB_DL[CC_id],
0 0 //FIXME is correct to pass frame = 0??
); );
} }
else { else {
...@@ -1660,7 +1660,8 @@ init_SI_NB( ...@@ -1660,7 +1660,8 @@ init_SI_NB(
ctxt_pP->module_id, ctxt_pP->module_id,
CC_id, CC_id,
&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id], &eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id],
configuration configuration,
0 //FIXME is correct to pass frame = 0??
); );
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment