Add asn1_msg_NB_IoT.c and fix warning in rrc layer (7 warnings remaining)

cmake_targets/CMakeLists.txt

@@ -326,7 +326,7 @@ add_custom_target (
 set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
 add_library(RRC_LIB ${rrc_source}
     ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg.c)
-    #${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
+    #${OPENAIR2_DIR}/RRC/NBIOT/MESSAGES/asn1_msg_NB_IoT.c
 add_dependencies(RRC_LIB rrc_flag)
 include_directories ("${RRC_FULL_DIR}")
 

openair2/RRC/NBIOT/proto_NB_IoT.h

@@ -35,7 +35,7 @@
 #include "rlc.h"
 #include "extern_NB_IoT.h"
 #include "LAYER2/MAC/defs_NB_IoT.h"
-//#include "platform_types_NB_IoT.h"
+#include "platform_types_NB_IoT.h"
 
 uint8_t* generate_msg4_NB_IoT(rrc_eNB_carrier_data_NB_IoT_t *carrier);
 
@@ -71,7 +71,59 @@ long *get_NB_IoT_SIB1_eutracontrolregionsize(void);
 
 void init_testing_NB_IoT(uint8_t Mod_id, int CC_id, rrc_eNB_carrier_data_NB_IoT_t *carrier, NbIoTRrcConfigurationReq *configuration, uint32_t frame, uint32_t hyper_frame);
 
-
+//defined in L2_interface/pdcp.c
+//FIXME SRB1bis should bypass the pdcp
+//Distinction between different SRBs will be done by means of rd_id
+uint8_t rrc_data_req_NB_IoT(
+  const protocol_ctxt_t*   const ctxt_pP,
+  const rb_id_t                  rb_idP,
+  const mui_t                    muiP,
+  const confirm_t                confirmP,
+  const sdu_size_t               sdu_sizeP,
+  uint8_t*                 const buffer_pP,
+  const pdcp_transmission_mode_t modeP //when go through SRB1bis should be set as Transparent mode
+);
+//--------------------------------------------------
+
+//XXX for the moment we not configure PDCP for SRB1bis (but used as it is SRB1)
+//defined in pdcp.c
+boolean_t rrc_pdcp_config_asn1_req_NB_IoT (
+  const protocol_ctxt_t* const  ctxt_pP,
+  LTE_SRB_ToAddModList_NB_r13_t  *const srb2add_list_pP,
+  LTE_DRB_ToAddModList_NB_r13_t  *const drb2add_list_pP,
+  LTE_DRB_ToReleaseList_NB_r13_t *const drb2release_list_pP,
+  const uint8_t                   security_modeP,
+  uint8_t                  *const kRRCenc_pP,
+  uint8_t                  *const kRRCint_pP,
+  uint8_t                  *const kUPenc_pP,
+  rb_id_t                 *const defaultDRB,
+  long                      LCID
+);
+//--------------------------------------------------
+
+//defined in rlc_rrc.c
+rlc_op_status_t rrc_rlc_config_asn1_req_NB_IoT (
+    const protocol_ctxt_t   * const ctxt_pP,
+    const LTE_SRB_ToAddModList_NB_r13_t   * const srb2add_listP,
+    const LTE_DRB_ToAddModList_NB_r13_t   * const drb2add_listP,
+    const LTE_DRB_ToReleaseList_NB_r13_t  * const drb2release_listP,
+    srb1bis_flag_t                          srb1bis_flag
+    );
+//-------------------------------------------------------------------------
+
+/*-----------eNB procedures (rrc_eNB_NB_IoT.c)---------------*/
+
+//---Initialization--------------
+void openair_eNB_rrc_on_NB_IoT(
+  const protocol_ctxt_t* const ctxt_pP
+);
+
+/// Utilities------------------------------------------------
+
+void rrc_eNB_free_mem_UE_context_NB_IoT(
+  const protocol_ctxt_t*               const ctxt_pP,
+  struct rrc_eNB_ue_context_NB_IoT_s*         const ue_context_pP
+);
 
 
 

openair2/RRC/NBIOT/rrc_eNB_NB_IoT.c

@@ -32,7 +32,7 @@
 /*NB-IoT include files*/
 //#include "PHY/extern_NB_IoT.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
-//#include "RRC/LITE/proto_NB_IoT.h"
+#include "RRC/NBIOT/proto_NB_IoT.h"
 #include "defs_NB_IoT.h"
 #include "openair1/SCHED_NBIOT/defs_NB_IoT.h"
 #include "RRC/NBIOT/MESSAGES/asn1_msg_NB_IoT.h"
@@ -118,6 +118,8 @@ mui_t                               rrc_eNB_mui_NB_IoT = 0;
 
 
 
+
+
 // should be called when UE is lost by eNB
 void rrc_eNB_free_UE_NB_IoT(const module_id_t enb_mod_idP,const struct rrc_eNB_ue_context_NB_IoT_s*        const ue_context_pP)
 //-----------------------------------------------------------------------------
@@ -508,7 +510,7 @@ void rrc_eNB_generate_RRCConnectionSetup_NB_IoT(
 
   //XXX MP:warning due to function still not completed at PHY (get_lte_frame_parms)
   //XXX this approach is gone most probably
-  NB_IoT_DL_FRAME_PARMS *fp = get_NB_IoT_frame_parms(ctxt_pP->module_id,CC_id);
+  //NB_IoT_DL_FRAME_PARMS *fp = get_NB_IoT_frame_parms(ctxt_pP->module_id,CC_id);
   T(T_ENB_RRC_CONNECTION_SETUP, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
     T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
 
@@ -1965,7 +1967,7 @@ int rrc_eNB_decode_ccch_NB_IoT(
 
         	  //InitialUE-Identity randomValue size should be 40bits = 5 byte
             AssertFatal(rrcConnectionRequest_NB_IoT->ue_Identity_r13.choice.randomValue.size == 5,
-                        "wrong InitialUE-Identity randomValue size, expected 5, provided %d",
+                        "wrong InitialUE-Identity randomValue size, expected 5, provided %zd",
                         rrcConnectionRequest_NB_IoT->ue_Identity_r13.choice.randomValue.size);
 
             memcpy(((uint8_t*) & random_value) + 3,
@@ -2874,7 +2876,8 @@ void* rrc_enb_task_NB_IoT(
   }
 }
 
-
+#if 0
 #ifndef USER_MODE
 EXPORT_SYMBOL(Rlc_info_am_config);
 #endif
+#endif
\ No newline at end of file