creation of new rx_ulsch function for NB-IoT (rx_ulsch_NB_IoT)

+ creation of three new files:
openair1/PHY/LTE_ESTIMATION/freq_equalization_NB_IoT.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation_NB_IoT.c
openair1/PHY/LTE_TRANSPORT/ulsch_demodulation_NB_IoT.c

cmake_targets/CMakeLists.txt

@@ -1021,6 +1021,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/drs_modulation.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_modulation.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_demodulation_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_coding.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding.c
   ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c
@@ -1037,6 +1038,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
   ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_time.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync.c
@@ -1045,6 +1047,7 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation_NB_IoT.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_eNB_measurements.c

openair1/PHY/LTE_ESTIMATION/defs_NB_IoT.h

@@ -36,5 +36,26 @@ int lte_est_timing_advance(NB_IoT_DL_FRAME_PARMS *frame_parms,
 int NB_IoT_est_timing_advance_pusch(PHY_VARS_eNB_NB_IoT* phy_vars_eNB,module_id_t UE_id);
 
 
+
+int lte_ul_channel_estimation_NB_IoT(PHY_VARS_eNB_NB_IoT      *phy_vars_eNB,
+			      					 eNB_rxtx_proc_NB_IoT_t   *proc,
+                              		 module_id_t              eNB_id,
+                              		 module_id_t              UE_id,
+                              		 uint8_t                  l,
+                              		 uint8_t                  Ns,
+                              		 uint8_t                  cooperation_flag);
+
+int16_t lte_ul_freq_offset_estimation_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,
+                                      		 int32_t *ul_ch_estimates,
+                                      		 uint16_t nb_rb);
+
+void freq_equalization_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,
+                       		  int **rxdataF_comp,
+                       		  int **ul_ch_mag,
+                       		  int **ul_ch_mag_b,
+                       		  unsigned char symbol,
+                       	      unsigned short Msc_RS,
+                              unsigned char Qm);
+
 /** @} */
 #endif

openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h

@@ -662,6 +662,8 @@ typedef struct {
   uint32_t              F;
   /// Temporary h sequence to flag PUSCH_x/PUSCH_y symbols which are not scrambled
   //uint8_t h[MAX_NUM_CHANNEL_BITS];
+  /// SRS active flag
+  uint8_t srs_active;
   /// Pointer to the payload
   uint8_t               *b;
   /// Current Number of Symbols

openair1/PHY/LTE_TRANSPORT/extern_NB_IoT.h

@@ -32,4 +32,9 @@ extern unsigned char cs_ack_normal_NB_IoT[4];
 extern unsigned char cs_ack_extended_NB_IoT[4];
 extern int8_t wACK_RX_NB_IoT[5][4];
 
+
+extern short conjugate[8],conjugate2[8];
+extern short *ul_ref_sigs_rx[30][2][33];
+extern unsigned short dftsizes[33];
+
 #endif
\ No newline at end of file

openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h

@@ -224,5 +224,13 @@ void rx_ulsch_NB_IoT(PHY_VARS_eNB_NB_IoT      *phy_vars_eNB,
                      NB_IoT_eNB_ULSCH_t       **ulsch,
                      uint8_t                  cooperation_flag);
 
+void ulsch_extract_rbs_single_NB_IoT(int32_t                **rxdataF,
+                                     int32_t                **rxdataF_ext,
+                                     uint32_t               first_rb,
+                                     uint32_t               nb_rb,
+                                     uint8_t                l,
+                                     uint8_t                Ns,
+                                     NB_IoT_DL_FRAME_PARMS  *frame_parms);
+
 
 #endif

openair1/PHY/impl_defs_lte_NB_IoT.h

@@ -352,6 +352,14 @@ typedef struct {
   uint8_t groupHoppingEnabled;
   /// , see TS 36.211 (5.5.1.3). \vr{[0..29]}
   uint8_t groupAssignmentNPUSCH;
+  /// Parameter: cyclicShift, see TS 36.211 (Table 5.5.2.1.1-2). \vr{[0..7]}
+  uint8_t cyclicShift;
+  /// nPRS for cyclic shift of DRS \note not part of offical UL-ReferenceSignalsPUSCH ASN1 specification.
+  uint8_t nPRS[20];
+  /// group hopping sequence for DRS \note not part of offical UL-ReferenceSignalsPUSCH ASN1 specification.
+  uint8_t grouphop[20];
+  /// sequence hopping sequence for DRS \note not part of offical UL-ReferenceSignalsPUSCH ASN1 specification.
+  uint8_t seqhop[20];
 } UL_REFERENCE_SIGNALS_NPUSCH_t;
 
 
@@ -365,6 +373,7 @@ typedef struct {
   DMRS_CONFIG_t dmrs_Config;
   /// Ref signals configuration
   UL_REFERENCE_SIGNALS_NPUSCH_t ul_ReferenceSignalsNPUSCH;
+
 } NPUSCH_CONFIG_COMMON;
 
 
@@ -385,6 +394,7 @@ typedef struct {
 	uint16_t	 dl_GapDurationCoeff;
 } DL_GapConfig_NB_IoT;
 
+
 typedef struct {
 
   /// Frame type (0 FDD, 1 TDD)

openair1/SCHED/phy_procedures_lte_eNb_NB_IoT.c

@@ -262,15 +262,15 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
           eNB->pusch_stats_rb[i][(frame*10)+subframe]    = eNB->nulsch[i]->harq_process->nb_rb;
           eNB->pusch_stats_round[i][(frame*10)+subframe] = eNB->nulsch[i]->harq_process->round;
           eNB->pusch_stats_mcs[i][(frame*10)+subframe]   = eNB->nulsch[i]->harq_process->mcs;
-/*
-  need for rx_ulsch function for NB_IoT
 
-          rx_ulsch(eNB,proc,
-                  eNB->UE_stats[i].sector,  // this is the effective sector id
-                  i,
-                  eNB->nulsch,
-                  0);
-*/
+  
+
+          rx_ulsch_NB_IoT(eNB,proc,
+                          eNB->UE_stats[i].sector,  // this is the effective sector id
+                          i,
+                          eNB->nulsch,
+                          0);
+
           ret = ulsch_decoding_NB_IoT(eNB,proc,
                                       i,
                                       0, // control_only_flag

openair2/LAYER2/MAC/defs_NB_IoT.h

@@ -667,7 +667,7 @@ typedef struct {
   time_stats_t schedule_dlsch; // include rlc_data_req + MAC header + preprocessor
   /// Delete processing time of eNB MCH scheduler
   /// processing time of eNB ULSCH reception
-  time_stats_t rx_ulsch_sdu; // include rlc_data_ind
+  time_stats_t rx_ulsch_sdu_NB_IoT; // include rlc_data_ind
 } eNB_MAC_INST_NB_IoT;
 
 /*!\brief Top level UE MAC structure */

openair2/LAYER2/MAC/eNB_scheduler_ulsch_NB_IoT.c

@@ -160,7 +160,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
   int crnti_rx=0;
   //int old_buffer_info;
 
-  start_meas(&eNB->rx_ulsch_sdu);
+  start_meas(&eNB->rx_ulsch_sdu_NB_IoT);
 
   /*if there is an error for UE_id> max or UE_id==-1, set rx_lengths to 0*/
   if ((UE_id >  NUMBER_OF_UE_MAX_NB_IoT) || (UE_id == -1)  )
@@ -480,7 +480,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
   }
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU,0);
-  stop_meas(&eNB->rx_ulsch_sdu);
+  stop_meas(&eNB->rx_ulsch_sdu_NB_IoT);
 }
 }
 

openair2/RRC/LITE/defs_NB_IoT.h

@@ -100,6 +100,7 @@
 /* correct Rel(8|10)/Rel14 differences
  * the code is in favor of Rel14, those defines do the translation
  */
+/*
 #if !defined(Rel14)
 #  define CipheringAlgorithm_r12_t e_SecurityAlgorithmConfig__cipheringAlgorithm
 #  define CipheringAlgorithm_r12_t e_CipheringAlgorithm_r12 //maybe this solve the problem of the previous line
@@ -164,7 +165,7 @@
 #define SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib10 SystemInformation_r8_IEs_sib_TypeAndInfo_Member_PR_sib10
 #define SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib11 SystemInformation_r8_IEs_sib_TypeAndInfo_Member_PR_sib11
 #endif
-
+*/
 
 #ifndef NO_RRM
 #include "L3_rrc_interface.h"

openair2/RRC/LITE/extern_NB_IoT.h

@@ -40,22 +40,22 @@
 
 //MP: NOTE:XXX some of the parameters defined in vars_nb_iot are called by the extern.h file so not replicated here
 
-extern UE_RRC_INST_NB_IoT *UE_rrc_inst_NB_IoT;
-
-extern eNB_RRC_INST_NB_IoT *eNB_rrc_inst_NB_IoT;
-extern PHY_Config_t *config_INFO;
-
-extern rlc_info_t Rlc_info_am_NB_IoT,Rlc_info_am_config_NB_IoT;
-extern uint8_t DRB2LCHAN_NB_IoT[2];
-extern LogicalChannelConfig_NB_r13_t SRB1bis_logicalChannelConfig_defaultValue_NB_IoT;
-extern LogicalChannelConfig_NB_r13_t SRB1_logicalChannelConfig_defaultValue_NB_IoT;
-
-extern uint16_t T300_NB_IoT[8];
-extern uint16_t T301_NB_IoT[8];
-extern uint16_t T310_NB_IoT[8];
-extern uint16_t T311_NB_IoT[8];
-extern uint16_t N310_NB_IoT[8];
-extern uint16_t N311_NB_IoT[8];
+extern UE_RRC_INST_NB_IoT 					*UE_rrc_inst_NB_IoT;
+
+extern eNB_RRC_INST_NB_IoT 					*eNB_rrc_inst_NB_IoT;
+extern PHY_Config_t 						*config_INFO;
+
+extern rlc_info_t 							Rlc_info_am_NB_IoT,Rlc_info_am_config_NB_IoT;
+extern uint8_t 								DRB2LCHAN_NB_IoT[2];
+extern LogicalChannelConfig_NB_r13_t 		SRB1bis_logicalChannelConfig_defaultValue_NB_IoT;
+extern LogicalChannelConfig_NB_r13_t 		SRB1_logicalChannelConfig_defaultValue_NB_IoT;
+
+extern uint16_t 							T300_NB_IoT[8];
+extern uint16_t 							T301_NB_IoT[8];
+extern uint16_t 							T310_NB_IoT[8];
+extern uint16_t 							T311_NB_IoT[8];
+extern uint16_t 							N310_NB_IoT[8];
+extern uint16_t 							N311_NB_IoT[8];
 
 #endif
 

openair2/RRC/LITE/rrc_common_NB_IoT.c

@@ -31,7 +31,7 @@
 //#include "defs_NB_IoT.h"
 //#include "extern.h"
 //#include "RRC/LITE/extern_NB_IoT.h"
-//#include "common/utils/collection/tree.h"
+#include "common/utils/collection/tree.h"
 #include "LAYER2/MAC/extern_NB_IoT.h"
 //#include "COMMON/openair_defs.h"
 //#include "COMMON/platform_types.h"

openair2/RRC/LITE/rrc_eNB_NB_IoT.c

@@ -44,6 +44,7 @@
 #include "DL-DCCH-Message-NB.h"
 #include "SRB-ToAddMod-NB-r13.h"
 
+#include "common/utils/collection/tree.h"
 //#include "extern.h"
 #include "extern_NB_IoT.h"
 #include "assertions.h"