do_SERVINGCELLCONFIGCOMMON will be reuse for fill common config

openair2/COMMON/rrc_messages_types.h

@@ -405,7 +405,6 @@ typedef struct NRRrcConfigurationReq_s {
   long                    PDCCH_TCI_StateId[MAX_NUM_CCs];
   BOOLEAN_t               tci_PresentInDCI[MAX_NUM_CCs];
   uint32_t                PDCCH_DMRS_ScramblingID[MAX_NUM_CCs];
-  uint8_t                 frequencyDomainResources_buf[6];
 
   //NR PDCCH-ConfigCommon commonSearchSpaces
   long                    SearchSpaceId[MAX_NUM_CCs];

openair2/RRC/NR/MESSAGES/asn1_msg.h

@@ -80,10 +80,11 @@ uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier,
 uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,int Mod_id,int CC_id, gNB_RrcConfigurationReq *configuration);
 
 void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
-                                int CC_id
+                                int CC_id,
                                 #if defined(ENABLE_ITTI)
-                                ,gNB_RrcConfigurationReq *configuration
+                                gNB_RrcConfigurationReq *configuration,
                                 #endif
+                                int initial_flag
                                 );
 
 

openair2/RRC/NR/nr_rrc_defs.h

@@ -338,6 +338,16 @@ typedef struct gNB_RRC_UE_s {
   uint32_t                           ue_reestablishment_timer;
   uint32_t                           ue_reestablishment_timer_thres;
   uint8_t                            e_rab_release_command_flag;
+//------------------------------------------------------------------------------//
+  NR_CellGroupId_t                                      cellGroupId;
+  struct NR_SpCellConfig                                *spCellConfig;
+  struct NR_CellGroupConfig__sCellToAddModList          *sCellconfig;
+  struct NR_CellGroupConfig__sCellToReleaseList         *sCellconfigRelease;
+  struct NR_CellGroupConfig__rlc_BearerToAddModList     *rlc_BearerBonfig;
+  struct NR_CellGroupConfig__rlc_BearerToReleaseList    *rlc_BearerRelease;
+  struct NR_MAC_CellGroupConfig                         *mac_CellGroupConfig;
+  struct NR_PhysicalCellGroupConfig                     *physicalCellGroupConfig;
+  
 } gNB_RRC_UE_t;
 
 typedef uid_t ue_uid_t;

openair2/RRC/NR/nr_rrc_proto.h

@@ -58,6 +58,13 @@ void rrc_gNB_generate_SgNBAdditionRequestAcknowledge(
      rrc_gNB_ue_context_t   *const ue_context_pP
      );
 
+void rrc_config_servingcellconfigcommon(uint8_t Mod_id,
+                                        int CC_id
+                                        #if defined(ENABLE_ITTI)
+                                        ,gNB_RrcConfigurationReq *common_configuration
+                                        #endif
+                                       );
+
 #if defined(ENABLE_ITTI)
 /**\brief RRC eNB task.
    \param void *args_p Pointer on arguments to start the task. */

openair2/RRC/NR/rrc_gNB.c

@@ -144,6 +144,40 @@ void rrc_gNB_generate_SgNBAdditionRequestAcknowledge(
      rrc_gNB_ue_context_t   *const ue_context_pP
      ){
 
+  uint8_t size;
+  uint8_t buffer[100];
+  int     CC_id = ue_context_pP->ue_context.primaryCC_id;
+  /*
+  NR_CellGroupId_t                                    cellGroupId;
+  struct NR_CellGroupConfig__rlc_BearerToAddModList   *rlc_BearerToAddModList;
+  struct NR_MAC_CellGroupConfig                       *mac_CellGroupConfig;
+  struct NR_PhysicalCellGroupConfig                   *physicalCellGroupConfig;
+  struct NR_SpCellConfig                              *spCellConfig;
+  struct NR_CellGroupConfig__sCellToAddModList        *sCellToAddModList;
+  */
+  gNB_RrcConfigurationReq  *common_configuration;
+  common_configuration = CALLOC(1,sizeof(gNB_RrcConfigurationReq));
+
+  //Fill config
+  rrc_config_servingcellconfigcommon(ctxt_pP->module_id,
+                                     ue_context_pP->ue_context.primaryCC_id
+                                     #if defined(ENABLE_ITTI)
+                                     ,common_configuration
+                                     #endif
+                                    );
+  //Fill config to structure
+  do_SERVINGCELLCONFIGCOMMON(ctxt_pP->module_id,
+                             ue_context_pP->ue_context.primaryCC_id,
+                             #if defined(ENABLE_ITTI)
+                             common_configuration,
+                             #endif
+                             0
+                             );
+/*
+  memcpy( (*spCellConfig)->reconfigurationWithSync->spCellConfigCommon , 
+          RC.nrrrc[ctxt_pP->module_id]->carrier[0].servingcellconfigcommon,
+          sizeof(struct NR_ServingCellConfigCommon));
+*/
 
 }
 
@@ -184,10 +218,11 @@ static void init_NR_SI(const protocol_ctxt_t* const ctxt_pP,
                                                                             );
 
   do_SERVINGCELLCONFIGCOMMON(ctxt_pP->module_id,
-                             CC_id
+                             CC_id,
                              #if defined(ENABLE_ITTI)
-                             ,configuration
+                             configuration,
                              #endif
+                             1
                              );
   
   LOG_I(NR_RRC,"Done init_NR_SI\n");