remove extra useless code in MAC

openair2/LAYER2/MAC/extern_NB_IoT.h

@@ -30,30 +30,9 @@
 #ifndef __MAC_EXTERN_NB_IOT_H__
 #define __MAC_EXTERN_NB_IOT_H__
 
-// #ifdef USER_MODE
-// //#include "stdio.h"
-// #endif //USER_MODE
-// #include "PHY/defs.h"
-// #include "defs.h"
-// #include "COMMON/mac_rrc_primitives.h"
-// #ifdef PHY_EMUL
-// //#include "SIMULATION/simulation_defs.h"
-// #endif //PHY_EMUL
 #include "openair2/PHY_INTERFACE/defs_NB_IoT.h" 
-//#include "RRC/LITE/defs_NB_IoT.h"
 
-//#include "LAYER2/MAC/vars_NB_IoT.h"
 
-//NB-IoT
-//extern IF_Module_NB_IoT_t *if_inst_NB_IoT;
-//extern eNB_MAC_INST_NB_IoT *mac_inst_NB_IoT;
-
-
-
-
-//#ifndef USER_MODE
-
-// extern RRC_XFACE *Rrc_xface;          //// to uncomment when it is used
 
 extern uint8_t Is_rrc_registered;
 
@@ -79,9 +58,6 @@ extern EMULATION_VARS *Emul_vars;
 
 extern eNB_MAC_INST_NB_IoT *mac_inst;
 extern uint8_t Is_rrc_registered_NB_IoT;
-//extern BCCH_BCH_Message_NB_t               MIB;
-//extern BCCH_DL_SCH_Message_NB_t            SIB;
-//extern RRCConnectionSetup_NB_r13_IEs_t     DED_Config;
 
 extern available_resource_DL_t *available_resource_DL;
 extern available_resource_tones_UL_t *available_resource_UL;
@@ -133,8 +109,6 @@ extern const int dl_rep[3];
 extern const uint32_t dci_rep[3];
 extern const uint32_t harq_rep[3];
 
-extern int preamble_trigger;
-extern int preamble_sfn;
 //SIBs
 extern int extend_space[2];
 extern int extend_alpha_offset[2];

openair2/LAYER2/MAC/main_NB_IoT.c

@@ -145,10 +145,6 @@ void init_mac_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst)
   Initialize_Resource();
   //add_UL_Resource(mac_inst);    
   extend_available_resource_DL(mac_inst, mac_inst->current_subframe + 1 + 160);
-  
-  // for fixed scheduling
-  preamble_trigger = 0;
-  preamble_sfn = 0;
 
 }
 

openair2/LAYER2/MAC/vars_NB_IoT.h

@@ -33,22 +33,12 @@
 #ifdef USER_MODE
 //#include "stdio.h"
 #endif //USER_MODE
-//#include "PHY/defs.h"
-//#include "defs.h"
-#include "LAYER2/MAC/defs_NB_IoT.h"
-//#include "PHY_INTERFACE/defs.h"
-//#include "COMMON/mac_rrc_primitives.h"
 
-int preamble_trigger;
-int preamble_sfn;
-//IF_Module_NB_IoT_t *if_inst_NB_IoT;
+#include "LAYER2/MAC/defs_NB_IoT.h"
 
 //NB-IoT--------------------------------------
 eNB_MAC_INST_NB_IoT *mac_inst;
 
-//BCCH_BCH_Message_NB_t               MIB;
-//BCCH_DL_SCH_Message_NB_t            SIB;
-//RRCConnectionSetup_NB_r13_IEs_t     DED_Config;
 schedule_result_t *schedule_result_list_UL;
 schedule_result_t *schedule_result_list_DL;
 available_resource_DL_t *available_resource_DL;

openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.c

@@ -68,8 +68,6 @@ void UL_indication_NB_IoT(UL_IND_NB_IoT_t *UL_INFO)
                                  (UL_INFO->nrach_ind.nrach_pdu_list+i)->nrach_indication_rel13.timing_advance*16
                                  );
                   LOG_D(MAC,"Init_RA_NB_IoT Out\n");
-                  preamble_trigger=1;
-                  preamble_sfn = UL_INFO->frame;
                 }
           }
       //}