diff --git a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c index ddfc991f10..115cf64f8b 100644 --- a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c +++ b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c @@ -86,10 +86,10 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, NR_gNB_PUSCH *pusch_vars = &gNB->pusch_vars[ul_id]; c16_t **ul_ch_estimates = (c16_t **)pusch_vars->ul_ch_estimates; const int symbolSize = gNB->frame_parms.ofdm_symbol_size; - const int soffset = (Ns & 3) * gNB->frame_parms.symbols_per_slot*symbolSize; + const int soffset = (Ns & 3) * gNB->frame_parms.symbols_per_slot * symbolSize; const int delta = get_delta(p, pusch_pdu->dmrs_config_type); - int ch_offset = symbolSize*symbol; - const int symbol_offset = symbolSize*symbol; + int ch_offset = symbolSize * symbol; + const int symbol_offset = symbolSize * symbol; const int k0 = bwp_start_subcarrier; const int nb_rb_pusch = pusch_pdu->rb_size; @@ -157,7 +157,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, c16_t *rxdataF = (c16_t *)&gNB->common_vars.rxdataF[aarx][symbol_offset]; c16_t *ul_ch = &ul_ch_estimates[nl * gNB->frame_parms.nb_antennas_rx + aarx][ch_offset]; - memset(ul_ch,0,sizeof(*ul_ch)*symbolSize); + memset(ul_ch, 0, sizeof(*ul_ch) * symbolSize); #ifdef DEBUG_PUSCH LOG_I(PHY, "In %s symbol_offset %d, delta %d\n", symbol_offset, delta); LOG_I(PHY, "ch est pilot, N_RB_UL %d\n", gNB->frame_parms.N_RB_UL); @@ -174,10 +174,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, c16_t *pil = pilot; int re_offset = k0; LOG_D(PHY,"PUSCH estimation DMRS type 1, Freq-domain interpolation"); - // For configuration type 1: k = 4*n + 2*k' + delta, - // where k' is 0 or 1, and delta is in Table 6.4.1.1.3-1 from TS 38.211 int pilot_cnt = 0; - int delta = nr_pusch_dmrs_delta(pusch_dmrs_type1, p); for (int n = 0; n < 3 * nb_rb_pusch; n++) { // LS estimation diff --git a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c b/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c index 0debd23295..1c217d8da0 100644 --- a/openair1/PHY/NR_REFSIG/nr_dmrs_rx.c +++ b/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, diff --git a/openair1/PHY/NR_REFSIG/nr_refsig.h b/openair1/PHY/NR_REFSIG/nr_refsig.h index 8636c9972a..cf93433db7 100644 --- a/openair1/PHY/NR_REFSIG/nr_refsig.h +++ b/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,