FreeCalypso > hg > freecalypso-sw
changeset 735:458366ab2d6d
rr_cs.c compiles
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Sun, 05 Oct 2014 08:52:20 +0000 |
| parents | abfc662e0082 |
| children | c64af13c976f |
| files | gsm-fw/g23m-gsm/rr/Makefile gsm-fw/g23m-gsm/rr/rr_cs.c |
| diffstat | 2 files changed, 42 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/g23m-gsm/rr/Makefile Sun Oct 05 07:51:55 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/Makefile Sun Oct 05 08:52:20 2014 +0000 @@ -5,7 +5,7 @@ CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \ -I../../cdginc -OBJS= rr_attf.o rr_attp.o rr_atts.o +OBJS= rr_attf.o rr_attp.o rr_atts.o rr_cs.o all: ${OBJS}
--- a/gsm-fw/g23m-gsm/rr/rr_cs.c Sun Oct 05 07:51:55 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/rr_cs.c Sun Oct 05 08:52:20 2014 +0000 @@ -22,6 +22,10 @@ #ifndef RR_CS_C #define RR_CS_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_RR /*==== INCLUDES ===================================================*/ @@ -130,7 +134,8 @@ * 0 not member of the BCCH info list * 1 member of the BCCH info list * - * The flag indicates whether a cell is member of the BCCH information list or not. + * The flag indicates whether a cell is member of the BCCH information + * list or not. */ /* @@ -183,7 +188,7 @@ rr_data->dyn_config.lim_ser_nps_delay= DELAY_NON_PAR_SEARCH_LIM_SER; #if defined(_SIMULATION_FFS_) - rr_csf_ffs_init(); + rr_csf_ffs_init(); #endif } @@ -373,13 +378,14 @@ rr_csf_get_freq_bands (&freq_bands); if (!pch_interrupt) - {/* - * Power measurements without PCH interruption => PLMN search - * ---------------------------------------------------------- - * In this case we use the found and set value of 'std' for the frequency - * area to mask out not available frequencies from 'freq_bands'. - * Use only frequencies of the current area. - */ + { + /* + * Power measurements without PCH interruption => PLMN search + * ---------------------------------------------------------- + * In this case we use the found and set value of 'std' for the frequency + * area to mask out not available frequencies from 'freq_bands'. + * Use only frequencies of the current area. + */ switch (std) { case STD_900: @@ -446,11 +452,11 @@ if(local_std EQ STD_NOT_PRESENT) { - /* Parallel search case */ + /* Parallel search case */ #ifdef TI_PS_FF_QUAD_BAND_SUPPORT local_std = std; #else - local_std = std_bands[std-1]; + local_std = std_bands[std-1]; #endif } @@ -737,7 +743,6 @@ /* White list is valid */ mph_power_req->white_list.white_list_valid = TRUE; - } } @@ -920,7 +925,6 @@ */ for (i=0;i<rr_data->cs_data.max_arfcn;i++) { - /* * check only cells which have high/mid priority */ @@ -1112,23 +1116,23 @@ *start BSIC Reading;For fast search, the first scan is only on reasonably strong carriers.i.e carrires with rxlev>MEDIUM_RXLEV_THRESHOLD *This is as per the cell selection improvements document. Hence dont send BSIC request on white listed low power carrires for first scan. *(OMAPS00109145)*/ - if( (rr_data->cs_data.previous_search_mode EQ FAST_SEARCH_MODE) AND (rr_data->cs_data.scan_mode NEQ CS_SECOND_SCAN) AND ( rr_data->cs_data.rxlev[x]<MEDIUM_RXLEV_THRESHOLD)) - return FALSE; - else - { - PALLOC (mph_bsic_req, MPH_BSIC_REQ); - - mph_bsic_req->arfcn = rr_data->cs_data.arfcn[x]; - - TRACE_EVENT_P3 ("BSIC REQ[%u]%u a=0x%x", - rr_data->cs_data.arfcn[x] & ARFCN_MASK, - x, rr_data->cs_data.attributes[x]); - - PSENDX (PL, mph_bsic_req); + if( (rr_data->cs_data.previous_search_mode EQ FAST_SEARCH_MODE) AND (rr_data->cs_data.scan_mode NEQ CS_SECOND_SCAN) AND ( rr_data->cs_data.rxlev[x]<MEDIUM_RXLEV_THRESHOLD)) + return FALSE; + else + { + PALLOC (mph_bsic_req, MPH_BSIC_REQ); + + mph_bsic_req->arfcn = rr_data->cs_data.arfcn[x]; + + TRACE_EVENT_P3 ("BSIC REQ[%u]%u a=0x%x", + rr_data->cs_data.arfcn[x] & ARFCN_MASK, + x, rr_data->cs_data.attributes[x]); + + PSENDX (PL, mph_bsic_req); + } + return TRUE; } - return TRUE; } - } else return FALSE; } @@ -1380,7 +1384,7 @@ even after a down link failure has happened and if another BCCH carrer of less power become active and available for the mobile to camp */ - rxlev = rr_data->dyn_config.lower_rxlev_thr[x]; + rxlev = rr_data->dyn_config.lower_rxlev_thr[x]; copy = TRUE; if((i >= mph_power_cnf->num_of_white_list_chan) AND @@ -1533,7 +1537,6 @@ rr_data->cs_data.all_freq_area = TRUE; TRACE_EVENT("all_freq_area : 1"); } - } /* CSI-LLD section:4.1.1.3.12 @@ -1550,9 +1553,9 @@ rr_data->cs_data.attributes [rr_data->cs_data.act_index] |= (CS_CHECK_FLAG | CS_BCCH_READ); - /* CSI-LLD section:4.1.1.11 - * Synchronisation succeeded. Remove the carrier from black list - */ + /* CSI-LLD section:4.1.1.11 + * Synchronisation succeeded. Remove the carrier from black list + */ cs_del_from_black_list(rr_data->cs_data.region, (U16)(mph_bsic_cnf->arfcn&ARFCN_MASK)); @@ -1998,9 +2001,9 @@ LOCAL void cs_add_current_network_to_found_list (void) { GET_INSTANCE_DATA; - T_loc_area_ident *lai = &rr_data->nc_data[SC_INDEX].lai; - - TRACE_FUNCTION ("cs_add_current_network_to_found_list()"); + T_loc_area_ident *lai = &rr_data->nc_data[SC_INDEX].lai; + + TRACE_FUNCTION ("cs_add_current_network_to_found_list()"); switch (rr_data->ms_data.rr_service) { @@ -2123,7 +2126,6 @@ GLOBAL BOOL cs_check_arfcn_range(U16 arfcn) { - if(arfcn EQ CHANNEL_0) arfcn = CHANNEL_0_INTERNAL; @@ -2802,8 +2804,8 @@ | STATE : code ROUTINE : cs_get_new_search_mode | +----------------------------------------------------------------------+ - PURPOSE : This routine returns the new search mode depending on the timer active - and the previous search mode + PURPOSE : This routine returns the new search mode depending on the timer + active and the previous search mode CSI-LLD section:4.1.3.4.1.1 */