full IF4p5 simulation working

nfapi/oai_integration/nfapi_pnf.c

@@ -49,6 +49,9 @@ extern RAN_CONTEXT_t RC;
 #include "UTIL/LOG/log.h"
 #include "openair2/LAYER2/MAC/mac_proto.h"
 
+#include "PHY/INIT/phy_init.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
+
 #define NUM_P5_PHY 2
 
 #define _GNU_SOURCE

openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c

@@ -41,6 +41,7 @@
 #include "PHY/sse_intrin.h"
 
 #ifndef TEST_DEBUG
+#include "PHY/impl_defs_top.h"
 #include "PHY/defs_common.h"
 #include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/lte_interleaver_inline.h"

openair1/PHY/INIT/init_top.c

@@ -23,6 +23,9 @@
 #include "phy_init.h"
 #include "PHY/phy_extern.h"
 #include "PHY/CODING/coding_extern.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 
 void generate_64qam_table(void)
 {

openair1/PHY/INIT/lte_init.c

@@ -25,6 +25,7 @@
 #include "PHY/phy_extern.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 #include "SIMULATION/TOOLS/sim.h"
 #include "RadioResourceConfigCommonSIB.h"
 #include "RadioResourceConfigDedicated.h"

openair1/PHY/INIT/lte_param_init.c

@@ -30,6 +30,9 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern.h"
+#include "phy_init.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 
 extern PHY_VARS_eNB *eNB;
 extern PHY_VARS_UE *UE;

openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c

@@ -24,7 +24,7 @@
 #include "PHY/phy_extern_ue.h"
 
 #include "UTIL/LOG/vcd_signal_dumper.h"
-#include "lte_estimation_defs.h"
+#include "lte_estimation.h"
 
 #define DEBUG_PHY
 

openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_ue.c

@@ -21,7 +21,7 @@
 
 #include "PHY/types.h"
 #include "PHY/defs_UE.h"
-#include "PHY/LTE_ESTIMATION/lte_estimation_defs.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
 #include "PHY/impl_defs_top.h"
 
 #include "UTIL/LOG/vcd_signal_dumper.h"

openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c

@@ -26,7 +26,7 @@
 #include "UTIL/LOG/log.h"
 #include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 #include "T.h"
-#include "lte_estimation_defs.h"
+#include "lte_estimation.h"
 
 // round(exp(sqrt(-1)*(pi/2)*[0:1:N-1]/N)*pow2(15))
 static int16_t ru_90[2*128] = {32767, 0,32766, 402,32758, 804,32746, 1206,32729, 1608,32706, 2009,32679, 2411,32647, 2811,32610, 3212,32568, 3612,32522, 4011,32470, 4410,32413, 4808,32352, 5205,32286, 5602,32214, 5998,32138, 6393,32058, 6787,31972, 7180,31881, 7571,31786, 7962,31686, 8351,31581, 8740,31471, 9127,31357, 9512,31238, 9896,31114, 10279,30986, 10660,30853, 11039,30715, 11417,30572, 11793,30425, 12167,30274, 12540,30118, 12910,29957, 13279,29792, 13646,29622, 14010,29448, 14373,29269, 14733,29086, 15091,28899, 15447,28707, 15800,28511, 16151,28311, 16500,28106, 16846,27897, 17190,27684, 17531,27467, 17869,27246, 18205,27020, 18538,26791, 18868,26557, 19195,26320, 19520,26078, 19841,25833, 20160,25583, 20475,25330, 20788,25073, 21097,24812, 21403,24548, 21706,24279, 22006,24008, 22302,23732, 22595,23453, 22884,23170, 23170,22884, 23453,22595, 23732,22302, 24008,22006, 24279,21706, 24548,21403, 24812,21097, 25073,20788, 25330,20475, 25583,20160, 25833,19841, 26078,19520, 26320,19195, 26557,18868, 26791,18538, 27020,18205, 27246,17869, 27467,17531, 27684,17190, 27897,16846, 28106,16500, 28311,16151, 28511,15800, 28707,15447, 28899,15091, 29086,14733, 29269,14373, 29448,14010, 29622,13646, 29792,13279, 29957,12910, 30118,12540, 30274,12167, 30425,11793, 30572,11417, 30715,11039, 30853,10660, 30986,10279, 31114,9896, 31238,9512, 31357,9127, 31471,8740, 31581,8351, 31686,7962, 31786,7571, 31881,7180, 31972,6787, 32058,6393, 32138,5998, 32214,5602, 32286,5205, 32352,4808, 32413,4410, 32470,4011, 32522,3612, 32568,3212, 32610,2811, 32647,2411, 32679,2009, 32706,1608, 32729,1206, 32746,804, 32758,402, 32766};

openair1/PHY/LTE_TRANSPORT/dci.c

@@ -44,6 +44,7 @@
 #include "UTIL/LOG/log.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 #include "PHY/LTE_TRANSPORT/transport_extern.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 //#define DEBUG_DCI_ENCODING 1
 //#define DEBUG_DCI_DECODING 1

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -46,7 +46,7 @@
 
 //#define DEBUG_DCI
 #include "dci_tools_common_extern.h"
-
+#include "transport_proto.h"
 
 int8_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type)
 {

openair1/PHY/LTE_TRANSPORT/dci_tools_common.c

@@ -38,7 +38,8 @@
 #endif
 #include "assertions.h"
 #include "nfapi_interface.h"
-
+#include "transport_common_proto.h"
+#include "SCHED/sched_common.h"
 //#define DEBUG_HARQ
 
 

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -36,6 +36,7 @@
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "PHY/LTE_TRANSPORT/transport_eNB.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
+#include "PHY/LTE_TRANSPORT/transport_proto.h"
 
 //#define DEBUG_DLSCH_MODULATION
 #define NEW_ALLOC_RE

openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c

@@ -189,7 +189,7 @@ void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
 
 
 
-void init_scrambling_lut() {
+void init_scrambling_lut(void) {
 
   uint32_t s;
   int i=0,j;
@@ -242,7 +242,7 @@ void dlsch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
   }
 }
 
-void init_unscrambling_lut() {
+void init_unscrambling_lut(void) {
 
   uint32_t s;
   int i=0,j;

openair1/PHY/LTE_TRANSPORT/edci.c

@@ -42,6 +42,7 @@
 #include "assertions.h" 
 #include "T.h"
 #include "UTIL/LOG/log.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 //#define DEBUG_DCI_ENCODING 1
 //#define DEBUG_DCI_DECODING 1

openair1/PHY/LTE_TRANSPORT/group_hopping.c

@@ -30,6 +30,7 @@
 * \warning
 */
 #include "PHY/defs_common.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 //#define DEBUG_GROUPHOP 1
 

openair1/PHY/LTE_TRANSPORT/pbch.c

@@ -36,6 +36,7 @@
 #include "transport_proto.h"
 #include "PHY/phy_extern.h"
 #include "PHY/sse_intrin.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 //#define DEBUG_PBCH 1
 //#define DEBUG_PBCH_ENCODING

openair1/PHY/LTE_TRANSPORT/pcfich.c

@@ -31,6 +31,7 @@
 */
 #include "PHY/impl_defs_top.h"
 #include "PHY/defs_eNB.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 //#define DEBUG_PCFICH
 extern uint8_t pcfich_b[4][32];

openair1/PHY/LTE_TRANSPORT/phich.c

@@ -34,6 +34,8 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/impl_defs_top.h"
 #include "T.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
+#include "transport_common_proto.h"
 
 //#define DEBUG_PHICH 1
 

openair1/PHY/LTE_TRANSPORT/pilots.c

@@ -30,6 +30,7 @@
 * \warning
 */
 #include "PHY/defs_eNB.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 void generate_pilots(PHY_VARS_eNB *eNB,
                      int32_t **txdataF,

openair1/PHY/LTE_TRANSPORT/pilots_mbsfn.c

@@ -31,7 +31,7 @@
 */
 
 #include "PHY/defs_eNB.h"
-
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 int generate_mbsfn_pilot(PHY_VARS_eNB *eNB,
 			 eNB_rxtx_proc_t *proc,

openair1/PHY/LTE_TRANSPORT/pucch_common.c

@@ -35,6 +35,7 @@
 
 #include "UTIL/LOG/log.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
+#include "PHY/LTE_REFSIG/lte_refsig.h"
 
 #include "T.h"
 

openair1/PHY/LTE_TRANSPORT/transport_common_proto.h

@@ -157,6 +157,8 @@ void generate_pcfich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms);
 
 void generate_phich_reg_mapping(LTE_DL_FRAME_PARMS *frame_parms);
 
+uint32_t check_phich_reg(LTE_DL_FRAME_PARMS *frame_parms,uint32_t kprime,uint8_t lprime,uint8_t mi);
+
 void generate_RIV_tables(void);
 
 /** \brief  This routine provides the relationship between a PHICH TXOp and its corresponding PUSCH subframe (Table 8.3.-1 from 36.213).
@@ -267,9 +269,16 @@ uint64_t pmi2hex_2Ar1(uint32_t pmi);
 
 uint64_t pmi2hex_2Ar2(uint32_t pmi);
 
+uint8_t get_pmi(uint8_t N_RB_DL,MIMO_mode_t mode, uint32_t pmi_alloc,uint16_t rb);
+
 // DL power control functions
 double get_pa_dB(uint8_t pa);
 
+void init_scrambling_lut(void);
+
+void init_unscrambling_lut(void);
+
+
 uint8_t get_prach_prb_offset(LTE_DL_FRAME_PARMS *frame_parms, 
 			     uint8_t prach_ConfigIndex, 
 			     uint8_t n_ra_prboffset,

openair1/PHY/LTE_TRANSPORT/transport_proto.h

@@ -535,6 +535,7 @@ void pdcch_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
                         int8_t* llr,
                         uint32_t length);
 
+
 void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
                       int mbsfn_flag,
                       LTE_eNB_DLSCH_t *dlsch,
@@ -606,6 +607,9 @@ double computeRhoB_eNB(uint8_t pa,
 
 
 
+void conv_eMTC_rballoc(uint16_t resource_block_coding,
+		       uint32_t N_RB_DL,
+		       uint32_t *rb_alloc);
 
 int8_t find_dlsch(uint16_t rnti, PHY_VARS_eNB *eNB,find_type_t type);
 

openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c

@@ -43,6 +43,7 @@
 #include "UTIL/LOG/vcd_signal_dumper.h"
 //#define DEBUG_ULSCH_DECODING
 #include "targets/RT/USER/rt_wrapper.h"
+#include "transport_proto.h"
 
 extern int codingw;
 

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c

@@ -35,6 +35,9 @@
 #include "transport_eNB.h"
 //#define DEBUG_ULSCH
 #include "PHY/sse_intrin.h"
+#include "transport_common_proto.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+#include "PHY/MODULATION/modulation_eNB.h"
 
 #include "T.h"
 
@@ -1103,7 +1106,7 @@ void ulsch_channel_level(int32_t **drs_ch_estimates_ext,
 
 int ulsch_power_LUT[750];
 
-void init_ulsch_power_LUT() {
+void init_ulsch_power_LUT(void) {
   
   int i;
 

openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c

@@ -1263,7 +1263,7 @@ void compute_llr_offset(LTE_DL_FRAME_PARMS *frame_parms,
 
     pdsch_vars->llr_offset[pdcch_vars->num_pdcch_symbols] = 0;
 
-    LOG_I(PHY,"compute_llr_offset:  nb RB %d - Qm %d \n", nb_rb_alloc, dlsch0_harq->Qm);
+    LOG_D(PHY,"compute_llr_offset:  nb RB %d - Qm %d \n", nb_rb_alloc, dlsch0_harq->Qm);
 
     //dlsch0_harq->rb_alloc_even;
     //dlsch0_harq->rb_alloc_odd;
@@ -1293,14 +1293,14 @@ void compute_llr_offset(LTE_DL_FRAME_PARMS *frame_parms,
         if(symbol < (frame_parms->symbols_per_tti-1))
           pdsch_vars->llr_offset[symbol+1] = pdsch_vars->llr_offset[symbol] + llr_offset;
 
-	LOG_I(PHY,"Granted Re subframe %d / symbol %d => %d (%d RBs)\n", subframe, symbol_mod, granted_re,dlsch0_harq->nb_rb);
-	LOG_I(PHY,"Pbch/PSS/SSS Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, pbch_pss_sss_re);
-	LOG_I(PHY,"CRS Re Per PRB subframe %d / symbol %d => %d \n", subframe, symbol_mod, crs_re);
-	LOG_I(PHY,"Data Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, data_re);
+	LOG_D(PHY,"Granted Re subframe %d / symbol %d => %d (%d RBs)\n", subframe, symbol_mod, granted_re,dlsch0_harq->nb_rb);
+	LOG_D(PHY,"Pbch/PSS/SSS Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, pbch_pss_sss_re);
+	LOG_D(PHY,"CRS Re Per PRB subframe %d / symbol %d => %d \n", subframe, symbol_mod, crs_re);
+	LOG_D(PHY,"Data Re subframe %d / symbol %d => %d \n", subframe, symbol_mod, data_re);
 
 
 
-        LOG_I(PHY,"Data Re subframe %d-symbol %d => llr length %d, llr offset %d \n", subframe, symbol,
+        LOG_D(PHY,"Data Re subframe %d-symbol %d => llr length %d, llr offset %d \n", subframe, symbol,
               pdsch_vars->llr_length[symbol], pdsch_vars->llr_offset[symbol]);
     }
 }

openair1/PHY/LTE_UE_TRANSPORT/dlsch_decoding.c

@@ -36,6 +36,7 @@
 #include "SCHED/sched_common_extern.h"
 #include "SIMULATION/TOOLS/sim.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
+#include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 //#define DEBUG_DLSCH_DECODING
 //#define UE_DEBUG_TRACE 1
 

openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c

@@ -98,7 +98,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
 
 #else //normal case (simulation)
   prach_start = subframe*ue->frame_parms.samples_per_tti-ue->N_TA_offset;
-  LOG_I(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
+  LOG_D(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
     prach_start,
     ue->rx_offset,
     ue->hw_timing_advance,

openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h

@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-/*! \file PHY/LTE_TRANSPORT/proto.h
+/*! \file PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
  * \brief Function prototypes for PHY physical/transport channel processing and generation V8.6 2009-03
  * \author R. Knopp, F. Kaltenberger
  * \date 2011
@@ -32,6 +32,7 @@
 #ifndef __LTE_TRANSPORT_PROTO_UE__H__
 #define __LTE_TRANSPORT_PROTO_UE__H__
 #include "PHY/defs_UE.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 #include <math.h>
 #include "nfapi_interface.h"
 
@@ -64,6 +65,7 @@ void free_ue_ulsch(LTE_UE_ULSCH_t *ulsch);
 
 LTE_UE_ULSCH_t *new_ue_ulsch(unsigned char N_RB_UL, uint8_t abstraction_flag);
 
+void fill_UE_dlsch_MCH(PHY_VARS_UE *ue,int mcs,int ndi,int rvidx,int eNB_id);
 
 int rx_pmch(PHY_VARS_UE *phy_vars_ue,
             unsigned char eNB_id,
@@ -1026,8 +1028,7 @@ int32_t rx_pdcch(PHY_VARS_UE *ue,
                  uint8_t subframe,
                  uint8_t eNB_id,
                  MIMO_mode_t mimo_mode,
-                 uint32_t high_speed_flag,
-                 uint8_t is_secondary_ue);
+                 uint32_t high_speed_flag);
 
 /*! \brief Extract PSS and SSS resource elements
   @param phy_vars_ue Pointer to UE variables

openair1/PHY/MODULATION/modulation_common.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef __MODULATION_DEFS__H__
-#define __MODULATION_DEFS__H__
+#ifndef __MODULATION_COMMON__H__
+#define __MODULATION_COMMON__H__
 #include "PHY/defs_common.h"
 /** @addtogroup _PHY_MODULATION_
  * @{

openair1/PHY/MODULATION/ofdm_mod.c

@@ -34,7 +34,7 @@ This section deals with basic functions for OFDM Modulation.
 #include "UTIL/LOG/log.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 #include "modulation_common.h"
-
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 //#define DEBUG_OFDM_MOD
 
 

openair1/SCHED/phy_procedures_lte_common.c

@@ -32,6 +32,7 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/defs_UE.h"
 #include "SCHED/sched_common_extern.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 
 void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
                     unsigned char current_subframe,

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -34,6 +34,7 @@
 #include "PHY/phy_extern.h"
 #include "SCHED/sched_eNB.h"
 #include "SCHED/sched_common_extern.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
 #include "nfapi_interface.h"
 #include "fapi_l1.h"
 #include "UTIL/LOG/log.h"
@@ -139,7 +140,6 @@ void pmch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
 
 #if defined(Rel10) || defined(Rel14)
   MCH_PDU *mch_pduP=NULL;
-  MCH_PDU  mch_pdu;
   //  uint8_t sync_area=255;
 #endif
 

openair1/SCHED/ru_procedures.c

@@ -33,9 +33,10 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/phy_extern.h"
 #include "SCHED/sched_eNB.h"
-
+#include "PHY/MODULATION/modulation_eNB.h"
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
 #include "PHY/LTE_TRANSPORT/if5_tools.h"
+#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 
 #include "LAYER2/MAC/mac.h"
 #include "UTIL/LOG/log.h"

openair1/SCHED/sched_eNB.h

@@ -30,6 +30,7 @@
 
 #include "PHY/defs_eNB.h"
 #include "PHY_INTERFACE/phy_interface.h"
+#include "sched_common.h"
 
 enum THREAD_INDEX { OPENAIR_THREAD_INDEX = 0,
                     TOP_LEVEL_SCHEDULER_THREAD_INDEX,

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -40,6 +40,9 @@
 
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "SCHED_UE/sched_UE.h"
+#include "PHY/MODULATION/modulation_UE.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
+
 //#define DEBUG_PHY_PROC
 
 #ifndef PUCCH
@@ -1408,7 +1411,7 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
       ue->prach_resources[eNB_id]->ra_PreambleIndex = 19;
     }
     
-    LOG_I(PHY,"[UE  %d][RAPROC] Frame %d, Subframe %d : Generating PRACH, preamble %d,PL %d,  P0_PRACH %d, TARGET_RECEIVED_POWER %d dBm, PRACH TDD Resource index %d, RA-RNTI %d\n",
+    LOG_D(PHY,"[UE  %d][RAPROC] Frame %d, Subframe %d : Generating PRACH, preamble %d,PL %d,  P0_PRACH %d, TARGET_RECEIVED_POWER %d dBm, PRACH TDD Resource index %d, RA-RNTI %d\n",
 	  ue->Mod_id,
 	  frame_tx,
 	  subframe_tx,
@@ -2767,15 +2770,17 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
 	   subframe_rx,
 	   eNB_id,
 	   ue->frame_parms.nb_antenna_ports_eNB==1?SISO:ALAMOUTI,
-	   ue->high_speed_flag,
-	   ue->is_secondary_ue);
+	   ue->high_speed_flag);
   
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_PDCCH, VCD_FUNCTION_OUT);
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_DCI_DECODING, VCD_FUNCTION_IN);
   
   
-  //printf("Decode SIB frame param agregation + DCI %d %d \n",agregationLevel,dciFormat);
-  
+  /*printf("Decode SIB frame param aggregation + DCI %d %d, num_pdcch_symbols %d\n",
+	 ue->pdcch_vars[ue->current_thread_id[subframe_rx]][eNB_id]->agregationLevel,
+	 ue->pdcch_vars[ue->current_thread_id[subframe_rx]][eNB_id]->dciFormat,
+	 ue->pdcch_vars[ue->current_thread_id[subframe_rx]][eNB_id]->num_pdcch_symbols);
+  */
   //agregation level == FF means no configuration on
   if(ue->pdcch_vars[ue->current_thread_id[subframe_rx]][eNB_id]->agregationLevel == 0xFF || ue->decode_SIB)
     {

openair1/SCHED_UE/pucch_pc.c

@@ -34,7 +34,7 @@
 #include "SCHED_UE/sched_UE.h"
 #include "SCHED/sched_common_extern.h"
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
-
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
 
 int16_t pucch_power_cntl(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t subframe,uint8_t eNB_id,PUCCH_FMT_t pucch_fmt)
 {

openair1/SCHED_UE/pusch_pc.c

@@ -35,6 +35,7 @@
 #include "PHY/defs_UE.h"
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/phy_extern_ue.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
 
 int16_t get_hundred_times_delta_IF(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t harq_pid)
 {

openair1/SCHED_UE/srs_pc.c

@@ -33,6 +33,7 @@
 #include "PHY/defs_UE.h"
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "PHY/phy_extern_ue.h"
+#include "PHY/LTE_ESTIMATION/lte_estimation.h"
 
 void srs_power_cntl(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t *pnb_rb_srs, uint8_t abstraction_flag)
 {

openair1/SIMULATION/TOOLS/random_channel.c

@@ -32,6 +32,8 @@
 #include "UTIL/LOG/log.h"
 //#define DEBUG_CH
 
+#include "assertions.h"
+
 extern void print_shorts(char *s,__m128i *x);
 
 void fill_channel_desc(channel_desc_t *chan_desc,
@@ -1210,10 +1212,8 @@ int random_channel(channel_desc_t *desc, uint8_t abstraction_flag) {
   struct complex anew[NB_ANTENNAS_TX*NB_ANTENNAS_RX],acorr[NB_ANTENNAS_TX*NB_ANTENNAS_RX];
   struct complex phase, alpha, beta;
 
-  if ((desc->nb_tx>NB_ANTENNAS_TX) || (desc->nb_rx > NB_ANTENNAS_RX)) {
-    LOG_E(PHY,"random_channel.c: Error: temporary buffer for channel not big enough (%d,%d)\n",desc->nb_tx,desc->nb_rx);
-    return(-1);
-  }
+  AssertFatal(desc->nb_tx<=NB_ANTENNAS_TX && desc->nb_rx <= NB_ANTENNAS_RX,
+	      "random_channel.c: Error: temporary buffer for channel not big enough (%d,%d)\n",desc->nb_tx,desc->nb_rx);
 
   start_meas(&desc->random_channel);
   for (i=0;i<(int)desc->nb_taps;i++) {
@@ -1372,8 +1372,7 @@ double N_RB2sampling_rate(uint16_t N_RB)
     break;
 
   default:
-    LOG_E(PHY,"Unknown N_PRB\n");
-    return(-1);
+    AssertFatal(1==0,"Unknown N_PRB %d",N_RB);
   }
 
   return(sampling_rate);

openair2/COMMON/platform_constants.h

@@ -69,9 +69,11 @@
 
 #ifdef LARGE_SCALE
 #    define MAX_MOBILES_PER_ENB         128
+#    define MAX_MOBILES_PER_ENB_NB_IoT  128
 #    define MAX_eNB                      2
 #else
 #    define MAX_MOBILES_PER_ENB         16
+#    define MAX_MOBILES_PER_ENB_NB_IoT  16
 #    define MAX_eNB                      2
 #endif
 

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c

@@ -836,7 +836,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
   Protocol__FlexHeader *header = NULL;
   int i, j, UE_id;
 
-  int available_harq[NUMBER_OF_UE_MAX];
+  int available_harq[MAX_MOBILES_PER_ENB];
 
   const int xid = *((int *)params);
 
@@ -854,7 +854,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
   frame_t frame;
   sub_frame_t subframe;
 
-  for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
+  for (i = 0; i < MAX_MOBILES_PER_ENB; i++) {
     available_harq[i] = -1;
   }
 
@@ -878,7 +878,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
 
   sf_trigger_msg->n_dl_info = 0;
 
-  for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
+  for (i = 0; i < MAX_MOBILES_PER_ENB; i++) {
     for (j = 0; j < 8; j++) {
       if (RC.mac && RC.mac[mod_id] && RC.mac[mod_id]->UE_list.eNB_UE_stats[UE_PCCID(mod_id,i)][i].harq_pid == 1) {
 	available_harq[i] = j;
@@ -904,7 +904,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
       goto error;
     i = -1;
     //Fill the status of the current HARQ process for each UE
-    for(UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
+    for(UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
       if (available_harq[UE_id] < 0) {
 	continue;
       } else {
@@ -1262,7 +1262,7 @@ void flexran_agent_init_mac_agent(mid_t mod_id) {
   //Allow RINGBUFFER_SIZE messages to be stored in the ringbuffer at any time
   dl_mac_config_array[mod_id] = malloc( sizeof(struct lfds700_ringbuffer_element) *  num_elements);
   lfds700_ringbuffer_init_valid_on_current_logical_core( &ringbuffer_state[mod_id], dl_mac_config_array[mod_id], num_elements, &ps[mod_id], NULL );
-  for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
+  for (i = 0; i < MAX_MOBILES_PER_ENB; i++) {
     for (j = 0; j < 8; j++) {
       if (RC.mac && RC.mac[mod_id])
         RC.mac[mod_id]->UE_list.eNB_UE_stats[UE_PCCID(mod_id,i)][i].harq_pid = 0;

openair2/ENB_APP/CONTROL_MODULES/PDCP/flexran_agent_pdcp.c

@@ -37,7 +37,7 @@ unsigned int pdcp_agent_registered[NUM_MAX_ENB];
 /*Array containing the Agent-PDCP interfaces*/
 AGENT_PDCP_xface *agent_pdcp_xface[NUM_MAX_ENB];
 
-// NUMBER_OF_UE_MAX
+// MAX_MOBILES_PER_ENB
 
 void flexran_agent_pdcp_aggregate_stats(const mid_t mod_id,
 					const mid_t ue_id,

openair2/ENB_APP/enb_app.c

@@ -46,6 +46,7 @@
 #   include "gtpv1u_eNB_task.h"
 # endif
 
+#include "openair1/PHY/INIT/phy_init.h"
 extern unsigned char NB_eNB_INST;
 #endif
 

openair2/ENB_APP/enb_config.c

@@ -48,6 +48,7 @@
 #include "LAYER2/MAC/mac_extern.h"
 #include "LAYER2/MAC/mac_proto.h"
 #include "PHY/phy_extern.h"
+#include "PHY/INIT/phy_init.h"
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
 #include "nfapi_vnf.h"
 #include "nfapi_pnf.h"
@@ -295,8 +296,10 @@ void RCconfig_macrlc() {
 
     RC.nb_macrlc_inst=MacRLC_ParamList.numelt; 
     mac_top_init_eNB();   
-    for (j=0;j<RC.nb_macrlc_inst;j++) {
+    RC.nb_mac_CC = (int*)malloc(RC.nb_macrlc_inst*sizeof(int));
 
+    for (j=0;j<RC.nb_macrlc_inst;j++) {
+      RC.nb_mac_CC[j] = *(MacRLC_ParamList.paramarray[j][MACRLC_CC_IDX].iptr);
       //RC.mac[j]->phy_test = *(MacRLC_ParamList.paramarray[j][MACRLC_PHY_TEST_IDX].iptr);
       //printf("PHY_TEST = %d,%d\n", RC.mac[j]->phy_test, j);
 

openair2/ENB_APP/flexran_agent_ran_api.c

@@ -1207,7 +1207,7 @@ void flexran_set_pdcp_rx_stat_window(const mid_t mod_id, const mid_t ue_id, uint
 
 /*PDCP num tx pdu status flexRAN*/
 uint32_t flexran_get_pdcp_tx(const mid_t mod_id,  const mid_t ue_id, const lcid_t lcid){
-  if (mod_id <0 || mod_id> MAX_NUM_CCs || ue_id<0 || ue_id> NUMBER_OF_UE_MAX || lcid<0 || lcid>NB_RB_MAX)
+  if (mod_id <0 || mod_id> MAX_NUM_CCs || ue_id<0 || ue_id> MAX_MOBILES_PER_ENB || lcid<0 || lcid>NB_RB_MAX)
     return -1;
   return Pdcp_stats_tx[mod_id][ue_id][lcid];
 }

openair2/LAYER2/MAC/defs_NB_IoT.h

@@ -98,7 +98,7 @@ typedef enum{
   DL
 }message_direction_t;
 
-#define MAX_NUMBER_OF_UE_MAX_NB_IoT 20
+#define MAX_MAX_MOBILES_PER_ENB_NB_IoT 20
 #define SCH_PAYLOAD_SIZE_MAX_NB_IoT 320
 #define MAX_NUMBER_OF_SIBs_NB_IoT 16
 
@@ -233,17 +233,17 @@ typedef struct{
 typedef struct {
 
   /// DCI template and MAC connection parameters for UEs
-  UE_TEMPLATE_NB_IoT UE_template_NB_IoT[MAX_NUMBER_OF_UE_MAX_NB_IoT];
+  UE_TEMPLATE_NB_IoT UE_template_NB_IoT[MAX_MAX_MOBILES_PER_ENB_NB_IoT];
 
   /// NPDCCH Period and searching space info
   NPDCCH_config_dedicated_NB_IoT_t NPDCCH_config_dedicated;
-  //int next[MAX_NUMBER_OF_UE_MAX_NB_IoT];
+  //int next[MAX_MAX_MOBILES_PER_ENB_NB_IoT];
   // -1:No UE in list
   int head;
   // -1:No UE in list
   int tail;
   int num_UEs;
-  //boolean_t active[MAX_NUMBER_OF_UE_MAX_NB_IoT];
+  //boolean_t active[MAX_MAX_MOBILES_PER_ENB_NB_IoT];
 
 } UE_list_NB_IoT_t;
 
@@ -261,7 +261,7 @@ typedef struct{
   // flag to indicate scheduling type1 NPDCCH CSS with different CE level
   uint8_t flag_type1_css[3];
   // flag to indicate scheduling NPDCCH USS with UE list
-  uint8_t flag_uss[MAX_NUMBER_OF_UE_MAX_NB_IoT];
+  uint8_t flag_uss[MAX_MAX_MOBILES_PER_ENB_NB_IoT];
   // flag to indicate scheduling sib1/MIB
   uint8_t flag_fix_scheduling;
   // number of the type2 css to schedule in this period
@@ -494,7 +494,7 @@ typedef struct eNB_MAC_INST_NB_IoT_s {
   RA_template_list_t RA_msg3_list;
   RA_template_list_t RA_msg4_list;
 
-  RA_TEMPLATE_NB_IoT RA_template[MAX_NUMBER_OF_UE_MAX_NB_IoT];
+  RA_TEMPLATE_NB_IoT RA_template[MAX_MAX_MOBILES_PER_ENB_NB_IoT];