Adjust framework of lte-enb-nbiot.c

openair1/PHY/NBIoT_TRANSPORT/SIB_NB_IoT.c

@@ -347,8 +347,8 @@ int generate_NDLSCH_NB_IoT(PHY_VARS_eNB_NB_IoT    *eNB,
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////
-int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t 	  *DCI_1,
+///////////////////////////////////////////////////////////////////////////////////////////
+int generate_NPDCCH_NB_IoT(NB_IoT_eNB_NPDCCH_t 	  *DCI_1, // add _1 to solve compliation error
 		                   int32_t 				  **txdataF,
 		                   int16_t                amp,
 		                   LTE_DL_FRAME_PARMS 	  *frame_parms,

openair1/PHY/defs_L1_NB_IoT.h

@@ -270,6 +270,9 @@ typedef struct {
   int                   frame_tx;
   /// frame to act upon for reception
   int                   frame_rx;
+
+  uint16_t     HFN;
+
   /// \brief Instance count for RXn-TXnp4 processing thread.
   /// \internal This variable is protected by \ref mutex_rxtx.
   int                   instance_cnt_rxtx;

openair1/SCHED_NBIOT/phy_procedures_lte_eNb_nbiot.c

@@ -3059,7 +3059,7 @@ void eNB_fep_full_2thread(PHY_VARS_eNB *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
 
 
 
-void eNB_fep_full(PHY_VARS_eNB *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
+void eNB_fep_full_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
 
   int l;
   LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
@@ -3099,9 +3099,9 @@ void eNB_fep_full(PHY_VARS_eNB *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
   }    
 }
 
-void eNB_fep_rru_if5(PHY_VARS_eNB *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
+void eNB_fep_rru_if5_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
 
-  eNB_proc_t *proc=&eNB->proc;
+  eNB_proc_NB_IoT_t *proc=&eNB->proc;
   uint8_t seqno=0;
 
   /// **** send_IF5 of rxdata to BBU **** ///       
@@ -3115,9 +3115,9 @@ void eNB_fep_rru_if5(PHY_VARS_eNB *eNB,eNB_rxtx_proc_NB_IoT_t *proc_rxtx) {
 
 }
 
-void do_prach(PHY_VARS_eNB *eNB,int frame,int subframe) {
+void do_prach_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,int frame,int subframe) {
 
-  eNB_proc_t *proc = &eNB->proc;
+  eNB_proc_NB_IoT_t *proc = &eNB->proc;
  // LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
 
 if(frame%2==0 && subframe==9)

openair2/LAYER2/MAC/main_NB_IoT.c

@@ -12,6 +12,7 @@
 #include "LAYER2/MAC/defs_NB_IoT.h"
 #include "LAYER2/MAC/proto_NB_IoT.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
+#include "PHY_INTERFACE/IF_Module_NB_IoT.h"
 #include "vars_NB_IoT.h"
 #include "RRC/NBIOT/proto_NB_IoT.h"
 

openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.c

-#include "IF_Module_L2_primitives_NB_IoT.h"
+#include "PHY_INTERFACE/IF_Module_NB_IoT.h"
 #include "LAYER2/MAC/proto_NB_IoT.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
 

openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h

-#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
-//#include "LAYER2/MAC/extern.h"
-
-
-
-#ifndef __IF_MODULE_L2_PRIMITIVES_NB_IOT_H__
-#define __IF_MODULE_L2_PRIMITIVES_NB_IOT_H__
-
-#endif

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_NBIOT/IF_Module_L1_primitives_NB_IoT.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
 //#include "LAYER2/MAC/proto_NB_IoT.h"