# HG changeset patch # User Mychaela Falconia # Date 1475374320 0 # Node ID af1bacf61dc68ceec7c2f0df0bd83707f510527a # Parent 832b4be80ed90e51050193559be2d6d8e6c409aa src/cs/layer1/cfile/l1_ctl.c: fix for typo made during reconstruction diff -r 832b4be80ed9 -r af1bacf61dc6 src/cs/layer1/cfile/l1_ctl.c --- a/src/cs/layer1/cfile/l1_ctl.c Sun Oct 02 00:52:22 2016 +0000 +++ b/src/cs/layer1/cfile/l1_ctl.c Sun Oct 02 02:12:00 2016 +0000 @@ -1993,7 +1993,7 @@ #endif UWORD16 dco_algo_ctl_pw_temp = 0; UWORD8 if_ctl = 0; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM; #endif @@ -2180,12 +2180,12 @@ WORD8 delta1_freq, delta2_freq; WORD16 delta_drp_gain=0; WORD32 index, lna_value; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD16 arfcn; #endif UWORD16 dco_algo_ctl_pw_temp = 0; UWORD8 if_ctl = 0; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM; #endif @@ -2212,7 +2212,7 @@ // in the associated CTL task to build // the agc used in this CTL. -#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) +#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) #if (L1_FF_MULTIBAND == 0) arfcn = Convert_l1_radio_freq(radio_freq); #else @@ -2288,12 +2288,12 @@ WORD16 delta_low_drp_gain=0; WORD32 index; UWORD16 g_magic; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD16 arfcn; #endif UWORD16 dco_algo_ctl_pw_temp = 0; UWORD8 if_ctl = 0; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM; #endif @@ -2317,7 +2317,7 @@ // lna_off was set to 0 during CTRL, so lna_value = 0 do not appear in the following // formula. -#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) +#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) #if (L1_FF_MULTIBAND == 0) arfcn = Convert_l1_radio_freq(radio_freq); #else @@ -2472,13 +2472,13 @@ WORD32 current_IL, current_calibrated_IL; UWORD8 i; WORD32 lna_value; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD16 arfcn; #endif UWORD8 lna_off; UWORD16 dco_algo_ctl_pw_temp = 0; UWORD8 if_ctl = 0; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM; #endif @@ -2502,7 +2502,7 @@ // in the associated CTL task to build // the agc used in this CTL. -#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) +#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) #if (L1_FF_MULTIBAND == 0) arfcn = Convert_l1_radio_freq(radio_freq); #else @@ -2587,13 +2587,13 @@ UWORD8 *tab_ptr; T_DEDIC_SET *aset; WORD32 lna_value; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD16 arfcn; #endif UWORD8 lna_off; UWORD16 dco_algo_ctl_pw_temp = 0; UWORD8 if_ctl = 0; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM; #endif @@ -2635,7 +2635,7 @@ lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq); } -#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) +#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) #if (L1_FF_MULTIBAND == 0) arfcn = Convert_l1_radio_freq(radio_freq); #else @@ -2783,13 +2783,13 @@ UWORD8 *tab_ptr, *tab_amr_ptr; T_DEDIC_SET *aset; WORD32 lna_value; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD16 arfcn; #endif UWORD8 lna_off; UWORD16 dco_algo_ctl_pw_temp = 0; UWORD8 if_ctl = 0; - #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) + #if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM; #endif @@ -2835,7 +2835,7 @@ lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq); } -#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION) +#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION) #if (L1_FF_MULTIBAND == 0) arfcn = Convert_l1_radio_freq(radio_freq); #else