Merge remote-tracking branch 'origin/feat-sib1-sa-mode' into integration-develop-nr-2019w48bis

openair2/RRC/NR/MESSAGES/asn1_msg.h

@@ -65,30 +65,28 @@ uint8_t get_adjacent_cell_mod_id_NR(uint16_t phyCellId);
 @param phich_duration PHICH duration parameter
 @param frame radio frame number
 @return size of encoded bit stream in bytes*/
-uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier, 
-                  uint32_t frame, 
-                  uint32_t ssb_SubcarrierOffset, 
-                  uint32_t pdcch_ConfigSIB1, 
-                  uint32_t subCarrierSpacingCommon, 
+uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier,
+                  uint32_t frame,
+                  uint32_t ssb_SubcarrierOffset,
+                  uint32_t pdcch_ConfigSIB1,
+                  uint32_t subCarrierSpacingCommon,
                   uint32_t dmrs_TypeA_Position);
 /**
-\brief Generate configuration for SIB1 (eNB).
+\brief Generate configuration for SIB1 (gNB).
 @param carrier pointer to Carrier information
-@param Mod_id Instance of eNB
-@param Component carrier Component carrier to configure
-@param configuration Pointer Configuration Request structure  
+@param configuration Pointer Configuration Request structure
 @return size of encoded bit stream in bytes*/
-
-uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
-		           int Mod_id,
-				   int CC_id,
-				   gNB_RrcConfigurationReq *configuration);
+uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier
+#if defined(ENABLE_ITTI)
+  , gNB_RrcConfigurationReq *configuration
+#endif
+                  );
 
 void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
                                 int CC_id,
-                                #if defined(ENABLE_ITTI)
-                                gNB_RrcConfigurationReq *configuration,
-                                #endif
+#if defined(ENABLE_ITTI)
+  gNB_RrcConfigurationReq *configuration,
+#endif
                                 int initial_flag);
 
 void do_RLC_BEARER(uint8_t Mod_id,

openair2/RRC/NR/nr_rrc_defs.h

@@ -56,8 +56,10 @@
 //#include "RRCConnectionRequest.h"
 //#include "RRCConnectionReestablishmentRequest.h"
 #include "NR_RRCReestablishmentRequest.h"
-//#include "BCCH-DL-SCH-Message.h"
+#include "NR_BCCH-DL-SCH-Message.h"
 #include "NR_BCCH-BCH-Message.h"
+#include "NR_PLMN-IdentityInfo.h"
+#include "NR_MCC-MNC-Digit.h"
 //#include "MCCH-Message.h"
 //#include "MBSFNAreaConfiguration-r9.h"
 //#include "SCellToAddMod-r10.h"
@@ -374,6 +376,9 @@ typedef struct {
   uint8_t                                   *MIB;
   uint8_t                                   sizeof_MIB;
 
+  uint8_t                                   *SIB1;
+  uint8_t                                   sizeof_SIB1;
+
   uint8_t                                   *ServingCellConfigCommon;
   uint8_t                                   sizeof_servingcellconfigcommon;
 
@@ -388,6 +393,7 @@ typedef struct {
 
   //are the only static one (memory has been already allocated)
   NR_BCCH_BCH_Message_t                     mib;
+  NR_BCCH_DL_SCH_Message_t                  *siblock1;
 
   NR_ServingCellConfigCommon_t              *servingcellconfigcommon;