FreeCalypso > hg > fc-tourmaline
changeset 158:5ff381b88fec
mmiNetwork.c: bogotab fixes
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Mon, 16 Nov 2020 21:05:18 +0000 |
| parents | 7eee5ad6ae86 |
| children | 368f10ebcc64 |
| files | src/ui/bmi/mmiNetwork.c |
| diffstat | 1 files changed, 1145 insertions(+), 1184 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui/bmi/mmiNetwork.c Mon Nov 16 20:17:50 2020 +0000 +++ b/src/ui/bmi/mmiNetwork.c Mon Nov 16 21:05:18 2020 +0000 @@ -1,6 +1,6 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -9,21 +9,20 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: Network - $File: MmiNetwork.c - $Revision: 1.0 - - $Author: Condat(UK) - $Date: 22/02/01 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: Network + $File: MmiNetwork.c + $Revision: 1.0 + + $Author: Condat(UK) + $Date: 22/02/01 ******************************************************************************** Description: - ******************************************************************************** $Hist @@ -37,20 +36,20 @@ Solution: In network_nm_cb(), added a new case E_NM_PLMN_LIST_BOOTUP, to list the PLMNs during bootup. May 31, 2007 DR: OMAPS00133201 x0pleela Description: MS keeps searching networks and doesn't list available PLMNs after performing - manual selection + manual selection Solution : Added new function nm_abort_network() to destroy the dialog saying "Searching for - Networks" when CME_ERR_AbortedByNetwork error is recieved from ACI - - May 24, 2007 DR: OMAPS00132483 x0pleela - Description: MM: While playing an AAC, unplug USB freezes the audio - Solution: In network() function, setting or resetting the phonelock and auto phone lock status bits - - May 09, 2007 DR: OMAPS00129014 x0pleela - Description: COMBO: unable to send SMS during midi playing - Solution: Added phone lock status code in network() function. - May 09, 2007 DR: OMAPS00129014 - Description: COMBO: unable to send SMS during midi playing - Solution: Added phone lock status code in network() function. + Networks" when CME_ERR_AbortedByNetwork error is recieved from ACI + + May 24, 2007 DR: OMAPS00132483 x0pleela + Description: MM: While playing an AAC, unplug USB freezes the audio + Solution: In network() function, setting or resetting the phonelock and auto phone lock status bits + + May 09, 2007 DR: OMAPS00129014 x0pleela + Description: COMBO: unable to send SMS during midi playing + Solution: Added phone lock status code in network() function. + May 09, 2007 DR: OMAPS00129014 + Description: COMBO: unable to send SMS during midi playing + Solution: Added phone lock status code in network() function. 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 network function, under the NETWORK_FULL_SERVICE, @@ -62,10 +61,10 @@ manually for network list .Now network() checking for for Manual selection by checking data->network_list_status is NETWORK_LIST_DISPLAY_FIRST or not. - Feb 16, 2007 OMAPS00098351 x0066814(Geetha) - Description: NITZ support is not working + Feb 16, 2007 OMAPS00098351 x0066814(Geetha) + Description: NITZ support is not working Solution: Added the FF_TIMEZONE flag.Time is calculated according to GMT, if the FF_TIMEZONE flag is enabled. - Added settingsNITZ function to write the menu option selected onto the Flash. + Added settingsNITZ function to write the menu option selected onto the Flash. Feb 08,2007 DRT: OMAPS00115060 x00061088(Prachi) Description : To check for Forbidden network (for denied services),it takes long time. @@ -74,7 +73,6 @@ is moved out of condition if (parameter != Null). - Jan 10, 2007 REF: OMAPS00110741 x0039928(sumanth) Description: Sample resets after network deregistration during Robustness Test Solution: A condition is added to check if the parameter passed to the network() is NULL. @@ -99,12 +97,12 @@ NETWORK_FORBIDDEN_NETWORK to network(),by setting flags network_data.aborted =False and network_data.forbidden = Ture. - Jun 23, 2006 DR: OMAPS00082374 x0pleela - Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile - Solution: a) Removed the usage of global variable gEons_alloc_active - b) Added new check for CNIV request - c) Memset the data->plmn_name and data->network_name - d) Added check to display short name if long name len is 0. or display numeric name if short name len is 0 + Jun 23, 2006 DR: OMAPS00082374 x0pleela + Description: EONS Failures - unexpected output from the MMI: 2 carriers; on the top always T-Mobile + Solution: a) Removed the usage of global variable gEons_alloc_active + b) Added new check for CNIV request + c) Memset the data->plmn_name and data->network_name + d) Added check to display short name if long name len is 0. or display numeric name if short name len is 0 June 02, 2006 DR: OMAPS00078005 x0021334 Descripton: Test for NITZ (Network Identity and Timezone) support - No New time was displayed @@ -112,76 +110,76 @@ function. This function has now been implemented to pass on the received values to MMI for user confirmation and RTC updation. - May 26, 2006 ER: OMAPS00079607 x0012849 :Jagannatha M - Description: CPHS: To support AoC and information numbers. - Solution: Made the following changes - Added a function that returns the roaming status. - - Feb 15, 2006 ER: OMAPS00065203 x0pleela - Description: Cingular Operator Name Prioritization implementation required - Solution: Incorporated review comments - - Included flag NEPTUNE_BOARD to retain old code for operator get name and - added new code for this ER also - - Removed the global variable gOper_sel_done and have introduced 2 functions which will - set and get the status of the operator selection - - Feb 09, 2006 ER: OMAPS00065203 x0pleela - Description: Cingular Operator Name Prioritization implementation required - Solution: In function network(), check if EONS is allocated and activated. If not, get operator name from other sources - Removed CPHS check code as prioritized operator name is already updated to network_data - - xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 - Added a please wait screen so that the sim is updated with the new code before - populating the list again when deleting or when entering a newtwork code - - Nov 02, 2005 REF: omaps00044855 Sumanth Kumar.C - Description: Phone crashes on invoking Manual option in Network Selection Menu. - Solution: Memory free of network_data.pplmn is done when the editor exits instead of + May 26, 2006 ER: OMAPS00079607 x0012849 :Jagannatha M + Description: CPHS: To support AoC and information numbers. + Solution: Made the following changes + Added a function that returns the roaming status. + + Feb 15, 2006 ER: OMAPS00065203 x0pleela + Description: Cingular Operator Name Prioritization implementation required + Solution: Incorporated review comments + - Included flag NEPTUNE_BOARD to retain old code for operator get name and + added new code for this ER also + - Removed the global variable gOper_sel_done and have introduced 2 functions which will + set and get the status of the operator selection + + Feb 09, 2006 ER: OMAPS00065203 x0pleela + Description: Cingular Operator Name Prioritization implementation required + Solution: In function network(), check if EONS is allocated and activated. If not, get operator name from other sources + Removed CPHS check code as prioritized operator name is already updated to network_data + + xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 + Added a please wait screen so that the sim is updated with the new code before + populating the list again when deleting or when entering a newtwork code + + Nov 02, 2005 REF: omaps00044855 Sumanth Kumar.C + Description: Phone crashes on invoking Manual option in Network Selection Menu. + Solution: Memory free of network_data.pplmn is done when the editor exits instead of list exit by option selection so that the pplmn data is available when the list is invoked once again. - Jun 14, 2005 REF: MMI-FIX-30439 x0018858 - Description: The homezone/cityzone tags were not being displayed properly. - Solution: Modified to save the tags properly in caches and also made the - appropriate modifications to update the same properly during mobility. + Jun 14, 2005 REF: MMI-FIX-30439 x0018858 + Description: The homezone/cityzone tags were not being displayed properly. + Solution: Modified to save the tags properly in caches and also made the + appropriate modifications to update the same properly during mobility. 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 - error is returned and flash an alert to the user. - - Sep 8, 2004 REF: CRR 16062 xvilliva - Bug: If a PLMN is selected (by using the middle key) from the PLMN list - presented upon a manual search the D-Sample may freeze. - Fix: The "KEY_MNUSELECT" event is also monitered which was not - done earlier and was resulting in the PLMN list shown again. + Bug: Enable/disable the manual network selection option depending + on ENS. + Fix: If the manual network selection is disabled we check if an + error is returned and flash an alert to the user. + + Sep 8, 2004 REF: CRR 16062 xvilliva + Bug: If a PLMN is selected (by using the middle key) from the PLMN list + presented upon a manual search the D-Sample may freeze. + Fix: The "KEY_MNUSELECT" event is also monitered which was not + done earlier and was resulting in the PLMN list shown again. Jul 21, 2004 REF: CRR 13348 xvilliva - Bug: After selecting HPLMN manually, the idle screen is not shown. - Fix: After the "Network Selected" alert is flashed, we destroy the - phonebook menu to return to the idle screen. - - - // Apr 14, 2004 REF: CRR 12641 xpradipg - // The network when selected using "Automatic" is not showing an alert after selection. - // A flag has been used to show the alert when ever network is selected using - // "Automatic" method. As the flag is present it will not flash this alert when the - // device is restarted. - - 25/10/00 Original Condat(UK) BMI version. - - 05/04/06 REF:OMAPS00061046 x0043641 - BUG:Possible to cancel the searching with right soft key although the option is not available. - FIX: In the searching mode cancel option is provided. - - 08-03-2006 REF: OMAPS00061049 x0020906 - - Bug: The sample crashed many times while trying to camp onto a FPLMN. PCO stucked when tracing this TC, - therefore no PCO traces available; only L1 traces (TestHarness). - - Fix: During manual selection from the indication will get the plmn list count and used the count for allocating - plmn_list pointer and then destorying the list and free the pointer allocation when particular network is selected - or when back softkey is pressed. + Bug: After selecting HPLMN manually, the idle screen is not shown. + Fix: After the "Network Selected" alert is flashed, we destroy the + phonebook menu to return to the idle screen. + + + // Apr 14, 2004 REF: CRR 12641 xpradipg + // The network when selected using "Automatic" is not showing an alert after selection. + // A flag has been used to show the alert when ever network is selected using + // "Automatic" method. As the flag is present it will not flash this alert when the + // device is restarted. + + 25/10/00 Original Condat(UK) BMI version. + + 05/04/06 REF:OMAPS00061046 x0043641 + BUG:Possible to cancel the searching with right soft key although the option is not available. + FIX: In the searching mode cancel option is provided. + + 08-03-2006 REF: OMAPS00061049 x0020906 + + Bug: The sample crashed many times while trying to camp onto a FPLMN. PCO stucked when tracing this TC, + therefore no PCO traces available; only L1 traces (TestHarness). + + Fix: During manual selection from the indication will get the plmn list count and used the count for allocating + plmn_list pointer and then destorying the list and free the pointer allocation when particular network is selected + or when back softkey is pressed. $End @@ -412,7 +410,6 @@ MMI_GMT_PT_1200 = 48, /* Read as GMT +12:00 */ - MMI_TIME_ERROR = -100 } T_MMI_TZ; @@ -427,9 +424,9 @@ T_MMI_CONTROL mmi_control; T_MFW_HND network_win; /* MFW win handler */ T_MFW_HND nm_handle; /* MFW network handler */ - UBYTE aborted; - UBYTE forbidden; - UBYTE keep_plmn_list; + UBYTE aborted; + UBYTE forbidden; + UBYTE keep_plmn_list; T_MFW_NETWORK_STRUCT *pplmn; /* pref. PLMN list */ T_MFW_PPLMN_MEM pplmn_mem; UBYTE plmn_name[SIZE_PLMN_NAME]; /* textual network name */ @@ -440,7 +437,7 @@ UBYTE network_list_status;/* Network List Status */ UBYTE network_search_name[MAX_PLMN][6]; /* numeric network name */ T_MFW_HND network_search_win; - UBYTE Listposition; + UBYTE Listposition; } T_network; T_network network_data; @@ -455,14 +452,14 @@ T_MFW_HND kbd_long; T_MFW_HND menu; T_MFW_HND dialog_win; - ListMenuData *network_list; + ListMenuData *network_list; /*SPR 2635, replace pplmn data structure pointer with pointer to array of strings*/ - char** pplmn_longnames; - CHAR buffer[6]; + char** pplmn_longnames; + CHAR buffer[6]; #ifdef NEW_EDITOR - T_AUI_EDITOR_DATA editor_info; /* SPR#1428 - SH - New Editor data */ + T_AUI_EDITOR_DATA editor_info; /* SPR#1428 - SH - New Editor data */ #else - T_EDITOR_DATA editor_info; /* storage for editor attributes */ + T_EDITOR_DATA editor_info; /* storage for editor attributes */ #endif } T_network_OPT; @@ -477,7 +474,7 @@ } e_lists_events; // Apr 14, 2004 REF: CRR 12641 xpradipg -static BOOLEAN Auto_Network_Select=false; +static BOOLEAN Auto_Network_Select=false; extern T_MFW_HND gPhbkMenu;// Jul 21, 2004 REF: CRR 13348 xvilliva // Sep 23, 2004 REF: CRR 24562 xvilliva extern int g_ensErr; @@ -495,10 +492,10 @@ static ListMenuData * network_create_list (T_network * data, T_MFW_PLMN_LIST * plmn_list); static ListMenuData * network_create_pref_list (T_network * data); static ListMenuData * network_create_mobile_list (T_network_OPT * data); -static void network_start_animation_plmn_selection (int plmn_value); +static void network_start_animation_plmn_selection (int plmn_value); static void network_start_animation (void); static void network_stop_animation (void); -static void network_selected (void); +static void network_selected (void); static void network_forbidden_plmn (void); static void network_no_plmns (void); void network_animation_cb (T_MFW_HND win, UBYTE identifier, UBYTE reason); @@ -512,11 +509,11 @@ static int network_MNU_mnu_cb (MfwEvt e, MfwMnu *m); static int network_MNU_win_cb (MfwEvt e, MfwWin *w); static int network_MNU_kbd_cb (MfwEvt e, MfwKbd *k); -static int network_request_plnm_list (MfwMnu* m, MfwMnuItem* i); +static int network_request_plnm_list (MfwMnu* m, MfwMnuItem* i); void network_delete_pref_plnm (T_MFW_HND win , USHORT identifier, UBYTE reason); void network_info_screen (T_MFW_HND win, USHORT MessageId, T_VOID_FUNC funt_ptr );// xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 static int network_delete(MfwMnu* m, MfwMnuItem* i); - T_MFW_HND network_EDT_start (MfwMnu* m, MfwMnuItem* i); + T_MFW_HND network_EDT_start (MfwMnu* m, MfwMnuItem* i); static T_MFW_HND network_EDT_create (T_MFW_HND parent); static void network_EDT_destroy (T_MFW_HND window); static void network_EDT_exec_cb (T_MFW_HND win, USHORT event, SHORT value, void * parameter); @@ -549,7 +546,7 @@ #define NETWORK_PREFERRED_LIST 423 #define NETWORK_PPLMN_MEM_LIST 424 /* SPR759 - SH - Cell reselection */ -#define NETWORK_CELL_SELECT 425 +#define NETWORK_CELL_SELECT 425 #define NETWORK_LIST_DISPLAY 430 #define NETWORK_LIST_SELECT_PLMN 432 @@ -577,11 +574,11 @@ #define NETWORK_MENU_ITEM 2 //nm 5.3.01 this number will be change -#define MAX_SHOW_OF_PLMN 99 +#define MAX_SHOW_OF_PLMN 99 static MfwMnuItem network_OPTItems [] = { - {0,0,0,(char *)TxtSelectFromList, 0, (MenuFunc)network_request_plnm_list, item_flag_none}, + {0,0,0,(char *)TxtSelectFromList, 0, (MenuFunc)network_request_plnm_list, item_flag_none}, {0,0,0,(char *)TxtEnterNetworkCode, 0, (MenuFunc)network_EDT_start, item_flag_none}, {0,0,0,(char *)TxtDelete, 0, (MenuFunc)network_delete, item_flag_none} }; @@ -593,13 +590,10 @@ (U8)-1, /* use default font */ network_OPTItems, /* with these items */ sizeof(network_OPTItems)/sizeof(MfwMnuItem), /* number of items */ - COLOUR_LIST_NETWORK, TxtNull, NULL, MNUATTRSPARE - - + COLOUR_LIST_NETWORK, TxtNull, NULL, MNUATTRSPARE }; - static MfwMnuAttr network_menuAttrib = { &network_menuArea, @@ -607,13 +601,12 @@ (U8)-1, /* use default font */ NULL, /* with these items */ 0, /* number of items */ - COLOUR_LIST_NETWORK, TxtNull, NULL, MNUATTRSPARE - + COLOUR_LIST_NETWORK, TxtNull, NULL, MNUATTRSPARE }; //x0pleela 09 May, 2007 DR: OMAPS00129014 #ifdef FF_PHONE_LOCK -extern T_MFW_HND phlock_win_handle; /* to hold the win handle of phone unlock editor window */ +extern T_MFW_HND phlock_win_handle; /* to hold the win handle of phone unlock editor window */ GLOBAL UBYTE phlock_auto; //x0pleela 29 May, 2007 DR: OMAPS00132483 EXTERN int mfw_get_Phlock_status(void); @@ -623,7 +616,7 @@ #endif //F_PHONE_LOCK /******************************************************************************* - $Function: networkInit + $Function: networkInit $Description: @@ -640,9 +633,9 @@ /******************************************************************************* - $Function: networkExit - - $Description: exit network handling (Backward Compatibility interface) + $Function: networkExit + + $Description: exit network handling (Backward Compatibility interface) $Returns: @@ -668,9 +661,9 @@ /******************************************************************************* - $Function: network_create - - $Description: create network top window + $Function: network_create + + $Description: create network top window $Returns: @@ -720,7 +713,6 @@ data->Listposition = 0; - winShow(data->network_win); /* * return window handle @@ -730,9 +722,9 @@ /******************************************************************************* - $Function: network_destroy - - $Description: destroy network top window + $Function: network_destroy + + $Description: destroy network top window $Returns: @@ -769,9 +761,9 @@ /******************************************************************************* - $Function: network - - $Description: network top window dialog function + $Function: network + + $Description: network top window dialog function $Returns: @@ -780,7 +772,6 @@ *******************************************************************************/ void network (T_MFW_HND win, USHORT event, SHORT value, void * parameter) { - T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data; T_network * data = (T_network *)win_data->user; T_MFW_NETWORK_STRUCT * plmn_ident; @@ -799,35 +790,35 @@ //x0pleela 09 Mar, 2007 DR: OMAPS00129014 #ifdef FF_PHONE_LOCK - if( mfw_phlock_get_lock_status(MFW_PH_LOCK) == MFW_PH_LOCK_ENABLE ) - { - TRACE_EVENT("idle_draw: MFW_PH_LOCK_ENABLE"); - - //x0pleela 23 May, 2007 DR: OMAPS00132483 - //Set the phone lock status to TRUE - mfw_set_Phlock_status(TRUE); - - if( !phlock_win_handle ) - phLock_UnLock(); - } - else //for Automatic Phone lock check - { - //x0pleela 23 May, 2007 DR: OMAPS00132483 - //Set the phone lock status to FALSE - mfw_set_Phlock_status(FALSE); - - if( mfw_phlock_get_autolock_status(MFW_AUTO_PH_LOCK) == MFW_PH_LOCK_ENABLE ) - { - phlock_auto = TRUE; - - //x0pleela 23 May, 2007 DR: OMAPS00132483 - //Set the auto phone lock status to TRUE - mfw_set_Auto_Phlock_status(TRUE); - } - //x0pleela 23 May, 2007 DR: OMAPS00132483 - //Set the auto phone lock status to FALSE - mfw_set_Auto_Phlock_status(FALSE); - } + if( mfw_phlock_get_lock_status(MFW_PH_LOCK) == MFW_PH_LOCK_ENABLE ) + { + TRACE_EVENT("idle_draw: MFW_PH_LOCK_ENABLE"); + + //x0pleela 23 May, 2007 DR: OMAPS00132483 + //Set the phone lock status to TRUE + mfw_set_Phlock_status(TRUE); + + if( !phlock_win_handle ) + phLock_UnLock(); + } + else //for Automatic Phone lock check + { + //x0pleela 23 May, 2007 DR: OMAPS00132483 + //Set the phone lock status to FALSE + mfw_set_Phlock_status(FALSE); + + if( mfw_phlock_get_autolock_status(MFW_AUTO_PH_LOCK) == MFW_PH_LOCK_ENABLE ) + { + phlock_auto = TRUE; + + //x0pleela 23 May, 2007 DR: OMAPS00132483 + //Set the auto phone lock status to TRUE + mfw_set_Auto_Phlock_status(TRUE); + } + //x0pleela 23 May, 2007 DR: OMAPS00132483 + //Set the auto phone lock status to FALSE + mfw_set_Auto_Phlock_status(FALSE); + } #endif /* FF_PHONE_LOCK */ switch (event) @@ -862,32 +853,32 @@ switch (data->network_list_status) { case NETWORK_LIST_REGISTRATION: - TRACE_EVENT ("NETWORK_LIST_REGISTRATION"); + TRACE_EVENT ("NETWORK_LIST_REGISTRATION"); /* * Present list of available PLMNs again * - * Start the available plmn search - */ - nm_avail_plmn_list(); - //Sep 23, 2004 REF: CRR 24562 xvilliva - //After retrieving the list we see if an error occured - //and flash an alert to the user accordingly. - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - } - - /* - * remove network log if needed - */ - network_remove_network_log (); - - network_data.forbidden = TRUE; + * Start the available plmn search + */ + nm_avail_plmn_list(); + //Sep 23, 2004 REF: CRR 24562 xvilliva + //After retrieving the list we see if an error occured + //and flash an alert to the user accordingly. + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + } + + /* + * remove network log if needed + */ + network_remove_network_log (); + + network_data.forbidden = TRUE; break; case NETWORK_LIST_SELECTED: - TRACE_EVENT ("NETWORK_LIST_SELECTED"); + TRACE_EVENT ("NETWORK_LIST_SELECTED"); /* * After registration start, MFW returns the current status */ @@ -898,13 +889,13 @@ } } //Oct 05, 2006 ER: OMAPS00094496 x0061088(Prachi) - signal_value = 0 ; + signal_value = 0 ; globalSignalUpdate(signal_value); #ifdef MMI_HOMEZONE_ENABLED - /* sh - tell homezone there is no network */ - //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 - //Modified to incorporate the third argument. - homezoneUpdate(0,0,0); + /* sh - tell homezone there is no network */ + //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 + //Modified to incorporate the third argument. + homezoneUpdate(0,0,0); #endif break; @@ -920,7 +911,7 @@ */ data->status = NETWORK_FULL_SERVICE; #ifdef FF_CPHS_REL4 - mfw_cphs_get_msp_info(); + mfw_cphs_get_msp_info(); #endif // June 02, 2006 DR: OMAPS00078005 x0021334 @@ -937,15 +928,15 @@ */ plmn_ident = (T_MFW_NETWORK_STRUCT *)parameter; - //x0pleela 15 Feb, 2006 ER: OMAPs00065203 - //Removed the global variable gOper_sel_done and have introduced 2 functions which will - //set and get the status of the operator selection + //x0pleela 15 Feb, 2006 ER: OMAPs00065203 + //Removed the global variable gOper_sel_done and have introduced 2 functions which will + //set and get the status of the operator selection //x0pleela 9 Feb, 2006 ER:OMAPS00065203 - //Check if EONS is allocated and activated. If not, and if operator name is not yet obtained from other sources - //get operator name from other sources - if( ( ( plmn_ident->opn_read_from EQ NM_CPHS ) AND ( plmn_ident->roaming_indicator) ) - OR (plmn_ident->opn_read_from EQ NM_ROM) ) + //Check if EONS is allocated and activated. If not, and if operator name is not yet obtained from other sources + //get operator name from other sources + if( ( ( plmn_ident->opn_read_from EQ NM_CPHS ) AND ( plmn_ident->roaming_indicator) ) + OR (plmn_ident->opn_read_from EQ NM_ROM) ) { //get operator name from other sources CPHS or NITZ or ROM nm_get_opername(plmn_ident); @@ -960,18 +951,18 @@ memcpy (data->network_name, plmn_ident->network_numeric, SIZE_NETWORK_NAME); /* - * If network name is not known use numeric representation as default. - */ + * If network name is not known use numeric representation as default. + */ #ifdef NO_ASCIIZ //Apr 13, 2007 DRT:OMAPS00122739 x0066814(Geetha) if(!(strlen((char*)data->plmn_name))) { - if( plmn_ident->network_short.len EQ 0 ) - strcpy ((char *)data->plmn_name, (char *)data->network_name); - else - memcpy (data->plmn_name, &plmn_ident->network_short.data, SHORT_NAME); /* x0039928 -Lint warning removal */ + if( plmn_ident->network_short.len EQ 0 ) + strcpy ((char *)data->plmn_name, (char *)data->network_name); + else + memcpy (data->plmn_name, &plmn_ident->network_short.data, SHORT_NAME); /* x0039928 -Lint warning removal */ } #else @@ -979,10 +970,10 @@ if(!(strlen((char*)data->plmn_name))) { - if (strlen ((char *)(plmn_ident->network_short)) EQ 0) - strcpy ((char *)data->plmn_name, (char *)data->network_name); - else - memcpy (data->plmn_name, &plmn_ident->network_short, SIZE_PLMN_NAME); + if (strlen ((char *)(plmn_ident->network_short)) EQ 0) + strcpy ((char *)data->plmn_name, (char *)data->network_name); + else + memcpy (data->plmn_name, &plmn_ident->network_short, SIZE_PLMN_NAME); } #endif @@ -996,7 +987,7 @@ /* * Inform Idle screen */ - SEND_EVENT (idle_get_window(), NETWORK_FULL_SERVICE, 0, 0); + SEND_EVENT (idle_get_window(), NETWORK_FULL_SERVICE, 0, 0); /* * If network list is available @@ -1008,7 +999,7 @@ case NETWORK_LIST_REGISTRATION: if(data->keep_plmn_list EQ FALSE) { - TRACE_EVENT("NETWORK_LIST_REGISTRATION No 1"); + TRACE_EVENT("NETWORK_LIST_REGISTRATION No 1"); #ifdef FF_2TO1_PS #ifndef NEPTUNE_BOARD @@ -1017,19 +1008,19 @@ #else /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #endif #else #ifndef NEPTUNE_BOARD - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, MAX_PLMN_ID * sizeof (T_MFW_MNU_ITEM)); #else /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #endif @@ -1045,20 +1036,20 @@ */ TRACE_EVENT("NETWORK_LIST_SELECTED"); data->network_list_status= NETWORK_LIST_REGISTRATION; - /* Commented out and moved - network_selected(); */ + /* Commented out and moved + network_selected(); */ break; } // API - Moved from previous position - network_selected(); + network_selected(); } - // Apr 14, 2004 REF: CRR 12641 xpradipg - if(Auto_Network_Select==true) - { - network_selected(); - Auto_Network_Select=false; - } + // Apr 14, 2004 REF: CRR 12641 xpradipg + if(Auto_Network_Select==true) + { + network_selected(); + Auto_Network_Select=false; + } break; @@ -1082,10 +1073,10 @@ SEND_EVENT (idle_get_window(), NETWORK_NO_SERVICE, 0, 0); } #ifdef MMI_HOMEZONE_ENABLED - /* sh - tell homezone there is no network */ - //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 - //Modified to incorporate the third argument. - homezoneUpdate(0,0,0); + /* sh - tell homezone there is no network */ + //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 + //Modified to incorporate the third argument. + homezoneUpdate(0,0,0); #endif break; //sep 18 2006 OMPAS00090268 x0061088(Prachi) @@ -1096,126 +1087,126 @@ /* * PLMN list found */ - if (network_data.aborted != TRUE) - { - if (network_log_enabled ()) - { - data->status = NETWORK_NO_SERVICE; - SEND_EVENT (idle_get_window(), NETWORK_NO_PLMN_XXX_AVAIL, 0, 0); - } - else - { - T_MFW_PLMN_LIST * plmn_list; - /* - * Networks founds. - */ - data->status = NETWORK_NO_SERVICE; - /* - * If network list is available, destroy - */ - if (data->network_list NEQ NULL) - { + if (network_data.aborted != TRUE) + { + if (network_log_enabled ()) + { + data->status = NETWORK_NO_SERVICE; + SEND_EVENT (idle_get_window(), NETWORK_NO_PLMN_XXX_AVAIL, 0, 0); + } + else + { + T_MFW_PLMN_LIST * plmn_list; + /* + * Networks founds. + */ + data->status = NETWORK_NO_SERVICE; + /* + * If network list is available, destroy + */ + if (data->network_list NEQ NULL) + { #ifdef FF_2TO1_PS #ifndef NEPTUNE_BOARD - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, MMREG_MAX_PLMN_ID * sizeof (T_MFW_MNU_ITEM)); #else /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #endif #else #ifndef NEPTUNE_BOARD - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, MAX_PLMN_ID * sizeof (T_MFW_MNU_ITEM)); #else /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #endif #endif - FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); - data->network_list = NULL; - } + FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); + data->network_list = NULL; + } /* Jan 10, 2007 REF: OMAPS00110741 x0039928(sumanth) */ /* Soln : check if parameter passed is NULL */ - if(parameter != NULL) - { - /* - * If list is empty, show info screen - */ - plmn_list = (T_MFW_PLMN_LIST *)parameter; + if(parameter != NULL) + { + /* + * If list is empty, show info screen + */ + plmn_list = (T_MFW_PLMN_LIST *)parameter; #ifdef NEPTUNE_BOARD - /* Count assigned to global static variable - OMAPS00061049 - 08-03-2006 */ - Plmn_list_count = plmn_list->count; + /* Count assigned to global static variable - OMAPS00061049 - 08-03-2006 */ + Plmn_list_count = plmn_list->count; #endif /* Dec 13, 2006 DRT: OMAPS00105640 x0039928(Sumanth) Fix: Condition added to check if sim is active */ - if(SIM_NOT_ACTIVE != sim_status_check()) - { - if (plmn_list->count EQ 0) - { - network_stop_animation (); - network_no_plmns (); - } - else - { - /* - * Create and present list of available PLMNs - * - */ - - /* Pass the plmn_list which already hold the parameter data - OMAPS00061049 - 08-03-2006 */ + if(SIM_NOT_ACTIVE != sim_status_check()) + { + if (plmn_list->count EQ 0) + { + network_stop_animation (); + network_no_plmns (); + } + else + { + /* + * Create and present list of available PLMNs + * + */ + + /* Pass the plmn_list which already hold the parameter data - OMAPS00061049 - 08-03-2006 */ #ifndef NEPTUNE_BOARD - data->network_list = network_create_list (data, parameter); + data->network_list = network_create_list (data, parameter); #else - data->network_list = network_create_list (data, plmn_list ); + data->network_list = network_create_list (data, plmn_list ); #endif - data->network_list_status = NETWORK_LIST_DISPLAY_FIRST; - network_stop_animation (); - listDisplayListMenu (win, data->network_list, (ListCbFunc)network_list_cb,0); - - // change by Sasken ( Pradeep/Vadiraj) on Apr 07th 2004 - // Issue Number : SPR#12654 on 07/04/04 by Pradeep/Vadiraj - // Bug : Pressing "search" button does not trigger anything - // Solution: When the ME is already camped on to a network the NoNetwork event is not sent. - // Commented the following line - // SEND_EVENT (idle_get_window(), NETWORK_NO_SERVICE, 0, 0); - - - } - } + data->network_list_status = NETWORK_LIST_DISPLAY_FIRST; + network_stop_animation (); + listDisplayListMenu (win, data->network_list, (ListCbFunc)network_list_cb,0); + + // change by Sasken ( Pradeep/Vadiraj) on Apr 07th 2004 + // Issue Number : SPR#12654 on 07/04/04 by Pradeep/Vadiraj + // Bug : Pressing "search" button does not trigger anything + // Solution: When the ME is already camped on to a network the NoNetwork event is not sent. + // Commented the following line + // SEND_EVENT (idle_get_window(), NETWORK_NO_SERVICE, 0, 0); + + + } + } } } - //Mar 30,2007 DRT: OMAPS00120157 x00061088(Prachi) - if(data->network_list_status == NETWORK_LIST_DISPLAY_FIRST) - { + //Mar 30,2007 DRT: OMAPS00120157 x00061088(Prachi) + if(data->network_list_status == NETWORK_LIST_DISPLAY_FIRST) + { // Feb 08,2007 DRT: OMAPS00115060 x00061088(Prachi) - if (network_data.forbidden == TRUE) - { - network_forbidden_plmn(); - network_data.forbidden = FALSE; - } - } - - } - else - { - network_data.aborted = FALSE; - } + if (network_data.forbidden == TRUE) + { + network_forbidden_plmn(); + network_data.forbidden = FALSE; + } + } + + } + else + { + network_data.aborted = FALSE; + } #ifdef MMI_HOMEZONE_ENABLED - /* sh - tell homezone there is no network */ - //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 - //Modified to incorporate the third argument. - homezoneUpdate(0,0,0); + /* sh - tell homezone there is no network */ + //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 + //Modified to incorporate the third argument. + homezoneUpdate(0,0,0); #endif break; @@ -1230,55 +1221,55 @@ network_start_animation_plmn_selection (value); data->network_list_status = NETWORK_LIST_SELECTED; nm_select_plmn ((U8 *)network_data.network_search_name[value]); - //Sep 23, 2004 REF: CRR 24562 xvilliva - //After retrieving the list we see if an error occured - //and flash an alert to the user accordingly. - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - } - - /* x0056422, OMAPS00148258 */ - - if (data->network_list NEQ NULL) - { - #ifdef FF_2TO1_PS - #ifndef NEPTUNE_BOARD - FREE_MEMORY ((UBYTE *)data->network_list->List, + //Sep 23, 2004 REF: CRR 24562 xvilliva + //After retrieving the list we see if an error occured + //and flash an alert to the user accordingly. + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + } + + /* x0056422, OMAPS00148258 */ + + if (data->network_list NEQ NULL) + { + #ifdef FF_2TO1_PS + #ifndef NEPTUNE_BOARD + FREE_MEMORY ((UBYTE *)data->network_list->List, MMREG_MAX_PLMN_ID * sizeof (T_MFW_MNU_ITEM)); - #else + #else /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); - #endif /* NEPTUNE_BOARD */ - - #else - #ifndef NEPTUNE_BOARD - FREE_MEMORY ((UBYTE *)data->network_list->List, + #endif /* NEPTUNE_BOARD */ + + #else + #ifndef NEPTUNE_BOARD + FREE_MEMORY ((UBYTE *)data->network_list->List, MAX_PLMN_ID * sizeof (T_MFW_MNU_ITEM)); - #else - /* Free the allocated memory for PLMN list window - + #else + /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); - #endif /* NEPTUNE_BOARD */ - - #endif /* FF_2TO1_PS */ - - FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); - data->network_list = NULL; - } - //Modify by hou peng 2007/09/19 end - - /* x0056422 OMAPS00148258 */ + #endif /* NEPTUNE_BOARD */ + + #endif /* FF_2TO1_PS */ + + FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); + data->network_list = NULL; + } + //Modify by hou peng 2007/09/19 end + + /* x0056422 OMAPS00148258 */ break; case NETWORK_PPLMN_MEM_LIST: - { + { T_MFW_PPLMN_MEM *pplmn_mem; - UBYTE i; + UBYTE i; TRACE_EVENT (">> NETWORK PPLMN MEM LIST"); /* Save the number of PLMN records: @@ -1287,55 +1278,55 @@ */ pplmn_mem = (T_MFW_PPLMN_MEM *)parameter; - network_data.pplmn_mem.maxRcd = pplmn_mem->maxRcd; - network_data.pplmn_mem.usedRcd = pplmn_mem->usedRcd; + network_data.pplmn_mem.maxRcd = pplmn_mem->maxRcd; + network_data.pplmn_mem.usedRcd = pplmn_mem->usedRcd; /* * Request preferred PLMN list from the SIM */ - network_data.pplmn = (T_MFW_NETWORK_STRUCT *)ALLOC_MEMORY ((pplmn_mem->maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); - - if (network_data.pplmn EQ 0) - { - return; - } - - if (pplmn_mem->usedRcd > 0) - { - // request MFW to fill up the pref. PLMN list - nm_pref_plmn_list(network_data.pplmn, pplmn_mem->maxRcd, 1); - } - else - { - // doesnt make sense to request the MFW to fill up the list - // when the "pplmn_mem->usedRcd" is 0 - - TRACE_EVENT(">> NETWORK PPLMN MEM LIST - ELSE Loop"); - for (i=0; i < (network_data.pplmn_mem.maxRcd); i++) - { + network_data.pplmn = (T_MFW_NETWORK_STRUCT *)ALLOC_MEMORY ((pplmn_mem->maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); + + if (network_data.pplmn EQ 0) + { + return; + } + + if (pplmn_mem->usedRcd > 0) + { + // request MFW to fill up the pref. PLMN list + nm_pref_plmn_list(network_data.pplmn, pplmn_mem->maxRcd, 1); + } + else + { + // doesnt make sense to request the MFW to fill up the list + // when the "pplmn_mem->usedRcd" is 0 + + TRACE_EVENT(">> NETWORK PPLMN MEM LIST - ELSE Loop"); + for (i=0; i < (network_data.pplmn_mem.maxRcd); i++) + { #ifdef NO_ASCIIZ - network_data.pplmn[i].network_long.len = 0; - network_data.pplmn[i].network_short.len = 0; + network_data.pplmn[i].network_long.len = 0; + network_data.pplmn[i].network_short.len = 0; #else - memset(network_data.pplmn[i].network_long, '\0', LONG_NAME); - memset(network_data.pplmn[i].network_short, '\0', SHORT_NAME); + memset(network_data.pplmn[i].network_long, '\0', LONG_NAME); + memset(network_data.pplmn[i].network_short, '\0', SHORT_NAME); #endif - memset(network_data.pplmn[i].network_numeric, '\0', NUMERIC_LENGTH); - } - - data->network_list = network_create_pref_list (data); - listDisplayListMenu (win, data->network_list,(ListCbFunc)network_pref_list_cb,0); - } + memset(network_data.pplmn[i].network_numeric, '\0', NUMERIC_LENGTH); + } + + data->network_list = network_create_pref_list (data); + listDisplayListMenu (win, data->network_list,(ListCbFunc)network_pref_list_cb,0); + } } break; case NETWORK_PREFERRED_LIST: - { - - /* UBYTE i; */ /* Warning Correction */ + { + + /* UBYTE i; */ /* Warning Correction */ TRACE_EVENT (">>NETWORK PREFERRED LIST"); @@ -1351,69 +1342,69 @@ /* cq12719 Check if prefered list info resource has been created.16-03-04 MZ */ if(data->network_list != NULL) - listDisplayListMenu (win, data->network_list,(ListCbFunc)network_pref_list_cb,0); + listDisplayListMenu (win, data->network_list,(ListCbFunc)network_pref_list_cb,0); } break; case NETWORK_CELL_SELECT: - { - - /* x0045876, 14-Aug-2006 (WR -"cell_data" was set but never used) */ + { + + /* x0045876, 14-Aug-2006 (WR -"cell_data" was set but never used) */ #ifdef MMI_HOMEZONE_ENABLED - /* If Homezone is active, inform it of the new cell data */ - T_MFW_CELL_STRUCT *cell_data; + /* If Homezone is active, inform it of the new cell data */ + T_MFW_CELL_STRUCT *cell_data; #endif - TRACE_EVENT(">>NETWORK CELL SELECT"); + TRACE_EVENT(">>NETWORK CELL SELECT"); /* x0045876, 14-Aug-2006 (WR -"cell_data" was set but never used) */ - /* cell_data = (T_MFW_CELL_STRUCT *)parameter; */ + /* cell_data = (T_MFW_CELL_STRUCT *)parameter; */ #ifdef MMI_HOMEZONE_ENABLED - /* x0045876, 14-Aug-2006 (WR -"cell_data" was set but never used) */ - cell_data = (T_MFW_CELL_STRUCT *)parameter; - - /* SPR759 - SH - send cell reselection info to homezone */ - - //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 - //Modified to incorporate the third argument. - homezoneUpdate(cell_data->lid, cell_data->ci, 0); + /* x0045876, 14-Aug-2006 (WR -"cell_data" was set but never used) */ + cell_data = (T_MFW_CELL_STRUCT *)parameter; + + /* SPR759 - SH - send cell reselection info to homezone */ + + //Jun 14, 2005 REF: MMI-FIX-30439 x0018858 + //Modified to incorporate the third argument. + homezoneUpdate(cell_data->lid, cell_data->ci, 0); #endif - break; + break; #ifdef NEPTUNE_BOARD /* Destory the list when select softkey is pressed / back softkey is pressed */ /* OMAPS00061049 - 08-03-2006 - BEGIN*/ case NETWORK_LIST_DESTORY: TRACE_EVENT ("Inside NETWORK_LIST_DESTORY Event"); - /* Destory the list window */ - listsDestroy(data->network_list->win); - - TRACE_EVENT ("Destoryed list window successfully"); - - /* - * If network list is available, destroy - */ - if (data->network_list NEQ NULL) - { + /* Destory the list window */ + listsDestroy(data->network_list->win); + + TRACE_EVENT ("Destoryed list window successfully"); + + /* + * If network list is available, destroy + */ + if (data->network_list NEQ NULL) + { #ifdef FF_2TO1_PS /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #else /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ - FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #endif - FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); - data->network_list = NULL; - } - - TRACE_EVENT ("List window memory freed"); - break; - /* OMAPS00061049 - 08-03-2006 - END */ + FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); + data->network_list = NULL; + } + + TRACE_EVENT ("List window memory freed"); + break; + /* OMAPS00061049 - 08-03-2006 - END */ #endif @@ -1428,7 +1419,7 @@ //Dec 13,2006 DR:OMAPS00098351 x0066814 - Begin #ifdef FF_TIMEZONE case NETWORK_TIME_UPDATE: - { + { BOOL modify_date_negative = FALSE; BOOL modify_date_positive = FALSE; int actual_TD = 0; @@ -1513,10 +1504,10 @@ if(modify_date_negative) { - TRACE_EVENT("modify date negative"); - network_time->hour = 24 - abs(network_time->hour - abs(actual_TD/4 )); - - network_time->day = network_time->day -1; + TRACE_EVENT("modify date negative"); + network_time->hour = 24 - abs(network_time->hour - abs(actual_TD/4 )); + + network_time->day = network_time->day -1; if(network_time->day == 0) { @@ -1527,10 +1518,10 @@ network_time->month = network_time->month -1; network_time->day = 31; } - else{ + else{ network_time->month = network_time->month -1; network_time->day = 30; - } + } } else if(((network_time->month)%2 == 0) && network_time->month < 7) { @@ -1544,13 +1535,13 @@ network_time->month = network_time->month -1; network_time->day = 31; } - else + else { network_time->month = network_time->month -1; network_time->day = 30; } - } + } if(network_time->month == 2) { if(((network_time->year+2000)%4 == 0) && ((network_time->year+2000)%100 != 0)) @@ -1568,7 +1559,7 @@ else if(modify_date_positive) { - TRACE_EVENT("modify date positive"); + TRACE_EVENT("modify date positive"); network_time->hour = network_time->hour -24; network_time->day = network_time->day + 1; @@ -1583,9 +1574,9 @@ if(network_time ->day == 29) { if(((network_time->year+2000)%4 == 0) && ((network_time->year+2000)%100 != 0)) - { + { network_time->day = 29; - } + } else { network_time->day = 1; @@ -1593,13 +1584,13 @@ } } } - else - { - if(network_time->day>=31) - { - if(network_time->day == 31) - { - if(((network_time->month)%2 != 0) && network_time->month <= 7) + else + { + if(network_time->day>=31) + { + if(network_time->day == 31) + { + if(((network_time->month)%2 != 0) && network_time->month <= 7) { network_time->day = 31; } @@ -1613,14 +1604,14 @@ network_time->day = 1; network_time->month = network_time->month +1; } - } - else + } + else { network_time->day = 1; network_time->month = network_time->month +1; } - } - } + } + } if(network_time->month > 12) { network_time->year = network_time->year + 1; @@ -1650,15 +1641,15 @@ newTime.hour = 12; } else if (network_time->hour < 12) // If hour info from network is less than 12, - { // set the hour info as it is and AM flag to off. + { // set the hour info as it is and AM flag to off. newTime.PM_flag = 0; newTime.hour = network_time->hour; - } - else - { - newTime.PM_flag = 1; // If hour info from network is greater than 12, - newTime.hour = network_time->hour - 12; // set hour = received hour - 12 and AM/PM - } // flag to ON indicate PM. + } + else + { + newTime.PM_flag = 1; // If hour info from network is greater than 12, + newTime.hour = network_time->hour - 12; // set hour = received hour - 12 and AM/PM + } // flag to ON indicate PM. newTime.minute = network_time->minute; // Set minute info newTime.second = network_time->second; // Set second info @@ -1696,7 +1687,7 @@ if(FFS_flashData.nitz_option==NitzAutomatic) { - // Update RTC with new time info + // Update RTC with new time info mfw_td_set_time(&newTime); // Update RTC with new date info @@ -1724,9 +1715,9 @@ //Dec 13,2006 DR:OMAPS00098351 x0066814 - End /******************************************************************************* - $Function: network_win_cb - - $Description: network top window + $Function: network_win_cb + + $Description: network top window $Returns: @@ -1744,9 +1735,9 @@ /******************************************************************************* - $Function: network_nm_cb - - $Description: network handler (mfw callback handler) + $Function: network_nm_cb + + $Description: network handler (mfw callback handler) $Returns: @@ -1762,7 +1753,7 @@ case E_NM_FULL_SERVICE: //x0pleela 9 Feb, 2006 ER:OMAPS00065203 //Handling E_NM_OPN for operator name display - case E_NM_OPN: + case E_NM_OPN: SEND_EVENT (network_data.network_win, NETWORK_FULL_SERVICE, 0, para); break; @@ -1772,11 +1763,11 @@ //NETWORK_FORBIDDEN_NETWORK to network(),by setting flags network_data.aborted =False //and network_data.forbidden = Ture case E_NM_FORBIDDEN_NETWORK: - network_data.forbidden = TRUE; - network_data.aborted = FALSE; - /* Jan 10, 2007 REF: OMAPS00110741 x0039928(sumanth) */ - /* Fix : Pass NULL as parameter */ - SEND_EVENT (network_data.network_win, NETWORK_FORBIDDEN_NETWORK, 0, 0); + network_data.forbidden = TRUE; + network_data.aborted = FALSE; + /* Jan 10, 2007 REF: OMAPS00110741 x0039928(sumanth) */ + /* Fix : Pass NULL as parameter */ + SEND_EVENT (network_data.network_win, NETWORK_FORBIDDEN_NETWORK, 0, 0); break; case E_NM_LIMITED_SERVICE: @@ -1785,74 +1776,74 @@ case E_NM_NO_SERVICE: SEND_EVENT (network_data.network_win, NETWORK_NO_SERVICE, 0, para); - break; + break; case E_NM_SEARCH_NETWORK: - SEND_EVENT (network_data.network_win, NETWORK_SEARCH_NETWORK, 0, para); - break; + SEND_EVENT (network_data.network_win, NETWORK_SEARCH_NETWORK, 0, para); + break; case E_NM_NO_NETWORK: - SEND_EVENT (network_data.network_win, NETWORK_NO_NETWORK, 0, para); - break; - - case E_NM_PLMN_LIST: - SEND_EVENT (network_data.network_win, NETWORK_PLMN_LIST, 0, para); + SEND_EVENT (network_data.network_win, NETWORK_NO_NETWORK, 0, para); + break; + + case E_NM_PLMN_LIST: + SEND_EVENT (network_data.network_win, NETWORK_PLMN_LIST, 0, para); break; - case E_NM_DEREGISTRATION: - TRACE_EVENT("MmiNetwork:E_NM_DEREGISTRATION"); - mainShutdown(); - break; - case E_NM_PREF_PLMN_LIST: - TRACE_EVENT("MmiNetwork:E_NM_PREF_PLMN_LIST"); + case E_NM_DEREGISTRATION: + TRACE_EVENT("MmiNetwork:E_NM_DEREGISTRATION"); + mainShutdown(); + break; + case E_NM_PREF_PLMN_LIST: + TRACE_EVENT("MmiNetwork:E_NM_PREF_PLMN_LIST"); SEND_EVENT (network_data.network_win, NETWORK_PREFERRED_LIST, 0, para); - break; - case E_NM_PPLMN_MEM: - TRACE_EVENT("MmiNetwork:E_NM_PPLMN_MEM"); + break; + case E_NM_PPLMN_MEM: + TRACE_EVENT("MmiNetwork:E_NM_PPLMN_MEM"); SEND_EVENT (network_data.network_win, NETWORK_PPLMN_MEM_LIST, 0, para); - break; - /* SH 29-04-02 - Cell reselection */ - case E_NM_CELL_SELECT: - TRACE_EVENT("MmiNetwork:E_NM_CELL_SELECT"); - SEND_EVENT (network_data.network_win, NETWORK_CELL_SELECT, 0, para); - break; - /* SPR919 - SH - Band selection */ - case E_NM_BAND: - TRACE_EVENT("MmiNetwork:E_NM_BAND"); - nm_registration (nm_get_mode (),0, 0); - //Sep 23, 2004 REF: CRR 24562 xvilliva - //After retrieving the list we see if an error occured - //and flash an alert to the user accordingly. - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - } - break; - - //x0pleela 30 May, 2007 DR: OMAPS00133201 - case E_NM_ABORT_NETWORK: - TRACE_EVENT("MmiNetwork:E_NM_ABORT_NETWORK"); - nm_abort_network(); - break; + break; + /* SH 29-04-02 - Cell reselection */ + case E_NM_CELL_SELECT: + TRACE_EVENT("MmiNetwork:E_NM_CELL_SELECT"); + SEND_EVENT (network_data.network_win, NETWORK_CELL_SELECT, 0, para); + break; + /* SPR919 - SH - Band selection */ + case E_NM_BAND: + TRACE_EVENT("MmiNetwork:E_NM_BAND"); + nm_registration (nm_get_mode (),0, 0); + //Sep 23, 2004 REF: CRR 24562 xvilliva + //After retrieving the list we see if an error occured + //and flash an alert to the user accordingly. + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + } + break; + + //x0pleela 30 May, 2007 DR: OMAPS00133201 + case E_NM_ABORT_NETWORK: + TRACE_EVENT("MmiNetwork:E_NM_ABORT_NETWORK"); + nm_abort_network(); + break; /*Aug 07, 2007 DR:OMAPS00137726 x0066814(Geetha)*/ - case E_NM_PLMN_LIST_BOOTUP: - TRACE_EVENT("MmiNetwork:E_NM_PLMN_LIST_BOOTUP"); - /*Start the available plmn search*/ - nm_avail_plmn_list(); - /*After retrieving the list we see if an error occured - and flash an alert to the user accordingly.*/ - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - } - /* remove network log if needed */ - network_remove_network_log (); - network_start_animation (); - network_data.aborted = FALSE; - - break; + case E_NM_PLMN_LIST_BOOTUP: + TRACE_EVENT("MmiNetwork:E_NM_PLMN_LIST_BOOTUP"); + /*Start the available plmn search*/ + nm_avail_plmn_list(); + /*After retrieving the list we see if an error occured + and flash an alert to the user accordingly.*/ + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + } + /* remove network log if needed */ + network_remove_network_log (); + network_start_animation (); + network_data.aborted = FALSE; + + break; // June 02, 2006 DR: OMAPS00078005 x0021334 // Send NETWORK_TIME_UPDATE event to update the new network time/date @@ -1860,22 +1851,22 @@ #ifdef FF_TIMEZONE case E_MFW_TIME_IND: TRACE_EVENT("E_MFW_TIME_IND"); - SEND_EVENT (network_data.network_win, NETWORK_TIME_UPDATE, 0, para); + SEND_EVENT (network_data.network_win, NETWORK_TIME_UPDATE, 0, para); break; #endif default: - return 0; + return 0; } return 1; } /******************************************************************************* - $Function: nm_flag_log_off - - $Description: Attribut function for menu entries. - It defines whether the network log off function shall - be displayed or not. + $Function: nm_flag_log_off + + $Description: Attribut function for menu entries. + It defines whether the network log off function shall + be displayed or not. $Returns: @@ -1891,11 +1882,11 @@ } /******************************************************************************* - $Function: nm_flag_log_off - - $Description: Attribut function for menu entries. - It defines whether the network log off function shall - be displayed or not. + $Function: nm_flag_log_off + + $Description: Attribut function for menu entries. + It defines whether the network log off function shall + be displayed or not. $Returns: @@ -1916,9 +1907,9 @@ /******************************************************************************* - $Function: network_set_mode_auto - - $Description: Start a automatic registration + $Function: network_set_mode_auto + + $Description: Start a automatic registration $Returns: @@ -1951,14 +1942,14 @@ network_start_animation (); // Apr 14, 2004 REF: CRR 12641 xpradipg - Auto_Network_Select=true; + Auto_Network_Select=true; return 1; } /******************************************************************************* - $Function: network_set_mode_man - - $Description: Start a manual registration + $Function: network_set_mode_man + + $Description: Start a manual registration $Returns: @@ -1978,15 +1969,15 @@ * Start the available plmn search */ nm_avail_plmn_list(); - //Sep 23, 2004 REF: CRR 24562 xvilliva - //After retrieving the list we see if an error occured - //and flash an alert to the user accordingly. - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - return 1; - } + //Sep 23, 2004 REF: CRR 24562 xvilliva + //After retrieving the list we see if an error occured + //and flash an alert to the user accordingly. + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + return 1; + } /* * remove network log if needed @@ -2006,7 +1997,7 @@ /* +--------------------------------------------------------------------+ -| PROJECT : MMI (6366) MODULE : MmiNetwork | +| PROJECT : MMI (6366) MODULE : MmiNetwork | | STATE : code ROUTINE : network_pref_list | +--------------------------------------------------------------------+ @@ -2021,9 +2012,7 @@ * Request the maximum number of preferred PLMN records * on the SIM card */ - nm_pplmn_mem_req(); - - + nm_pplmn_mem_req(); return 1; } @@ -2031,9 +2020,9 @@ /******************************************************************************* - $Function: network_remove_network_log - - $Description: Reset network log if set. + $Function: network_remove_network_log + + $Description: Reset network log if set. $Returns: @@ -2042,7 +2031,6 @@ *******************************************************************************/ static void network_remove_network_log (void) { - if (FFS_flashData.net_log_status EQ NM_LOG_AVAIL_USED) { /* @@ -2051,15 +2039,14 @@ */ FFS_flashData.net_log_status = NM_LOG_AVAIL_NOT_USED; flash_write(); - } } /******************************************************************************* - $Function: network_log_off - - $Description: Removes a network log and returns to automatic registration. + $Function: network_log_off + + $Description: Removes a network log and returns to automatic registration. $Returns: @@ -2075,7 +2062,6 @@ */ network_set_mode_auto (m,i); - network_start_animation (); return 1; @@ -2083,9 +2069,9 @@ /******************************************************************************* - $Function: network_log_on - - $Description: Sets a network log. + $Function: network_log_on + + $Description: Sets a network log. $Returns: @@ -2094,11 +2080,8 @@ *******************************************************************************/ int network_log_on(T_MFW_MNU *m, T_MFW_MNU_ITEM *i) { - - TRACE_FUNCTION ("network_log_on()"); - if (FFS_flashData.net_log_status EQ NM_LOG_AVAIL_NOT_USED OR FFS_flashData.net_log_status EQ NM_LOG_AVAIL_USED) { @@ -2111,7 +2094,7 @@ memcpy (FFS_flashData.network_name, network_data.network_name, SIZE_NETWORK_NAME); - flash_write(); + flash_write(); /* * Save the manual mode in PCM for next power on */ @@ -2121,17 +2104,16 @@ * Start the registration of the logged network */ nm_select_plmn (network_data.network_name); - //Sep 23, 2004 REF: CRR 24562 xvilliva - //After retrieving the list we see if an error occured - //and flash an alert to the user accordingly. - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - } + //Sep 23, 2004 REF: CRR 24562 xvilliva + //After retrieving the list we see if an error occured + //and flash an alert to the user accordingly. + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + } } - network_start_animation (); return 1; @@ -2139,7 +2121,7 @@ /******************************************************************************* - $Function: network_start_full_service + $Function: network_start_full_service $Description: Starts a full service registration. a) manual selection @@ -2153,7 +2135,6 @@ *******************************************************************************/ void network_start_full_service(void) { - TRACE_FUNCTION ("network_start_full_service()"); network_data.status = NETWORK_SEARCH_NETWORK; @@ -2186,28 +2167,28 @@ nm_select_plmn (network_data.network_name); break; default: - if (nm_get_mode() == NM_MANUAL) - SEND_EVENT (idle_get_window(), NETWORK_SEARCH_NETWORK, 0, 0); + if (nm_get_mode() == NM_MANUAL) + SEND_EVENT (idle_get_window(), NETWORK_SEARCH_NETWORK, 0, 0); nm_registration (nm_get_mode (),0, 0); break; } } - //Sep 23, 2004 REF: CRR 24562 xvilliva - //After retrieving the list we see if an error occured - //and flash an alert to the user accordingly. - if(g_ensErr == 1) - { - g_ensErr = 0; - info_screen(0, TxtNotAllowed, TxtNull, NULL); - } + //Sep 23, 2004 REF: CRR 24562 xvilliva + //After retrieving the list we see if an error occured + //and flash an alert to the user accordingly. + if(g_ensErr == 1) + { + g_ensErr = 0; + info_screen(0, TxtNotAllowed, TxtNull, NULL); + } } /******************************************************************************* - $Function: network_get_name - - $Description: Returns the textual and numeric representation of the - network name. + $Function: network_get_name + + $Description: Returns the textual and numeric representation of the + network name. $Returns: @@ -2265,37 +2246,37 @@ else { - memcpy (nm->plmn_name, network_data.plmn_name, SIZE_PLMN_NAME); - memcpy (nm->network_name, network_data.network_name, SIZE_NETWORK_NAME); + memcpy (nm->plmn_name, network_data.plmn_name, SIZE_PLMN_NAME); + memcpy (nm->network_name, network_data.network_name, SIZE_NETWORK_NAME); } - /* Marcus: Issue 1618: 24/01/2003: Start */ + /* Marcus: Issue 1618: 24/01/2003: Start */ /* Obtain the service provider name (from the SIM EF-SPN file) if any */ nm->service_provider_name[0] = '\0'; #endif #ifdef NO_ASCIIZ nm_get_spn(&service_provider_name); - if ((service_provider_name.len != 0) && - (service_provider_name.data[0] != '\0')) - { - if (service_provider_name.len > sizeof(nm->service_provider_name)-1) - service_provider_name.len = sizeof(nm->service_provider_name)-1; - - memcpy(nm->service_provider_name, - service_provider_name.data, - service_provider_name.len); - - nm->service_provider_name[service_provider_name.len] = '\0'; - } + if ((service_provider_name.len != 0) && + (service_provider_name.data[0] != '\0')) + { + if (service_provider_name.len > sizeof(nm->service_provider_name)-1) + service_provider_name.len = sizeof(nm->service_provider_name)-1; + + memcpy(nm->service_provider_name, + service_provider_name.data, + service_provider_name.len); + + nm->service_provider_name[service_provider_name.len] = '\0'; + } #else nm_get_spn(service_provider_name); - if (strlen(service_provider_name)) - { - strncpy(nm->service_provider_name, - service_provider_name, - sizeof(nm->service_provider_name)-1); - - nm->service_provider_name[sizeof(nm->service_provider_name)-1] = '\0'; + if (strlen(service_provider_name)) + { + strncpy(nm->service_provider_name, + service_provider_name, + sizeof(nm->service_provider_name)-1); + + nm->service_provider_name[sizeof(nm->service_provider_name)-1] = '\0'; } #endif /* Marcus: Issue 1618: 24/01/2003: End */ @@ -2304,9 +2285,9 @@ /******************************************************************************* - $Function: network_log_enabled - - $Description: Checks whether a network log is active or not. + $Function: network_log_enabled + + $Description: Checks whether a network log is active or not. $Returns: @@ -2315,7 +2296,6 @@ *******************************************************************************/ static UBYTE network_log_enabled (void) { - TRACE_FUNCTION ("network_log_enabled()"); if (FFS_flashData.net_log_status EQ NM_LOG_AVAIL_USED) @@ -2326,9 +2306,9 @@ /******************************************************************************* - $Function: ListMenuData - - $Description: Creates a list of available PLMNs for selection. + $Function: ListMenuData + + $Description: Creates a list of available PLMNs for selection. $Returns: @@ -2366,7 +2346,7 @@ { #ifndef NEPTUNE_BOARD /* Taken this statement inside the condition */ - /* OMAPS00061049 - 08-03-2006 */ + /* OMAPS00061049 - 08-03-2006 */ mnuInitDataItem(&list_menu_data->List[i]); #endif @@ -2432,15 +2412,14 @@ list_menu_data->autoDestroy = TRUE; list_menu_data->listCol = COLOUR_LIST_XX; - return list_menu_data; } /******************************************************************************* - $Function: network_create_pref_list - - $Description: Creates a list of preferred PLMNs for selection. + $Function: network_create_pref_list + + $Description: Creates a list of preferred PLMNs for selection. $Returns: @@ -2462,24 +2441,21 @@ if (list_menu_data->List EQ 0) { - /* cq12719 If second memory alloc fails Free the memory allocated for list menu data. 16-03-04 MZ */ - if(NULL != list_menu_data) - FREE_MEMORY ((void *)list_menu_data, sizeof (ListMenuData)); + if(NULL != list_menu_data) + FREE_MEMORY ((void *)list_menu_data, sizeof (ListMenuData)); return NULL; - } + } TRACE_EVENT ("network_create_pref_list ()"); - - /* * Fill Menu List */ for (i=0; i < (network_data.pplmn_mem.maxRcd); i++) { - mnuInitDataItem(&list_menu_data->List[i]); + mnuInitDataItem(&list_menu_data->List[i]); /* * set network name @@ -2488,13 +2464,13 @@ #ifdef NO_ASCIIZ if (network_data.pplmn[i].network_long.len NEQ 0 ) { - list_menu_data->List[i].str = (char *)network_data.pplmn[i].network_long.data; - } + list_menu_data->List[i].str = (char *)network_data.pplmn[i].network_long.data; + } #else if (strlen((char *)network_data.pplmn[i].network_long) NEQ 0 ) { - list_menu_data->List[i].str = (char *)network_data.pplmn[i].network_long; - } + list_menu_data->List[i].str = (char *)network_data.pplmn[i].network_long; + } #endif else { @@ -2513,7 +2489,7 @@ list_menu_data->ListLength = network_data.pplmn_mem.maxRcd; list_menu_data->ListPosition = 1; list_menu_data->CursorPosition = 1; - list_menu_data->SnapshotSize = network_data.pplmn_mem.maxRcd; + list_menu_data->SnapshotSize = network_data.pplmn_mem.maxRcd; list_menu_data->Font = 0; list_menu_data->LeftSoftKey = TxtSoftOptions; /* SPR#2354 - SH - Change 'Select' to 'Options' */ list_menu_data->RightSoftKey = TxtSoftBack; @@ -2529,7 +2505,7 @@ /******************************************************************************* - $Function: network_create_mobile_list + $Function: network_create_mobile_list $Description: @@ -2546,7 +2522,7 @@ if (list_menu_data EQ 0) { - TRACE_EVENT ("failed to create the list"); + TRACE_EVENT ("failed to create the list"); return NULL; } @@ -2558,35 +2534,33 @@ if (list_menu_data->List EQ 0) { - TRACE_EVENT ("failed to create the list"); + TRACE_EVENT ("failed to create the list"); return NULL; } TRACE_EVENT ("network_create_mobile_list ()"); - - /* * Fill Menu List */ for (i=0; i < MAX_SHOW_OF_PLMN; i++) { - mnuInitDataItem(&list_menu_data->List[i]); + mnuInitDataItem(&list_menu_data->List[i]); /* * set network name */ /*SPR 2635 copy set list strings pointing at longname strings*/ - if (data->pplmn_longnames[i][0] NEQ 0 ) + if (data->pplmn_longnames[i][0] NEQ 0 ) { - list_menu_data->List[i].str =data->pplmn_longnames[i]; - } - else + list_menu_data->List[i].str =data->pplmn_longnames[i]; + } + else { list_menu_data->List[i].str = GET_TEXT(TxtEmpty); - } + } /*SPR 2635, end*/ @@ -2618,9 +2592,9 @@ #if(0) /* x0039928 - Lint warning removal */ /******************************************************************************* - $Function: network_submenu - - $Description: Creates a submenu for the preferred list. + $Function: network_submenu + + $Description: Creates a submenu for the preferred list. $Returns: @@ -2631,7 +2605,6 @@ { UBYTE i; - ListMenuData *list_menu_data = (ListMenuData *)ALLOC_MEMORY (sizeof (ListMenuData)); if (list_menu_data EQ 0) @@ -2646,22 +2619,22 @@ */ for (i=0;i<(NETWORK_MENU_ITEM);i++) { - mnuInitDataItem(&list_menu_data->List[i]); + mnuInitDataItem(&list_menu_data->List[i]); /* * set network name */ #ifdef NO_ASCIIZ if (plmn_list->network_long.len NEQ 0) - list_menu_data->List[i].str = (char *)plmn_list->network_long.data; + list_menu_data->List[i].str = (char *)plmn_list->network_long.data; #else if (strlen((char *)plmn_list->network_long) NEQ 0) - list_menu_data->List[i].str = (char *)plmn_list->network_long; + list_menu_data->List[i].str = (char *)plmn_list->network_long; #endif else ; - //strncpy ((char *)list_menu_data->List[i].str,(char *)empty, 6); + //strncpy ((char *)list_menu_data->List[i].str,(char *)empty, 6); plmn_list ++; @@ -2690,9 +2663,9 @@ /******************************************************************************* - $Function: network_list_cb - - $Description: Callback function list dialog. + $Function: network_list_cb + + $Description: Callback function list dialog. $Returns: @@ -2706,14 +2679,14 @@ #ifndef NEPTUNE_BOARD if (ListData->Reason != LISTS_REASON_BACK) { - SEND_EVENT (win, NETWORK_LIST_SELECT_PLMN, ListData->CursorPosition, NULL); + SEND_EVENT (win, NETWORK_LIST_SELECT_PLMN, ListData->CursorPosition, NULL); } #else if (ListData->Reason EQ LISTS_REASON_SELECT) { - SEND_EVENT (win, NETWORK_LIST_SELECT_PLMN, ListData->CursorPosition, NULL); - SEND_EVENT (win, NETWORK_LIST_DESTORY, NULL, NULL); + SEND_EVENT (win, NETWORK_LIST_SELECT_PLMN, ListData->CursorPosition, NULL); + SEND_EVENT (win, NETWORK_LIST_DESTORY, NULL, NULL); } if ((ListData->Reason EQ LISTS_REASON_BACK) || @@ -2729,9 +2702,9 @@ /******************************************************************************* - $Function: network_pref_list_cb - - $Description: Callback function pref. list dialog. + $Function: network_pref_list_cb + + $Description: Callback function pref. list dialog. $Returns: @@ -2752,37 +2725,36 @@ FREE_MEMORY ((UBYTE *)network_data.network_list, sizeof (ListMenuData)); // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 //Commented FREE_MEMORY for network_data.pplmn as this is required when we enter the option menu. - // Nov 02, 2005 REF: omaps00044855 Sumanth Kumar.C - // Solution: Comment network_data.pplmn memory free. + // Nov 02, 2005 REF: omaps00044855 Sumanth Kumar.C + // Solution: Comment network_data.pplmn memory free. /* // cq12719 Stop the memory leak 17-03-04 MZ. FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); */ - //keep the position of the selected PLMN, need it later to update the list - network_data.Listposition = ListData->ListPosition; - - network_MNU_start(win,&network_OPTAttrib); + //keep the position of the selected PLMN, need it later to update the list + network_data.Listposition = ListData->ListPosition; + + network_MNU_start(win,&network_OPTAttrib); } else { - //user pressed Exit to go back to the network submenu - FREE_MEMORY ((UBYTE *)network_data.network_list->List, (network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_MNU_ITEM)); - - FREE_MEMORY ((UBYTE *)network_data.network_list, sizeof (ListMenuData)); - - FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); + //user pressed Exit to go back to the network submenu + FREE_MEMORY ((UBYTE *)network_data.network_list->List, (network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_MNU_ITEM)); + + FREE_MEMORY ((UBYTE *)network_data.network_list, sizeof (ListMenuData)); + + FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); } - } /******************************************************************************* - $Function: network_mobile_list_cb - - $Description: Callback function international list dialog. + $Function: network_mobile_list_cb + + $Description: Callback function international list dialog. $Returns: @@ -2792,56 +2764,53 @@ static void network_mobile_list_cb(T_MFW_HND win, ListMenuData * ListData) { - /* UBYTE i;*/ /* Warning Correction */ - - T_MFW_PPLMN_MODE mode; + /* UBYTE i;*/ /* Warning Correction */ + + T_MFW_PPLMN_MODE mode; T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_network_OPT * data = (T_network_OPT *)win_data->user; T_DISPLAY_DATA display_info; - TRACE_EVENT ("network_mobile_list_cb()"); - + TRACE_EVENT ("network_mobile_list_cb()"); switch (ListData->Reason) { - case LISTS_REASON_SELECT: /* */ - - mode = REPLACE_PREF_PLMN; /* Overwrite an existing entry at a given index */ - /*SPR 2635, use new function to replace preferred PLMN using the longname*/ - nm_change_pref_plmn_longname(mode,(network_data.Listposition) +1 , 0, data->pplmn_longnames[ListData->ListPosition]); - - /* SPR#2354 - SH - Now display "Changed". On callback, redraw network list */ - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtChanged, TxtNull, COLOUR_STATUS_NETWORKS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_mobile_list_changed_cb, THREE_SECS, 0 ); - - info_dialog (win, &display_info); - - break; - case LISTS_REASON_BACK: /* back to previous menu */ - - TRACE_EVENT ("pressed Back-key"); - - //API - SPR 2025 - 22/05/03 - De Allocate memory to avoid memory leak and also Crash - if ( network_data.pplmn != NULL ) - FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); - - network_MNU_destroy(data->win); - - break; - default: - return; + case LISTS_REASON_SELECT: /* */ + + mode = REPLACE_PREF_PLMN; /* Overwrite an existing entry at a given index */ + /*SPR 2635, use new function to replace preferred PLMN using the longname*/ + nm_change_pref_plmn_longname(mode,(network_data.Listposition) +1 , 0, data->pplmn_longnames[ListData->ListPosition]); + + /* SPR#2354 - SH - Now display "Changed". On callback, redraw network list */ + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtChanged, TxtNull, COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_mobile_list_changed_cb, THREE_SECS, 0 ); + + info_dialog (win, &display_info); + + break; + case LISTS_REASON_BACK: /* back to previous menu */ + + TRACE_EVENT ("pressed Back-key"); + + //API - SPR 2025 - 22/05/03 - De Allocate memory to avoid memory leak and also Crash + if ( network_data.pplmn != NULL ) + FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); + + network_MNU_destroy(data->win); + + break; + default: + return; } - - } /******************************************************************************* - $Function: network_mobile_list_changed_cb - - $Description: Callback from "Changed" message. Destroys the list and recreates the - updated network list. + $Function: network_mobile_list_changed_cb + + $Description: Callback from "Changed" message. Destroys the list and recreates the + updated network list. $Returns: @@ -2855,7 +2824,7 @@ T_network_OPT * data = (T_network_OPT *)win_data->user; /* T_DISPLAY_DATA display_info; */ /* Warning Correction */ - /* destroy the Menu */ + /* destroy the Menu */ network_MNU_destroy(data->win); /* request the pref. PLMN list */ @@ -2867,9 +2836,9 @@ /******************************************************************************* - $Function: network_start_animation - - $Description: Starts the network animation. + $Function: network_start_animation + + $Description: Starts the network animation. $Returns: @@ -2882,19 +2851,19 @@ TRACE_FUNCTION ("network_start_animation()"); - if (network_data.network_search_win != NULL) - { - network_stop_animation(); - } + if (network_data.network_search_win != NULL) + { + network_stop_animation(); + } /* REF: OMAPS00061046 possible to cancel the searching with right soft key although * the option is not available. */ #ifdef NEPTUNE_BOARD - dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtCancel, "Searching for", "Networks", COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtCancel, "Searching for", "Networks", COLOUR_STATUS_NETWORKS); #else dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtNull, "Searching for", "Networks", COLOUR_STATUS_NETWORKS); #endif - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, FOREVER, KEY_CLEAR | KEY_RIGHT); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, FOREVER, KEY_CLEAR | KEY_RIGHT); /* * Call Info Screen */ @@ -2905,9 +2874,9 @@ /******************************************************************************* - $Function: network_start_animation_plmn_selection - - $Description: Starts the plmn selection animation. + $Function: network_start_animation_plmn_selection + + $Description: Starts the plmn selection animation. $Returns: @@ -2921,8 +2890,8 @@ TRACE_FUNCTION ("network_start_animation()"); - dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtNull, "Requesting....", NULL, COLOUR_STATUS_NETWORKS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, FOREVER, KEY_CLEAR| KEY_RIGHT ); + dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtNull, "Requesting....", NULL, COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, FOREVER, KEY_CLEAR| KEY_RIGHT ); /* * Call Info Screen @@ -2934,9 +2903,9 @@ /******************************************************************************* - $Function: network_forbidden_plmn - - $Description: Starts the forbidden plmn data screen. + $Function: network_forbidden_plmn + + $Description: Starts the forbidden plmn data screen. $Returns: @@ -2949,13 +2918,13 @@ TRACE_FUNCTION ("network_forbidden_plmn()"); - if (network_data.network_search_win != NULL) - { - network_stop_animation(); - } - - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtNetwork, TxtForbidden, COLOUR_STATUS_NETWORKS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, 3500, KEY_CLEAR| KEY_RIGHT ); + if (network_data.network_search_win != NULL) + { + network_stop_animation(); + } + + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtNetwork, TxtForbidden, COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, 3500, KEY_CLEAR| KEY_RIGHT ); /* * Call Info Screen */ @@ -2966,9 +2935,9 @@ /******************************************************************************* - $Function: network_selected - - $Description: displays info screen on network selected + $Function: network_selected + + $Description: displays info screen on network selected $Returns: @@ -2981,10 +2950,10 @@ TRACE_FUNCTION ("network_start_animation()"); - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtNetwork, TxtSelected, COLOUR_STATUS_NETWORKS); - // Jul 21, 2004 REF: CRR 13348 xvilliva - // We use a new callback to return to idle screen after the alert is flashed. - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_select_animation_cb, 3500, KEY_CLEAR| KEY_RIGHT ); + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtNetwork, TxtSelected, COLOUR_STATUS_NETWORKS); + // Jul 21, 2004 REF: CRR 13348 xvilliva + // We use a new callback to return to idle screen after the alert is flashed. + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_select_animation_cb, 3500, KEY_CLEAR| KEY_RIGHT ); /* * Call Info Screen @@ -2995,9 +2964,9 @@ /******************************************************************************* - $Function: network_no_plmns - - $Description: Indicate Info Screen that the network list is empty. + $Function: network_no_plmns + + $Description: Indicate Info Screen that the network list is empty. $Returns: @@ -3010,19 +2979,19 @@ TRACE_FUNCTION ("network_no_plmns()"); - dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtNull, "No networks", "available", COLOUR_STATUS_NETWORKS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, THREE_SECS, KEY_CLEAR| KEY_RIGHT ); + dlg_initDisplayData_TextStr( &display_info, TxtNull, TxtNull, "No networks", "available", COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_animation_cb, THREE_SECS, KEY_CLEAR| KEY_RIGHT ); /* * Call Info Screen */ info_dialog (0, &display_info); - } + /******************************************************************************* - $Function: network_stop_animation - - $Description: Stops the network animation. + $Function: network_stop_animation + + $Description: Stops the network animation. $Returns: @@ -3035,15 +3004,16 @@ if (network_data.network_search_win) { - SEND_EVENT(network_data.network_search_win,DIALOG_DESTROY,0,0); + SEND_EVENT(network_data.network_search_win,DIALOG_DESTROY,0,0); network_data.network_search_win = 0; } } + /******************************************************************************* - $Function: network_animation_cb - - $Description: Callback for information dialog (not used)n + $Function: network_animation_cb + + $Description: Callback for information dialog (not used)n $Returns: @@ -3060,9 +3030,9 @@ /******************************************************************************* - $Function: network_select_animation_cb - - $Description: Callback for information dialog "Network Selected". + $Function: network_select_animation_cb + + $Description: Callback for information dialog "Network Selected". $Returns: @@ -3071,24 +3041,24 @@ *******************************************************************************/ void network_select_animation_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) { - TRACE_FUNCTION ("network_select_animation_cb()"); - - network_data.network_search_win = 0; - network_data.aborted = TRUE; - // Jul 21, 2004 REF: CRR 13348 xvilliva - // If "gPhbkMenu" is not NULL, we destroy phonebook menu - // to return to idle screen. - if(gPhbkMenu != NULL) - { - bookPhonebookDestroy( gPhbkMenu ); - } + TRACE_FUNCTION ("network_select_animation_cb()"); + + network_data.network_search_win = 0; + network_data.aborted = TRUE; + // Jul 21, 2004 REF: CRR 13348 xvilliva + // If "gPhbkMenu" is not NULL, we destroy phonebook menu + // to return to idle screen. + if(gPhbkMenu != NULL) + { + bookPhonebookDestroy( gPhbkMenu ); + } } /******************************************************************************* - $Function: network_MNU_start - - $Description: called when the user press the Edit Softkey to enter the + $Function: network_MNU_start + + $Description: called when the user press the Edit Softkey to enter the Option Menu "Select from the list" & "Enter the Network Code" & "Delete" $Returns: @@ -3105,21 +3075,21 @@ win = network_MNU_create (parent_window); if (win NEQ NULL) - { - SEND_EVENT (win, E_INIT, NULL, (void *)menuAttr); - } + { + SEND_EVENT (win, E_INIT, NULL, (void *)menuAttr); + } return win; } /******************************************************************************* - $Function: network_MNU_create - - $Description: Create the Option window - - $Returns: mfw window handle - - $Arguments: parent_window -parent window handle + $Function: network_MNU_create + + $Description: Create the Option window + + $Returns: mfw window handle + + $Arguments: parent_window -parent window handle *******************************************************************************/ @@ -3135,11 +3105,11 @@ */ data->win = - win_create (parent_window, 0, E_WIN_VISIBLE, (T_MFW_CB)network_MNU_win_cb); + win_create (parent_window, 0, E_WIN_VISIBLE, (T_MFW_CB)network_MNU_win_cb); if (data->win EQ NULL) - { - return NULL; - } + { + return NULL; + } /* * connect the dialog data to the MFW-window @@ -3160,13 +3130,13 @@ /******************************************************************************* - $Function: network_MNU_destroy - - $Description: Destroy the Option window - - $Returns: mfw window handle - - $Arguments: own_window - current window + $Function: network_MNU_destroy + + $Description: Destroy the Option window + + $Returns: mfw window handle + + $Arguments: own_window - current window *******************************************************************************/ @@ -3179,65 +3149,65 @@ TRACE_FUNCTION ("network_MNU_destroy()"); if (own_window) - { - win_data = ((T_MFW_HDR *)own_window)->data; - data = (T_network_OPT *)win_data->user; - - if (data) - { - kbd_delete(data->kbd); - kbd_delete(data->kbd_long); - mnuDelete (data->menu); - /* - * Delete WIN handler - */ - win_delete (data->win); - TRACE_EVENT("END of WIN DELETE"); - - if(data->network_list != NULL) - { - TRACE_EVENT("START FREE MEMORY"); - - /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ + { + win_data = ((T_MFW_HDR *)own_window)->data; + data = (T_network_OPT *)win_data->user; + + if (data) + { + kbd_delete(data->kbd); + kbd_delete(data->kbd_long); + mnuDelete (data->menu); + /* + * Delete WIN handler + */ + win_delete (data->win); + TRACE_EVENT("END of WIN DELETE"); + + if(data->network_list != NULL) + { + TRACE_EVENT("START FREE MEMORY"); + + /* Free the allocated memory for PLMN list window - OMAPS00061049 - 08-03-2006 */ #ifndef NEPTUNE_BOARD - FREE_MEMORY ((UBYTE *)data->network_list->List, MAX_SHOW_OF_PLMN* sizeof (T_MFW_MNU_ITEM)); + FREE_MEMORY ((UBYTE *)data->network_list->List, MAX_SHOW_OF_PLMN* sizeof (T_MFW_MNU_ITEM)); #else - FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); + FREE_MEMORY ((UBYTE *)data->network_list->List, Plmn_list_count * sizeof (T_MFW_MNU_ITEM)); #endif - FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); - - /*SPR 2635, free list of pointers to longname atrings*/ - FREE_MEMORY ((UBYTE *)data->pplmn_longnames,MAX_SHOW_OF_PLMN* sizeof (char*)); - - TRACE_EVENT("END of FREE MEMORY"); - } - - /* - * Free Memory - */ - - FREE_MEMORY ((void *)data, sizeof (T_network_OPT)); - } - else - { - TRACE_EVENT ("network_MNU_destroy() called twice"); - } - } + FREE_MEMORY ((UBYTE *)data->network_list, sizeof (ListMenuData)); + + /*SPR 2635, free list of pointers to longname atrings*/ + FREE_MEMORY ((UBYTE *)data->pplmn_longnames,MAX_SHOW_OF_PLMN* sizeof (char*)); + + TRACE_EVENT("END of FREE MEMORY"); + } + + /* + * Free Memory + */ + + FREE_MEMORY ((void *)data, sizeof (T_network_OPT)); + } + else + { + TRACE_EVENT ("network_MNU_destroy() called twice"); + } + } } /******************************************************************************* - $Function: network_MNU_exec_cb - - $Description: Exec callback function for the Option window - - $Returns: none - - $Arguments: win - current window - event - event id - value - unique id - parameter - optional data. + $Function: network_MNU_exec_cb + + $Description: Exec callback function for the Option window + + $Returns: none + + $Arguments: win - current window + event - event id + value - unique id + parameter - optional data. *******************************************************************************/ @@ -3248,39 +3218,39 @@ /* T_MFW_HND * l_parent; */ /* Warning Correction */ /* SHORT l_id; */ /* Warning Correction */ /* T_MFW_HDR * parent = data->parent; */ /* Warning Correction */ - /* T_MFW_EVENT MfwEvents; */ /* Warning Correction */ + /* T_MFW_EVENT MfwEvents; */ /* Warning Correction */ TRACE_FUNCTION ("network_MNU_exec_cb()"); switch (event) - { - case E_INIT: - data->kbd = kbdCreate(data->win,KEY_ALL, (MfwCb)network_MNU_kbd_cb); - data->kbd_long = kbdCreate(data->win,KEY_ALL|KEY_LONG,(MfwCb)network_MNU_kbd_cb); - data->menu = mnuCreate(data->win,&network_OPTAttrib, E_MNU_ESCAPE, (MfwCb)network_MNU_mnu_cb); - mnuLang(data->menu,mainMmiLng); - - /* put the (new) dialog window on top of the window stack */ - mnuUnhide(data->menu); - winShow(win); - - break; - default: - return; - } + { + case E_INIT: + data->kbd = kbdCreate(data->win,KEY_ALL, (MfwCb)network_MNU_kbd_cb); + data->kbd_long = kbdCreate(data->win,KEY_ALL|KEY_LONG,(MfwCb)network_MNU_kbd_cb); + data->menu = mnuCreate(data->win,&network_OPTAttrib, E_MNU_ESCAPE, (MfwCb)network_MNU_mnu_cb); + mnuLang(data->menu,mainMmiLng); + + /* put the (new) dialog window on top of the window stack */ + mnuUnhide(data->menu); + winShow(win); + + break; + default: + return; + } } /******************************************************************************* - $Function: network_MNU_mnu_cb - - $Description: Menu callback function for the Option window - - $Returns: none - - $Arguments: e - event id - m - menu handle + $Function: network_MNU_mnu_cb + + $Description: Menu callback function for the Option window + + $Returns: none + + $Arguments: e - event id + m - menu handle *******************************************************************************/ static int network_MNU_mnu_cb (MfwEvt e, MfwMnu *m) @@ -3295,30 +3265,29 @@ switch (e) { - case E_MNU_ESCAPE: /* back to previous menu "pref. network list"*/ - network_MNU_destroy(data->win); - - // request MFW to fill up the pref. PLMN list - nm_pref_plmn_list(network_data.pplmn, network_data.pplmn_mem.maxRcd, 1); - - - break; - default: /* in mnuCreate() only E_MNU_ESCAPE has been enabled! */ - return MFW_EVENT_REJECTED; + case E_MNU_ESCAPE: /* back to previous menu "pref. network list"*/ + network_MNU_destroy(data->win); + + // request MFW to fill up the pref. PLMN list + nm_pref_plmn_list(network_data.pplmn, network_data.pplmn_mem.maxRcd, 1); + + break; + default: /* in mnuCreate() only E_MNU_ESCAPE has been enabled! */ + return MFW_EVENT_REJECTED; } return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: network_MNU_win_cb - - $Description: Window callback function for the Option window - - $Returns: execution status - - $Arguments: e - event id - w - window handle + $Function: network_MNU_win_cb + + $Description: Window callback function for the Option window + + $Returns: execution status + + $Arguments: e - event id + w - window handle *******************************************************************************/ static int network_MNU_win_cb (MfwEvt e, MfwWin *w) @@ -3326,28 +3295,28 @@ TRACE_FUNCTION ("network_MNU_win_cb()"); switch (e) - { - case MfwWinVisible: /* window is visible */ - displaySoftKeys(TxtSoftSelect,TxtSoftBack); - break; - case MfwWinFocussed: /* input focus / selected */ - case MfwWinDelete: /* window will be deleted */ - default: - return MFW_EVENT_REJECTED; - } + { + case MfwWinVisible: /* window is visible */ + displaySoftKeys(TxtSoftSelect,TxtSoftBack); + break; + case MfwWinFocussed: /* input focus / selected */ + case MfwWinDelete: /* window will be deleted */ + default: + return MFW_EVENT_REJECTED; + } return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: network_MNU_kbd_cb - - $Description: Exec callback function for the Option window - - $Returns: execution status - - $Arguments: e - event id - k - keyboard info + $Function: network_MNU_kbd_cb + + $Description: Exec callback function for the Option window + + $Returns: execution status + + $Arguments: e - event id + k - keyboard info *******************************************************************************/ static int network_MNU_kbd_cb (MfwEvt e, MfwKbd *k) @@ -3359,47 +3328,47 @@ TRACE_FUNCTION ("network_MNU_kbd_cb()"); if (e & KEY_LONG) - { - switch (k->code) - { - case KCD_HUP: /* back to previous menu */ - mnuEscape(data->menu); - break; - case KCD_RIGHT: /* Power Down */ - return MFW_EVENT_REJECTED; /* handled by idle */ - default: /* no response to all other keys */ - return MFW_EVENT_CONSUMED; - } - } + { + switch (k->code) + { + case KCD_HUP: /* back to previous menu */ + mnuEscape(data->menu); + break; + case KCD_RIGHT: /* Power Down */ + return MFW_EVENT_REJECTED; /* handled by idle */ + default: /* no response to all other keys */ + return MFW_EVENT_CONSUMED; + } + } else - { - switch (k->code) - { - case KCD_MNUUP: /* highlight previous entry */ - mnuUp(data->menu); - break; - case KCD_MNUDOWN: /* highlight next entry */ - mnuDown(data->menu); - break; - case KCD_LEFT: /* activate this entry */ - mnuSelect(data->menu); - break; - case KCD_HUP: /* back to previous menu */ - case KCD_RIGHT: /* back to previous menu */ - mnuEscape(data->menu); - break; - default: /* no response to all other keys */ - return MFW_EVENT_CONSUMED; - } - } + { + switch (k->code) + { + case KCD_MNUUP: /* highlight previous entry */ + mnuUp(data->menu); + break; + case KCD_MNUDOWN: /* highlight next entry */ + mnuDown(data->menu); + break; + case KCD_LEFT: /* activate this entry */ + mnuSelect(data->menu); + break; + case KCD_HUP: /* back to previous menu */ + case KCD_RIGHT: /* back to previous menu */ + mnuEscape(data->menu); + break; + default: /* no response to all other keys */ + return MFW_EVENT_CONSUMED; + } + } return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: network_request_plnm_list - - $Description: Request existing network list in Mobile + $Function: network_request_plnm_list + + $Description: Request existing network list in Mobile $Returns: @@ -3412,15 +3381,15 @@ T_MFW_HND win = mfwParent(mfw_header()); /* T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; */ /* Warning Correction */ /* T_network_OPT * data = (T_network_OPT *)win_data->user; */ /* Warning Correction */ - T_DISPLAY_DATA display_info; - - TRACE_FUNCTION("network_request_plnm_list"); - - /* SPR#2354 - SH - Display "Choose Replacement" dialogue, - * so the function of the second list is more evident */ - - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtChooseReplacement1, TxtChooseReplacement2, COLOUR_STATUS_NETWORKS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_request_plmn_list_cb, TWO_SECS, 0 ); + T_DISPLAY_DATA display_info; + + TRACE_FUNCTION("network_request_plnm_list"); + + /* SPR#2354 - SH - Display "Choose Replacement" dialogue, + * so the function of the second list is more evident */ + + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtChooseReplacement1, TxtChooseReplacement2, COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)network_request_plmn_list_cb, TWO_SECS, 0 ); info_dialog (win, &display_info); @@ -3429,13 +3398,13 @@ /******************************************************************************* - $Function: network_request_plnm_list_cb - - $Description: User has been advised to "choose replacement", now display the list! - - $Returns: None - - $Arguments: Usual info dialogue callback arguments. + $Function: network_request_plnm_list_cb + + $Description: User has been advised to "choose replacement", now display the list! + + $Returns: None + + $Arguments: Usual info dialogue callback arguments. *******************************************************************************/ @@ -3443,24 +3412,24 @@ { T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_network_OPT * data = (T_network_OPT *)win_data->user; - /*SPR 2635, just alloc pointers to strings */ - data->pplmn_longnames = (char**)ALLOC_MEMORY ((MAX_SHOW_OF_PLMN) * sizeof (char*)); - - if (data->pplmn_longnames NEQ 0) - { - //now fill up the "data->pplmn_longnames" with the PLMN list from ACI - nm_plnm_list_longnames(data->pplmn_longnames, 1, MAX_SHOW_OF_PLMN); - - } - /*SPR 2635 end*/ - else - { - TRACE_EVENT("create the list failed"); - return; - } - - //show the list on the screen now - data->network_list = network_create_mobile_list (data); + /*SPR 2635, just alloc pointers to strings */ + data->pplmn_longnames = (char**)ALLOC_MEMORY ((MAX_SHOW_OF_PLMN) * sizeof (char*)); + + if (data->pplmn_longnames NEQ 0) + { + //now fill up the "data->pplmn_longnames" with the PLMN list from ACI + nm_plnm_list_longnames(data->pplmn_longnames, 1, MAX_SHOW_OF_PLMN); + + } + /*SPR 2635 end*/ + else + { + TRACE_EVENT("create the list failed"); + return; + } + + //show the list on the screen now + data->network_list = network_create_mobile_list (data); listDisplayListMenu (data->win, data->network_list,(ListCbFunc)network_mobile_list_cb,0); return; @@ -3469,7 +3438,7 @@ /******************************************************************************* - $Function: network_delete + $Function: network_delete $Description: @@ -3482,47 +3451,44 @@ static int network_delete(MfwMnu* m, MfwMnuItem* i) { - T_MFW_HND win = mfwParent(mfw_header()); - TRACE_FUNCTION ("network_delete()"); + TRACE_FUNCTION ("network_delete()"); #ifdef NO_ASCIIZ - if (network_data.pplmn[network_data.Listposition].network_short.len NEQ 0 ) + if (network_data.pplmn[network_data.Listposition].network_short.len NEQ 0 ) #else - if (strlen((char *)network_data.pplmn[network_data.Listposition].network_short) NEQ 0 ) + if (strlen((char *)network_data.pplmn[network_data.Listposition].network_short) NEQ 0 ) #endif - { - // if the user selected a pref. PLMN - // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 - //Made network_info_screen as a generic function as it can be reused to display different messgaes to the user - //Hence need to pass the callback funtion as a parameter - network_info_screen (win, TxtDeleted,(T_VOID_FUNC)network_delete_pref_plnm); - } - else - { - // if the user selected a empty item - // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 - //Made network_info_screen as a generic function as it can be reused to display different messgaes to the user - //Hence need to pass the callback funtion as a parameter - network_info_screen (win, TxtEmptyList,(T_VOID_FUNC)network_delete_pref_plnm); - } - - // destroy the Menu - network_MNU_destroy(win); - - /* Warning Correction - BEGIN */ - return 1; - /* END */ - - + { + // if the user selected a pref. PLMN + // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 + //Made network_info_screen as a generic function as it can be reused to display different messgaes to the user + //Hence need to pass the callback funtion as a parameter + network_info_screen (win, TxtDeleted,(T_VOID_FUNC)network_delete_pref_plnm); + } + else + { + // if the user selected a empty item + // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 + //Made network_info_screen as a generic function as it can be reused to display different messgaes to the user + //Hence need to pass the callback funtion as a parameter + network_info_screen (win, TxtEmptyList,(T_VOID_FUNC)network_delete_pref_plnm); + } + + // destroy the Menu + network_MNU_destroy(win); + + /* Warning Correction - BEGIN */ + return 1; + /* END */ } /******************************************************************************* - $Function: network_delete_pref_plnm - - $Description: Delete the selected pref. PLMN l + $Function: network_delete_pref_plnm + + $Description: Delete the selected pref. PLMN l $Returns: @@ -3533,45 +3499,45 @@ void network_delete_pref_plnm (T_MFW_HND win , USHORT identifier, UBYTE reason) { - T_MFW_PPLMN_MODE mode; - UBYTE i; + T_MFW_PPLMN_MODE mode; + UBYTE i; /* T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; */ /* Warning Correction */ /* T_network_OPT * data = (T_network_OPT *)win_data->user; */ /* Warning Correction */ - TRACE_FUNCTION ("network_delete_pref_plnm()"); - - - mode = DELETE_PREF_PLMN; /* Delete an entry from the list */ - - //update now the pref. PLMN list - //(network_data.Listposition) "+1" because the zero is counted as well - nm_change_pref_plmn(mode, (network_data.Listposition) +1 , 0, 0); - - // clear all the PLMN and fill up with updated list - for (i=0; i < network_data.pplmn_mem.maxRcd; i++) - { + TRACE_FUNCTION ("network_delete_pref_plnm()"); + + + mode = DELETE_PREF_PLMN; /* Delete an entry from the list */ + + //update now the pref. PLMN list + //(network_data.Listposition) "+1" because the zero is counted as well + nm_change_pref_plmn(mode, (network_data.Listposition) +1 , 0, 0); + + // clear all the PLMN and fill up with updated list + for (i=0; i < network_data.pplmn_mem.maxRcd; i++) + { #ifdef NO_ASCIIZ - network_data.pplmn[i].network_long.len = 0; - network_data.pplmn[i].network_short.len = 0; + network_data.pplmn[i].network_long.len = 0; + network_data.pplmn[i].network_short.len = 0; #else - memset(network_data.pplmn[i].network_long, '\0', LONG_NAME); - memset(network_data.pplmn[i].network_short, '\0', SHORT_NAME); + memset(network_data.pplmn[i].network_long, '\0', LONG_NAME); + memset(network_data.pplmn[i].network_short, '\0', SHORT_NAME); #endif - memset(network_data.pplmn[i].network_numeric, '\0', NUMERIC_LENGTH); - } + memset(network_data.pplmn[i].network_numeric, '\0', NUMERIC_LENGTH); + } // request the updated pref. PLMN list - nm_pref_plmn_list(network_data.pplmn, network_data.pplmn_mem.maxRcd, 1); + nm_pref_plmn_list(network_data.pplmn, network_data.pplmn_mem.maxRcd, 1); } /******************************************************************************* - $Function: network_info_screen - - $Description: confirm the deleted PLMN + $Function: network_info_screen + + $Description: confirm the deleted PLMN $Returns: @@ -3587,8 +3553,8 @@ TRACE_FUNCTION ("network_info_screen()"); - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, MessageId, TxtNull, COLOUR_STATUS_NETWORKS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)funt_ptr, THREE_SECS, 0 ); + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, MessageId, TxtNull, COLOUR_STATUS_NETWORKS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)funt_ptr, THREE_SECS, 0 ); info_dialog (win, &display_info); } @@ -3596,7 +3562,7 @@ /******************************************************************************* - $Function: network_OPT_EDT_start + $Function: network_OPT_EDT_start $Description: @@ -3607,23 +3573,23 @@ *******************************************************************************/ T_MFW_HND network_EDT_start (MfwMnu* m, MfwMnuItem* i) { - T_MFW_HND win; - T_MFW_HND parent_window = mfwParent(mfw_header()); + T_MFW_HND win; + T_MFW_HND parent_window = mfwParent(mfw_header()); TRACE_FUNCTION ("network_OPT_EDT_start()"); win = network_EDT_create (parent_window); if (win NEQ NULL) - { - SEND_EVENT (win, E_INIT, 0, 0); - } + { + SEND_EVENT (win, E_INIT, 0, 0); + } return win; } /******************************************************************************* - $Function: network_OPT_EDT_create + $Function: network_OPT_EDT_create $Description: @@ -3646,9 +3612,9 @@ data->win = win_create (parent_window, 0, 0, NULL); if (data->win EQ NULL) - { - return NULL; - } + { + return NULL; + } /* * connect the dialog data to the MFW-window @@ -3671,7 +3637,7 @@ /******************************************************************************* - $Function: network_EDT_destroy + $Function: network_EDT_destroy $Description: @@ -3689,33 +3655,33 @@ TRACE_FUNCTION ("networkT_EDT_destroy()"); if (own_window) - { - win_data = ((T_MFW_HDR *)own_window)->data; - data = (T_network_OPT *)win_data->user; - - if (data) - { - /* - * Delete WIN handler - */ - win_delete (data->win); - - /* - * Free Memory - */ - FREE_MEMORY ((void *)data, sizeof (T_network_OPT)); - } - else - { - TRACE_EVENT ("network_EDT_destroy() called twice"); - } - } + { + win_data = ((T_MFW_HDR *)own_window)->data; + data = (T_network_OPT *)win_data->user; + + if (data) + { + /* + * Delete WIN handler + */ + win_delete (data->win); + + /* + * Free Memory + */ + FREE_MEMORY ((void *)data, sizeof (T_network_OPT)); + } + else + { + TRACE_EVENT ("network_EDT_destroy() called twice"); + } + } } /******************************************************************************* - $Function: network_EDT_exec_cb + $Function: network_EDT_exec_cb $Description: @@ -3735,64 +3701,63 @@ TRACE_FUNCTION ("network_EDT_exec_cb()"); switch (event) - { - case E_INIT: - /* SPR#1428 - SH - New Editor changes */ + { + case E_INIT: + /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR - AUI_edit_SetDefault(&data->editor_info); - AUI_edit_SetDisplay(&data->editor_info, ZONE_FULL_SK_TITLE, COLOUR_EDITOR_XX, EDITOR_FONT); - AUI_edit_SetEvents(&data->editor_info, value, TRUE, FOREVER, (T_AUI_EDIT_CB)network_EDT_editor_cb); - AUI_edit_SetTextStr(&data->editor_info, TxtSoftOK, TxtDelete, TxtMCCMNC, NULL); - AUI_edit_SetMode(&data->editor_info, 0, ED_CURSOR_UNDERLINE); - AUI_edit_SetAltTextStr(&data->editor_info, 5, TxtNull, TRUE, TxtSoftBack); - AUI_edit_SetBuffer(&data->editor_info, ATB_DCS_ASCII, (UBYTE *)data->buffer, 6); - - AUI_edit_Start(data->win, &data->editor_info); + AUI_edit_SetDefault(&data->editor_info); + AUI_edit_SetDisplay(&data->editor_info, ZONE_FULL_SK_TITLE, COLOUR_EDITOR_XX, EDITOR_FONT); + AUI_edit_SetEvents(&data->editor_info, value, TRUE, FOREVER, (T_AUI_EDIT_CB)network_EDT_editor_cb); + AUI_edit_SetTextStr(&data->editor_info, TxtSoftOK, TxtDelete, TxtMCCMNC, NULL); + AUI_edit_SetMode(&data->editor_info, 0, ED_CURSOR_UNDERLINE); + AUI_edit_SetAltTextStr(&data->editor_info, 5, TxtNull, TRUE, TxtSoftBack); + AUI_edit_SetBuffer(&data->editor_info, ATB_DCS_ASCII, (UBYTE *)data->buffer, 6); + + AUI_edit_Start(data->win, &data->editor_info); #else /* NEW_EDITOR */ - data->editor_info.editor_attr.win.px = 6; - data->editor_info.editor_attr.win.py = /*12*/Mmi_layout_line(2); - data->editor_info.editor_attr.win.sx = /*80*/SCREEN_SIZE_X; - data->editor_info.editor_attr.win.sy = /*20 */Mmi_layout_line_height()*2; - data->editor_info.editor_attr.edtCol = COLOUR_EDITOR_XX; - data->editor_info.editor_attr.font = 0; - data->editor_info.editor_attr.mode = edtCurBar1; - data->editor_info.editor_attr.controls = 0; - data->editor_info.editor_attr.text = data->buffer; /* buffer to be edited */ + data->editor_info.editor_attr.win.px = 6; + data->editor_info.editor_attr.win.py = /*12*/Mmi_layout_line(2); + data->editor_info.editor_attr.win.sx = /*80*/SCREEN_SIZE_X; + data->editor_info.editor_attr.win.sy = /*20 */Mmi_layout_line_height()*2; + data->editor_info.editor_attr.edtCol = COLOUR_EDITOR_XX; + data->editor_info.editor_attr.font = 0; + data->editor_info.editor_attr.mode = edtCurBar1; + data->editor_info.editor_attr.controls = 0; + data->editor_info.editor_attr.text = data->buffer; /* buffer to be edited */ data->editor_info.editor_attr.size = 6; - data->editor_info.LeftSoftKey = TxtSoftOK; - data->editor_info.RightSoftKey = TxtDelete; - data->editor_info.TextId = TxtMCCMNC; - data->editor_info.Identifier = value; /* optional */ - data->editor_info.mode = DIGITS_MODE; - data->editor_info.Callback = (T_EDIT_CB)network_EDT_editor_cb; - data->editor_info.destroyEditor = TRUE; - data->editor_info.hide = FALSE; - data->editor_info.AlternateLeftSoftKey = TxtNull; - data->editor_info.TextString = NULL; - data->editor_info.min_enter = 5; - data->editor_info.timeout = FOREVER; - - /* create the dialog handler */ - editor_start(data->win, &data->editor_info); /* start the editor */ + data->editor_info.LeftSoftKey = TxtSoftOK; + data->editor_info.RightSoftKey = TxtDelete; + data->editor_info.TextId = TxtMCCMNC; + data->editor_info.Identifier = value; /* optional */ + data->editor_info.mode = DIGITS_MODE; + data->editor_info.Callback = (T_EDIT_CB)network_EDT_editor_cb; + data->editor_info.destroyEditor = TRUE; + data->editor_info.hide = FALSE; + data->editor_info.AlternateLeftSoftKey = TxtNull; + data->editor_info.TextString = NULL; + data->editor_info.min_enter = 5; + data->editor_info.timeout = FOREVER; + + /* create the dialog handler */ + editor_start(data->win, &data->editor_info); /* start the editor */ #endif /* NEW_EDITOR */ - - break; - case E_ABORT: - case E_EXIT: /* defaultreaction */ - network_EDT_destroy(data->win); - break; - default: - return; - } + break; + case E_ABORT: + case E_EXIT: /* defaultreaction */ + network_EDT_destroy(data->win); + break; + default: + return; + } } /******************************************************************************* - $Function: network_change_pref_plmn - - $Description: Populates the preffered plmn List. + $Function: network_change_pref_plmn + + $Description: Populates the preffered plmn List. $Returns: @@ -3801,13 +3766,11 @@ *******************************************************************************/ void network_change_pref_plmn (T_MFW_HND win , USHORT identifier, UBYTE reason) { - - nm_pref_plmn_list(network_data.pplmn, network_data.pplmn_mem.maxRcd, 1); - + nm_pref_plmn_list(network_data.pplmn, network_data.pplmn_mem.maxRcd, 1); } /******************************************************************************* - $Function: network_EDT_editor_cb + $Function: network_EDT_editor_cb $Description: @@ -3821,57 +3784,56 @@ T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_network_OPT * data = (T_network_OPT *)win_data->user; T_MFW_HND * l_parent; - T_MFW_PPLMN_MODE mode; + T_MFW_PPLMN_MODE mode; TRACE_FUNCTION ("network_EDT_editor_cb()"); - - l_parent = data->parent; + l_parent = data->parent; switch(event) - { - case INFO_KCD_LEFT: - - mode = REPLACE_PREF_PLMN; /* Overwrite an existing entry at a given index */ - - //update now the pref. PLMN list - //Overwrite an existing entry - //(network_data.Listposition) "+1" because the zero is counted as well - nm_change_pref_plmn(mode, (network_data.Listposition) +1 , 0, (UBYTE*) data->buffer); - - // destroy the Editor - network_EDT_destroy(data->win); - // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 - //Added this info screen so that sim is updated by nm_change_pref_plmn with the new code - //before populating the new list with nm_pref_plmn_list - network_info_screen (win, TxtPleaseWait,(T_VOID_FUNC)network_change_pref_plmn); - // destroy the MENU - network_MNU_destroy(l_parent); - break; - case INFO_KCD_RIGHT: - case INFO_KCD_HUP: - // destroy the Editor - network_EDT_destroy(data->win); - // destroy the MENU - network_MNU_destroy(l_parent); - - // Nov 02, 2005 REF: omaps00044855 Sumanth Kumar.C - // Solution: Free network_data.pplmn. - FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); - - break; - default: - break; - } + { + case INFO_KCD_LEFT: + + mode = REPLACE_PREF_PLMN; /* Overwrite an existing entry at a given index */ + + //update now the pref. PLMN list + //Overwrite an existing entry + //(network_data.Listposition) "+1" because the zero is counted as well + nm_change_pref_plmn(mode, (network_data.Listposition) +1 , 0, (UBYTE*) data->buffer); + + // destroy the Editor + network_EDT_destroy(data->win); + // xrashmic 10 Nov, 2004 MMI-SPR-OMAPS00044200-OMAPS00044851 + //Added this info screen so that sim is updated by nm_change_pref_plmn with the new code + //before populating the new list with nm_pref_plmn_list + network_info_screen (win, TxtPleaseWait,(T_VOID_FUNC)network_change_pref_plmn); + // destroy the MENU + network_MNU_destroy(l_parent); + break; + case INFO_KCD_RIGHT: + case INFO_KCD_HUP: + // destroy the Editor + network_EDT_destroy(data->win); + // destroy the MENU + network_MNU_destroy(l_parent); + + // Nov 02, 2005 REF: omaps00044855 Sumanth Kumar.C + // Solution: Free network_data.pplmn. + FREE_MEMORY ((UBYTE *)network_data.pplmn,(network_data.pplmn_mem.maxRcd) * sizeof (T_MFW_NETWORK_STRUCT)); + + break; + default: + break; + } return; } //x0pleela 30 May, 2007 DR: OMAPS00133201 /******************************************************************************* - $Function: nm_abort_network - - $Description: remove the searhing window dialog + $Function: nm_abort_network + + $Description: remove the searhing window dialog $Returns: @@ -3892,19 +3854,18 @@ //x0012849: Jagannatha 01 June, 2006 ER: OMAPS00079607 -To Support AcC and Info numbers /******************************************************************************* - $Function: getRoamingStatus + $Function: getRoamingStatus $Description: Returns the value of roaming_indicator. $Returns: TRUE or FALSE based on the roaming status. - $Arguments: None. + $Arguments: None. *******************************************************************************/ #ifdef FF_CPHS UBYTE getRoamingStatus() { - return network_data.roaming_indicator; } #endif @@ -3913,11 +3874,11 @@ // Descripton: Test for NITZ (Network Identity and Timezone) support - No New time was displayed /******************************************************************************* - $Function: nw_time_update_callback - - $Description: Call back function for network time update info dialog. - - $Returns: Result code + $Function: nw_time_update_callback + + $Description: Call back function for network time update info dialog. + + $Returns: Result code $Arguments: @@ -3967,9 +3928,9 @@ //Feb 28,,2007 DR:OMAPS00098351 x0066814 /******************************************************************************* - $Function: settingsNITZ - - $Description: Settings the time update to On, Off or Automatic + $Function: settingsNITZ + + $Description: Settings the time update to On, Off or Automatic $Returns: @@ -3987,21 +3948,21 @@ { case 0: TRACE_EVENT("Menu option 0: Automatic"); - FFS_flashData.nitz_option=NitzAutomatic; - txtId = TxtAutomatic; + FFS_flashData.nitz_option=NitzAutomatic; + txtId = TxtAutomatic; break; case 1: TRACE_EVENT("Menu option 1: NITZOn"); FFS_flashData.nitz_option=NitzOn; - txtId = TxtOn; + txtId = TxtOn; break; case 2: TRACE_EVENT("Menu option 2: NITZOff"); - FFS_flashData.nitz_option=NitzOff; - txtId = TxtOff; - break; + FFS_flashData.nitz_option=NitzOff; + txtId = TxtOff; + break; } flash_write();