fix enb_paramdef_NB_IoT.h & the type of NB_UE_INST in MAC/extern_NB_IoT.h

openair2/COMMON/rrc_messages_types.h

@@ -478,6 +478,8 @@ typedef struct NbIoTRrcConfigurationReq_s {
   long            ue_TimersAndConstants_t311_NB;
   long            ue_TimersAndConstants_n310_NB;
   long            ue_TimersAndConstants_n311_NB;
+
+  int             NB_IoT_configured;
 } NbIoTRrcConfigurationReq;
 
 

openair2/ENB_APP/enb_config.c

@@ -54,6 +54,7 @@
 #include "common/config/config_userapi.h"
 #include "RRC_config_tools.h"
 #include "enb_paramdef.h"
+#include "enb_paramdef_NB_IoT.h"
 #include "proto_agent.h"
 
 extern uint16_t sf_ahead;
@@ -310,7 +311,7 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) {
   paramdef_t SRB1Params[] = SRB1PARAMS_DESC(srb1_params);
   paramdef_t SLParams[]              = CCPARAMS_SIDELINK_DESC(SLconfig);
   // for NB-IoT
-  paramdef_t NBIOTParams[]              = CCPARAMS_NB_IOT_DESC((&NBconfig));
+  paramdef_t NBIOTParams[]              = CCPARAMS_NB_IOT_DESC(NBconfig);
 
   /* map parameter checking array instances to parameter definition array instances */
   for (int I=0; I< ( sizeof(CCsParams)/ sizeof(paramdef_t)  ) ; I++) {

openair2/LAYER2/MAC/extern_NB_IoT.h

@@ -43,7 +43,7 @@ extern uint8_t Is_rrc_registered;
 extern unsigned char NB_INST;
 #endif
 extern unsigned char NB_eNB_INST;
-extern unsigned char NB_UE_INST;
+extern uint16_t 	 NB_UE_INST;
 extern unsigned char NB_RN_INST;
 extern unsigned short NODE_ID[1];
 extern void* bigphys_malloc(int);

openair2/LAYER2/MAC/vars.h

@@ -35,10 +35,11 @@
 #ifdef USER_MODE
 //#include "stdio.h"
 #endif //USER_MODE
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
+#include "PHY/defs_UE.h"
 #include "defs.h"
 #include "defs_NB_IoT.h"
-#include "PHY_INTERFACE/defs.h"
+#include "PHY_INTERFACE/defs_NB_IoT.h"
 #include "COMMON/mac_rrc_primitives.h"
 
 

targets/RT/USER/lte-enb-nbiot.c

@@ -74,13 +74,13 @@
 #include "PHY/defs.h"
 #include "PHY/defs_L1_NB_IoT.h"
 //#include "PHY/defs_L1_NB_IoT.h"
-#include "SCHED/defs_NB_IoT.h"
+#include "SCHED_NBIOT/defs_NB_IoT.h"
 #include "SCHED/sched_common.h" // for calling prach_procedures_NB_IoT()
 #include "PHY_INTERFACE/IF_Module_NB_IoT.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
 #include "PHY/extern_NB_IoT.h"
 #include "LAYER2/MAC/defs.h"
-#include "PHY_INTERFACE/extern.h"
+#include "PHY_INTERFACE/phy_interface_extern.h"
 
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"

targets/RT/USER/lte-enb.c

@@ -76,12 +76,12 @@
 
 //NB-IoT 
 #include "PHY/defs_L1_NB_IoT.h"
-#include "SCHED/defs_NB_IoT.h"
+#include "SCHED_NBIOT/defs_NB_IoT.h"
 #include "PHY_INTERFACE/IF_Module_NB_IoT.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
 #include "PHY/extern_NB_IoT.h"
 #include "LAYER2/MAC/defs.h"
-#include "PHY_INTERFACE/extern.h"
+#include "PHY_INTERFACE/phy_interface_extern.h"
 
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"