From 796eab07e1cbab01cee3e46cc2620924f90f3476 Mon Sep 17 00:00:00 2001 From: Guy De Souza Date: Mon, 27 Aug 2018 10:54:16 +0200 Subject: [PATCH] debug commit --- openair1/PHY/INIT/nr_init.c | 4 ++-- openair1/PHY/NR_TRANSPORT/nr_dci.c | 4 ++-- openair1/PHY/NR_TRANSPORT/nr_pbch.c | 2 +- targets/RT/USER/nr-gnb.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c index 29e10410be..a9d57fefce 100644 --- a/openair1/PHY/INIT/nr_init.c +++ b/openair1/PHY/INIT/nr_init.c @@ -119,10 +119,10 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB, // PBCH DMRS gold sequences generation nr_init_pbch_dmrs(gNB); // Polar encoder init for PBCH - nr_polar_init(&gNB->nrPolar_params, + /*nr_polar_init(&gNB->nrPolar_params, NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, - NR_POLAR_PBCH_AGGREGATION_LEVEL); + NR_POLAR_PBCH_AGGREGATION_LEVEL);*/ //PDCCH DMRS init gNB->nr_gold_pdcch_dmrs = (uint32_t ***)malloc16(fp->slots_per_frame*sizeof(uint32_t**)); diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c index 842b62ff3a..e62b6e2850 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dci.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c @@ -206,7 +206,7 @@ uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars, // CRC attachment + Scrambling + Channel coding + Rate matching uint32_t encoder_output[NR_MAX_DCI_SIZE_DWORD]; uint16_t n_RNTI = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? pdcch_params.rnti : 0; -#ifdef PDCCH_TEST_POLAR_TEMP_FIX +/*#ifdef PDCCH_TEST_POLAR_TEMP_FIX t_nrPolar_paramsPtr currentPtr = NULL;//, polarParams = NULL; nr_polar_init(¤tPtr, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L); // t_nrPolar_paramsPtr currentPtr = nr_polar_params(*nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L); @@ -221,7 +221,7 @@ uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars, dci_alloc.dci_pdu[0], dci_alloc.dci_pdu[1], dci_alloc.dci_pdu[2], dci_alloc.dci_pdu[3]); printf("Encoded Payload: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n", encoder_output[0], encoder_output[1], encoder_output[2], encoder_output[3]); -#endif +#endif*/ // QPSK modulation int16_t mod_dci[NR_MAX_DCI_SIZE>>1]; diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c index 1e761ea0bb..267387408b 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c @@ -288,7 +288,7 @@ pbch_a_b[m] = ((pbch->pbch_a_prime[m/8]>>(m&7))&01); } /// CRC, coding and rate matching - polar_encoder (pbch->pbch_a_prime, pbch->pbch_e, &frame_parms->pbch_polar_params); + //polar_encoder (pbch->pbch_a_prime, pbch->pbch_e, &frame_parms->pbch_polar_params); #ifdef DEBUG_PBCH_ENCODING printf("Channel coding:\n"); for (int i=0; i>3; i++) diff --git a/targets/RT/USER/nr-gnb.c b/targets/RT/USER/nr-gnb.c index 27d233bedb..fbd3c714d5 100644 --- a/targets/RT/USER/nr-gnb.c +++ b/targets/RT/USER/nr-gnb.c @@ -916,10 +916,10 @@ void init_gNB(int single_thread_flag,int wait_for_sync) { gNB = RC.gNB[inst][CC_id]; gNB->abstraction_flag = 0; gNB->single_thread_flag = single_thread_flag; - nr_polar_init(&gNB->nrPolar_params, + /*nr_polar_init(&gNB->nrPolar_params, NR_POLAR_PBCH_MESSAGE_TYPE, NR_POLAR_PBCH_PAYLOAD_BITS, - NR_POLAR_PBCH_AGGREGATION_LEVEL); + NR_POLAR_PBCH_AGGREGATION_LEVEL);*/ LOG_I(PHY,"Initializing gNB %d CC_id %d single_thread_flag:%d\n",inst,CC_id,single_thread_flag); #ifndef OCP_FRAMEWORK