Commit f216ee51 authored by Vijay C's avatar Vijay C

Merge branch '8_1_1_2_Msg1_Issue_br' into '3GPP_TTCN_System_Simulator'

8.1.1.2 Fix for SystemInfoTag

See merge request firecell/rdsubscription/sequansrd!87
parents b9099963 3a3c77f1
......@@ -323,6 +323,7 @@ typedef struct RrcConfigurationReq_s {
int eMBMS_M2_configured;
int eMTC_configured;
int SL_configured;
uint8_t systemInfoValueTag;
RadioResourceConfig radioresourceconfig[MAX_NUM_CCs];
RadioResourceConfig radioresourceconfig_BR[MAX_NUM_CCs];
......
......@@ -1433,7 +1433,7 @@ initiate_ra_proc(module_id_t module_idP,
MessageDef *m = itti_alloc_new_message(TASK_MAC_ENB, 0, SS_SYSTEM_IND);
SS_SYSTEM_IND(m).bitmask = false;
SS_SYSTEM_IND(m).sfn = frameP;
SS_SYSTEM_IND(m).sf = subframeP -1;// Workaround for 1 Subframe Difference
SS_SYSTEM_IND(m).sf = subframeP;
SS_SYSTEM_IND(m).ra_PreambleIndex = preamble_index;
SS_SYSTEM_IND(m).prtPower_Type = true;
SS_SYSTEM_IND(m).repetitionsPerPreambleAttempt = 0;
......
......@@ -976,7 +976,12 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
}
(*sib1)->si_WindowLength = LTE_SystemInformationBlockType1__si_WindowLength_ms20;
(*sib1)->systemInfoValueTag = 0;
if (RC.ss.mode == SS_SOFTMODEM) {
(*sib1)->systemInfoValueTag = configuration->systemInfoValueTag;
} else {
(*sib1)->systemInfoValueTag = 0;
}
LOG_A(RRC,"Updating systemInfoValueTag Value: %d \n",(*sib1)->systemInfoValueTag);
(*sib1)->nonCriticalExtension = calloc(1, sizeof(LTE_SystemInformationBlockType1_v890_IEs_t));
LTE_SystemInformationBlockType1_v890_IEs_t *sib1_890 = (*sib1)->nonCriticalExtension;
sib1_890->lateNonCriticalExtension = NULL;
......@@ -1205,7 +1210,6 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
}
(*sib1)->si_WindowLength=LTE_SystemInformationBlockType1__si_WindowLength_ms20;
(*sib1)->systemInfoValueTag=0;
// (*sib1).nonCriticalExtension = calloc(1,sizeof(*(*sib1).nonCriticalExtension));
if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
......
......@@ -423,6 +423,7 @@ int sys_add_reconfig_cell(struct CellConfigInfo_Type *AddOrReconfigure)
}
RRC_CONFIGURATION_REQ(msg_p).num_plmn = SIB1_CELL_ACCESS_REL_INFO.plmn_IdentityList.d;
RRC_CONFIGURATION_REQ(msg_p).systemInfoValueTag = SIDL_SIB1_VAL.c1.v.systemInformationBlockType1.systemInfoValueTag;
for (int i = 0; i < RRC_CONFIGURATION_REQ(msg_p).num_plmn; ++i) {
if(SIB1_CELL_ACCESS_REL_INFO.plmn_IdentityList.v->plmn_Identity.mcc.d == TRUE)
......
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