From e74b9a5c297c584d6d5ebc0a385cfe6c8b901d96 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS Date: Mon, 28 Aug 2023 18:44:23 +0200 Subject: [PATCH] remove a frame param useless attribute --- nfapi/oai_integration/nfapi_pnf.c | 4 +--- .../NR_ESTIMATION/nr_ul_channel_estimation.c | 3 +-- .../nr_dl_channel_estimation.c | 15 ++---------- openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c | 24 +++++++++---------- openair1/PHY/defs_nr_common.h | 2 -- openair1/SIMULATION/NR_PHY/pbchsim.c | 1 - .../NR_UE_PHY/unit_tests/src/pss_util_test.c | 3 +-- 7 files changed, 17 insertions(+), 35 deletions(-) diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c index 0a7b53b9ea..2e2bea2061 100644 --- a/nfapi/oai_integration/nfapi_pnf.c +++ b/nfapi/oai_integration/nfapi_pnf.c @@ -879,7 +879,6 @@ int config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, nfap if (req->sch_config.physical_cell_id.tl.tag == NFAPI_SCH_CONFIG_PHYSICAL_CELL_ID_TAG) { fp->Nid_cell = req->sch_config.physical_cell_id.value; - fp->nushift = fp->Nid_cell%6; num_tlv++; } @@ -1049,8 +1048,7 @@ int nr_config_request(nfapi_pnf_config_t *config, nfapi_pnf_phy_config_t *phy, n } if (req->cell_config.phy_cell_id.tl.tag == NFAPI_NR_CONFIG_PHY_CELL_ID_TAG) { - fp->Nid_cell = req->cell_config.phy_cell_id.value; //sch_config.physical_cell_id.value; - fp->nushift = fp->Nid_cell%6; + fp->Nid_cell = req->cell_config.phy_cell_id.value; // sch_config.physical_cell_id.value; num_tlv++; } diff --git a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c index 1eb864f010..4f54e4679c 100644 --- a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c +++ b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c @@ -138,8 +138,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB, 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 nushift = (p>>1)&1; - gNB->frame_parms.nushift = nushift; + const int nushift = (p >> 1) & 1; int ch_offset = symbolSize*symbol; const int symbol_offset = symbolSize*symbol; diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c index 0de7dbaa9c..a86485d844 100644 --- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c +++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c @@ -635,18 +635,13 @@ int nr_pbch_dmrs_correlation(PHY_VARS_NR_UE *ue, c16_t rxdataF[][ue->frame_parms.samples_per_slot_wCP]) { int pilot[200] __attribute__((aligned(16))); - unsigned short k; unsigned int pilot_cnt; int16_t ch[2],*pil,*rxF; int symbol_offset; - - uint8_t nushift; uint8_t ssb_index=current_ssb->i_ssb; uint8_t n_hf=current_ssb->n_hf; - nushift = ue->frame_parms.Nid_cell%4; - ue->frame_parms.nushift = nushift; unsigned int ssb_offset = ue->frame_parms.first_carrier_offset + ue->frame_parms.ssb_start_subcarrier; if (ssb_offset>= ue->frame_parms.ofdm_symbol_size) ssb_offset-=ue->frame_parms.ofdm_symbol_size; @@ -656,8 +651,7 @@ int nr_pbch_dmrs_correlation(PHY_VARS_NR_UE *ue, symbol_offset = ue->frame_parms.ofdm_symbol_size*symbol; - - k = nushift; + unsigned int k = ue->frame_parms.Nid_cell % 4; #ifdef DEBUG_PBCH printf("PBCH DMRS Correlation : gNB_id %d , OFDM size %d, Ncp=%d, Ns=%d, k=%d symbol %d\n", proc->gNB_id, ue->frame_parms.ofdm_symbol_size, ue->frame_parms.Ncp, Ns, k, symbol); @@ -805,8 +799,7 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue, //int slot_pbch; uint8_t nushift; - nushift = ue->frame_parms.Nid_cell%4; - ue->frame_parms.nushift = nushift; + nushift = ue->frame_parms.Nid_cell % 4; unsigned int ssb_offset = ue->frame_parms.first_carrier_offset + ue->frame_parms.ssb_start_subcarrier; if (ssb_offset>= ue->frame_parms.ofdm_symbol_size) ssb_offset-=ue->frame_parms.ofdm_symbol_size; @@ -1707,12 +1700,8 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue, uint8_t nushift = 0; if (config_type == NFAPI_NR_DMRS_TYPE1) { nushift = (p >> 1) & 1; - if (p < 4) - ue->frame_parms.nushift = nushift; } else { // NFAPI_NR_DMRS_TYPE2 nushift = delta; - if (p < 6) - ue->frame_parms.nushift = nushift; } for (int aarx = 0; aarx < ue->frame_parms.nb_antennas_rx; aarx++) { diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c index e89b0e5d1c..2629c00968 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c @@ -57,10 +57,11 @@ static uint16_t nr_pbch_extract(uint32_t rxdataF_sz, struct complex16 dl_ch_estimates_ext[][PBCH_MAX_RE_PER_SYMBOL], uint32_t symbol, uint32_t s_offset, - NR_DL_FRAME_PARMS *frame_parms) { + NR_DL_FRAME_PARMS *frame_parms, + int nushiftmod4) +{ uint16_t rb; - uint8_t i,j,aarx; - int nushiftmod4 = frame_parms->nushift; + uint8_t i, j, aarx; AssertFatal(symbol>=1 && symbol<5, "symbol %d illegal for PBCH extraction\n", symbol); @@ -395,12 +396,12 @@ int nr_rx_pbch(PHY_VARS_NR_UE *ue, { int max_h=0; int symbol; - //uint8_t pbch_a[64]; - //FT ?? cppcheck doesn't like pbch_a allocation because of line 525..and i don't get what this variable is for.. - //uint8_t *pbch_a = malloc(sizeof(uint8_t) * NR_POLAR_PBCH_PAYLOAD_BITS); - uint8_t nushift; - uint16_t M; + // uint8_t pbch_a[64]; + // FT ?? cppcheck doesn't like pbch_a allocation because of line 525..and i don't get what this variable is for.. + // uint8_t *pbch_a = malloc(sizeof(uint8_t) * NR_POLAR_PBCH_PAYLOAD_BITS); uint8_t Lmax=frame_parms->Lmax; + int M = NR_POLAR_PBCH_E; + int nushift = (Lmax == 4) ? i_ssb & 3 : i_ssb & 7; //uint16_t crc; //unsigned short idx_demod =0; uint32_t decoderState=0; @@ -440,7 +441,8 @@ int nr_rx_pbch(PHY_VARS_NR_UE *ue, dl_ch_estimates_ext, symbol, symbol_offset, - frame_parms); + frame_parms, + nushift); #ifdef DEBUG_PBCH LOG_I(PHY,"[PHY] PBCH Symbol %d ofdm size %d\n",symbol, frame_parms->ofdm_symbol_size ); LOG_I(PHY,"[PHY] PBCH starting channel_level\n"); @@ -496,9 +498,7 @@ int nr_rx_pbch(PHY_VARS_NR_UE *ue, printf("pbch rx llr %d\n",*(pbch_e_rx+cnt)); #endif - //un-scrambling - M = NR_POLAR_PBCH_E; - nushift = (Lmax==4)? i_ssb&3 : i_ssb&7; + // un-scrambling uint32_t unscrambling_mask = (Lmax==64)?0x100006D:0x1000041; uint32_t pbch_a_interleaved=0; uint32_t pbch_a_prime=0; diff --git a/openair1/PHY/defs_nr_common.h b/openair1/PHY/defs_nr_common.h index 0741291fb4..8e0cb24dcb 100644 --- a/openair1/PHY/defs_nr_common.h +++ b/openair1/PHY/defs_nr_common.h @@ -229,8 +229,6 @@ struct NR_DL_FRAME_PARMS { c16_t timeshift_symbol_rotation[4096*2] __attribute__ ((aligned (16))); /// Table used to apply the delay compensation in UL c16_t ul_delay_table[2 * MAX_UL_DELAY_COMP + 1][NR_MAX_OFDM_SYMBOL_SIZE * 2]; - /// shift of pilot position in one RB - uint8_t nushift; /// SRS configuration from TS 38.331 RRC SRS_NR srs_nr; /// Power used by SSB in order to estimate signal strength and path loss diff --git a/openair1/SIMULATION/NR_PHY/pbchsim.c b/openair1/SIMULATION/NR_PHY/pbchsim.c index 4a45360ac0..68b7f9fab0 100644 --- a/openair1/SIMULATION/NR_PHY/pbchsim.c +++ b/openair1/SIMULATION/NR_PHY/pbchsim.c @@ -495,7 +495,6 @@ int main(int argc, char **argv) frame_parms->nb_antenna_ports_gNB = n_tx; frame_parms->N_RB_DL = N_RB_DL; frame_parms->Nid_cell = Nid_cell; - frame_parms->nushift = Nid_cell%4; frame_parms->ssb_type = nr_ssb_type_C; frame_parms->freq_range = mu<2 ? nr_FR1 : nr_FR2; diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c index 815c12a6a6..04445af3dc 100644 --- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c +++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c @@ -233,8 +233,7 @@ int init_test(unsigned char N_tx, unsigned char N_rx, unsigned char transmission frame_parms->N_RB_DL = N_RB_DL; //50 for 10MHz and 25 for 5 MHz frame_parms->N_RB_UL = N_RB_DL; frame_parms->Ncp = extended_prefix_flag; - frame_parms->Nid_cell = Nid_cell; - frame_parms->nushift = Nid_cell%6; + frame_parms->Nid_cell = Nid_cell; frame_parms->nb_antennas_tx = N_tx; frame_parms->nb_antennas_rx = N_rx; frame_parms->frame_type = frame_type;