FreeCalypso > hg > tcs211-l1-reconst

changeset 310:cd2507a8ec57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
l1p_ctl.c: passes compilation
author Mychaela Falconia <falcon@freecalypso.org>
date Mon, 02 Oct 2017 20:17:05 +0000
parents 871cf4253768
children 5f8ab159aa76
files chipsetsw/layer1/p_cfile/l1p_ctl.c
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/chipsetsw/layer1/p_cfile/l1p_ctl.c	Mon Oct 02 20:08:51 2017 +0000
+++ b/chipsetsw/layer1/p_cfile/l1p_ctl.c	Mon Oct 02 20:17:05 2017 +0000
@@ -233,7 +233,7 @@
   // Process AGC to apply
   *agc     = Cust_get_agc_from_IL(radio_freq,
                                   input_level >> 1,
-                                  curve_id, *lna_off);
+                                  curve_id);
 
   // Store lna_off and input_level field used for current CTRL in order to be able 
   // to build IL from pm in READ phase.
@@ -276,7 +276,7 @@
   UWORD8   lna_off;
   UWORD16  dco_algo_ctl_pw_temp = 0;
   UWORD8   if_ctl = 0;
-  #if (CODE_VERSION != SIMULATION)
+#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION)
   UWORD8   if_threshold = C_IF_ZERO_LOW_THRESHOLD_GPRS;
 #endif
 
@@ -293,7 +293,7 @@
   delta2_freq = l1ctl_encode_delta2(radio_freq);
 
   // AGC used in the control phase (format F7.1)
-  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID, l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
 
   // LNA attenuation
   lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
@@ -495,7 +495,7 @@
     selected_IL = &l1a_l1s_com.Scell_info.transfer_meas;
   }
   *lna_off = selected_IL->lna_off;
-  *agc     = Cust_get_agc_from_IL(radio_freq,selected_IL->input_level >> 1, MAX_ID, *lna_off);
+  *agc     = Cust_get_agc_from_IL(radio_freq,selected_IL->input_level >> 1, MAX_ID);
 
   // Store lna_off and input_level field used for current CTRL in order to be able 
   // to build IL from pm in READ phase.
@@ -624,7 +624,7 @@
   UWORD8       lna_off;
   UWORD16 dco_algo_ctl_pw_temp = 0;
   UWORD8 if_ctl = 0;
-  #if (CODE_VERSION != SIMULATION)
+#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION)
   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GPRS;
 #endif
 
@@ -647,7 +647,7 @@
   delta2_freq                                      = l1ctl_encode_delta2(radio_freq);
 
   // AGC used in the control phase (format F7.1)
-  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID, l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
 
   // LNA attenuation
   lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
@@ -1004,7 +1004,7 @@
   UWORD8       lna_off;
   UWORD16 dco_algo_ctl_pw_temp = 0;
   UWORD8 if_ctl = 0;
-  #if (CODE_VERSION != SIMULATION)
+#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION)
   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GPRS;
 #endif
 
@@ -1027,7 +1027,7 @@
   delta2_freq = l1ctl_encode_delta2(radio_freq);
 
   // Last known AGC (format F7.1)
-  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
 
   // LNA attenuation
   lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
@@ -1320,7 +1320,7 @@
   UWORD8       lna_off;
   UWORD16 dco_algo_ctl_pw_temp = 0;
   UWORD8 if_ctl = 0;
-  #if (CODE_VERSION != SIMULATION)
+#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION)
   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GPRS;
 #endif
 
@@ -1342,7 +1342,7 @@
   delta2_freq = l1ctl_encode_delta2(radio_freq);
 
   // Last known AGC (format F7.1)
-  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+  used_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
 
   // LNA attenuation
   lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
@@ -1581,7 +1581,7 @@
   UWORD16      arfcn;
   UWORD16 dco_algo_ctl_pw_temp = 0;
   UWORD8 if_ctl = 0;
-  #if (CODE_VERSION != SIMULATION)
+#if (RF_FAM == 61) && (CODE_VERSION != SIMULATION)
   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GPRS;
 #endif
 
@@ -1602,7 +1602,7 @@
   lna_value = lna_off * l1ctl_get_lna_att(radio_freq);
 
   // Used AGC in the control phase (format F7.1)
-  used_agc = (Cust_get_agc_from_IL(radio_freq, last_known_il >> 1, PWR_ID, lna_off)) << 1;
+  used_agc = (Cust_get_agc_from_IL(radio_freq, last_known_il >> 1, PWR_ID)) << 1;
 
 
   // DRP correction