Commit 41181936 authored by Petro Shevchenko's avatar Petro Shevchenko Committed by jperaldi

bugz #125674: fixed fault in do_SIB5() in case of several cells.

InterFreqCarrierFreqInfoCount became an array
parent 414ae195
......@@ -498,7 +498,7 @@ typedef struct RrcConfigurationReq_s {
//SIB5
bool sib5_Present[MAX_NUM_CCs];
int InterFreqCarrierFreqInfoCount;
int InterFreqCarrierFreqInfoCount[MAX_NUM_CCs];
InterFreqCarrierFreqInfo_t *InterFreqCarrierFreqInfo[MAX_NUM_CCs];
//SIB18
......
......@@ -2452,7 +2452,7 @@ uint8_t do_SIB5(uint8_t Mod_id,
LTE_InterFreqCarrierFreqInfo_t *InterFreqCarrierInfo;
/* Handling multiple entities in InterFrequencyList for SIB5 message */
for(int i=0;i<configuration->InterFreqCarrierFreqInfoCount;i++) {
for(int i=0;i<configuration->InterFreqCarrierFreqInfoCount[CC_id];i++) {
InterFreqCarrierInfo = CALLOC(1,sizeof(struct LTE_InterFreqCarrierFreqInfo));
InterFreqCarrierInfo->dl_CarrierFreq = configuration->InterFreqCarrierFreqInfo[CC_id][i].dl_CarrierFreq;
InterFreqCarrierInfo->q_RxLevMin = configuration->InterFreqCarrierFreqInfo[CC_id][i].q_RxLevMin;
......
......@@ -546,8 +546,8 @@ int sys_add_reconfig_cell(struct SYSTEM_CTRL_REQ *req)
/* SIB5: Received SIB5 from TTCN */
if(SQN_SystemInformation_r8_IEs_sib_TypeAndInfo_s_sib5 == AddOrReconfigure->Basic.v.BcchConfig.v.BcchInfo.v.SIs.v.v[i].message.v.c1.v.systemInformation.criticalExtensions.v.systemInformation_r8.sib_TypeAndInfo.v[j].d) {
RRC_CONFIGURATION_REQ(msg_p).sib5_Present[cell_index] = true;
RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfoCount = AddOrReconfigure->Basic.v.BcchConfig.v.BcchInfo.v.SIs.v.v[i].message.v.c1.v.systemInformation.criticalExtensions.v.systemInformation_r8.sib_TypeAndInfo.v[j].v.sib5.interFreqCarrierFreqList.d;
RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfo[cell_index] = CALLOC(RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfoCount,sizeof(struct InterFreqCarrierFreqInfo_s));
RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfoCount[cell_index] = AddOrReconfigure->Basic.v.BcchConfig.v.BcchInfo.v.SIs.v.v[i].message.v.c1.v.systemInformation.criticalExtensions.v.systemInformation_r8.sib_TypeAndInfo.v[j].v.sib5.interFreqCarrierFreqList.d;
RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfo[cell_index] = CALLOC(RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfoCount[cell_index],sizeof(struct InterFreqCarrierFreqInfo_s));
for(int k=0;k < AddOrReconfigure->Basic.v.BcchConfig.v.BcchInfo.v.SIs.v.v[i].message.v.c1.v.systemInformation.criticalExtensions.v.systemInformation_r8.sib_TypeAndInfo.v[j].v.sib5.interFreqCarrierFreqList.d; k++) {
RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfo[cell_index][k].dl_CarrierFreq = AddOrReconfigure->Basic.v.BcchConfig.v.BcchInfo.v.SIs.v.v[i].message.v.c1.v.systemInformation.criticalExtensions.v.systemInformation_r8.sib_TypeAndInfo.v[j].v.sib5.interFreqCarrierFreqList.v[k].dl_CarrierFreq;
RRC_CONFIGURATION_REQ(msg_p).InterFreqCarrierFreqInfo[cell_index][k].q_RxLevMin = AddOrReconfigure->Basic.v.BcchConfig.v.BcchInfo.v.SIs.v.v[i].message.v.c1.v.systemInformation.criticalExtensions.v.systemInformation_r8.sib_TypeAndInfo.v[j].v.sib5.interFreqCarrierFreqList.v[k].q_RxLevMin;
......
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