more NB-IoT integration

cmake_targets/CMakeLists.txt

@@ -314,7 +314,8 @@ file(GLOB rrc_h ${RRC_FULL_DIR}/*.h)
 set(rrc_h ${rrc_h} ${RRC_FULL_DIR}/asn1_constants.h)
 set_source_files_properties(${rrc_source} PROPERTIES COMPILE_FLAGS -w) # suppress warnings from generated code
 add_library(RRC_LIB ${rrc_h} ${rrc_source}
-    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c)
+    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg.c
+    ${OPENAIR2_DIR}/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c)
 include_directories ("${RRC_FULL_DIR}")
 
 # add the command to generate the source code
@@ -1717,6 +1718,17 @@ if(NAS_UE)
 endif()
 
 
+# nbiot
+add_definitions("-DNUMBER_OF_UE_MAX_NB_IoT=16")
+set (NBIOT_SOURCES
+    ${OPENAIR2_DIR}/ENB_APP/NB_IoT_config.c
+)
+add_library(NB_IoT MODULE ${NBIOT_SOURCES} )
+
+# shared library loader
+set (SHLIB_LOADER_SOURCES
+    ${OPENAIR_DIR}/common/utils/load_module_shlib.c
+)
 
 # Make lfds as a own source code (even if it is a outside library)
 # For better intergration with compilation flags & structure of cmake
@@ -1789,6 +1801,7 @@ include_directories("${NFAPI_DIR}/nfapi/inc")
 include_directories("${NFAPI_DIR}/sim_common/inc")
 include_directories("${NFAPI_DIR}/pnf_sim/inc")
 
+
 # System packages that are required
 # We use either the cmake buildin, in ubuntu are in: /usr/share/cmake*/Modules/
 # or cmake provide a generic interface to pkg-config that widely used
@@ -1947,6 +1960,7 @@ add_executable(lte-softmodem
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
+  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
@@ -1985,6 +1999,7 @@ add_executable(lte-softmodem-nos1
   ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
   ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
   ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
+  ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c

cmake_targets/tools/fix_asn1

@@ -5,6 +5,7 @@
 
 RRC_Rel14=(
   "SystemInformation-r8-IEs.h" 4df485c5ddf2540eca271876cdc512caa19b0890 "fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
+  "SystemInformation-NB-r13-IEs.h" 6d91332d5c39205819b06e5e36efe62ff8e5b33b "fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff"
 )
 
 RRC_Rel10=(

cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff

+48a49,70
+> struct SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member {
+> 	SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_PR present;
+> 	union SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_u {
+> 		SystemInformationBlockType2_NB_r13_t	 sib2_r13;
+> 		SystemInformationBlockType3_NB_r13_t	 sib3_r13;
+> 		SystemInformationBlockType4_NB_r13_t	 sib4_r13;
+> 		SystemInformationBlockType5_NB_r13_t	 sib5_r13;
+> 		SystemInformationBlockType14_NB_r13_t	 sib14_r13;
+> 		SystemInformationBlockType16_NB_r13_t	 sib16_r13;
+> 		/*
+> 		 * This type is extensible,
+> 		 * possible extensions are below.
+> 		 */
+> 		SystemInformationBlockType15_NB_r14_t	 sib15_v1430;
+> 		SystemInformationBlockType20_NB_r14_t	 sib20_v1430;
+> 		SystemInformationBlockType22_NB_r14_t	 sib22_v1430;
+> 	} choice;
+> 	
+> 	/* Context for parsing across buffer boundaries */
+> 	asn_struct_ctx_t _asn_ctx;
+> };
+> 
+52,72c74
+< 		A_SEQUENCE_OF(struct SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member {
+< 			SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_PR present;
+< 			union SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_u {
+< 				SystemInformationBlockType2_NB_r13_t	 sib2_r13;
+< 				SystemInformationBlockType3_NB_r13_t	 sib3_r13;
+< 				SystemInformationBlockType4_NB_r13_t	 sib4_r13;
+< 				SystemInformationBlockType5_NB_r13_t	 sib5_r13;
+< 				SystemInformationBlockType14_NB_r13_t	 sib14_r13;
+< 				SystemInformationBlockType16_NB_r13_t	 sib16_r13;
+< 				/*
+< 				 * This type is extensible,
+< 				 * possible extensions are below.
+< 				 */
+< 				SystemInformationBlockType15_NB_r14_t	 sib15_v1430;
+< 				SystemInformationBlockType20_NB_r14_t	 sib20_v1430;
+< 				SystemInformationBlockType22_NB_r14_t	 sib22_v1430;
+< 			} choice;
+< 			
+< 			/* Context for parsing across buffer boundaries */
+< 			asn_struct_ctx_t _asn_ctx;
+< 		} ) list;
+---
+> 		A_SEQUENCE_OF(struct SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member) list;

common/ran_context.h

@@ -48,6 +48,8 @@
 #include "NwGtpv1uPrivate.h"
 #include "gtpv1u_eNB_defs.h"
 
+#include "PHY/defs_L1_NB_IoT.h"
+#include "RRC/LITE/defs_NB_IoT.h"
 typedef struct {
   /// RAN context config file name
   char *config_file_name;
@@ -76,7 +78,7 @@ typedef struct {
   /// eNB context variables
   struct PHY_VARS_eNB_s ***eNB;
   /// NB_IoT L1 context variables
-  //struct PHY_VARS_eNB_NB_IoT_s **L1_NB_IoT;
+  struct PHY_VARS_eNB_NB_IoT_s **L1_NB_IoT;
   /// RRC context variables
   struct eNB_RRC_INST_s **rrc;
   /// NB_IoT RRC context variables
@@ -84,7 +86,7 @@ typedef struct {
   /// MAC context variables
   struct eNB_MAC_INST_s **mac;
   /// NB_IoT MAC context variables
-  //struct eNB_MAC_INST_NB_IoT_s **nb_iot_mac;
+  struct eNB_MAC_INST_NB_IoT_s **nb_iot_mac;
   /// GTPu descriptor 
   gtpv1u_data_t *gtpv1u_data_g;
   /// RU descriptors. These describe what each radio unit is supposed to do and contain the necessary functions for fronthaul interfaces

nfapi/oai_integration/nfapi_pnf.h

@@ -21,7 +21,7 @@
 
 #if !defined(NFAPI_PNF_H__)
 #define NFAPI_PNF_H__
-
+int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind);
 void configure_nfapi_pnf(char *vnf_ip_addr, int vnf_p5_port, char *pnf_ip_addr, int pnf_p7_port, int vnf_p7_port);
 
 #endif

openair1/PHY/INIT/defs_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
+ */
+
+
+#ifndef __INIT_DEFS_NB_IOT__H__
+#define __INIT_DEFS_NB_IOT__H__
+
+//#include "PHY/defs_NB_IoT.h"
+#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"  
+#include "nfapi_interface.h"  
+
+//#include "SystemInformationBlockType2.h"
+//#include "RadioResourceConfigCommonSIB.h"
+//#include "RadioResourceConfigDedicated.h"
+//#include "TDD-Config.h"
+//#include "MBSFN-SubframeConfigList.h"
+//#include "MobilityControlInfo.h"
+//#if defined(Rel10) || defined(Rel14)
+//#include "SCellToAddMod-r10.h"
+//#endif
+
+/*brief Configure LTE_DL_FRAME_PARMS with components derived after initial synchronization (MIB-NB decoding + primary/secondary synch).*/
+void phy_config_mib_eNB_NB_IoT(int  		Mod_id,
+						   	   int          eutra_band,
+						       int          Nid_cell,
+						       int          Ncp,
+						       int			Ncp_UL,
+						       int          p_eNB,
+						       uint16_t		EARFCN,
+						       uint16_t		prb_index, // NB_IoT_RB_ID,
+						       uint16_t 	operating_mode,
+						       uint16_t		control_region_size,
+						       uint16_t		eutra_NumCRS_ports);
+
+/*NB_phy_config_sib1_eNB is not needed since NB-IoT use only FDD mode*/
+
+/*brief Configure LTE_DL_FRAME_PARMS with components of SIB2-NB (at eNB).*/
+
+//void NB_phy_config_sib2_eNB(module_id_t                            Mod_id,
+//                         int                                		CC_id,
+//                         RadioResourceConfigCommonSIB_NB_r13_t      *radioResourceConfigCommon
+//                         );
+
+void phy_config_sib2_eNB_NB_IoT(uint8_t Mod_id,
+				nfapi_nb_iot_config_t *config,
+				nfapi_rf_config_t *rf_config,
+				nfapi_uplink_reference_signal_config_t* ul_nrs_config,
+				extra_phyConfig_t* extra_phy_parms);
+
+void phy_config_dedicated_eNB_NB_IoT(module_id_t Mod_id,
+				     rnti_t rnti,
+				     extra_phyConfig_t* extra_phy_parms); 
+
+// void phy_init_lte_top_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms); 
+void phy_init_nb_iot_eNB(PHY_VARS_eNB_NB_IoT *phyvar);
+int l1_north_init_NB_IoT(void);
+
+#endif
+

openair1/PHY/LTE_REFSIG/defs_NB_IoT.h

+/*******************************************************************************
+
+ *******************************************************************************/
+/*! \file PHY/LTE_REFSIG/defs_NB_IoT.c
+* \function called by lte_dl_cell_spec_NB_IoT.c ,	 TS 36-211, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+/* Definitions for NB_IoT Reference signals */
+
+#ifndef __LTE_REFSIG_DEFS_NB_IOT__H__
+#define __LTE_REFSIG_DEFS_NB_IOT__H__
+
+#include "PHY/defs_L1_NB_IoT.h"
+
+/** @ingroup _PHY_REF_SIG
+ * @{
+*/
+/*!\brief This function generates the LTE Gold sequence (36-211, Sec 7.2), specifically for DL reference signals.
+@param frame_parms LTE DL Frame parameters
+@param lte_gold_table pointer to table where sequences are stored
+@param Nid_cell Cell Id for NB_IoT (to compute sequences for local and adjacent cells) */
+
+void lte_gold_NB_IoT(NB_IoT_DL_FRAME_PARMS  *frame_parms,
+					 uint32_t 				lte_gold_table_NB_IoT[20][2][14],
+					 uint16_t 				Nid_cell);
+
+/*! \brief This function generates the Narrowband reference signal (NRS) sequence (36-211, Sec 6.10.1.1)
+@param phy_vars_eNB Pointer to eNB variables
+@param output Output vector for OFDM symbol (Frequency Domain)
+@param amp Q15 amplitude
+@param Ns Slot number (0..19)
+@param l symbol (0,1) - Note 1 means 3!
+@param p antenna index
+@param RB_IoT_ID the ID of the RB dedicated for NB_IoT
+*/
+int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB_NB_IoT  *phy_vars_eNB,
+                     		int32_t 			 *output,
+                     		short 				 amp,
+                     		unsigned char 		 Ns,
+                     		unsigned char 		 l,
+                     		unsigned char 		 p,
+					 		unsigned short 		 RB_IoT_ID); 
+
+
+unsigned int lte_gold_generic_NB_IoT(unsigned int  *x1,
+									 unsigned int  *x2,
+									 unsigned char reset);
+		
+void generate_ul_ref_sigs_rx_NB_IoT(void);
+
+void free_ul_ref_sigs_NB_IoT(void);
+			 
+#endif

openair1/PHY/LTE_TRANSPORT/dci_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 PHY/LTE_TRANSPORT/dci.h
+* \brief typedefs for LTE DCI structures from 36-212, V8.6 2009-03.  Limited to 5 MHz formats for the moment.Current LTE compliance V8.6 2009-03.
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: knopp@eurecom.fr
+* \note
+* \warning
+*/
+#ifndef __DCI_NB_IOT_H__
+#define __DCI_NB_IOT_H__
+
+//#ifndef USER_MODE
+//#include "PHY/types.h"
+//#else
+#include <stdint.h>
+//#endif
+
+typedef enum 
+{
+  DCIFormatN0 = 0,
+  DCIFormatN1,
+  DCIFormatN1_RA,//is for initial RA procedure (semi-static information) so maybe is not needed
+  DCIFormatN1_RAR,
+  DCIFormatN2,
+  DCIFormatN2_Ind,
+  DCIFormatN2_Pag,
+}DCI_format_NB_IoT_t;
+
+///  DCI Format Type 0 (180 kHz, 23 bits)
+struct DCIFormatN0{
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type;
+  /// Subcarrier indication, 6 bits
+  uint8_t scind;
+  /// Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign;
+  /// Modulation and Coding Scheme, 4 bits
+  uint8_t mcs;
+  /// New Data Indicator, 1 bits
+  uint8_t ndi;
+  /// Scheduling Delay, 2 bits
+  uint8_t Scheddly;
+  /// Repetition Number, 3 bits
+  uint8_t RepNum;
+  /// Redundancy version for HARQ (only use 0 and 2), 1 bits
+  uint8_t rv;
+  /// DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep;
+};
+
+typedef struct DCIFormatN0 DCIFormatN0_t;
+
+///  DCI Format Type N1 for User data
+struct DCIFormatN1{
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1,1bits
+  uint8_t type;
+  //NPDCCH order indicator (set to 0), 1 bits
+  uint8_t orderIndicator;
+  // Scheduling Delay,3 bits
+  uint8_t Scheddly;
+  // Resourse Assignment (RU Assignment),3 bits
+  uint8_t ResAssign;
+  // Modulation and Coding Scheme,4 bits
+  uint8_t mcs;
+  // Repetition Number,4 bits
+  uint8_t RepNum;
+  // New Data Indicator,1 bits
+  uint8_t ndi;
+  // HARQ-ACK resource,4 bits
+  uint8_t HARQackRes;
+  // DCI subframe repetition Number,2 bits
+  uint8_t DCIRep;
+};
+
+
+typedef struct DCIFormatN1 DCIFormatN1_t;
+
+///  DCI Format Type N1 for initial RA
+struct DCIFormatN1_RA{
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type;
+  //NPDCCH order indicator (set to 0),1 bits
+  uint8_t orderIndicator;
+  // Start number of NPRACH repetiiton, 2 bits
+  uint8_t Scheddly;
+  // Subcarrier indication of NPRACH, 6 bits
+  uint8_t scind;
+  // All the remainging bits, 13 bits
+  uint8_t remaingingBits;
+};
+
+typedef struct DCIFormatN1_RA DCIFormatN1_RA_t;
+
+///  DCI Format Type N1 for User data
+struct DCIFormatN1_RAR{
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1,1bits
+  uint8_t type;
+  //NPDCCH order indicator (set to 0), 1 bits
+  uint8_t orderIndicator;
+  // Scheduling Delay,3 bits
+  uint8_t Scheddly;
+  // Resourse Assignment (RU Assignment),3 bits
+  uint8_t ResAssign;
+  // Modulation and Coding Scheme,4 bits
+  uint8_t mcs;
+  // Repetition Number,4 bits
+  uint8_t RepNum;
+  // New Data Indicator,1 bits,reserved in the RAR
+  uint8_t ndi;
+  // HARQ-ACK resource,4 bits,reserved in the RAR
+  uint8_t HARQackRes;
+  // DCI subframe repetition Number,2 bits
+  uint8_t DCIRep;
+};
+
+typedef struct DCIFormatN1_RAR DCIFormatN1_RAR_t;
+
+//  DCI Format Type N2 for direct indication, 15 bits
+struct DCIFormatN2_Ind{
+  //Flag for paging(1)/direct indication(0), set to 0,1 bits
+  uint8_t type;
+  //Direct indication information, 8 bits
+  uint8_t directIndInf;
+  // Reserved information bits, 6 bits
+  uint8_t resInfoBits;
+};
+
+typedef struct DCIFormatN2_Ind DCIFormatN2_Ind_t;
+
+//  DCI Format Type N2 for Paging, 15 bits
+struct DCIFormatN2_Pag{
+  //Flag for paging(1)/direct indication(0), set to 1,1 bits
+  uint8_t type;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs;
+  // Repetition Number, 4 bits
+  uint8_t RepNum;
+  // Reserved 3 bits
+  uint8_t DCIRep;
+};
+
+typedef struct DCIFormatN2_Pag DCIFormatN2_Pag_t;
+
+typedef union DCI_CONTENT {
+ // 
+ DCIFormatN0_t DCIN0;
+ //
+ DCIFormatN1_t DCIN1;
+ //
+ DCIFormatN1_RA_t DCIN1_RA;
+ //
+ DCIFormatN1_RAR_t DCIN1_RAR;
+ //
+ DCIFormatN2_Ind_t DCIN2_Ind;
+ //
+ DCIFormatN2_Pag_t DCIN2_Pag;
+
+ }DCI_CONTENT;
+
+ /*Structure for packing*/
+
+ struct DCIN0{
+  /// DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep:2;
+  /// New Data Indicator, 1 bits
+  uint8_t ndi:1;
+  /// Repetition Number, 3 bits
+  uint8_t RepNum:3;
+  /// Redundancy version for HARQ (only use 0 and 2), 1 bits
+  uint8_t rv:1;
+  /// Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  /// Scheduling Delay, 2 bits
+  uint8_t Scheddly:2;
+  /// Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  /// Subcarrier indication, 6 bits
+  uint8_t scind:6;
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type:1;
+ } __attribute__ ((__packed__));
+
+ typedef struct DCIN0 DCIN0_t;
+#define sizeof_DCIN0_t 23
+
+struct DCIN1_RAR{
+  // DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep:2;
+  // HARQ-ACK resource,4 bits
+  uint8_t HARQackRes:4; 
+  // New Data Indicator,1 bits
+  uint8_t ndi:1;
+  // Repetition Number, 4 bits
+  uint8_t RepNum:4;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  // Scheduling Delay, 3 bits
+  uint8_t Scheddly:3;
+  //NPDCCH order indicator (set to 0),1 bits
+  uint8_t orderIndicator:1;
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type:1;
+ } __attribute__ ((__packed__));
+
+ typedef struct DCIN1_RAR DCIN1_RAR_t;
+#define sizeof_DCIN1_RAR_t 23
+
+struct DCIN1{
+  // DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep:2;
+  // HARQ-ACK resource,4 bits
+  uint8_t HARQackRes:4; 
+  // New Data Indicator,1 bits
+  uint8_t ndi:1;
+  // Repetition Number, 4 bits
+  uint8_t RepNum:4;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  // Scheduling Delay, 3 bits
+  uint8_t Scheddly:3;
+  //NPDCCH order indicator (set to 0),1 bits
+  uint8_t orderIndicator:1;
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type:1;
+ } __attribute__ ((__packed__));
+
+ typedef struct DCIN1 DCIN1_t;
+#define sizeof_DCIN1_t 23
+
+//  DCI Format Type N2 for direct indication, 15 bits
+struct DCIN2_Ind{
+  // Reserved information bits, 6 bits
+  uint8_t resInfoBits:6;
+  //Direct indication information, 8 bits
+  uint8_t directIndInf:8;
+  //Flag for paging(1)/direct indication(0), set to 0,1 bits
+  uint8_t type:1;
+} __attribute__ ((__packed__));;
+
+typedef struct DCIN2_Ind DCIN2_Ind_t;
+#define sizeof_DCIN2_Ind_t 15
+
+//  DCI Format Type N2 for Paging, 15 bits
+struct DCIN2_Pag{
+  // Reserved 3 bits
+  uint8_t DCIRep:3;
+  // Repetition Number, 4 bits
+  uint8_t RepNum:4;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  //Flag for paging(1)/direct indication(0), set to 1,1 bits
+  uint8_t type:1;
+} __attribute__ ((__packed__));;
+
+typedef struct DCIN2_Pag DCIN2_Pag_t;
+
+#define sizeof_DCIN2_Pag_t 15
+
+#define MAX_DCI_SIZE_BITS_NB_IoT 23
+
+#endif

openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c

@@ -40,7 +40,7 @@
 //#define DEBUG_LLR_SIC
 
 
-int16_t zero[8] __attribute__ ((aligned(16))) = {0,0,0,0,0,0,0,0};
+int16_t zeros[8] __attribute__ ((aligned(16))) = {0,0,0,0,0,0,0,0};
 int16_t ones[8] __attribute__ ((aligned(16))) = {0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff};
 #if defined(__x86_64__) || defined(__i386__)
 __m128i rho_rpi __attribute__ ((aligned(16)));

openair1/PHY/LTE_TRANSPORT/uci_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
+ */
+
+#ifndef __UCI_NB_IOT__H__
+#define __UCI_NB_IOT__H__
+//#include "PHY/types_NB_IoT.h"
+
+
+
+typedef enum {
+  ue_selected_NB_IoT,
+  wideband_cqi_rank1_2A_NB_IoT, //wideband_cqi_rank1_2A,
+  wideband_cqi_rank2_2A_NB_IoT, //wideband_cqi_rank2_2A,
+  HLC_subband_cqi_nopmi_NB_IoT, //HLC_subband_cqi_nopmi,
+  HLC_subband_cqi_rank1_2A_NB_IoT, //HLC_subband_cqi_rank1_2A,
+  HLC_subband_cqi_rank2_2A_NB_IoT, //HLC_subband_cqi_rank2_2A,
+  HLC_subband_cqi_modes123_NB_IoT, //HLC_subband_cqi_modes123
+  HLC_subband_cqi_mcs_CBA_NB_IoT, // MCS and RNTI, for contention-based acces
+  unknown_cqi_NB_IoT//
+} UCI_format_NB_IoT_t;
+
+// **********************************************1.5 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:16;
+  uint32_t pmi:12;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_1_5MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank1_2A_1_5MHz_NB_IoT 16
+
+typedef struct __attribute__((packed))
+{
+  uint16_t padding:2;
+  uint16_t pmi:6;
+  uint16_t cqi2:4;
+  uint16_t cqi1:4;
+}
+wideband_cqi_rank2_2A_1_5MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank2_2A_1_5MHz_NB_IoT 14
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:16;
+  uint32_t diffcqi1:12;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_1_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_nopmi_1_5MHz_NB_IoT 16
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:12;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_1_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank1_2A_1_5MHz_NB_IoT 18
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:31;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:12;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:12;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_1_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank2_2A_1_5MHz_NB_IoT 33
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:16;
+  uint32_t diffcqi1:12;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_1_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_modes123_1_5MHz_NB_IoT 16
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_1_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_mcs_CBA_1_5MHz_NB_IoT 21
+
+
+// **********************************************5 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t pmi:14;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_5MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank1_2A_5MHz_NB_IoT 18
+
+typedef struct __attribute__((packed))
+{
+  uint16_t padding:1;
+  uint16_t pmi:7;
+  uint16_t cqi2:4;
+  uint16_t cqi1:4;
+}
+wideband_cqi_rank2_2A_5MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank2_2A_5MHz_NB_IoT 15
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t diffcqi1:14;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_nopmi_5MHz_NB_IoT 18
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:12;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:14;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank1_2A_5MHz_NB_IoT 20
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:27;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:14;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:14;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank2_2A_5MHz_NB_IoT 37
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t diffcqi1:14;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_modes123_5MHz_NB_IoT 18
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_5MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_mcs_CBA_5MHz_NB_IoT 21
+
+// **********************************************10 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:10;
+  uint32_t pmi:18;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_10MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank1_2A_10MHz_NB_IoT 22
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:15;
+  uint32_t pmi:9;
+  uint32_t cqi2:4;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank2_2A_10MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank2_2A_10MHz_NB_IoT 17
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:10;
+  uint32_t diffcqi1:18;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_10MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_nopmi_10MHz_NB_IoT 22
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:8;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:18;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_10MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank1_2A_10MHz_NB_IoT 24
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:19;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:18;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:18;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_10MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank2_2A_10MHz_NB_IoT 45
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:10;
+  uint32_t diffcqi1:18;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_10MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_modes123_10MHz_NB_IoT 22
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_10MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_mcs_CBA_10MHz_NB_IoT 21
+
+// **********************************************20 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:2;
+  uint32_t pmi:26;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_20MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank1_2A_20MHz_NB_IoT 20
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t pmi:13;
+  uint32_t cqi2:4;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank2_2A_20MHz_NB_IoT ;
+#define sizeof_wideband_cqi_rank2_2A_20MHz_NB_IoT 21
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:2;
+  uint32_t diffcqi1:26;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_20MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_nopmi_20MHz_NB_IoT 30
+
+typedef struct __attribute__((packed))
+{
+  //  uint32_t padding:12;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:26;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_20MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank1_2A_20MHz_NB_IoT 32
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:3;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:26;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:26;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_20MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_rank2_2A_20MHz_NB_IoT 61
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:2;
+  uint32_t diffcqi1:26;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_20MHz_NB_IoT;
+#define sizeof_HLC_subband_cqi_modes123_20MHz_NB_IoT 30
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_20MHz_NB_IoT;
+
+#define sizeof_HLC_subband_cqi_mcs_CBA_20MHz_NB_IoT 21
+
+#define MAX_CQI_PAYLOAD_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT)*8*20)
+#define MAX_CQI_BITS_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT)*8)
+#define MAX_CQI_BYTES_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT))
+#define MAX_ACK_PAYLOAD_NB_IoT 18
+#define MAX_RI_PAYLOAD_NB_IoT 6
+
+#endif
\ No newline at end of file

openair1/PHY/TOOLS/lte_phy_scope.c

@@ -162,7 +162,7 @@ void phy_scope_eNB(FD_lte_phy_scope_enb *form,
   int16_t **chest_t;
   int16_t **chest_f;
   int16_t *pusch_llr;
-  int16_t *pusch_comp;
+  int32_t *pusch_comp;
   int32_t *pucch1_comp;
   int32_t *pucch1_thres;
   int32_t *pucch1ab_comp;
@@ -200,7 +200,7 @@ void phy_scope_eNB(FD_lte_phy_scope_enb *form,
   chest_t = (int16_t**) phy_vars_enb->srs_vars[UE_id].srs_ch_estimates[eNB_id];
   chest_f = (int16_t**) phy_vars_enb->pusch_vars[UE_id]->drs_ch_estimates[eNB_id];
   pusch_llr = (int16_t*) phy_vars_enb->pusch_vars[UE_id]->llr;
-  pusch_comp = (int16_t*) phy_vars_enb->pusch_vars[UE_id]->rxdataF_comp[0];
+  pusch_comp = (int32_t*) phy_vars_enb->pusch_vars[UE_id]->rxdataF_comp[0];
   pucch1_comp = (int32_t*) phy_vars_enb->pucch1_stats[UE_id];
   pucch1_thres = (int32_t*) phy_vars_enb->pucch1_stats_thres[UE_id];
   pucch1ab_comp = (int32_t*) phy_vars_enb->pucch1ab_stats[UE_id];

openair1/PHY/types_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
+ */
+
+#ifndef __openair_TYPES_NB_IOT_H__
+#define __openair_TYPES_NB_IOT_H__
+
+#ifdef USER_MODE
+#include <stdint.h>
+#else
+#include <linux/types.h>
+#endif
+
+
+#endif /*__openair_TYPES_NB_IOT_H__ */

openair1/SCHED/prach_procedures.c

@@ -36,6 +36,7 @@
 #include "SCHED/extern.h"
 #include "nfapi_interface.h"
 #include "fapi_l1.h"
+#include "nfapi_pnf.h"
 #include "UTIL/LOG/log.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 

openair2/COMMON/platform_constants.h

@@ -77,6 +77,10 @@
 
 #define MAX_MANAGED_ENB_PER_MOBILE  2
 
+///NB-IOT
+#define NB_RB_MAX_NB_IOT  (maxDRB_NB_r13 + 3) //MP: NB_IoT --> 2(DRB)+3(SRBs - 2 is not used) = 5
+
+
 #define DEFAULT_RAB_ID 1
 
 #define NB_RB_MAX      (maxDRB + 3) /* was 11, now 14, maxDRB comes from asn1_constants.h, + 3 because of 3 SRB, one invisible id 0, then id 1 and 2 */

openair2/COMMON/rrc_messages_def.h

@@ -54,6 +54,7 @@ MESSAGE_DEF(RRC_STATE_IND,              MESSAGE_PRIORITY_MED,       RrcStateInd,
 //-------------------------------------------------------------------------------------------//
 // eNB: ENB_APP -> RRC messages
 MESSAGE_DEF(RRC_CONFIGURATION_REQ,      MESSAGE_PRIORITY_MED,       RrcConfigurationReq,        rrc_configuration_req)
+MESSAGE_DEF(NBIOTRRC_CONFIGURATION_REQ, MESSAGE_PRIORITY_MED,       NbIoTRrcConfigurationReq,   nbiotrrc_configuration_req)
 
 // UE: NAS -> RRC messages
 MESSAGE_DEF(NAS_KENB_REFRESH_REQ,       MESSAGE_PRIORITY_MED,       NasKenbRefreshReq,          nas_kenb_refresh_req)

openair2/COMMON/rrc_messages_types.h

@@ -62,6 +62,8 @@ typedef UL_DCCH_Message_t       RrcUlDcchMessage;
 
 #define RRC_CONFIGURATION_REQ(mSGpTR)   (mSGpTR)->ittiMsg.rrc_configuration_req
 
+#define NBIOTRRC_CONFIGURATION_REQ(mSGpTR)   (mSGpTR)->ittiMsg.nbiotrrc_configuration_req
+
 #define NAS_KENB_REFRESH_REQ(mSGpTR)    (mSGpTR)->ittiMsg.nas_kenb_refresh_req
 #define NAS_CELL_SELECTION_REQ(mSGpTR)  (mSGpTR)->ittiMsg.nas_cell_selection_req
 #define NAS_CONN_ESTABLI_REQ(mSGpTR)    (mSGpTR)->ittiMsg.nas_conn_establi_req
@@ -167,6 +169,77 @@ typedef struct RrcConfigurationReq_s {
   long                    ue_TimersAndConstants_n311[MAX_NUM_CCs];
   long                    ue_TransmissionMode[MAX_NUM_CCs];
 } RrcConfigurationReq;
+#define MAX_NUM_NBIOT_CELEVELS    3
+typedef struct NbIoTRrcConfigurationReq_s {
+  uint32_t            cell_identity;
+
+  uint16_t            tac;
+
+  uint16_t	      mcc;
+  uint16_t	      mnc;
+  uint8_t	      mnc_digit_length;
+  lte_frame_type_t	  frame_type;
+  uint8_t                 tdd_config;
+  uint8_t                 tdd_config_s;
+  lte_prefix_type_t       prefix_type;
+  lte_prefix_type_t	  prefix_type_UL;
+  int16_t                 eutra_band;
+  uint32_t                downlink_frequency;
+  int32_t                 uplink_frequency_offset;
+  int16_t                 Nid_cell;// for testing, change later
+  int16_t                 N_RB_DL;// for testing, change later
+  //RACH
+  long					  rach_raResponseWindowSize_NB;
+  long					  rach_macContentionResolutionTimer_NB;
+  long					  rach_powerRampingStep_NB;
+  long					  rach_preambleInitialReceivedTargetPower_NB;
+  long					  rach_preambleTransMax_CE_NB;
+  //BCCH
+  long					  bcch_modificationPeriodCoeff_NB;
+  //PCCH
+  long					  pcch_defaultPagingCycle_NB;
+  long					  pcch_nB_NB;
+  long					  pcch_npdcch_NumRepetitionPaging_NB;
+  //NPRACH
+  long					  nprach_CP_Length;
+  long					  nprach_rsrp_range;
+  long					  nprach_Periodicity[MAX_NUM_NBIOT_CELEVELS];
+  long					  nprach_StartTime[MAX_NUM_NBIOT_CELEVELS];
+  long					  nprach_SubcarrierOffset[MAX_NUM_NBIOT_CELEVELS];
+  long					  nprach_NumSubcarriers[MAX_NUM_NBIOT_CELEVELS];
+  long					  numRepetitionsPerPreambleAttempt_NB[MAX_NUM_NBIOT_CELEVELS];
+  long					  nprach_SubcarrierMSG3_RangeStart;
+  long					  maxNumPreambleAttemptCE_NB;
+  long					  npdcch_NumRepetitions_RA[MAX_NUM_NBIOT_CELEVELS];
+  long					  npdcch_StartSF_CSS_RA[MAX_NUM_NBIOT_CELEVELS];
+  long					  npdcch_Offset_RA[MAX_NUM_NBIOT_CELEVELS];
+  //NPDSCH
+  long					  npdsch_nrs_Power;
+  //NPUSCH
+  long					  npusch_ack_nack_numRepetitions_NB;
+  long					  npusch_srs_SubframeConfig_NB;
+  long					  npusch_threeTone_CyclicShift_r13;
+  long					  npusch_sixTone_CyclicShift_r13;
+  BOOLEAN_t				  npusch_groupHoppingEnabled;
+  long					  npusch_groupAssignmentNPUSCH_r13;
+
+  //DL_GapConfig
+  long					  dl_GapThreshold_NB;
+  long	 				  dl_GapPeriodicity_NB;
+  long	 				  dl_GapDurationCoeff_NB;
+  //Uplink power control Common
+  long					  npusch_p0_NominalNPUSCH;
+  long					  npusch_alpha;
+  long					  deltaPreambleMsg3;
+  //UE timers and constants
+  long					  ue_TimersAndConstants_t300_NB;
+  long					  ue_TimersAndConstants_t301_NB;
+  long					  ue_TimersAndConstants_t310_NB;
+  long					  ue_TimersAndConstants_t311_NB;
+  long					  ue_TimersAndConstants_n310_NB;
+  long					  ue_TimersAndConstants_n311_NB;
+} NbIoTRrcConfigurationReq;
+
 
 // UE: NAS -> RRC messages
 typedef kenb_refresh_req_t      NasKenbRefreshReq;

openair2/COMMON/tasks_def.h

@@ -40,6 +40,10 @@ SUB_TASK_DEF(TASK_L2L1,     TASK_PDCP_ENB,              200)
 
 ///   Radio Resource Control task
 TASK_DEF(TASK_RRC_ENB,  TASK_PRIORITY_MED,          200)
+
+// Define here for now
+TASK_DEF(TASK_RRC_ENB_NB_IoT,  TASK_PRIORITY_MED,          200)
+
 ///   S1ap task
 /// RAL task for ENB
 TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200)

openair2/ENB_APP/nbiot_config.c → openair2/ENB_APP/NB_IoT_config.c

@@ -33,13 +33,6 @@
 #include "log.h"
 #include "log_extern.h"
 #include "assertions.h"
-#include "enb_config.h"
-#include "UTIL/OTG/otg.h"
-#include "UTIL/OTG/otg_externs.h"
-#if defined(OAI_EMU)
-# include "OCG.h"
-# include "OCG_extern.h"
-#endif
 #if defined(ENABLE_ITTI)
 # include "intertask_interface.h"
 # if defined(ENABLE_USE_MME)
@@ -47,16 +40,14 @@
 #   include "sctp_eNB_task.h"
 # endif
 #endif
-#include "sctp_default_values.h"
 #include "SystemInformationBlockType2.h"
-#include "LAYER2/MAC/extern.h"
+
 #include "PHY/extern.h"
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
-
 #include "common/config/config_userapi.h"
 #include "RRC_config_tools.h"
 #include "RRC_paramsvalues.h"
-#include "nbiot_paramdef.h"
+#include "NB_IoT_paramdef.h"
 #include "L1_paramdef.h"
 #include "MACRLC_paramdef.h"
 #include "LAYER2/MAC/proto_NB_IoT.h"

openair2/ENB_APP/NB_IoT_interface.c

+/*
+ * 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.1  (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 openair2/ENB_APP/NB_IoT_interface.c
+ * \brief: load library implementing coding/decoding algorithms
+ * \date 2018
+ * \version 0.1
+ * \note
+ * \warning
+ */
+#define _GNU_SOURCE 
+#include <sys/types.h>
+
+
+#include "openair1/PHY/extern.h"
+#include "common/utils/load_module_shlib.h" 
+#define NBIOT_INTERFACE_SOURCE
+#include "NB_IoT_interface.h"
+
+
+
+
+int load_NB_IoT(void) {
+ int ret;
+ RCConfig_NbIoT_f_t RCConfig;
+ loader_shlibfunc_t shlib_fdesc[]=NBIOT_INTERFACE_FLIST; 
+
+     ret=load_module_shlib(NBIOT_MODULENAME,shlib_fdesc,sizeof(shlib_fdesc)/sizeof(loader_shlibfunc_t));
+     if (ret) {
+        return ret;
+     }
+     RCConfig = get_shlibmodule_fptr(NBIOT_MODULENAME,NBIOT_RCCONFIG_FNAME );
+     if (RCConfig == NULL) {
+        return -1;
+     } 
+ 
+     RCConfig(&RC);
+return 0;
+}
+

openair2/RRC/LITE/proto.h

@@ -410,6 +410,7 @@ rrc_data_req(
 );
 
 uint8_t
+
 rrc_data_req_ue(
   const protocol_ctxt_t*   const ctxt_pP,
   const rb_id_t                  rb_idP,
@@ -420,6 +421,7 @@ rrc_data_req_ue(
   const pdcp_transmission_mode_t modeP
 );
 
+
 void
 rrc_data_ind(
   const protocol_ctxt_t* const ctxt_pP,

openair3/GTPV1-U/gtpv1u_eNB.c

@@ -53,6 +53,7 @@
 
 #undef GTP_DUMP_SOCKET
 
+/*
 extern boolean_t pdcp_data_req(
   const protocol_ctxt_t* const  ctxt_pP,
   const srb_flag_t     srb_flagP,
@@ -62,7 +63,7 @@ extern boolean_t pdcp_data_req(
   const sdu_size_t     sdu_buffer_sizeP,
   unsigned char *const sdu_buffer_pP,
   const pdcp_transmission_mode_t modeP);
-
+*/
 extern unsigned char NB_eNB_INST;
 extern RAN_CONTEXT_t RC;
 

targets/COMMON/openairinterface5g_limits.h

@@ -11,7 +11,6 @@
 #        define NUMBER_OF_RU_MAX 32
 #        define NUMBER_OF_UE_MAX 20
 #        define NUMBER_OF_CONNECTED_eNB_MAX 3
-
 #        if defined(STANDALONE) && STANDALONE==1
 #                undef  NUMBER_OF_eNB_MAX
 #                undef  NUMBER_OF_UE_MAX