From d6bbce2194f9a9a8f56ed57a75d115d9b4381858 Mon Sep 17 00:00:00 2001 From: Guy De Souza Date: Thu, 17 May 2018 10:46:51 +0200 Subject: [PATCH] Minor changes: loop declarations --- openair1/PHY/NR_TRANSPORT/nr_pbch.c | 14 +++++++------- openair1/PHY/NR_TRANSPORT/nr_pss.c | 8 ++++---- openair1/PHY/NR_TRANSPORT/nr_sss.c | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c index e068e6e644..2de3673d79 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c +++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c @@ -45,14 +45,14 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs, nfapi_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms) { - int m,k,l; - int a, aa; + int k,l; + int16_t a; int16_t mod_dmrs[2 * NR_PBCH_DMRS_LENGTH]; LOG_I(PHY, "PBCH DMRS mapping started at symbol %d shift %d\n", ssb_start_symbol+1, nu); /// BPSK modulation - for (m=0; m>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1)]; mod_dmrs[(m<<1)+1] = nr_mod_table[((NR_MOD_TABLE_BPSK_OFFSET + ((gold_pbch_dmrs[m>>5]&(1<<(m&0x1f)))>>(m&0x1f)))<<1) + 1]; #ifdef DEBUG_PBCH @@ -63,7 +63,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs, /// Resource mapping a = (config->rf_config.tx_antenna_ports.value == 1) ? amp : (amp*ONE_OVER_SQRT2_Q15)>>15; - for (aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++) + for (int aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++) { // PBCH DMRS are mapped within the SSB block on every fourth subcarrier starting from nu of symbols 1, 2, 3 @@ -71,7 +71,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs, k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nu; l = ssb_start_symbol + 1; - for (m = 0; m < 60; m++) { + for (int m = 0; m < 60; m++) { #ifdef DEBUG_PBCH printf("m %d at k %d of l %d\n", m, k, l); #endif @@ -87,7 +87,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs, k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nu; l++; - for (m = 60; m < 84; m++) { + for (int m = 60; m < 84; m++) { #ifdef DEBUG_PBCH printf("m %d at k %d of l %d\n", m, k, l); #endif @@ -103,7 +103,7 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs, k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + nu; l++; - for (m = 84; m < NR_PBCH_DMRS_LENGTH; m++) { + for (int m = 84; m < NR_PBCH_DMRS_LENGTH; m++) { #ifdef DEBUG_PBCH printf("m %d at k %d of l %d\n", m, k, l); #endif diff --git a/openair1/PHY/NR_TRANSPORT/nr_pss.c b/openair1/PHY/NR_TRANSPORT/nr_pss.c index 88ab34b8e6..e8e6722494 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_pss.c +++ b/openair1/PHY/NR_TRANSPORT/nr_pss.c @@ -30,8 +30,8 @@ int nr_generate_pss( int16_t *d_pss, nfapi_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms) { - int i,m,k,l; - int16_t a, aa; + int i,k,l,m; + int16_t a; int16_t x[NR_PSS_LENGTH]; const int x_initial[7] = {0, 1, 1 , 0, 1, 1, 1}; @@ -57,7 +57,7 @@ int nr_generate_pss( int16_t *d_pss, /// Resource mapping a = (config->rf_config.tx_antenna_ports.value == 1) ? amp : (amp*ONE_OVER_SQRT2_Q15)>>15; - for (aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++) + for (int aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++) { // PSS occupies a predefined position (subcarriers 56-182, symbol 0) within the SSB block starting from @@ -77,5 +77,5 @@ int nr_generate_pss( int16_t *d_pss, write_output("pss_0.m", "pss_0", (void*)txdataF[0][2*l*frame_parms->ofdm_symbol_size], frame_parms->ofdm_symbol_size, 1, 1); #endif - return (0); + return 0; } diff --git a/openair1/PHY/NR_TRANSPORT/nr_sss.c b/openair1/PHY/NR_TRANSPORT/nr_sss.c index 5ec7d4e320..8001949a75 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_sss.c +++ b/openair1/PHY/NR_TRANSPORT/nr_sss.c @@ -30,10 +30,10 @@ int nr_generate_sss( int16_t *d_sss, nfapi_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms) { - int i,m,k,l; + int i,k,l; int m0, m1; int Nid, Nid1, Nid2; - int16_t a, aa; + int16_t a; int16_t x0[NR_SSS_LENGTH], x1[NR_SSS_LENGTH]; const int x0_initial[7] = { 1, 0, 0, 0, 0, 0, 0 }; const int x1_initial[7] = { 1, 0, 0, 0, 0, 0, 0 }; @@ -67,14 +67,14 @@ int nr_generate_sss( int16_t *d_sss, /// Resource mapping a = (config->rf_config.tx_antenna_ports.value == 1) ? amp : (amp*ONE_OVER_SQRT2_Q15)>>15; - for (aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++) + for (int aa = 0; aa < config->rf_config.tx_antenna_ports.value; aa++) { // SSS occupies a predefined position (subcarriers 56-182, symbol 2) within the SSB block starting from k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + 56; //and l = ssb_start_symbol + 2; - for (m = 0; m < NR_SSS_LENGTH; m++) { + for (int m = 0; m < NR_SSS_LENGTH; m++) { ((int16_t*)txdataF[aa])[2*(l*frame_parms->ofdm_symbol_size + k)] = (a * d_sss[m]) >> 15; k++; @@ -86,5 +86,5 @@ int nr_generate_sss( int16_t *d_sss, write_output("sss_0.m", "sss_0", (void*)txdataF[0][2*l*frame_parms->ofdm_symbol_size], frame_parms->ofdm_symbol_size, 1, 1); #endif - return (0); + return 0; }