correction of the error in the previous commit: adding vars_NB_IoT.h file (115 warnings remaining)

cmake_targets/CMakeLists.txt

@@ -1153,7 +1153,6 @@ set(L2_SRC
   ${RLC_DIR}/rlc.c
   ${RLC_DIR}/rlc_rrc.c
   ${RLC_DIR}/rlc_mpls.c
-  ${RRC_DIR}/vars_NB_IoT.c
   ${RRC_DIR}/rrc_UE.c
   ${RRC_DIR}/rrc_eNB.c
   ${RRC_DIR}/rrc_eNB_NB_IoT.c

openair2/RRC/LITE/rrc_common_NB_IoT.c

@@ -45,6 +45,7 @@
 //#include "rrc_eNB_UE_context.h"
 //#include "proto_NB_IoT.h"
 #include "RRC/LITE/defs_NB_IoT.h"
+#include "RRC/LITE/vars_NB_IoT.h"
 
 #ifdef LOCALIZATION
 #include <sys/time.h>

openair2/RRC/LITE/vars_NB_IoT.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file vars_nb_iot.c
+* \brief rrc variables for NB_IoT
+* \author Raymond Knopp, Navid Nikaein and Michele Paffetti
+* \date 2013 -2017
+* \version 1.0
+* \company Eurecom
+* \email: navid.nikaein@eurecom.fr, michele.paffetti@studio.unibo.it
+*/
+
+
+#include "defs_NB_IoT.h"
+#include "LAYER2/RLC/rlc.h"
+#include "COMMON/mac_rrc_primitives.h"
+#include "LAYER2/MAC/defs_NB_IoT.h"
+#include "LogicalChannelConfig-NB-r13.h"
+
+//-----------------------------------------------------------------------
+// ALL what is defined here should be shared through extern_NB_IoT.h file
+//------------------------------------------------------------------------
+
+
+UE_RRC_INST_NB_IoT *UE_rrc_inst_NB_IoT; //MP: may not used for the moment
+#ifndef USER_MODE
+
+#ifndef NO_RRM
+int S_rrc= RRC2RRM_FIFO;
+#endif //NO_RRM
+
+#else
+//#include "LAYER2/MAC/extern.h"
+#ifndef NO_RRM
+sock_rrm_t S_rrc;
+#endif
+#endif
+
+#ifndef NO_RRM
+#ifndef USER_MODE
+char *Header_buf;
+char *Data;
+unsigned short Header_read_idx,Data_read_idx,Header_size;
+#endif
+unsigned short Data_to_read;
+#endif //NO_RRM
+
+//#include "LAYER2/MAC/extern.h"
+#define MAX_U32 0xFFFFFFFF
+
+eNB_RRC_INST_NB_IoT *eNB_rrc_inst_NB_IoT;
+uint8_t DRB2LCHAN_NB_IoT[2];//max can be 2 DRBs for NB_IoT --> it used for saving the LCID of DRBs
+
+//structure for FAPI-like configuration (memory for this is allocated in init_SI)
+PHY_Config_t *config_INFO;
+
+BOOLEAN_t logicalChannelSR_Prohibit = 1;
+long priority =1;
+
+// Default SRB configurations from 36.331 (9.2.1.1 pag 641  V14.2.1)
+struct LogicalChannelConfig_NB_r13 SRB1bis_logicalChannelConfig_defaultValue_NB_IoT = {
+		priority_r13: &priority, //priority
+		logicalChannelSR_Prohibit_r13: &logicalChannelSR_Prohibit //set to TRUE
+};
+struct LogicalChannelConfig_NB_r13 SRB1_logicalChannelConfig_defaultValue_NB_IoT = {
+		priority_r13: &priority, //priority
+		logicalChannelSR_Prohibit_r13: &logicalChannelSR_Prohibit //set to TRUE
+};
+
+
+
+//CONSTANTS
+rlc_info_t Rlc_info_am_NB_IoT, Rlc_info_am_config_NB_IoT;
+//MP:  LCHAN_DESC (mac_rrc_primitives) is not needed, was only an old implementation for storing LCH information
+
+
+// timers (TS 36.331 v14.2.1 "UE-TimersAndConstants-NB" pag 622) (milliseconds)
+//seems to be not used or only at UE side
+uint16_t T300_NB_IoT[8] = {2500,4000,6000,10000, 15000,25000,40000,60000};
+uint16_t T301_NB_IoT[8] = {2500,4000,6000,10000, 15000,25000,40000,60000}; //MP: this start at RRCconnectionReestablishmentReq (not implemented in OAI)
+uint16_t T310_NB_IoT[8] = {0,200,500,1000,2000,4000,8000};
+uint16_t T311_NB_IoT[8] = {1000, 3000, 5000, 10000, 15000, 20000, 30000}; //MP: may not used
+uint16_t N310_NB_IoT[8] = {1,2,3,4,6,8,10,20};
+uint16_t N311_NB_IoT[8] = {1,2,3,4,5,6,8,10};
+
+
+// MP: TimeToTrigger not used in NB-IoT
+/* MP: 36.133 Section 9.1.4 RSRP Measurement Report Mapping and RSRQ Mapping, Table: 9.1.4-1 --> not for NB-IoT*/
+
+