- Fix the warning in RRC gNB side

- It coulde be build, but there are "implicit declaration of function" warnings in MAC layer.
  Since we re-use the MAC layer function.
- Maybe it is already could be test for configuration module.

openair2/GNB_APP/gnb_config.c

@@ -1910,7 +1910,7 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
             if (strcmp(SearchSpace_monitoringSlotPeriodicityAndOffset_choice , "sl1") == 0){
               NRRRC_CONFIGURATION_REQ (msg_p).SearchSpace_monitoringSlotPeriodicityAndOffset_choice[j] =  NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
               
-              NRRRC_CONFIGURATION_REQ (msg_p).SearchSpace_monitoringSlotPeriodicityAndOffset_sl1[j] = NULL;                 
+              NRRRC_CONFIGURATION_REQ (msg_p).SearchSpace_monitoringSlotPeriodicityAndOffset_sl1[j] = 0;                 
 
             }else if (strcmp(SearchSpace_monitoringSlotPeriodicityAndOffset_choice , "sl2") == 0){
               NRRRC_CONFIGURATION_REQ (msg_p).SearchSpace_monitoringSlotPeriodicityAndOffset_choice[j] =  NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2;

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -94,7 +94,7 @@ void mac_top_init_gNB(void)
   // These should be out of here later
   pdcp_layer_init();
 
-  rrc_init_global_param();
+  rrc_init_nr_global_param();
 
   }else {
     RC.nrmac = NULL;

openair2/RRC/NR/nr_rrc_common.c

@@ -28,7 +28,6 @@
  * \email:  navid.nikaein@eurecom.fr and raymond.knopp@eurecom.fr
  */
 
-#include "nr_rrc_defs.h"
 #include "nr_rrc_extern.h"
 #include "LAYER2/MAC/mac_extern.h"
 #include "COMMON/openair_defs.h"
@@ -50,12 +49,7 @@ extern UE_MAC_INST *UE_mac_inst;
 extern mui_t rrc_gNB_mui;
 
 //-----------------------------------------------------------------------------
-int
-nr_rrc_init_global_param(
-  void
-)
-//-----------------------------------------------------------------------------
-{
+int rrc_init_nr_global_param(void){
 
   rrc_rlc_register_rrc (rrc_data_ind, NULL); //register with rlc
 
@@ -89,7 +83,7 @@ nr_rrc_init_global_param(
 //-----------------------------------------------------------------------------
 void
 rrc_config_nr_buffer(
-  SRB_INFO* Srb_info,
+  NR_SRB_INFO* Srb_info,
   uint8_t Lchan_type,
   uint8_t Role
 )

openair2/RRC/NR/nr_rrc_defs.h

@@ -90,9 +90,9 @@
 typedef unsigned int uid_nr_t;
 #define NR_UID_LINEAR_ALLOCATOR_BITMAP_SIZE (((NUMBER_OF_NR_UE_MAX/8)/sizeof(unsigned int)) + 1)
 
-typedef struct nr_uid_linear_allocator_s {
+/*typedef struct nr_uid_linear_allocator_s {
   unsigned int   bitmap[NR_UID_LINEAR_ALLOCATOR_BITMAP_SIZE];
-} nr_uid_allocator_t;
+} nr_uid_allocator_t;*/
     
 
 #define PROTOCOL_NR_RRC_CTXT_UE_FMT                PROTOCOL_CTXT_FMT
@@ -294,7 +294,7 @@ typedef struct gNB_RRC_INST_s {
 
   eth_params_t                                        eth_params_s;
   rrc_gNB_carrier_data_t                              carrier[MAX_NUM_CCs];
-  nr_uid_allocator_t                                  uid_allocator; // for rrc_ue_head
+  uid_allocator_t                                     uid_allocator; // for rrc_ue_head
   RB_HEAD(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s)     rrc_ue_head; // ue_context tree key search by rnti
   
   uint8_t                                             Nb_ue;

openair2/RRC/NR/nr_rrc_proto.h

@@ -35,9 +35,9 @@
 
 #include "flexran_agent_extern.h"
 
-int nr_rrc_init_global_param(void);
+int rrc_init_nr_global_param(void);
 
-void rrc_config_nr_buffer(SRB_INFO* Srb_info,
+void rrc_config_nr_buffer(NR_SRB_INFO* Srb_info,
                           uint8_t Lchan_type,
                           uint8_t Role);
 

openair2/RRC/NR/rrc_gNB.c

@@ -38,7 +38,7 @@
 
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 #include "LAYER2/RLC/rlc.h"
-#include "LAYER2/MAC/mac_proto.h"
+#include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "UTIL/LOG/log.h"
 #include "COMMON/mac_rrc_primitives.h"
 #include "RRC/NR/MESSAGES/asn1_msg.h"
@@ -279,7 +279,7 @@ char openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigu
               );
   }//END for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++)
 
-  nr_rrc_init_global_param();
+  rrc_init_nr_global_param();
 
 
   openair_nr_rrc_on(&ctxt);