removing/adding .h files + renaming functions

openair2/LAYER2/MAC/extern_NB_IoT.h

@@ -46,7 +46,7 @@
 //#include "RRC/LITE/defs_NB_IoT.h"
 
 #ifdef NB_IOT
-#include "defs_NB_IoT.h"
+#include "LAYER2/MAC/defs_NB_IoT.h"
 
 //NB-IoT
 extern IF_Module_t *if_inst;

openair2/LAYER2/MAC/main_NB_IoT.c

@@ -173,7 +173,7 @@ int mac_top_init_NB_IoT()
       memset (&eNB_mac_inst_NB_IoT[i].eNB_stats,0,sizeof(eNB_STATS_NB_IoT));
       UE_template = (UE_TEMPLATE_NB_IoT *)&eNB_mac_inst_NB_IoT[i].UE_list.UE_template[CC_id][0];
 
-      for (j=0; j<NUMBER_OF_UE_MAX; j++) {
+      for (j=0; j<NUMBER_OF_UE_MAX_NB_IoT; j++) {
         UE_template[j].rnti=0;
         // initiallize the eNB to UE statistics
         memset (&eNB_mac_inst_NB_IoT[i].UE_list.eNB_UE_stats[CC_id][j],0,sizeof(eNB_UE_STATS_NB_IoT));

openair2/LAYER2/MAC/vars_NB_IoT.h

@@ -37,7 +37,7 @@
 #endif //USER_MODE
 //#include "PHY/defs.h"
 //#include "defs.h"
-#include "defs_NB_IoT.h"
+#include "LAYER2/MAC/defs_NB_IoT.h"
 //#include "PHY_INTERFACE/defs.h"
 //#include "COMMON/mac_rrc_primitives.h"
 
@@ -47,7 +47,7 @@
 // IF_Module_t *if_inst;
 // #endif
 
-const uint32_t BSR_TABLE[BSR_TABLE_SIZE]= {0,10,12,14,17,19,22,26,31,36,42,49,57,67,78,91,
+const uint32_t BSR_TABLE_NB_IoT[BSR_TABLE_SIZE_NB_IoT]= {0,10,12,14,17,19,22,26,31,36,42,49,57,67,78,91,
                                            				105,125,146,171,200,234,274,321,376,440,515,603,706,826,967,1132,
                                            				1326,1552,1817,2127,2490,2915,3413,3995,4677,5467,6411,7505,8787,10287,12043,14099,
                                            				16507,19325,22624,26487,31009,36304,42502,49759,58255,68201,79846,93479,109439, 128125,150000, 300000

openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.c

 #include "IF_Module_L2_primitives_NB_IoT.h"
-
+#include "LAYER2/MAC/proto_NB_IoT.h"
 // Sched_INFO as a input for the scheduler
 void UL_indication(UL_IND_t *UL_INFO)
 {

openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h

 #include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
-#include "LAYER2/MAC/extern.h"
-#include "LAYER2/MAC/proto_NB_IoT.h"
+//#include "LAYER2/MAC/extern.h"
+
 
 
 #ifndef __IF_MODULE_L2_PRIMITIVES_NB_IOT_H__

openair2/PHY_INTERFACE/IF_Module_NB_IoT.c

 #include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
 #include "openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h"
 #include "openair1/SCHED/IF_Module_L1_primitives_NB_IoT.h"
-#include "LAYER2/MAC/extern.h"
-#include "LAYER2/MAC/proto_NB_IoT.h"
+#include "LAYER2/MAC/extern_NB_IoT.h"
+//#include "LAYER2/MAC/proto_NB_IoT.h"
 
 
 //called at initialization of L2

openair2/PHY_INTERFACE/IF_Module_NB_IoT.h

@@ -14,7 +14,7 @@
 //#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
 #include "openair2/COMMON/platform_types.h"
 
-#define SCH_PAYLOAD_SIZE_MAX 4096
+//#define SCH_PAYLOAD_SIZE_MAX 4096
 #define BCCH_PAYLOAD_SIZE_MAX_NB_IoT 128
 
 

openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c

@@ -93,8 +93,8 @@ int errno;
 #endif
 
 
-/*do_MIB_NB*/
-uint8_t do_MIB_NB(
+/*do_MIB_NB_NB_IoT*/
+uint8_t do_MIB_NB_IoT(
 		rrc_eNB_carrier_data_NB_IoT_t *carrier,
 		uint16_t N_RB_DL,//may not needed--> for NB_IoT only 1 PRB is used
 		uint32_t frame)

openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.h

@@ -62,7 +62,7 @@
 @param N_RB_DL Number of downlink PRBs
 @param frame radio frame number
 @return size of encoded bit stream in bytes*/
-uint8_t do_MIB_NB(
+uint8_t do_MIB_NB_IoT(
 		rrc_eNB_carrier_data_NB_IoT_t *carrier,
 		uint32_t N_RB_DL,
 		uint32_t frame);

openair2/RRC/LITE/rrc_eNB_NB_IoT.c

@@ -1639,7 +1639,7 @@ init_SI_NB(
   if (eNB_rrc_inst_NB_IoT[ctxt_pP->module_id].carrier[CC_id].MIB_NB)
   {
 	  eNB_rrc_inst_NB_IoT[ctxt_pP->module_id].carrier[CC_id].sizeof_MIB_NB =
-	  			  do_MIB_NB(&eNB_rrc_inst_NB_IoT[ctxt_pP->module_id].carrier[CC_id],
+	  			  do_MIB_NB_IoT(&eNB_rrc_inst_NB_IoT[ctxt_pP->module_id].carrier[CC_id],
 	  					  	configuration->N_RB_DL[CC_id],
 					        0 //FIXME is correct to pass frame = 0??
 					        );