FreeCalypso > hg > fc-tourmaline
diff src/ui/mfw/mfw_nm.c @ 188:92abb46dc1ba
src/ui/mfw/*.[ch]: rm trailing white space
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Tue, 19 Jan 2021 06:10:27 +0000 |
parents | 67bfe9f274f6 |
children |
line wrap: on
line diff
--- a/src/ui/mfw/mfw_nm.c Tue Jan 19 05:41:26 2021 +0000 +++ b/src/ui/mfw/mfw_nm.c Tue Jan 19 06:10:27 2021 +0000 @@ -16,61 +16,61 @@ Aug 07, 2007 DR:OMAPS00137726 x0066814(Geetha) Description:HPLMN Manual Selection at power on - unable to perform manual selection at power ON - Solution: Added a new function nm_get_plmn_list_during_bootup() + Solution: Added a new function nm_get_plmn_list_during_bootup() to get the PLMN list during boot up. - + Apr 13, 2007 DRT:OMAPS00122739 x0066814(Geetha) Description: With Orange SIM card, once attached (at+cgatt=1), "5201" is displayed instead of "Orange" - Solution: In nm_nitz_info_ind(), commented the code to copy mnc, mcc, long name and short anme + Solution: In nm_nitz_info_ind(), commented the code to copy mnc, mcc, long name and short anme to net_ind from mmr_info_ind. May 31, 2007 DR: OMAPS00133201 x0pleela - Description: MS keeps searching networks and doesn't list available PLMNs after + Description: MS keeps searching networks and doesn't list available PLMNs after performing manual selection - Solution : Modified the function nm_error_cops() to check for - CME_ERR_AbortedByNetwork error and send event + Solution : Modified the function nm_error_cops() to check for + CME_ERR_AbortedByNetwork error and send event E_NM_ABORT_NETWORK to BMI to destroy the n/w searching dialog Mar 12 2007 ,x0061088 (Prachi) - Removed function nm_restrict_bands()as function pl_pei_config() is no + Removed function nm_restrict_bands()as function pl_pei_config() is no more avalilable in g23m. Oct 30 2006, OMAPS00098881 x0039928(sumanth) Removal of power variant - + Sep 18,2006 DRT: OMAPS0090268 x0061088(Prachi) Description : To check for Forbidden network (for denied services),it takes long time. Solution : Function rAT_PercentCREG() has now be implemented to handle CREG_STAT_Denied, - which sends nm_signal(NETWORK_FORBIDDEN_NETWORK) to Bmi . + which sends nm_signal(NETWORK_FORBIDDEN_NETWORK) to Bmi . June 02, 2006 DR: OMAPS00078005 x0021334 Descripton: Test for NITZ (Network Identity and Timezone) support - No New time was displayed Solution: New Time/Date received from network is sent to MFW by lower layer by invoking 'rAT_PercentCTZV' function. This function has now been implemented to pass on the received values to MMI - for user confirmation and RTC updation. + for user confirmation and RTC updation. Jun 23, 2006 DR: OMAPS00082374 x0pleela - Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile + Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile Solution: a) Removed the usage of globals gEons_alloc_active and opn_sel_done b) Removed the check if( plmn_ident->opn_read_from EQ NM_EONS ) in function nm_update_plmn_data c) Updating the long name and short name lengths in function nm_update_plmn_data d) Removed the code where plmn_ident was updated with new MNC and MCC after qat_%COPN in function nm_update_plmn_data e) Updated function nm_get_opername() by calling only sat_%CNIV() f) Removed the function definitions of set_opn_sel_done and get_opn_sel_done - + May 15, 2006 OMAPS00075777 a0393213 (R.Prabakar) - Description : It is supposed that the sample register itself automatically (in Manual Mode) - to the last manual selected HPLMN cell before the power cycle, and this does not happen; + Description : It is supposed that the sample register itself automatically (in Manual Mode) + to the last manual selected HPLMN cell before the power cycle, and this does not happen; instead this, the sample shows up the available networks list - Fix : call to nm_avail_plmn_list() is changed to call to sAT_PercentNRG() + Fix : call to nm_avail_plmn_list() is changed to call to sAT_PercentNRG() Feb 15, 2006 ER: OMAPS00065203 x0pleela Description: Cingular Operator Name Prioritization implementation required Solution: Incorporated review comments - - Changed from NEQ NM_CPHS to EQ NM_ROM as we know %CNIV will + - Changed from NEQ NM_CPHS to EQ NM_ROM as we know %CNIV will be called only if source id is ROM or CPHS and not roaming in nm_get_opername() - - set_opn_sel_done(): sets opn_sel_done flag to TRUE or FALSE. + - set_opn_sel_done(): sets opn_sel_done flag to TRUE or FALSE. - get_opn_sel_done(): returns the current value of flag opn_sel_done. Feb 09, 2006 ER: OMAPS00065203 x0pleela @@ -81,7 +81,7 @@ nm_decodeSourceId:to convert the source id used by ACI to the source id used by MFW nm_update_plmn_data: update plmn data after querying COPN nm_get_COPN: query COPN - nm_get_opername: updates operator name based on cingular's prioritization requirement. + nm_get_opername: updates operator name based on cingular's prioritization requirement. Priority would be in order ONS->NITZ->ROM nm_get_network_data: gets operator name from network @@ -93,7 +93,7 @@ July 14, 2005 REF: CRR 31916 x0021334 Description: rCI_PercentCOPS() and rAT_PercentCOPS() is not implemented - Solution: rAT_PercentCOPS() is implemented. + Solution: rAT_PercentCOPS() is implemented. Mar 01, 2005 REF: ENH 29327 xdeepadh Bug:Locosto MMI Optimization @@ -101,7 +101,7 @@ This is done by removing the functions under #ifndef MMI_LITE. The static vaiable T_MFW_PLMN_LIST plmn_list has been made local variable. It has been dynamically allocated and deallocated. - + Aug 16, 2004 REF: CRR 24293 Deepa M.D Bug:Go-lite optimisation dynamic allocation of variable 'plmn_list' Fix:The static vaiable T_MFW_PLMN_LIST plmn_list has been made local variable. @@ -111,18 +111,18 @@ Aug 16, 2004 REF: CRR 24323 Deepa M.D Bug:Clenup of sprintf used for tracing Fix:Replace the char buf[]; sprintf (buf, "...", ...); TRACE_EVENT (buf); statements by TRACE_EVENT_PX $ - + Sep 23, 2004 REF: CRR 24562 xvilliva Bug: Enable/disable the manual network selection option depending on ENS. - Fix: If the manual network selection is disabled we check if an + Fix: If the manual network selection is disabled we check if an error is returned and set the global g_ensErr. May 22, 2006 X0047685 Removed pref_plmn for if not defined FF_2TO1_PS - + * * ***************** Version 39 ***************** * User: Es Date: 2.03.00 Time: 16:31 @@ -360,12 +360,12 @@ #ifndef NEPTUNE_BOARD #ifdef TI_PS_OP_OPN_TAB_ROMBASED -/* Changes for ROM data */ +/* Changes for ROM data */ /* Operator List size in ROM. Should go to where the decompression algo is present*/ #define PLMN_OPER_LST_SIZE_ROM 628 -/* Changes for ROM data -extern const T_OPER_NTRY_FIXED operListFixed[]; - Side access into cus_aci.h +/* Changes for ROM data +extern const T_OPER_NTRY_FIXED operListFixed[]; + Side access into cus_aci.h Above decl no more required */ EXTERN const UBYTE *ptr_plmn_compressed; EXTERN SHORT cmhMM_decodePlmn (T_OPER_ENTRY *oper, const UBYTE *plmn_comp_entry); @@ -475,7 +475,7 @@ MfwHdr *hdr; T_MFW_NM *nm_para; MfwHdr *insert_status =0; - + TRACE_FUNCTION("nm_create()"); hdr = (MfwHdr *) mfwAlloc(sizeof(MfwHdr)); @@ -484,12 +484,12 @@ if (!hdr || !nm_para) { TRACE_ERROR("ERROR: nm_create() Mem Alloc Failed."); - + if(hdr) mfwFree((U8*)hdr,sizeof(MfwHdr)); if(nm_para) - mfwFree((U8*)nm_para,sizeof(T_MFW_NM)); - + mfwFree((U8*)nm_para,sizeof(T_MFW_NM)); + return FALSE; } @@ -645,7 +645,7 @@ if (nm_sign_exec(mfwFocus,event,para)) { #ifndef FF_POWER_MANAGEMENT - dspl_Enable(temp); + dspl_Enable(temp); #else /*OMAPS00098881 (removing power variant) a0393213(Prabakar) display is enabled only when lcd refresh is needed*/ @@ -686,7 +686,7 @@ if (nm_sign_exec (h, event, para)) { #ifndef FF_POWER_MANAGEMENT - dspl_Enable(temp); + dspl_Enable(temp); #else /*OMAPS00098881 (removing power variant) a0393213(Prabakar) display is enabled only when lcd refresh is needed*/ @@ -702,7 +702,7 @@ if (h == mfwRoot) { #ifndef FF_POWER_MANAGEMENT - dspl_Enable(temp); + dspl_Enable(temp); #else /*OMAPS00098881 (removing power variant) a0393213(Prabakar) display is enabled only when lcd refresh is needed*/ @@ -722,7 +722,7 @@ nm_sign_exec (mfwRoot, event, para); } #ifndef FF_POWER_MANAGEMENT - dspl_Enable(temp); + dspl_Enable(temp); #else /*OMAPS00098881 (removing power variant) a0393213(Prabakar) display is enabled only when lcd refresh is needed*/ @@ -1082,7 +1082,7 @@ switch (mode) { - + case REPLACE_PREF_PLMN: idx = index; idx2 = -1; @@ -1178,7 +1178,7 @@ if (operLst->longOper) { USHORT length=strlen((const char *)operLst->longOper); - plmn->network_long.len = MINIMUM(LONG_NAME-1, length); + plmn->network_long.len = MINIMUM(LONG_NAME-1, length); memcpy (plmn->network_long.data, operLst->longOper, plmn->network_long.len); plmn->network_long.data[plmn->network_long.len] = '\0'; plmn->network_long.dcs = MFW_ASCII; @@ -1187,7 +1187,7 @@ if (operLst->shortOper) { USHORT length=strlen((const char *)operLst->shortOper); - plmn->network_short.len = MINIMUM(SHORT_NAME-1, length); + plmn->network_short.len = MINIMUM(SHORT_NAME-1, length); memcpy (plmn->network_short.data, operLst->shortOper, plmn->network_short.len); plmn->network_short.data[plmn->network_short.len] = '\0'; plmn->network_short.dcs = MFW_ASCII; @@ -1301,15 +1301,15 @@ if (mode == NM_MANUAL) { - /* - Apr 13, 2004 REF: CRR 16303 JuanVi Jativa-Villoldo - sim_spn_req(); Moved to the function rAT_PlusCFUNP + /* + Apr 13, 2004 REF: CRR 16303 JuanVi Jativa-Villoldo + sim_spn_req(); Moved to the function rAT_PlusCFUNP */ - /* May 15, 2006, a0393213 (R.Prabakar), OMAPS00075777 - Description : It is supposed that the sample register itself automatically (in Manual Mode) - to the last manual selected HPLMN cell before the power cycle, and this does not happen; + /* May 15, 2006, a0393213 (R.Prabakar), OMAPS00075777 + Description : It is supposed that the sample register itself automatically (in Manual Mode) + to the last manual selected HPLMN cell before the power cycle, and this does not happen; instead this, the sample shows up the available networks list - Fix : call to nm_avail_plmn_list() is changed to call to sAT_PercentNRG() */ + Fix : call to nm_avail_plmn_list() is changed to call to sAT_PercentNRG() */ if (sAT_PercentNRG(CMD_SRC_LCL, NRG_RGMD_Manual, NRG_SVMD_Full, @@ -1329,9 +1329,9 @@ { TRACE_ERROR("sAT_PercentNRG error"); } - /* - Apr 13, 2004 REF: CRR 16303 JuanVi Jativa-Villoldo - sim_spn_req(); Moved to the function rAT_PlusCFUNP + /* + Apr 13, 2004 REF: CRR 16303 JuanVi Jativa-Villoldo + sim_spn_req(); Moved to the function rAT_PlusCFUNP */ } return SIM_ACTIVE; } @@ -1364,7 +1364,7 @@ { TRACE_EVENT("plmn_list malloc failed"); return ; - } + } TRACE_FUNCTION("nm_avail_plmn_list()"); @@ -1383,7 +1383,7 @@ } return; } - + // PATCH JVU - PLMN selection during registration sAT_Abort(CMD_SRC_LCL, AT_CMD_NRG); @@ -1396,7 +1396,7 @@ TRACE_ERROR("ERROR: tAT_PlusCOPS error"); //Sep 23, 2004 REF: CRR 24562 xvilliva //If AT_FAIL is returned, we query for the exact error - //and set a variable accordingly. + //and set a variable accordingly. if(result == AT_FAIL) { ULONG err; @@ -1407,19 +1407,19 @@ case ACI_ERR_CLASS_Cme: if (ACI_ERR_DESC_NR( err ) == CME_ERR_OpNotAllow) { - g_ensErr = 1; + g_ensErr = 1; } break; } } - + /* Deallocate operator list buffer */ if (oper_list != NULL) { mfwFree((U8*)oper_list, sizeof(T_ACI_COPS_OPDESC)*MAX_OPER); oper_list = NULL; } - + nm_signal(E_NM_PLMN_LIST,plmn_list); //Mar 01, 2005 REF: ENH 29327 xdeepadh //Deallocate the plmn_list @@ -1515,7 +1515,7 @@ +--------------------------------------------------------------------+ PURPOSE : Request existing network list - + */ #ifndef NEPTUNE_BOARD #ifdef TI_PS_OP_OPN_TAB_ROMBASED @@ -1523,14 +1523,14 @@ { int i; - /* Changes for ROM data */ + /* Changes for ROM data */ const UBYTE *plmn_comp_entry; /* get a local pointer holder */ T_OPER_ENTRY oper; TRACE_FUNCTION("nm_plnm_list()"); - /* + /* PLMN_OPER_LST_SIZE_ROM is size of the PLMN operlist */ @@ -1538,7 +1538,7 @@ return 0; - /* Changes for ROM data */ + /* Changes for ROM data */ plmn_comp_entry = ptr_plmn_compressed; @@ -1551,7 +1551,7 @@ /* for each pointer in the list plmn_list */ i=0; - do + do { /* Get first compressed PLMN entry */ cmhMM_decodePlmn (&oper, plmn_comp_entry); @@ -1590,7 +1590,7 @@ /* Next compressed PLMN entry */ plmn_comp_entry += cmhMM_PlmnEntryLength (plmn_comp_entry); - + i+=1; } while (i < count); @@ -1708,7 +1708,7 @@ +--------------------------------------------------------------------+ PURPOSE : Request existing network list longnames. added for SPR 2635. - + */ #ifndef NEPTUNE_BOARD @@ -1716,14 +1716,14 @@ int nm_plnm_list_longnames(char**plmn_ln_list, int start, int count) { int i; - /* Changes for ROM data */ + /* Changes for ROM data */ const UBYTE *plmn_comp_entry; /* get a local pointer holder */ T_OPER_ENTRY oper; - + TRACE_FUNCTION("nm_plnm_list_longnames()"); - - /* + + /* PLMN_OPER_LST_SIZE_ROM is size of the PLMN operlist */ @@ -1739,7 +1739,7 @@ /* for each pointer in the list plmn_list */ i=0; - do + do { /* Get first compressed PLMN entry */ cmhMM_decodePlmn (&oper, plmn_comp_entry); @@ -1748,7 +1748,7 @@ { /*just set pointer to point at longname in ROM in ACI*/ plmn_ln_list[i] = (char*)oper.longName; - + start++; } else @@ -1759,7 +1759,7 @@ /* Next compressed PLMN entry */ plmn_comp_entry += cmhMM_PlmnEntryLength (plmn_comp_entry); - + i+=1; } while (i < count); @@ -1772,9 +1772,9 @@ { int i; int sum; - + TRACE_FUNCTION("nm_plnm_list_longnames()"); - + sum = 0; /*count the number of longnames*/ @@ -1791,7 +1791,7 @@ { /*just set pointer to point at longname in ROM in ACI*/ plmn_ln_list[i] = (char*)operListFixed[start].longName; - + start++; } else @@ -1809,9 +1809,9 @@ { int i; int sum; - + TRACE_FUNCTION("nm_plnm_list_longnames()"); - + sum = 0; /*count the number of longnames*/ @@ -1828,7 +1828,7 @@ { /*just set pointer to point at longname in ROM in ACI*/ plmn_ln_list[i] = (char*)operList[start].longName; - + start++; } else @@ -1867,8 +1867,8 @@ TRACE_ERROR("sAT_PercentNRG error"); //Sep 23, 2004 REF: CRR 24562 xvilliva //If AT_FAIL is returned, we query for the exact error - //and set a variable accordingly. - if(result == AT_FAIL) + //and set a variable accordingly. + if(result == AT_FAIL) { ULONG err; @@ -1878,7 +1878,7 @@ case ACI_ERR_CLASS_Cme: if (ACI_ERR_DESC_NR( err ) == CME_ERR_OpNotAllow) { - g_ensErr = 1; + g_ensErr = 1; } break; } @@ -1914,7 +1914,7 @@ #ifdef NO_ASCIIZ memset (service_provider_name.data, 0, sizeof(service_provider_name.data)); service_provider_name.len = 0; - + if (error EQ simErr) { for (i=0; (efspn->service_provider[i] != 0xFF) && (i < SP_NAME); i++) @@ -2048,7 +2048,7 @@ void nm_ok_band (void) { TRACE_FUNCTION("nm_ok_band()"); - + nm_signal(E_NM_BAND, 0); } @@ -2105,11 +2105,11 @@ PURPOSE : Notify about available PLMN list NOTE : oper_list defines as char * Every operator (PLMN) uses 3 bytes - + // July 14, 2005 REF: CRR 31916 x0021334 // The functionality in rAT_PlusCOPS has been moved to new function 'nm_Plus_Percent_COPS()' which is common for rAT_PercentCOPS as well. - + //SPR#0777 - DS - Added check to make sure last_ind is valid. If invalid set to 0. // - Changed check to make last_ind equal to MAX_OPER-1 if last_ind is greater than MAX_OPER. // - Changed <= to < in nm_copy_plmn_list for loop. @@ -2134,7 +2134,7 @@ // July 14, 2005 REF: CRR 31916 x0021334 // New function 'rAT_PercentCOPS()' implemented. - + */ void rAT_PercentCOPS (S16 last_ind, T_ACI_COPS_OPDESC *operLst) @@ -2165,8 +2165,8 @@ //Mar 01, 2005 REF: ENH 29327 xdeepadh //Dynamically allocate the plmn_list T_MFW_PLMN_LIST *plmn_list; - /* Aug 09, 2007 REF: OMAPS00140507 x0045876 - Added patch given by Dong Feng */ + /* Aug 09, 2007 REF: OMAPS00140507 x0045876 + Added patch given by Dong Feng */ char longName[MAX_ALPHA_OPER_LEN] = { '\0' }; char shrtName[MAX_ALPHA_OPER_LEN] = { '\0' }; plmn_list=(T_MFW_PLMN_LIST*)mfwAlloc(sizeof(T_MFW_PLMN_LIST)); @@ -2194,7 +2194,7 @@ /***************************Go-lite Optimization changes Start***********************/ // Aug 16, 2004 REF: CRR 24323 Deepa M.D TRACE_EVENT_P1("rAT_PlusCOPS: last_ind: %d",last_ind); - /***************************Go-lite Optimization changes END***********************/ + /***************************Go-lite Optimization changes END***********************/ if (last_ind > 128) //Invalid index passed in. { last_ind = -1; @@ -2206,7 +2206,7 @@ last_ind = MAX_OPER-1; } } - + //DS 27/5/2002 - changed <= to < for (i = 0; i <= last_ind; i++) /* operLst == oper_list !! */ @@ -2214,9 +2214,9 @@ nm_copy_plmn_list(&plmn_list->plmn[i], &operLst[i]); } - - /* BEGIN: Aug 09, 2007 REF: OMAPS00140507 x0045876 - Added patch given by Dong Feng */ + + /* BEGIN: Aug 09, 2007 REF: OMAPS00140507 x0045876 + Added patch given by Dong Feng */ for(i=0; i < MAX_OPER; i++) { if (operLst[i].status < 0) @@ -2237,7 +2237,7 @@ #ifdef NO_ASCIIZ plmn_list->plmn[i].network_long.len = 0; plmn_list->plmn[i].network_short.len = 0; - + if (operLst->longOper) { plmn_list->plmn[i].network_long.len = MINIMUM(LONG_NAME-1, strlen((char *)longName)); @@ -2247,7 +2247,7 @@ } #else memset(plmn_list->plmn[i].network_long, 0, LONG_NAME); - + if (operLst->longOper) strncpy((char *)plmn_list->plmn[i].network_long, (char *)longName, LONG_NAME-1); #endif @@ -2269,10 +2269,10 @@ operLst[i].shrt_len, operLst[i].shrt_ext_dcs, (UBYTE *)shrtName); - + #ifdef NO_ASCIIZ plmn_list->plmn[i].network_short.len = 0; - + if (operLst->shortOper) { plmn_list->plmn[i].network_short.len = MINIMUM(SHORT_NAME-1, strlen((char *)shrtName)); @@ -2282,7 +2282,7 @@ } #else memset(plmn_list->plmn[i].network_short, 0, SHORT_NAME); - + if (operLst->shortOper) strncpy((char *)plmn_list->plmn[i].network_short, (char *)shrtName, SHORT_NAME-1); #endif @@ -2297,14 +2297,14 @@ } } } - /* END: Aug 09, 2007 REF: OMAPS00140507 x0045876 - Added patch given by Dong Feng */ + /* END: Aug 09, 2007 REF: OMAPS00140507 x0045876 + Added patch given by Dong Feng */ /***************************Go-lite Optimization changes Start***********************/ // Aug 16, 2004 REF: CRR 24323 Deepa M.D TRACE_EVENT_P1("rAT_PlusCOPS: Loop i val is %d",i); /***************************Go-lite Optimization changes END***********************/ plmn_list->count = i; - + nm_signal(E_NM_PLMN_LIST,plmn_list); //Mar 01, 2005 REF: ENH 29327 xdeepadh //Deallocate the plmn_list @@ -2412,18 +2412,18 @@ plmn_ident.roaming_indicator = 0; if (stat == CREG_STAT_Roam) plmn_ident.roaming_indicator = 1; - + //x0pleela 08 Feb, 2006 ER: OMAPS00065203 - nm_get_COPN( &plmn_ident ); + nm_get_COPN( &plmn_ident ); nm_signal(E_NM_FULL_SERVICE,&plmn_ident); /* Cell ReSelection Code */ cell.ci = cid; cell.lid = lac; - nm_signal(E_NM_CELL_SELECT,&cell); + nm_signal(E_NM_CELL_SELECT,&cell); break; - + case CREG_STAT_NoSearch: case CREG_STAT_NotPresent: if (!reg_flag) @@ -2562,7 +2562,7 @@ #else /* END ADD: Sumit */ - + //Apr 13, 2007 DRT:OMAPS00122739 x0066814(Geetha) #if(0) /* copy country code and network code */ @@ -2639,7 +2639,7 @@ UBYTE flag; TRACE_FUNCTION("nm_nitz_info_ind() "); -//Apr 13, 2007 DRT:OMAPS00122739 x0066814(Geetha) +//Apr 13, 2007 DRT:OMAPS00122739 x0066814(Geetha) #if(0) flag = 0; /* copy country code and network code */ @@ -2816,11 +2816,11 @@ TRACE_FUNCTION("nm_decodeSourceId()"); #ifndef NEPTUNE_BOARD switch (sourceId) - { + { case Read_ROM_TABLE: return NM_ROM; case Read_EONS: return NM_EONS; case Read_CPHS: return NM_CPHS; - case Read_INVALID: + case Read_INVALID: default: return NM_NONE; } #endif @@ -2839,11 +2839,11 @@ PURPOSE : This function is used to update plmn data after querying COPN */ //x0pleela 09 Feb, 2006 ER: OMAPS00065203 -void nm_update_plmn_data( T_MFW_NETWORK_STRUCT *plmn_ident, +void nm_update_plmn_data( T_MFW_NETWORK_STRUCT *plmn_ident, T_ACI_OPER_NTRY oper_ntry) { TRACE_FUNCTION("nm_update_plmn_data()"); - + #ifndef NEPTUNE_BOARD plmn_ident->opn_read_from = (T_MFW_NM_OPN)nm_decodeSourceId(oper_ntry.source); /*a0393213 compiler warnings removal - explicit typecast done*/ #endif @@ -2853,25 +2853,25 @@ #ifdef NO_ASCIIZ memset(plmn_ident->network_long.data, 0, LONG_NAME); memset(plmn_ident->network_short.data, 0, SHORT_NAME); - memcpy( plmn_ident->network_long.data, - oper_ntry.longName, + memcpy( plmn_ident->network_long.data, + oper_ntry.longName, strlen(oper_ntry.longName) ); - - memcpy( plmn_ident->network_short.data, - oper_ntry.shrtName, + + memcpy( plmn_ident->network_short.data, + oper_ntry.shrtName, strlen(oper_ntry.shrtName)); plmn_ident->network_long.len = strlen((const char*)(plmn_ident->network_long.data)); /*a0393213 warnings removal - explicit typecasting done*/ - plmn_ident->network_short.len = strlen((const char*)(plmn_ident->network_short.data)); + plmn_ident->network_short.len = strlen((const char*)(plmn_ident->network_short.data)); #else memset(plmn_ident->network_long, 0, LONG_NAME); memset(plmn_ident->network_short, 0, SHORT_NAME); - strcpy( plmn_ident->network_long, + strcpy( plmn_ident->network_long, oper_ntry.longName); - strcpy( plmn_ident->network_short, + strcpy( plmn_ident->network_short, oper_ntry.shrtName); -#endif +#endif } /* @@ -2880,7 +2880,7 @@ | STATE : code ROUTINE : nm_get_COPN | +--------------------------------------------------------------------+ - PURPOSE : This function is used to query for COPS and COPN which will indicate from + PURPOSE : This function is used to query for COPS and COPN which will indicate from where the operator name was read */ //x0pleela 09 Feb, 2006 ER: OMAPS00065203 @@ -2899,12 +2899,12 @@ &format, (char *)opername ) EQ AT_CMPL ) { //Request info about operator name - if(qAT_PercentCOPN(CMD_SRC_LCL, - format, - (char *)opername, + if(qAT_PercentCOPN(CMD_SRC_LCL, + format, + (char *)opername, &oper_ntry) EQ AT_CMPL ) - { - nm_update_plmn_data(plmn_ident, oper_ntry); + { + nm_update_plmn_data(plmn_ident, oper_ntry); } } } @@ -2915,7 +2915,7 @@ | STATE : code ROUTINE : nm_get_opername | +--------------------------------------------------------------------+ - PURPOSE : This function updates operator name based on cingular's prioritization requirement. + PURPOSE : This function updates operator name based on cingular's prioritization requirement. Priority would be in order ONS->NITZ->ROM */ @@ -2924,7 +2924,7 @@ { TRACE_FUNCTION("nm_get_opername()"); sAT_PercentCNIV(CMD_SRC_LCL, CNIV_MODE_ON); - + return; } @@ -2957,16 +2957,16 @@ | STATE : code ROUTINE : nm_get_opername | +--------------------------------------------------------------------+ - PURPOSE : This function gets operator name from network. + PURPOSE : This function gets operator name from network. */ //x0pleela 09 Feb, 2006 ER: OMAPS00065203 void nm_get_network_data(T_MFW_NETWORK_STRUCT *plmn_netw_data) { TRACE_FUNCTION("nm_get_network_data()"); - - //send E_NM_OPN event - nm_signal(E_NM_OPN, plmn_netw_data); + + //send E_NM_OPN event + nm_signal(E_NM_OPN, plmn_netw_data); } @@ -2977,15 +2977,15 @@ | STATE : code ROUTINE : nm_set_network_time | +--------------------------------------------------------------------+ - PURPOSE : This function sets time and date info received from network. + PURPOSE : This function sets time and date info received from network. */ #ifdef FF_TIMEZONE void nm_set_network_time(T_MFW_TIME_IND *currclock) { TRACE_FUNCTION("nm_set_network_time()"); - //send E_MFW_TIME_IND event - nm_signal(E_MFW_TIME_IND, currclock); + //send E_MFW_TIME_IND event + nm_signal(E_MFW_TIME_IND, currclock); } #endif @@ -3002,5 +3002,5 @@ { TRACE_FUNCTION ("nm_get_plmn_list_during_bootup()"); nm_signal(E_NM_PLMN_LIST_BOOTUP,0); - + }