FreeCalypso > hg > tcs211-l1-reconst
diff chipsetsw/layer1/cfile/l1_ctl.c @ 82:ef6cf21cf9d6
l1_ctl.c: passes compilation, but doesn't match old object yet
| author | Mychaela Falconia <falcon@ivan.Harhan.ORG> |
|---|---|
| date | Tue, 29 Mar 2016 16:24:09 +0000 |
| parents | 6124f48fc1fa |
| children | 43dd68d8d891 |
line wrap: on
line diff
--- a/chipsetsw/layer1/cfile/l1_ctl.c Tue Mar 29 16:06:07 2016 +0000 +++ b/chipsetsw/layer1/cfile/l1_ctl.c Tue Mar 29 16:24:09 2016 +0000 @@ -655,9 +655,7 @@ } /* end else AFC_INIT*/ *frame_count=0; -//Locosto -// return(Psi_quant[C_N_del]>>3); /* F16.0 */ - return(CONVERT_PSI_QUANT(Psi_quant[C_N_del])); /* F16.0 to 14.2 or 13.3 */ + return(Psi_quant[C_N_del]>>3); /* F16.0 */ #else @@ -931,9 +929,7 @@ *frame_count = 0; -//Locosto -// return (psi_quant >> 3); /* F16.0 */ - return(CONVERT_PSI_QUANT(psi_quant)); /* F16.0 to 14.2 or 13.3 */ + return (psi_quant >> 3); /* F16.0 */ } /* end case algo 2 */ /* algo1 + init + estimator/predictor */ @@ -1274,12 +1270,10 @@ }/*end AFC_CLOSE_LOOP*/ - } /* end else AFC_INIT*/ - - *frame_count = 0; -//Locosto -// return(Psi_quant[C_N_del]>>3); /* F16.0 */ - return(((CONVERT_PSI_QUANT(Psi_quant[C_N_del]))&0x3FFF)); /* F16.0 to 14.2 or 13.3 */ + } /* end else AFC_INIT*/ + + *frame_count = 0; + return(Psi_quant[C_N_del]>>3); /* F16.0 */ } /* end case algo 3 */ #endif @@ -2138,7 +2132,7 @@ lna_value = lna_off * l1ctl_get_lna_att(radio_freq); - last_known_agc = (Cust_get_agc_from_IL(radio_freq, last_known_il >> 1, PWR_ID, lna_off)) << 1; + last_known_agc = (Cust_get_agc_from_IL(radio_freq, last_known_il >> 1, PWR_ID)) << 1; // F7.1 in order to be compatible with // pm and IL formats [-20,+140 in F7.1] // contain the input_level value we use @@ -2415,7 +2409,7 @@ lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq); // Compute applied agc for this pm - last_known_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; + last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1; // F7.1 in order to be compatible // with pm and IL formats // contain the input_level value we use @@ -2473,7 +2467,7 @@ #if L2_L3_SIMUL #if (DEBUG_TRACE==BUFFER_TRACE_PAGC) buffer_trace(4,IL_info_ptr->input_level,last_known_agc, - l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, IL_max >> 1, MAX_ID, l1a_l1s_com.Scell_used_IL_dd.lna_off)); + l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, IL_max >> 1, MAX_ID)); #endif #endif @@ -2538,10 +2532,10 @@ #endif { #if DPAGC_MAX_FLAG - last_known_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; + last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1; // F7.1 in order to be compatible with pm and IL formats #else - last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1; + last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID)) << 1; // F7.1 in order to be compatible with pm and IL formats #endif // input_level_dd : contain the input_level value we use @@ -2667,7 +2661,7 @@ #if L2_L3_SIMUL #if (DEBUG_TRACE==BUFFER_TRACE_DPAGC) buffer_trace(4,IL_info_ptr->input_level,last_known_agc, - l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)); + l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID)); #endif #endif @@ -2733,10 +2727,10 @@ #endif { #if DPAGC_MAX_FLAG - last_known_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; + last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1; // F7.1 in order to be compatible with pm and IL formats #else - last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1; + last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID)) << 1; // F7.1 in order to be compatible with pm and IL formats #endif // input_level_dd : contain the input_level value we use @@ -2875,7 +2869,7 @@ #if L2_L3_SIMUL #if (DEBUG_TRACE==BUFFER_TRACE_DPAGC) buffer_trace(4,IL_info_ptr->input_level,last_known_agc, - l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)); + l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID)); #endif #endif @@ -2941,7 +2935,7 @@ /* Return : */ /* Functionality : */ /*-------------------------------------------------------*/ -UWORD16 l1ctl_update_TPU_with_toa(void) +void l1ctl_update_TPU_with_toa(void) { #if (TOA_ALGO != 0) WORD16 toa_shift; @@ -3005,7 +2999,6 @@ #endif } #endif -return 0; //omaps00090550 }