Merge remote-tracking branch 'origin/fix_delta_ulsch_channel_estimation' into integration_2024_w33

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -41,10 +41,8 @@
 #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 // Table 6.4.1.1.3-1/2 from TS 38.211
-static const int delta1[8] = {0, 0, 1, 1, 0, 0, 1, 1};
 static const int wf1[8][2] = {{1, 1}, {1, -1}, {1, 1}, {1, -1}, {1, 1}, {1, -1}, {1, 1}, {1, -1}};
 static const int wt1[8][2] = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, -1}, {1, -1}, {1, -1}, {1, -1}};
-static const int delta2[12] = {0, 0, 2, 2, 4, 4, 0, 0, 2, 2, 4, 4};
 static const int wf2[12][2] =
     {{1, 1}, {1, -1}, {1, 1}, {1, -1}, {1, 1}, {1, -1}, {1, 1}, {1, -1}, {1, 1}, {1, -1}, {1, 1}, {1, -1}};
 static const int wt2[12][2] =
@@ -56,14 +54,6 @@ static const c16_t nr_rx_mod_table[7] =
 static const c16_t nr_rx_nmod_table[7] =
     {{0, 0}, {-23170, 23170}, {23170, -23170}, {-23170, 23170}, {-23170, -23170}, {23170, 23170}, {23170, -23170}};
 
-int nr_pusch_dmrs_delta(uint8_t dmrs_config_type, unsigned short p) {
-  if (dmrs_config_type == pusch_dmrs_type1) {
-    return delta1[p];
-  } else {
-    return delta2[p];
-  }
-}
-
 int nr_pusch_dmrs_rx(PHY_VARS_gNB *gNB,
                      unsigned int Ns,
                      const uint32_t *nr_gold_pusch,

openair1/PHY/NR_REFSIG/nr_refsig.h

@@ -27,8 +27,6 @@
 #include "PHY/defs_gNB.h"
 #include "openair1/PHY/NR_REFSIG/nr_refsig_common.h"
 
-int nr_pusch_dmrs_delta(uint8_t dmrs_config_type, unsigned short p);
-
 int nr_pusch_dmrs_rx(PHY_VARS_gNB *gNB,
                      unsigned int Ns,
                      const uint32_t *nr_gold_pusch,

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -1402,6 +1402,7 @@ void NFAPI_NR_DMRS_TYPE2_average_prb(NR_DL_FRAME_PARMS *frame_parms,
   c16multaddVectRealComplex(filt8_avlip6, &ch, dl_ch, 8);
 #endif
 }
+
 int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
                                 const UE_nr_rxtx_proc_t *proc,
                                 int nl,