slove conflict

openair1/SCHED_NR/fapi_nr_l1.c

@@ -45,7 +45,7 @@ void handle_nr_nfapi_bch_pdu(PHY_VARS_gNB *gNB,
   AssertFatal(dl_config_pdu->bch_pdu_rel15.length == 3, "BCH PDU has length %d != 3\n",
               dl_config_pdu->bch_pdu_rel15.length);
 
-  LOG_D(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
+  LOG_I(PHY,"bch_pdu: %x,%x,%x\n",sdu[0],sdu[1],sdu[2]);
   gNB->pbch_pdu[0] = sdu[2];
   gNB->pbch_pdu[1] = sdu[1];
   gNB->pbch_pdu[2] = sdu[0];

openair2/RRC/NR/L2_nr_interface.c

@@ -22,7 +22,7 @@ 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)&0x3f);
+  uint8_t sfn_msb                     = (uint8_t)((frameP>>4)&0x3f);
   
 #ifdef DEBUG_RRC
   int i;
@@ -38,16 +38,17 @@ int8_t mac_rrc_nr_data_req(const module_id_t Mod_idP,
   mib     = &carrier->mib;
 
   if( (Srb_id & RAB_OFFSET ) == MIBCH) {
-    mib->message.choice.mib->systemFrameNumber.buf = &sfn;
+    mib->message.choice.mib->systemFrameNumber.buf = &sfn_msb;
     enc_rval = uper_encode_to_buffer(&asn_DEF_NR_BCCH_BCH_Message,
                                      NULL,
                                      (void *)mib,
                                      carrier->MIB,
                                      24);
-    LOG_D(RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
+    LOG_I(NR_RRC,"Encoded MIB for frame %d (%p), bits %lu\n",sfn,carrier->MIB,enc_rval.encoded);
     buffer_pP[0]=carrier->MIB[0];
     buffer_pP[1]=carrier->MIB[1];
     buffer_pP[2]=carrier->MIB[2];
+    LOG_I(NR_RRC,"MIB PDU buffer_pP[0]=%x , buffer_pP[1]=%x, buffer_pP[2]=%x\n",buffer_pP[0],buffer_pP[1],buffer_pP[2]);
     AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
                  enc_rval.failed_type->name, enc_rval.encoded);
     return(3);

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -206,7 +206,7 @@ uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier,
   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_msb = (uint8_t)((frame>>4)&0x3f);
-  mib->message.choice.mib->systemFrameNumber.buf = &sfn;
+  mib->message.choice.mib->systemFrameNumber.buf = &sfn_msb;
   mib->message.choice.mib->systemFrameNumber.size = 1;
   mib->message.choice.mib->systemFrameNumber.bits_unused=2;