# HG changeset patch # User Mychaela Falconia # Date 1463297512 0 # Node ID 136a30c40ba579bda3cb17b9fd93fac235d06e63 # Parent 60a142a16d6bf0d1fafea63d47de92e326148296 l1_sync.c: removed helper functions for LoCosto version of l1s_meas_manager() diff -r 60a142a16d6b -r 136a30c40ba5 chipsetsw/layer1/cfile/l1_sync.c --- a/chipsetsw/layer1/cfile/l1_sync.c Sun May 15 07:22:04 2016 +0000 +++ b/chipsetsw/layer1/cfile/l1_sync.c Sun May 15 07:31:52 2016 +0000 @@ -242,10 +242,6 @@ void l1ps_macs_rlc_downlink_call (void); #endif -UWORD8 calc_num_pm_to_report(void); -void update_num_pm_fp_table_for_rach(UWORD8 nbmeas,UWORD8 *p); -void update_num_pm_table_for_rach(UWORD8 nbmeas,UWORD8 *p); - #if (TRACE_TYPE==7) // CPU_LOAD extern void l1_cpu_load_start(void); extern void l1_cpu_load_stop(void); @@ -8325,130 +8321,3 @@ //#pragma DUPLICATE_FOR_INTERNAL_RAM_END #endif // MOVE_IN_INTERNAL_RAM - -//This function calculates and returns the number of PM to scheduled during page block monitor -UWORD8 calc_num_pm_to_report() -{ - UWORD8 time_for_balist_meas; - UWORD8 num_pms_drx; - - time_for_balist_meas = ((((((5*l1a_l1s_com.ba_list.nbr_carrier)+6)/7)*l1a_l1s_com.bs_pa_mfrms /4)+1) > 5)?(((((5*l1a_l1s_com.ba_list.nbr_carrier)+6)/7)*l1a_l1s_com.bs_pa_mfrms /4)+1):5; - - if(time_for_balist_meas == 5) - { - num_pms_drx = ((5*l1a_l1s_com.ba_list.nbr_carrier*l1a_l1s_com.bs_pa_mfrms*51*577*8)/(time_for_balist_meas*1000*1000))+1; - } - else - { - num_pms_drx = ((5*l1a_l1s_com.ba_list.nbr_carrier*28*51*577*8)/(((5*l1a_l1s_com.ba_list.nbr_carrier)+6)*1000*1000))+1; - } - - return(num_pms_drx); -} - - - -void update_num_pm_fp_table_for_rach(UWORD8 nbmeas,UWORD8 *p) -{ - - switch(nbmeas) - { - case 1: - case 2: break; - case 3: p[0]=1; - p[1]=2; - break; - case 4: p[0]=1; - p[1]=3; - break; - case 5: p[0]=1; - p[1]=4; - break; - case 6: p[0]=1; - p[1]=4; - break; - case 7: p[0]=1; - p[1]=4; - break; - } - -} - - - -void update_num_pm_table_for_rach(UWORD8 nbmeas,UWORD8 *p) -{ - switch(nbmeas) - { - case 1: - case 2: - case 3: - case 4: break; - case 5: if(l1a_l1s_com.ba_list.np_ctrl == 1) - { - p[0]=1; - p[1]=2; - p[2]=1; - p[3]=1; - } - else if(l1a_l1s_com.ba_list.np_ctrl == 2) - { - p[0]=2; - p[1]=1; - p[2]=1; - p[3]=1; - } - else if(l1a_l1s_com.ba_list.np_ctrl == 3) - { - p[0]=2; - p[1]=1; - p[2]=1; - p[3]=1; - } - break; - case 6: if(l1a_l1s_com.ba_list.np_ctrl == 1) - { - p[0]=1; - p[1]=2; - p[2]=2; - p[3]=1; - } - else if(l1a_l1s_com.ba_list.np_ctrl == 2) - { - p[0]=2; - p[1]=1; - p[2]=2; - p[3]=1; - } - else if(l1a_l1s_com.ba_list.np_ctrl == 3) - { - p[0]=2; - p[1]=2; - p[2]=1; - p[3]=1; - } - break; - case 7: if(l1a_l1s_com.ba_list.np_ctrl == 1) - { - p[0]=1; - p[1]=2; - p[2]=2; - p[3]=2; - } - else if(l1a_l1s_com.ba_list.np_ctrl == 2) - { - p[0]=2; - p[1]=1; - p[2]=2; - p[3]=2; - } - else if(l1a_l1s_com.ba_list.np_ctrl == 3) - { - p[0]=2; - p[1]=2; - p[2]=1; - p[3]=2; - } - break; - } -}