From bb293b77428f54669b994c8dfbcea293d2cbf0f9 Mon Sep 17 00:00:00 2001 From: WEI-TAI CHEN Date: Wed, 11 Jul 2018 07:22:18 -0700 Subject: [PATCH] In NR,systemFrameNumber : 10 bits, MIB carry 6 bit MSB --- openair2/RRC/NR/L2_nr_interface.c | 4 ++-- openair2/RRC/NR/MESSAGES/asn1_msg.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openair2/RRC/NR/L2_nr_interface.c b/openair2/RRC/NR/L2_nr_interface.c index 2eaf7a43fd..e5a771f853 100644 --- a/openair2/RRC/NR/L2_nr_interface.c +++ b/openair2/RRC/NR/L2_nr_interface.c @@ -22,8 +22,8 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP, asn_enc_rval_t enc_rval; //SRB_INFO *Srb_info; //uint8_t Sdu_size = 0; - uint8_t sfn = (uint8_t)((frameP>>4)&0xff); - + uint8_t sfn = (uint8_t)((frameP>>4)&0x3f); + #ifdef DEBUG_RRC int i; LOG_I(RRC,"[eNB %d] mac_rrc_data_req to SRB ID=%d\n",Mod_idP,Srb_id); diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c index f83527160f..ed0adcd54f 100644 --- a/openair2/RRC/NR/MESSAGES/asn1_msg.c +++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c @@ -205,10 +205,10 @@ uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier, mib->message.choice.mib = CALLOC(1,sizeof(struct NR_MIB)); memset(mib->message.choice.mib,0,sizeof(struct NR_MIB)); //36.331 SFN BIT STRING (SIZE (8) , 38.331 SFN BIT STRING (SIZE (6)) - uint8_t sfn = (uint8_t)((frame>>4)&0xff); + uint8_t sfn_msb = (uint8_t)((frame>>4)&0x3f); mib->message.choice.mib->systemFrameNumber.buf = &sfn; mib->message.choice.mib->systemFrameNumber.size = 1; - mib->message.choice.mib->systemFrameNumber.bits_unused=0; + mib->message.choice.mib->systemFrameNumber.bits_unused=2; //38.331 spare BIT STRING (SIZE (1)) uint16_t *spare= calloc(1, sizeof(uint16_t));