maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving compilation errors (temp commit)

Browse Source
This commit is contained in:
Ahmed Elias
2017-10-11 19:06:06 +02:00
parent cd318b327a
commit d34226c8b2
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED/fapi_l1.c
+4 -4
View File
@@ -275,8 +275,8 @@ void handle_ulsch_cqi_ri_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request
ulsch_harq->frame = frame; ulsch_harq->frame = frame;
ulsch_harq->subframe = subframe; ulsch_harq->subframe = subframe;
ulsch_harq->O_RI = rel9->aperiodic_cqi_pmi_ri_report.cc[0].ri_size; ulsch_harq->O_RI = rel9->aperiodic_cqi_pmi_ri_report.cc[0].ri_size;
ulsch_harq->Or1 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[0]; //ulsch_harq->Or1 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[0];
if (ulsch_harq->O_RI>1) ulsch_harq->Or2 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[1]; //if (ulsch_harq->O_RI>1) ulsch_harq->Or2 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[1];
ulsch->beta_offset_ri_times8 = to_beta_offset_ri[rel9->delta_offset_ri]; ulsch->beta_offset_ri_times8 = to_beta_offset_ri[rel9->delta_offset_ri];
ulsch->beta_offset_cqi_times8 = to_beta_offset_cqi[rel9->delta_offset_cqi]; ulsch->beta_offset_cqi_times8 = to_beta_offset_cqi[rel9->delta_offset_cqi];
LOG_I(PHY,"Filling ulsch_cqi_ri information for frame %d, subframe %d : O_RI %d, Or1 %d, beta_offset_cqi_times8 %d (%d)\n", LOG_I(PHY,"Filling ulsch_cqi_ri information for frame %d, subframe %d : O_RI %d, Or1 %d, beta_offset_cqi_times8 %d (%d)\n",
@@ -296,10 +296,10 @@ void handle_ulsch_cqi_harq_ri_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_re
ulsch_harq->frame = frame; ulsch_harq->frame = frame;
ulsch_harq->subframe = subframe; ulsch_harq->subframe = subframe;
ulsch_harq->O_RI = rel9->aperiodic_cqi_pmi_ri_report.cc[0].ri_size; ulsch_harq->O_RI = rel9->aperiodic_cqi_pmi_ri_report.cc[0].ri_size;
ulsch_harq->Or1 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[0]; //ulsch_harq->Or1 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[0];
ulsch_harq->O_ACK = harq_information->harq_information_rel10.harq_size; ulsch_harq->O_ACK = harq_information->harq_information_rel10.harq_size;
if (ulsch_harq->O_RI>1) ulsch_harq->Or2 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[1]; //if (ulsch_harq->O_RI>1) ulsch_harq->Or2 = rel9->aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[1];
ulsch->beta_offset_harqack_times8 = to_beta_offset_harqack[harq_information->harq_information_rel10.delta_offset_harq]; ulsch->beta_offset_harqack_times8 = to_beta_offset_harqack[harq_information->harq_information_rel10.delta_offset_harq];
ulsch->beta_offset_ri_times8 = to_beta_offset_ri[rel9->delta_offset_ri]; ulsch->beta_offset_ri_times8 = to_beta_offset_ri[rel9->delta_offset_ri];
openair2/ENB_APP/enb_config.c
+10 -9
View File
@@ -449,7 +449,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
int32_t my_int; int32_t my_int;
/* /*
char* flexran_agent_interface_name = NULL; char* flexran_agent_interface_name = NULL;
char* flexran_agent_ipv4_address = NULL; char* flexran_agent_ipv4_address = NULL;
@@ -488,14 +487,14 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
paramdef_t CCsParams[] = CCPARAMS_DESC; paramdef_t CCsParams[] = CCPARAMS_DESC;
paramlist_def_t CCsParamList = {ENB_CONFIG_STRING_COMPONENT_CARRIERS,NULL,0}; paramlist_def_t CCsParamList = {ENB_CONFIG_STRING_COMPONENT_CARRIERS,NULL,0};
paramdef_t brParams[] = BRPARAMS_DESC; //paramdef_t brParams[] = BRPARAMS_DESC;
paramdef_t siInfoBRParams[] = SI_INFO_BR_DESC; // paramdef_t siInfoBRParams[] = SI_INFO_BR_DESC;
paramdef_t rsrprangeParams[] = RSRP_RANGE_LIST_DESC; //paramdef_t rsrprangeParams[] = RSRP_RANGE_LIST_DESC;
paramdef_t rachcelevelParams[] = RACH_CE_LEVELINFOLIST_R13_DESC; //paramdef_t rachcelevelParams[] = RACH_CE_LEVELINFOLIST_R13_DESC;
paramdef_t prachParams[] = PRACH_PARAMS_CE_R13_DESC; //paramdef_t prachParams[] = PRACH_PARAMS_CE_R13_DESC;
paramdef_t n1PUCCH_ANR13Params[] = N1PUCCH_AN_INFOLIST_R13_DESC; //paramdef_t n1PUCCH_ANR13Params[] = N1PUCCH_AN_INFOLIST_R13_DESC;
paramdef_t pcchv1310Params[] = PCCH_CONFIG_V1310_DESC; //paramdef_t pcchv1310Params[] = PCCH_CONFIG_V1310_DESC;
paramdef_t sib2freqhoppingParams[] = SIB2_FREQ_HOPPING_R13_DESC; //paramdef_t sib2freqhoppingParams[] = SIB2_FREQ_HOPPING_R13_DESC;
paramdef_t SRB1Params[] = SRB1PARAMS_DESC; paramdef_t SRB1Params[] = SRB1PARAMS_DESC;
@@ -616,6 +615,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
LOG_I(RRC,"num component carriers %d \n", num_component_carriers); LOG_I(RRC,"num component carriers %d \n", num_component_carriers);
if ( CCsParamList.numelt> 0) { if ( CCsParamList.numelt> 0) {
#ifdef CLOSE_FOR_NOW
char ccspath[MAX_OPTNAME_SIZE*2 + 16]; char ccspath[MAX_OPTNAME_SIZE*2 + 16];
@@ -1732,6 +1732,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) {
config_get( CCsParams,sizeof(CCsParams)/sizeof(paramdef_t),ccspath); config_get( CCsParams,sizeof(CCsParams)/sizeof(paramdef_t),ccspath);
} }
#endif
} }
char srb1path[MAX_OPTNAME_SIZE*2 + 8]; char srb1path[MAX_OPTNAME_SIZE*2 + 8];
sprintf(srb1path,"%s.%s",enbpath,ENB_CONFIG_STRING_SRB1); sprintf(srb1path,"%s.%s",enbpath,ENB_CONFIG_STRING_SRB1);
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+1 -1
View File
@@ -307,7 +307,7 @@ void generate_Msg2(module_id_t module_idP,int CC_idP,frame_t frameP,sub_frame_t
} //repetition_count==0 && SF condition met } //repetition_count==0 && SF condition met
if (RA_template->msg2_mpdcch_repetition_cnt>0) { // we're in a stream of repetitions if (RA_template->msg2_mpdcch_repetition_cnt>0) { // we're in a stream of repetitions
<<<<<<< HEAD
LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, Subframe %d : In generate_Msg2, MPDCCH repetition %d\n", LOG_I(MAC,"[eNB %d][RAPROC] Frame %d, Subframe %d : In generate_Msg2, MPDCCH repetition %d\n",
module_idP,frameP,subframeP,RA_template->msg2_mpdcch_repetition_cnt); module_idP,frameP,subframeP,RA_template->msg2_mpdcch_repetition_cnt);
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+2 -2
View File
@@ -436,7 +436,7 @@ void getRepetition(UE_TEMPLATE * pue_template,unsigned int *maxRep , unsigned i
void /*void
schedule_ue_spec_br( schedule_ue_spec_br(
module_id_t module_idP, module_id_t module_idP,
frame_t frameP, frame_t frameP,
@@ -1503,7 +1503,7 @@ schedule_ue_spec_br(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH, VCD_FUNCTION_OUT);
} }
*/
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+2 -2
View File
@@ -1383,11 +1383,11 @@ void fill_nfapi_ulsch_config_request_rel8(nfapi_ul_config_request_pdu_t *ul_con
for (int ri=0; for (int ri=0;
ri<(1<<ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].ri_size); ri<(1<<ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].ri_size);
ri++) ri++)
ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[ri] = /*ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.aperiodic_cqi_pmi_ri_report.cc[0].dl_cqi_pmi_size[ri] =
get_dl_cqi_pmi_size_pusch(cc, get_dl_cqi_pmi_size_pusch(cc,
tmode, tmode,
1+ri, 1+ri,
physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic); physicalConfigDedicated->cqi_ReportConfig->cqi_ReportModeAperiodic);*/
ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.delta_offset_cqi = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_CQI_Index; ul_config_pdu->ulsch_cqi_ri_pdu.cqi_ri_information.cqi_ri_information_rel9.delta_offset_cqi = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_CQI_Index;
((nfapi_ul_config_ulsch_cqi_ri_pdu*)ul_config_pdu)->cqi_ri_information.cqi_ri_information_rel9.delta_offset_ri = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_RI_Index; ((nfapi_ul_config_ulsch_cqi_ri_pdu*)ul_config_pdu)->cqi_ri_information.cqi_ri_information_rel9.delta_offset_ri = physicalConfigDedicated->pusch_ConfigDedicated->betaOffset_RI_Index;