From a1ae155b4e03fc1fb4691bbd11450cb961b742ac Mon Sep 17 00:00:00 2001 From: Guy De Souza Date: Wed, 5 Sep 2018 15:06:48 +0200 Subject: [PATCH] Minor size fix --- openair1/PHY/NR_TRANSPORT/nr_dci.c | 6 ++++-- openair1/PHY/defs_nr_common.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci.c b/openair1/PHY/NR_TRANSPORT/nr_dci.c index 431ff1a68e..4cca9e85f6 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_dci.c +++ b/openair1/PHY/NR_TRANSPORT/nr_dci.c @@ -205,9 +205,8 @@ uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars, } /// DCI payload processing - // CRC attachment + Scrambling + Channel coding + Rate matching + // CRC attachment + Scrambling + Channel coding + Rate matching uint32_t encoder_output[NR_MAX_DCI_SIZE_DWORD]; - uint32_t scrambled_output[NR_MAX_DCI_SIZE_DWORD]; uint16_t n_RNTI = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? ((pdcch_params.scrambling_id)?pdcch_params.rnti:0) : 0; uint16_t Nid = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? pdcch_params.scrambling_id : config.sch_config.physical_cell_id.value; #ifdef PDCCH_TEST_POLAR_TEMP_FIX @@ -226,6 +225,9 @@ uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars, 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 + + /// Scrambling + uint32_t scrambled_output[NR_MAX_DCI_SIZE_DWORD]; nr_pdcch_scrambling(encoder_output, encoded_length, Nid, n_RNTI, scrambled_output); // QPSK modulation diff --git a/openair1/PHY/defs_nr_common.h b/openair1/PHY/defs_nr_common.h index 47703de9fc..aca6f684a6 100644 --- a/openair1/PHY/defs_nr_common.h +++ b/openair1/PHY/defs_nr_common.h @@ -124,7 +124,7 @@ typedef struct NR_BWP_PARMS { typedef struct { uint8_t reg_idx; - uint8_t start_sc_idx; + uint16_t start_sc_idx; uint8_t symb_idx; } nr_reg_t;