# HG changeset patch # User Michael Spacefalcon # Date 1412478740 0 # Node ID d01d6b3ac2a9e490fd06def1565d79f7498dea01 # Parent a6f45d948d2202ad33f243836c75be3f2376397d rr_attp.c compiles diff -r a6f45d948d22 -r d01d6b3ac2a9 gsm-fw/g23m-gsm/rr/Makefile --- a/gsm-fw/g23m-gsm/rr/Makefile Sun Oct 05 02:53:52 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/Makefile Sun Oct 05 03:12:20 2014 +0000 @@ -5,7 +5,7 @@ CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \ -I../../cdginc -OBJS= rr_attf.o +OBJS= rr_attf.o rr_attp.o all: ${OBJS} diff -r a6f45d948d22 -r d01d6b3ac2a9 gsm-fw/g23m-gsm/rr/rr_attp.c --- a/gsm-fw/g23m-gsm/rr/rr_attp.c Sun Oct 05 02:53:52 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/rr_attp.c Sun Oct 05 03:12:20 2014 +0000 @@ -22,6 +22,10 @@ #ifndef RR_ATTP_C #define RR_ATTP_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_RR /*==== INCLUDES ===================================================*/ @@ -190,7 +194,6 @@ TRACE_EVENT ("downlink failure"); EM_DOWNLINK_FAILURE; - /* * try the next candidate for the cell reselection */ @@ -228,7 +231,7 @@ TRACE_EVENT ("radio link failure"); /* - * dynamic configuration command : IHO + * dynamic configuration command : IHO * Lock the DUT to the cell it is already camping - * Ignore the Radio Link Failures. */ @@ -657,8 +660,8 @@ memcpy (&rr_data->ms_data.measurement_report, mph_measurement_ind, sizeof (T_MPH_MEASUREMENT_IND)); - /* L1 always report BCCH RXLev as Zero in Connection Establishment mode, so copy - * BCCH RXLev as receivied level (rx_lev_full). + /* L1 always report BCCH RXLev as Zero in Connection Establishment + * mode, so copy BCCH RXLev as receivied level (rx_lev_full). * This will be used when we go into dedicated mode * And comback to Idle mode within 480MS Or * Dedicated mode was very-short duration and @@ -768,7 +771,7 @@ } #endif /*lint -fallthrough*/ - + case ATT_CS1: if ( GET_STATE (STATE_CELL_SEL) EQ CS_IDLE_ACTIVE ) { @@ -913,10 +916,8 @@ #else att_handle_rr_act_req (FALSE, rr_activate_req); #endif - break; - default: PFREE (rr_activate_req); break; @@ -1046,7 +1047,6 @@ (rr_sync_req->op.sim_ins << SHIFT_FOR_SIM_INSERTED); att_set_func (rr_sync_req->op.func); - switch (GET_STATE (STATE_ATT)) { case ATT_NO_SERVICE: @@ -1137,7 +1137,6 @@ break;/*state*/ }/*STATE_ATT*/ - switch (rr_sync_req->synccs) { case SYNCCS_EPLMN_LIST: @@ -1176,7 +1175,7 @@ att_add_to_forb_list (FORBIDDEN_LIST_NORMAL, &rr_sync_req->plmn, rr_sync_req->lac); - /* Specifications 24.008 (section 4.4.4.7) - + /* Specifications 24.008 (section 4.4.4.7) - * # 12: (Location Area not allowed); * The MS shall perform a cell selection when back to the MM IDLE state * according to 3GPP TS 03.22 and 3GPP TS 25.304.