# HG changeset patch # User Michael Spacefalcon # Date 1412495515 0 # Node ID abfc662e008244412f718c1f3ffec20317f658ab # Parent d01d6b3ac2a9e490fd06def1565d79f7498dea01 rr_atts.c compiles diff -r d01d6b3ac2a9 -r abfc662e0082 gsm-fw/g23m-gsm/rr/Makefile --- a/gsm-fw/g23m-gsm/rr/Makefile Sun Oct 05 03:12:20 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/Makefile Sun Oct 05 07:51:55 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 +OBJS= rr_attf.o rr_attp.o rr_atts.o all: ${OBJS} diff -r d01d6b3ac2a9 -r abfc662e0082 gsm-fw/g23m-gsm/rr/rr_atts.c --- a/gsm-fw/g23m-gsm/rr/rr_atts.c Sun Oct 05 03:12:20 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/rr_atts.c Sun Oct 05 07:51:55 2014 +0000 @@ -21,6 +21,10 @@ #ifndef RR_ATTS_C #define RR_ATTS_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_RR /*==== INCLUDES ===================================================*/ @@ -111,7 +115,6 @@ TRACE_EVENT(" PLMN_SEARCH_STOPPED"); } - /* * If network search is ongoing, abort * and allow cell reselection. @@ -309,7 +312,7 @@ { GET_INSTANCE_DATA; -/* + /* * get the storage area by checking the channel number */ UBYTE index = att_get_index (arfcn); @@ -410,7 +413,8 @@ /* * for 2 case:system information 2 is only important to speed up the * PLMN available search. - * for 2bis case:system information type 2bis message is stored. This is needed + * for 2bis case:system information type 2bis message is stored. + * This is needed * for PLMN available search. Really taken in account after * reception of system info 2,3 or 4. */ @@ -422,9 +426,9 @@ FALSE); if (si_type EQ SI_TYPE_2) { - /* - * if all is read, add the PLMN to the found list - */ + /* + * if all is read, add the PLMN to the found list + */ switch (rr_data->ms_data.req_mm_service) { case FUNC_NET_SRCH_BY_MMI: @@ -621,13 +625,14 @@ sys_info_3, FALSE); /* - * During Cell Selection if received SI3 from a PLMN which doesn't match - * requested PLMN then no need to wait for remaining SI messages - * The First Scan First Attempt is for Full Service search and only - * the carriers with Normal Priority is scanned and for this if the PLMN - * doesnot match, then no need to read remaining SIs. In the sucessive scans - * i.e First Scan Second Attempt and Second scan all the carriers are scanned - * irrespective of the priority and all the SI messages need to be read. + * During Cell Selection if received SI3 from a PLMN which doesn't match + * requested PLMN then no need to wait for remaining SI messages + * The First Scan First Attempt is for Full Service search and only + * the carriers with Normal Priority is scanned and for this if the + * PLMN doesnot match, then no need to read remaining SIs. In the + * successive scans i.e First Scan Second Attempt and Second scan all + * the carriers are scanned irrespective of the priority and all the SI + * messages need to be read. */ if ((rr_data->cs_data.scan_mode EQ CS_FIRST_SCAN_FIRST_ATTEMPT) AND (rr_data->ms_data.req_mm_service EQ FUNC_PLMN_SRCH) AND @@ -724,9 +729,6 @@ /* Implements RR Clone findings #30 */ att_sys_info_read(SYS_INFO_4_READ); - - - break; case NOT_PRESENT_8BIT: @@ -825,13 +827,14 @@ sys_info_4, FALSE); /* - * During Cell Selection if received SI4 from a PLMN which doesn't match - * requested PLMN then no need to wait for remaining SI messages - * The First Scan First Attempt is for Full Service search and only - * the carriers with Normal Priority is scanned and for this if the PLMN - * doesnot match, then no need to read remaining SIs. In the sucessive scans - * i.e First Scan Second Attempt and Second scan all the carriers are scanned - * irrespective of the priority and all the SI messages need to be read. + * During Cell Selection if received SI4 from a PLMN which doesn't match + * requested PLMN then no need to wait for remaining SI messages + * The First Scan First Attempt is for Full Service search and only + * the carriers with Normal Priority is scanned and for this if the + * PLMN doesnot match, then no need to read remaining SIs. In the + * successive scans i.e First Scan Second Attempt and Second scan all + * the carriers are scanned irrespective of the priority and all the SI + * messages need to be read. */ if ((rr_data->cs_data.scan_mode EQ CS_FIRST_SCAN_FIRST_ATTEMPT) AND (rr_data->ms_data.req_mm_service EQ FUNC_PLMN_SRCH) AND @@ -852,11 +855,11 @@ #ifdef GPRS else { - if (!sys_info_4->cell_select.acs) - { - att_check_gprs_supp(sys_info_4->si4_rest_oct.v_gprs_indic, - &sys_info_4->si4_rest_oct.gprs_indic); - } + if (!sys_info_4->cell_select.acs) + { + att_check_gprs_supp(sys_info_4->si4_rest_oct.v_gprs_indic, + &sys_info_4->si4_rest_oct.gprs_indic); + } } #endif att_check_bcch_carrier_si (); @@ -944,8 +947,6 @@ /* Implements RR Clone findings #30 */ att_sys_info_read(SYS_INFO_3_READ); - - break; default: @@ -998,7 +999,7 @@ /* +--------------------------------------------------------------------+ | PROJECT : GSM-PS (6147) MODULE : RR_ATT | -| STATE : code ROUTINE : att_for_sysinfo_type5_5bis | +| STATE : code ROUTINE : att_for_sysinfo_type5_5bis | +--------------------------------------------------------------------+ PURPOSE : This function handles the system information type 5 and 5bis @@ -1013,7 +1014,7 @@ { GET_INSTANCE_DATA; - /* + /* * calculate the index for the channel */ UBYTE index = att_get_index (arfcn); @@ -1038,14 +1039,14 @@ case ATT_CON_EST: if (dat_check_error_flag (SEND_NO_RR_STATUS)) { - /* - * receiving a modified BA indicator forces discarding the current BA - * receiving a SI5 while the bit SYS_INFO_5_READ is set or - * receiving a SI5Bis while the bit SYS_INFO_5Bis_READ is set - * indicates a change of the BA list - * => clear old channel list - * => delete other SI5x read bit mask - */ + /* + * receiving a modified BA indicator forces discarding the current BA + * receiving a SI5 while the bit SYS_INFO_5_READ is set or + * receiving a SI5Bis while the bit SYS_INFO_5Bis_READ is set + * indicates a change of the BA list + * => clear old channel list + * => delete other SI5x read bit mask + */ if(si_type EQ SI_TYPE_5) { cur_si_type_read = SYS_INFO_5_READ; @@ -1080,14 +1081,16 @@ } else { - /* - * SI5bis/SI5 received before - * merge list of sys info 5/sys info 5bis with the old neighbour cell list - */ + /* + * SI5bis/SI5 received before + * merge list of sys info 5/sys info 5bis with the old neighbour + * cell list + */ srv_merge_list (&rr_data->sc_data.cd.ncell_list, new_5_5bis_list); } /* CSI-LLD section:4.1.1.11 - * This function Updates the black list with the BA list received in si5/si5bis + * This function Updates the black list with the BA list received in + * si5/si5bis */ cs_remove_BA_MA_from_black_list(rr_data->cs_data.region,new_5_5bis_list); @@ -1777,6 +1780,5 @@ } } - #endif