Adapt function demod to modulation configs

openair1/PHY/LTE_ESTIMATION/freq_equalization_NB_IoT.c

@@ -315,8 +315,8 @@ void freq_equalization_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,
 #if defined(__x86_64__) || defined(__i386__)
     rxdataF_comp128[re] = _mm_mullo_epi16(rxdataF_comp128[re],*((__m128i *)&inv_ch_NB_IoT[8*amp]));
 
-    if (Qm==4)
-      ul_ch_mag128[re]  = _mm_set1_epi16(324);  // this is 512*2/sqrt(10)
+    // if (Qm==4)
+    //   ul_ch_mag128[re]  = _mm_set1_epi16(324);  // this is 512*2/sqrt(10)
    // else {
     //  ul_ch_mag128[re]  = _mm_set1_epi16(316);  // this is 512*4/sqrt(42)
     //  ul_ch_magb128[re] = _mm_set1_epi16(158);  // this is 512*2/sqrt(42)
@@ -324,8 +324,8 @@ void freq_equalization_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,
 #elif defined(__arm__)
     rxdataF_comp128[re] = vmulq_s16(rxdataF_comp128[re],*((int16x8_t *)&inv_ch_NB_IoT[8*amp]));
 
-    if (Qm==4)
-      ul_ch_mag128[re]  = vdupq_n_s16(324);  // this is 512*2/sqrt(10)
+    // if (Qm==4)
+    //   ul_ch_mag128[re]  = vdupq_n_s16(324);  // this is 512*2/sqrt(10)
     //else {
     //  ul_ch_mag128[re]  = vdupq_n_s16(316);  // this is 512*4/sqrt(42)
     //  ul_ch_magb128[re] = vdupq_n_s16(158);  // this is 512*2/sqrt(42)

openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h

@@ -251,5 +251,40 @@ uint16_t get_UL_sc_start_NB_IoT(uint16_t I_sc);
 void generate_grouphop_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms); 
 
 void init_ul_hopping_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms); 
+
+void rotate_single_carrier_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB, 
+                                  NB_IoT_DL_FRAME_PARMS *frame_parms,
+                                  int32_t **rxdataF_comp, 
+                                  uint8_t UE_id,
+                                  uint8_t symbol, 
+                                  uint8_t Qm); 
+
+void fill_rbs_zeros_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB, 
+                                  NB_IoT_DL_FRAME_PARMS *frame_parms,
+                                  int32_t **rxdataF_comp, 
+                                  uint8_t UE_id,
+                                  uint8_t symbol); 
+
+int32_t ulsch_bpsk_llr_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB, 
+                              NB_IoT_DL_FRAME_PARMS *frame_parms,
+                              int32_t **rxdataF_comp,
+                              int16_t *ulsch_llr,
+                              uint8_t symbol, 
+                              uint8_t uint8_t, 
+                              int16_t **llrp); 
+
+int32_t ulsch_qpsk_llr_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB, 
+                              NB_IoT_DL_FRAME_PARMS *frame_parms,
+                              int32_t **rxdataF_comp,
+                              int16_t *ulsch_llr, 
+                              uint8_t symbol, 
+                              uint8_t UE_id, 
+                              int16_t **llrp); 
+
+void rotate_bpsk_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB, 
+                        NB_IoT_DL_FRAME_PARMS *frame_parms,
+                        int32_t **rxdataF_comp, 
+                        uint8_t UE_id,
+                        uint8_t symbol); 
 //************************************************************//
 #endif

openair1/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c

@@ -733,6 +733,7 @@ int ulsch_decoding_data_2thread(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr
   return( (ret>proc->tdp.ret) ? ret : proc->tdp.ret );
 }
 */
+
 /*
 // NB_IoT: functions in ulsch_decoding_data_NB_IoT must be defined
 
@@ -983,7 +984,7 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT     *eNB,
   // x1 is set in lte_gold_generic
   // x2 should not reinitialized each subframe
   // x2 should be reinitialized according to 36.211 Sections 10.1.3.1 and 10.1.3.6
-  x2         =  ((uint32_t)ulsch->rnti<<14) + ((uint32_t)subframe<<9) + (((uint32_t)proc->frame_rx%2)<<13) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.3.1
+  x2         =  ((uint32_t)ulsch->rnti<<14) + ((uint32_t)subframe<<9) + (((uint32_t)proc->frame_rx%2)<<13) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 10.1.3.1
   ulsch_harq =  ulsch->harq_process;
 
   if (harq_pid==255) {
@@ -1000,7 +1001,8 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT     *eNB,
 
 /* ----------------------- Segmentation */
 
-  nb_rb = ulsch_harq->nb_rb;  // nb_rb set but not used ??
+  // nb_rb = ulsch_harq->nb_rb;  // nb_rb set but not used ??
+  nb_rb = 1;  // nb_rb set but not used ??
   A     = ulsch_harq->TBS;
   Q_m   = get_Qm_ul_NB_IoT(ulsch_harq->mcs,ulsch_harq->N_sc_RU);
   //G     = nb_rb * (12 * Q_m) * ulsch_harq->Nsymb_pusch;