removing .h files form openair2/RRC/LITE/extern_NB_IoT.h

openair2/LAYER2/MAC/extern_NB_IoT.h

@@ -108,8 +108,8 @@ extern EMULATION_VARS *Emul_vars;
 
 // extern DCI0_5MHz_TDD_1_6_t       UL_alloc_pdu;
 
-// extern DCI1A_5MHz_TDD_1_6_t      RA_alloc_pdu;
-// extern DCI1A_5MHz_TDD_1_6_t      DLSCH_alloc_pdu1A;
+extern DCI1A_5MHz_TDD_1_6_t      RA_alloc_pdu;
+extern DCI1A_5MHz_TDD_1_6_t      DLSCH_alloc_pdu1A;
 // extern DCI1A_5MHz_TDD_1_6_t      BCCH_alloc_pdu;
 
 // extern DCI1A_5MHz_TDD_1_6_t      CCCH_alloc_pdu;

openair2/RRC/LITE/L2_interface_NB_IoT.c

@@ -29,6 +29,7 @@
 //#include "PHY/defs.h"
 #include "PHY/defs_NB_IoT.h"
 #include "openair2/LAYER2/MAC/proto_NB_IoT.h"
+#include "openair2/LAYER2/MAC/extern_NB_IoT.h"
 //#include "PHY/INIT/defs_NB_IoT.h"
 //#include "SCHED/defs.h"
 //#include "platform_types.h"

openair2/RRC/LITE/extern_NB_IoT.h

@@ -30,10 +30,11 @@
 
 #ifndef __OPENAIR_RRC_EXTERN_NB_IOT_H__
 #define __OPENAIR_RRC_EXTERN_NB_IOT_H__
-#include "defs_NB_IoT.h"
-#include "COMMON/mac_rrc_primitives.h"
-#include "LAYER2/MAC/defs.h"
-#include "LAYER2/MAC/extern.h"
+#include "RRC/LITE/defs_NB_IoT.h"
+//#include "COMMON/mac_rrc_primitives.h"
+#include "PHY_INTERFACE/IF_Module_NB_IoT.h"
+//#include "LAYER2/MAC/defs.h"
+//#include "LAYER2/MAC/extern.h"
 #include "LAYER2/RLC/rlc.h"
 #include "LogicalChannelConfig-NB-r13.h"
 

openair2/RRC/LITE/proto_NB_IoT.h

@@ -34,7 +34,7 @@
 #include "pdcp.h"
 #include "rlc.h"
 #include "extern_NB_IoT.h"
-
+#include "LAYER2/MAC/defs_NB_IoT.h"
 /*NOTE: no static function should be declared in this header file (e.g. init_SI_NB)*/
 
 /*------------------------common_nb_iot.c----------------------------------------*/

openair2/RRC/LITE/rrc_eNB_UE_context_NB_IoT.c

@@ -60,7 +60,7 @@ uid_linear_allocator_new_NB_IoT(
   uid_t        uid = 0;
   uid_allocator_NB_IoT_t* uia_p = &rrc_instance_pP->uid_allocator;
 
-  for (i=0; i < UID_LINEAR_ALLOCATOR_BITMAP_SIZE; i++) {
+  for (i=0; i < UID_LINEAR_ALLOCATOR_BITMAP_SIZE_NB_IoT; i++) {
     if (uia_p->bitmap[i] != UINT_MAX) {
       bit_index = 1;
       uid       = 0;
@@ -90,7 +90,7 @@ uid_linear_allocator_free_NB_IoT(
   unsigned int bit = uidP % (sizeof(unsigned int) * 8);
   unsigned int value = ~(0x00000001 << bit);
 
-  if (i < UID_LINEAR_ALLOCATOR_BITMAP_SIZE) {
+  if (i < UID_LINEAR_ALLOCATOR_BITMAP_SIZE_NB_IoT) {
     rrc_instance_pP->uid_allocator.bitmap[i] &=  value;
   }
 }