FreeCalypso > hg > fc-tourmaline
changeset 167:897bdea4cb0b
mmiServices.c: formatting fixes and dead code elimination
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 17 Jan 2021 22:44:15 +0000 |
| parents | d715ee726526 |
| children | 464d69ef83e2 |
| files | src/ui/bmi/mmiServices.c |
| diffstat | 1 files changed, 747 insertions(+), 1318 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui/bmi/mmiServices.c Thu Nov 19 06:13:24 2020 +0000 +++ b/src/ui/bmi/mmiServices.c Sun Jan 17 22:44:15 2021 +0000 @@ -1,6 +1,6 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -11,12 +11,12 @@ $Project name: Basic MMI $Project code: BMI (6349) - $Module: Supplementary services - $File: MmiServices.c - $Revision: 1.0 - - $Author: Condat(UK) - $Date: 25/10/00 + $Module: Supplementary services + $File: MmiServices.c + $Revision: 1.0 + + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -31,18 +31,18 @@ May 03, 2007 DR: OMAPS00129383 x0pleela Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level Solution: Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE to activate - and de-activate both Tele and Bearere services + and de-activate both Tele and Bearere services Feb 27, 2007 ER: OMAPS00113891 x0pleela Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level Solution: Did the following changes: - - Externed call_data variable - - In function showssNotify(), - >> handling the case MFW_SS_MT_FORWARDED: where - incoming call dialog will be displayed with proper string for TTY/normal forwarded - incoming call. - >>New case MFW_SS_MT_CALL_FORWARDED is added to display a dialog "Incoming - call forwarde" to the subscriber who has forwarded his all incoming calls + - Externed call_data variable + - In function showssNotify(), + >> handling the case MFW_SS_MT_FORWARDED: where + incoming call dialog will be displayed with proper string for TTY/normal forwarded + incoming call. + >>New case MFW_SS_MT_CALL_FORWARDED is added to display a dialog "Incoming + call forwarde" to the subscriber who has forwarded his all incoming calls Nov 27, 2006 OMAPS00098359 a0393213(R.Prabakar) Description: CPHS 4.2 : Call Divert doesn't work properly for Line 2 @@ -55,17 +55,17 @@ Description: Result of ss_check_ss_string may be ignored Solution: Defined new enumeration T_SS_APLHA for DCS services(): Checking for dcs and if UCS2 character then display a dialog - saying font not supported. Else proceed with the transaction + saying font not supported. Else proceed with the transaction showUSSDError():This function displays a dialog saying USSD message received, - Font not supported for UCS2 characters - - - Aug 23, 2006 DR: OMAPS00090419 x0pleela - Descroption:FT Nice/France, Orange (wk32/06) - Call Barring - misleading message: - Solution:Commented the code (function getCBService()) which appends the ss string with *11 - or *89 as it is not a valid SS string for checking status, activation and deactivation of - call barring feature in functions servicesCallBarringCheck, servicesCallBarringDeactivate, - servicesCallBarringActivate + Font not supported for UCS2 characters + + + Aug 23, 2006 DR: OMAPS00090419 x0pleela + Descroption:FT Nice/France, Orange (wk32/06) - Call Barring - misleading message: + Solution:Commented the code (function getCBService()) which appends the ss string with *11 + or *89 as it is not a valid SS string for checking status, activation and deactivation of + call barring feature in functions servicesCallBarringCheck, servicesCallBarringDeactivate, + servicesCallBarringActivate May 30, 2006 REF:OMAPS00079650 a0393213 (R.Prabakar) Description : CPHS Call Forwarding feature implementation @@ -75,15 +75,15 @@ May 30, 2006 DR: OMAPS00070657 x0pleela Description: CPHS feature on Locosto-Lite Solution: For ALS feature, - a) Defined new enumeration "SERVICE_CB_SERVICE" for SS similar to Line 1 and Line 2 - b) Defined new function "getCBService()" to update psstring based on the current - line activated while processing SS + a) Defined new enumeration "SERVICE_CB_SERVICE" for SS similar to Line 1 and Line 2 + b) Defined new function "getCBService()" to update psstring based on the current + line activated while processing SS Apr 10, 2006 REF: OMAPS00052691 x0039928 Description: FT USA [Cingular(WK42)] - T 8.6 Call Waiting Accept - - ATD *43# returns "Unknown status" + ATD *43# returns "Unknown status" Solution: Proper Text is displyed when network returns status STAT_NONE( 0 ) for - call waiting activation. + call waiting activation. Dec 07, 2005 REF: OMAPS00050087 x0039928 Description: Deactivated is displayed while activate Hide Id option is selected @@ -96,7 +96,7 @@ Jun 16, 2005 REF: CRR 31543 x0021334 Issue: SATK: cannot get TR for send ussd command Solution: When the user presses "Hang up" key when the SAT USSD session is in progress, - a call is made to function 'sAT_end_ussd()' to end the USSD session. + a call is made to function 'sAT_end_ussd()' to end the USSD session. May 12, 2005 REF: CRR 30892 x0021334 Bug: MMI doesn't handle 2nd Interogation of "CW for basic services" using USSD *#43#. @@ -104,16 +104,16 @@ May 02, 2005 REF : LOCOSTO-ENH-30818 - xpradipg Description: IMEI retreival by posting a call to ACI sAT_xx API - Solution: The direct call to cl_get_imeisv() is replaced with the - call to the mmi_imei_store() which inturn calls sAT_Dn() and - retrieves the IMEI info and stores it onto the global - variable "imei" + Solution: The direct call to cl_get_imeisv() is replaced with the + call to the mmi_imei_store() which inturn calls sAT_Dn() and + retrieves the IMEI info and stores it onto the global + variable "imei" Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V Bug : Unable to compose a one or two digit number Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled. - The read only editor with the service provider message that comes up when a one or two digit is dialled - was not handled properly. So altered the editor handling to cater for the long message. + The read only editor with the service provider message that comes up when a one or two digit is dialled + was not handled properly. So altered the editor handling to cater for the long message. Oct 20, 2004 REF: CRR 25772 Deepa M.D Bug: Not displaying proper RSK name in call divert edit screens @@ -128,26 +128,25 @@ Jul 16, 2004 REF: CRR 18409 xvilliva Bug: CHW : message "Deactivated" when it should be "Activated". Fix: The alert displayed depends on the status code received. If we - receive the status as zero or 0xFF, we now show an alert saying - "unknown status" instead of "Deactivated". + receive the status as zero or 0xFF, we now show an alert saying + "unknown status" instead of "Deactivated". Jun 21,2004 CRR:13650 xpradipg - SASKEN Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken) - Solution: The CF state is maintained in flash. During bootup the CF icon in the idle screen - is displayed depending upon its state in the ffs + Solution: The CF state is maintained in flash. During bootup the CF icon in the idle screen + is displayed depending upon its state in the ffs Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken) - Solution: The condition for which Call Forward is activated/deactivated or its staus is checked, - is displayed in the message along with the activation/deactivation message + Solution: The condition for which Call Forward is activated/deactivated or its staus is checked, + is displayed in the message along with the activation/deactivation message Jun 21,2004 CRR:13650 xpradipg - SASKEN Description: CBA : no basic service sent when using the menu Fix: Basic service code 10(All teleservices) is sent for activation and deactivation thru menus - Jun 04,2004 CRR:13601 xpradipg - SASKEN Description: CFO interrogation display : Timer to long Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key @@ -161,7 +160,7 @@ Issue Number : SPR#12882 on 29/03/04 by VadiRaj - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End @@ -281,7 +280,6 @@ static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY * ss_notify); - static void showIMEI2 (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf); static void showUSSDREQ (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf); static void showUSSDCNF (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf); @@ -355,15 +353,15 @@ T_MFW_HND dialog_ext_info_dialog (T_MFW_HND parent_win, T_dialog_ext_info * display_info); -static MfwHnd lastFocus; /* store old focus */ -static MfwHnd win; /* our window */ +static MfwHnd lastFocus; /* store old focus */ +static MfwHnd win; /* our window */ /*x0039928- Lint warning removal */ /* static MfwHnd kbd; // our keyboard handler */ -static MfwHnd times; /* timeout */ +static MfwHnd times; /* timeout */ /* x0039928 - Lint warning removal static MmiState nextState; // next state when finished */ -static int servicesState; /* current state of module */ +static int servicesState; /* current state of module */ static T_MFW_SS_PARA *ss_cnf; /* union container for all SS confirmations */ @@ -376,9 +374,8 @@ static unsigned int serviceGetError( T_MFW_SS_ERROR ss_error); - #define SS_STAT_NONE 0 //xvilliva 18409, not registered, not active, - //not provisioned,not quiescent + //not provisioned,not quiescent //x0pleela 03 May, 2007 DR: OMAPS00129383 //defined new service code for both Teleservices and Bearer services @@ -413,7 +410,6 @@ } SERVICE_CB_TYPE; - typedef enum { CFVoice = 0, @@ -451,7 +447,7 @@ //Jun 02, 2004 CRR:13649 - xpradipg-SASKEN //added for holding the state for callbarring service //CQ-13649:start - CBCancelAll, + CBCancelAll, CBActionNone, //CQ-13649:end //CQ-16432 start @@ -460,7 +456,6 @@ } SERVICE_CB_ACTION; - /* NOTE that these are needed in new architecture */ static SERVICE_CF_TYPE CFType; /* Type of Call Forwarding */ static SERVICE_CF_SERVICE CFService; /* basic service for Call Forwarding */ @@ -481,11 +476,9 @@ static char CFNumber[MAX_LEN]; number to forward calls to */ - /* end of bits for USSD */ - #define CF_ACTIVE_STATUS 1 #define CF_INACTIVE_STATUS 2 /* Marcus: Issue 1652: 03/02/2003 */ @@ -536,28 +529,25 @@ static void srv_display_status (UBYTE ss_status); - typedef struct { - int text; + int text; #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ - T_ED_ATTR *editor_attr_input; + T_ED_ATTR *editor_attr_input; #else /* NEW_EDITOR */ MfwEdtAttr* edt_attr_input; #endif /* NEW_EDITOR */ int left_soft_key; int right_soft_key; - short abc; /* numeric or alpha? */ + short abc; /* numeric or alpha? */ #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ - T_AUI_EDIT_CB callback; + T_AUI_EDIT_CB callback; #else /* NEW_EDITOR */ void (* callback)(T_MFW_HND win,USHORT reason); #endif /* NEW_EDITOR */ } T_input_properties; - - typedef struct { T_MMI_CONTROL mmi_control; @@ -566,11 +556,11 @@ T_MFW_HND kbd; T_MFW_HND kbd_long; #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ - T_MFW_HND edit_win; + T_MFW_HND edit_win; #else /* NEW_EDITOR */ T_MFW_HND edt_input; #endif /* NEW_EDITOR */ - T_input_properties properties; + T_input_properties properties; } T_services_input; /* SPR#1428 - SH - New Editor changes - no longer required*/ @@ -579,7 +569,6 @@ #endif - static T_MFW_HND services_input_create (MfwHnd parent); static void services_input_destroy (MfwHnd window); static MfwHnd services_input_start(MfwHnd parent,T_input_properties *properties); @@ -593,7 +582,6 @@ #endif - /* editor */ //GW Moved editor definitions to MmiResources.h #define SAT_EDITOR_COLOR 0 @@ -626,15 +614,13 @@ *******************************************************************************/ - T_MFW_HND servicesInit (T_MFW_HND parent) { - - TRACE_FUNCTION("servicesInit function"); - - /* - * Initialise MFW - */ + TRACE_FUNCTION("servicesInit function"); + + /* + * Initialise MFW + */ ss_mfw_init(); /* * Create any other handler @@ -647,8 +633,6 @@ ss_data.win = 0; return (services_create (0)); - - } @@ -665,7 +649,6 @@ *******************************************************************************/ - void servicesExit (void) { TRACE_FUNCTION("servicesExit"); @@ -715,31 +698,31 @@ data->info_wait = 0; data->cb_menu_win = 0; - /* SPR#1428 - SH - New Editor changes - this editor never used */ + /* SPR#1428 - SH - New Editor changes - this editor never used */ #if 0 data->ussd_num_win = 0; data->ussd_name_win = 0; #endif data->input_number_win = 0; - memset(data->edt_buf_name,'\0',sizeof(data->edt_buf_name)); - memset(data->edt_buf_number,'\0',sizeof(data->edt_buf_number)); - memset(data->edt_buf_cb_password,'\0',sizeof(data->edt_buf_cb_password)); /* x0039928 - Lint warning fix */ - /* SPR#1428 - SH - New Editor changes - no longer required*/ + memset(data->edt_buf_name,'\0',sizeof(data->edt_buf_name)); + memset(data->edt_buf_number,'\0',sizeof(data->edt_buf_number)); + memset(data->edt_buf_cb_password,'\0',sizeof(data->edt_buf_cb_password)); /* x0039928 - Lint warning fix */ + /* SPR#1428 - SH - New Editor changes - no longer required*/ #ifndef NEW_EDITOR bookSetEditAttributes(SERVICE_CREATE_EDITOR,COLOUR_EDITOR_XX,0,edtCurBar1,0,(char*)data->edt_buf_name,PHB_MAX_LEN,&data->edt_attr_name); bookSetEditAttributes(SERVICE_CREATE_EDITOR,COLOUR_EDITOR_XX,0,edtCurBar1,0,(char*)data->edt_buf_number,PHB_MAX_LEN,&data->edt_attr_number); #endif /* ifndef NEW_EDITOR */ - /* NDH : 28/08/2003 : Intialise cfu_services to "ALL Inactive" */ - data->cfu_services = 0; + /* NDH : 28/08/2003 : Intialise cfu_services to "ALL Inactive" */ + data->cfu_services = 0; winShow (data->win); - /* - * return window handle - */ - return data->win; + /* + * return window handle + */ + return data->win; } @@ -805,9 +788,9 @@ static int services_win_cb(T_MFW_EVENT e, T_MFW_SS_PARA * para) { - /* - * Top Window has no output - */ + /* + * Top Window has no output + */ TRACE_FUNCTION ("services_win_cb()"); switch (e) { @@ -816,8 +799,7 @@ default: return 0; } - return 1; - + return 1; } /******************************************************************************* @@ -849,7 +831,6 @@ SEND_EVENT(ss_data.input_number_win, SERVICES_INPUT_DESTROY, 0, 0); ss_data.input_number_win = 0; } - } /* @@ -915,11 +896,11 @@ } switch (e) - { - case E_SS_RES: + { + case E_SS_RES: if (!ss_data.info_wait) { - TRACE_FUNCTION ("show the wait screen"); + TRACE_FUNCTION ("show the wait screen"); #ifdef FF_CPHS_REL4 if(interrogate != 1) { @@ -934,91 +915,78 @@ */ break; - case E_SS_NOTIFY: - if(!ss_data.info_win) + case E_SS_NOTIFY: + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_NOTIFY,0, para); - destroyInfoWindow(); break; - case E_SS_CF_CNF: - - if(!ss_data.info_win) + case E_SS_CF_CNF: + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_CF_CNF,0, para); - + destroyInfoWindow(); + break; + + case E_SS_CF_ICN_UPD: + if(!ss_data.info_win) + SEND_EVENT(ss_data.win,E_SS_CF_ICN_UPD,0, para); destroyInfoWindow(); break; - case E_SS_CF_ICN_UPD: - - if(!ss_data.info_win) - SEND_EVENT(ss_data.win,E_SS_CF_ICN_UPD,0, para); - - destroyInfoWindow(); - break; - - case E_SS_CW_CNF: - if(!ss_data.info_win) + case E_SS_CW_CNF: + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_CW_CNF,0, para); - destroyInfoWindow(); break; - case E_SS_CLI_CNF: - if(!ss_data.info_win) + case E_SS_CLI_CNF: + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_CLI_CNF,0, para); - destroyInfoWindow(); break; - case E_SS_CB_CNF: - if(!ss_data.info_win) + case E_SS_CB_CNF: + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_CB_CNF,0, para); - - destroyInfoWindow(); + destroyInfoWindow(); break; /* we must display the ussd info and then edit and send a user ussd */ case E_SS_USSD_REQ: - if(!ss_data.info_win) + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_USSD_REQ,0, para); - destroyInfoWindow(); break; /* just display the ussd info */ case E_SS_USSD_CNF: - if(!ss_data.info_win) + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_USSD_CNF,0, para); - destroyInfoWindow(); break; case E_SS_IMEI: - - if(!ss_data.info_win) + if(!ss_data.info_win) SEND_EVENT(ss_data.win,E_SS_IMEI,0, para); - destroyInfoWindow(); break; - - case E_SS_GET_PW: - - if(!ss_data.info_win) - SEND_EVENT(ss_data.win,E_SS_GET_PW,0, para); - + case E_SS_GET_PW: + if(!ss_data.info_win) + SEND_EVENT(ss_data.win,E_SS_GET_PW,0, para); destroyInfoWindow(); break; + //CQ-16432 - start - case E_SS_SAT_CPWD: + case E_SS_SAT_CPWD: TRACE_EVENT("Received event E_SS_SAT_CPWD in BMI"); - if(!ss_data.info_win) - SEND_EVENT(ss_data.win,E_SS_SAT_CPWD,0, para); + if(!ss_data.info_win) + SEND_EVENT(ss_data.win,E_SS_SAT_CPWD,0, para); destroyInfoWindow(); break; //CQ-16432 - end - default: + + default: break; } @@ -1054,7 +1022,6 @@ switch (event) { - case ServicesError: TRACE_FUNCTION ("ServicesError"); showError(win, ss_cnf->cb_cnf.ss_error); @@ -2119,7 +2086,6 @@ *******************************************************************************/ - static void srv_get_forwarded_to_number ( char * textString, char * forwarded_to_number, UBYTE max_chars) @@ -2144,7 +2110,7 @@ $History: //SPR#0776 - DS - Added default value for textId. Changed references from TxtNotImplemented - to TxtNull. + to TxtNull. *******************************************************************************/ @@ -2177,14 +2143,14 @@ *textId = TxtVoice; return TRUE; - case MFW_TS_ALL_SMS: - case MFW_TS_SMS_MO: - case MFW_TS_SMS_MT: + case MFW_TS_ALL_SMS: + case MFW_TS_SMS_MO: + case MFW_TS_SMS_MT: *textId = TxtSMS; return TRUE; - case MFW_TS_EMRGNCY: - case MFW_TS_ALL_XCPT_SMS: + case MFW_TS_EMRGNCY: + case MFW_TS_ALL_XCPT_SMS: case MFW_TS_ALL_PSSS: /* all PLMN specific TS */ case MFW_TS_PLMN2: /* PLMN specific TS 2 */ case MFW_TS_PLMN3: /* PLMN specific TS 3 */ @@ -2208,9 +2174,9 @@ return TRUE; case MFW_TS_ALL_FAX: - case MFW_TS_FAX3_ALT_SPCH: - case MFW_TS_FAX3_AUTO: - case MFW_TS_FAX4: + case MFW_TS_FAX3_ALT_SPCH: + case MFW_TS_FAX3_AUTO: + case MFW_TS_FAX4: *textId = TxtFax; return TRUE; } @@ -2224,7 +2190,7 @@ *textId = TxtData; //SPR#933 - DS - Changed TxtNull to TxtData. return TRUE; - case MFW_BS_ALL_DATA_CDA: //SPR#933 - DS - Added so MMI displays correct info to user. + case MFW_BS_ALL_DATA_CDA: //SPR#933 - DS - Added so MMI displays correct info to user. *textId = TxtData; return TRUE; @@ -2411,7 +2377,6 @@ } - /******************************************************************************* $Function: services_info_cb @@ -2425,7 +2390,6 @@ *******************************************************************************/ - static int services_info_cb(T_MFW_HND win, USHORT identifier, UBYTE reason) { @@ -2754,13 +2718,13 @@ *******************************************************************************/ -int servicesNumbers(MfwMnu* m, MfwMnuItem* i){ +int servicesNumbers(MfwMnu* m, MfwMnuItem* i) { CFAction = CFActivate; - servicesDoOtherNumber(); - - // ADDED BY RAVI - 28-11-2005 - return 1; - //END RAVI - 28-11-2005 + servicesDoOtherNumber(); + + // ADDED BY RAVI - 28-11-2005 + return 1; + //END RAVI - 28-11-2005 } @@ -2798,16 +2762,14 @@ T_MFW_HND win = mfw_parent(mfw_header()); // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI - - /* nextState = next; x0039928 - Lint warning removal */ - - - if (!winIsFocussed(win)) - lastFocus = winFocus(win); - - servicesState = reason; /* save reason now !! */ - - switch (reason) + /* nextState = next; x0039928 - Lint warning removal */ + + if (!winIsFocussed(win)) + lastFocus = winFocus(win); + + servicesState = reason; /* save reason now !! */ + + switch (reason) { case ServicesIdle: /* giving back control to last module*/ winFocus(lastFocus); @@ -2817,81 +2779,83 @@ case ServicesOk: TRACE_FUNCTION("Service OK"); - winShow(win); - timStart(times); /* start timer to go back in the submenu */ + winShow(win); + timStart(times); /* start timer to go back in the submenu */ break; case ServicesFailed: TRACE_FUNCTION("Service Failed"); - winShow(win); - timStart(times); /* start timer to go back in the submenu */ + winShow(win); + timStart(times); /* start timer to go back in the submenu */ break; - case ServicesError: + case ServicesError: TRACE_FUNCTION("Service Error"); - winShow(win); - timStart(times); /* start timer to go back in the submenu */ + winShow(win); + timStart(times); /* start timer to go back in the submenu */ break; - case ServicesExecCF: /* all Call forwarding from menu */ - case ServicesActCF: /* show "Please Wait" screen/animation */ - case ServicesDeactCF: - case ServicesCheckCF: + case ServicesExecCF: /* all Call forwarding from menu */ + case ServicesActCF: /* show "Please Wait" screen/animation */ + case ServicesDeactCF: + case ServicesCheckCF: case ServicesActCW: case ServicesDeactCW: case ServicesCheckCW: case ServicesActCLIR: case ServicesDeactCLIR: - case ServicesCheckCLIR: - winShow(win); - timStart(times); /* start timer to go back in the submenu */ + case ServicesCheckCLIR: + winShow(win); + timStart(times); /* start timer to go back in the submenu */ break; - case ServicesCheckCW_OK: - TRACE_FUNCTION(" ServicesCheckCW_OK"); - winShow(win); - timStart(times); /* start timer to go back in the submenu */ + case ServicesCheckCW_OK: + TRACE_FUNCTION(" ServicesCheckCW_OK"); + winShow(win); + timStart(times); /* start timer to go back in the submenu */ break; case ServicesCheckCLI_OK: TRACE_FUNCTION("ServicesCheckCLI_OK"); - winShow(win); - timStart(times); + winShow(win); + timStart(times); break; - case ServicesIMEI_OK: + case ServicesIMEI_OK: TRACE_FUNCTION("ServicesIMEI_OK"); - winShow(win); - timStart(times); - break; - case ServicesResShow: + winShow(win); + timStart(times); + break; + + case ServicesResShow: TRACE_FUNCTION("ServicesResShow"); - winShow(win); - timStart(times); - break; - - case ServicesCB_OK: + winShow(win); + timStart(times); + break; + + case ServicesCB_OK: TRACE_FUNCTION("ServicesCB_OK"); - lastFocus = winFocus(win); - winShow(win); - timStart(times); - break; - - case ServicesCFU_OK: + lastFocus = winFocus(win); + winShow(win); + timStart(times); + break; + + case ServicesCFU_OK: TRACE_FUNCTION("ServicesCFUShow"); - lastFocus = winFocus(win); - winShow(win); - timStart(times); - break; - - case ServicesDoCallDivert: - servicesSendCallDivert(0); - break; - - case PIN2_ABORT: - TRACE_FUNCTION("ServicesPin2_Abort"); - break; - default: + lastFocus = winFocus(win); + winShow(win); + timStart(times); + break; + + case ServicesDoCallDivert: + servicesSendCallDivert(0); + break; + + case PIN2_ABORT: + TRACE_FUNCTION("ServicesPin2_Abort"); + break; + + default: break; } } @@ -2902,7 +2866,7 @@ $Function: showUSSDError $Description: This function displays a dialog saying USSD message received, Font not supported - for UCS2 characters + for UCS2 characters $Returns: @@ -2914,19 +2878,17 @@ static void showUSSDError (T_MFW_HND win) { - T_DISPLAY_DATA display_info; TRACE_FUNCTION("showUSSDError"); - - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtUSSDMsgRxd, TxtFontNotSupported, COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtUSSDMsgRxd, TxtFontNotSupported, COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); display_info.Identifier = ServicesError; - /* - * Call Info Screen - */ + /* + * Call Info Screen + */ ss_data.info_win = info_dialog (ss_data.win, &display_info); @@ -2947,18 +2909,17 @@ static void showWait (T_MFW_HND win) { - T_DISPLAY_DATA display_info; - TRACE_FUNCTION("showWait"); - - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtRequesting, TxtNull, COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); + TRACE_FUNCTION("showWait"); + + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtRequesting, TxtNull, COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); display_info.Identifier = SS_WAIT; - /* - * Call Info Screen - */ + /* + * Call Info Screen + */ ss_data.info_wait = info_dialog (win, &display_info); } @@ -2978,19 +2939,17 @@ static void showOk (T_MFW_HND win) { - T_DISPLAY_DATA display_info; - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtDone, TxtNull, COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtDone, TxtNull, COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); display_info.Identifier = ServicesOk; - /* - * Call Info Screen - */ + /* + * Call Info Screen + */ ss_data.info_win = info_dialog (ss_data.win, &display_info); - } /******************************************************************************* @@ -3007,16 +2966,15 @@ static void showFailed (T_MFW_HND win) { - T_DISPLAY_DATA display_info; - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, TxtNull, COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, TxtNull, COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); display_info.Identifier = ServicesFailed; - /* - * Call Info Screen - */ + /* + * Call Info Screen + */ ss_data.info_win = info_dialog (ss_data.win, &display_info); } @@ -3034,21 +2992,19 @@ static void showError (T_MFW_HND win, T_MFW_SS_ERROR ss_error) { - T_DISPLAY_DATA display_info; TRACE_FUNCTION("showError"); - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, serviceGetError(ss_error), COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, serviceGetError(ss_error), COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); display_info.Identifier = ServicesError; - /* - * Call Info Screen - */ + /* + * Call Info Screen + */ ss_data.info_win = info_dialog (ss_data.win, &display_info); - } @@ -3067,9 +3023,8 @@ static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY * ss_notify) { - T_DISPLAY_DATA display_info; - USHORT TxtId1,TxtId2; + USHORT TxtId1,TxtId2; TRACE_FUNCTION("++ showSSNotify"); @@ -3079,8 +3034,8 @@ switch (ss_notify->code) { case MFW_SS_MO_unconFORWARD: /* CFU activated */ - { - TRACE_EVENT("showSSNotify() MFW_SS_MO_unconFORWARD"); + { + TRACE_EVENT("showSSNotify() MFW_SS_MO_unconFORWARD"); /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar) Description : CPHS Call Forwarding feature implementation @@ -3324,22 +3279,21 @@ static void srv_display_status (UBYTE ss_status) { - T_DISPLAY_DATA display_info; - USHORT TxtId2; - TRACE_FUNCTION("srv_display_status()"); - + T_DISPLAY_DATA display_info; + USHORT TxtId2; + TRACE_FUNCTION("srv_display_status()"); //GW Swapped text strings over if (ss_status & SS_STAT_ACTIVE) - TxtId2 = TxtActivated; + TxtId2 = TxtActivated; /* Marcus: Issue 1652: 03/02/2003: Removed NDH 10/06/03 */ else TxtId2 = TxtDeActivated; - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtNull, TxtId2, COLOUR_STATUS); - //Jun 04,2004 CRR:13601 xpradipg - SASKEN - //Timer value changed from FOREVER to FIVE_SECS - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtNull, TxtId2, COLOUR_STATUS); + //Jun 04,2004 CRR:13601 xpradipg - SASKEN + //Timer value changed from FOREVER to FIVE_SECS + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT ); display_info.Identifier = E_SS_CB_CNF; // can be used also for CF and CW /* @@ -3347,11 +3301,11 @@ */ ss_data.info_win = info_dialog (ss_data.win, &display_info); - } +} /******************************************************************************* - $Function: ysrv_empty_list_result + $Function: srv_empty_list_result $Description: Indicate a sensefull response to the user if an activation / deactivation or interrogation leads to an @@ -3367,8 +3321,8 @@ static void srv_empty_list_result (UBYTE ss_category, USHORT event, UBYTE ss_status, UBYTE ss_code) /* Marcus: Issue 1652: 03/02/2002 */ { T_DISPLAY_DATA display_info; - USHORT TxtId1; - USHORT TxtId2 = TxtNull; + USHORT TxtId1; + USHORT TxtId2 = TxtNull; TRACE_FUNCTION("srv_empty_list_result"); switch (event) @@ -3441,7 +3395,7 @@ // Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken) // Storing the Current state of CF in Flash FFS_flashData.CFState=TRUE; - flash_write(); + flash_write(); } /*CQ10690 - END*/ if(event==E_SS_CF_CNF) @@ -3484,43 +3438,42 @@ static void showCWStatus (T_MFW_HND win , T_ss * data) - { - T_DISPLAY_DATA display_info; - T_ss_feature_cw_data * pFeature; - - TRACE_FUNCTION("showCWStatus"); - - //MC got rid of dodgy pointer arithmetic - pFeature = &data->mfw_ss_cw->ss[data->current_feature]; - - if (data->max_feature == 1) - { - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS); - //Jun 04,2004 CRR:13601 xpradipg - SASKEN + T_DISPLAY_DATA display_info; + T_ss_feature_cw_data * pFeature; + + TRACE_FUNCTION("showCWStatus"); + + //MC got rid of dodgy pointer arithmetic + pFeature = &data->mfw_ss_cw->ss[data->current_feature]; + + if (data->max_feature == 1) + { + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS); + //Jun 04,2004 CRR:13601 xpradipg - SASKEN //Timer value changed from FOREVER to FIVE_SECS - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT); - } - else - { - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS); - //Jun 04,2004 CRR:13601 xpradipg - SASKEN + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT); + } + else + { + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS); + //Jun 04,2004 CRR:13601 xpradipg - SASKEN //Timer value changed from FOREVER to FIVE_SECS - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT ); - } - - display_info.Identifier = E_SS_CW_CNF; - - /* - * Call Info Screen - */ - - ss_data.info_win = info_dialog (ss_data.win, &display_info); - - if (ss_data.info_win EQ NULL) - { - TRACE_FUNCTION("NOT ENOUGH RESOURCES TO CREATE EXT INFO DIALOG"); - } + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT ); + } + + display_info.Identifier = E_SS_CW_CNF; + + /* + * Call Info Screen + */ + + ss_data.info_win = info_dialog (ss_data.win, &display_info); + + if (ss_data.info_win EQ NULL) + { + TRACE_FUNCTION("NOT ENOUGH RESOURCES TO CREATE EXT INFO DIALOG"); + } } /******************************************************************************* @@ -3723,17 +3676,17 @@ #endif static char imei_array[IMEI_LEN+1]; //GW IMEI number is 26 chars long! - memset(imei_array,0x00,IMEI_LEN+1); + memset(imei_array,0x00,IMEI_LEN+1); memcpy(imei_array, ss_cnf->imei_info.imei_number, IMEI_LEN); - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull,TxtIMEI, TxtNull , COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_CLEAR | KEY_LEFT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull,TxtIMEI, TxtNull , COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_CLEAR | KEY_LEFT ); display_info.TextString2 = imei_array; - /* - * Call Info Screen - */ + + /* + * Call Info Screen + */ ss_data.info_win = info_dialog (ss_data.win, &display_info); - } #endif @@ -3742,8 +3695,8 @@ $Function: showUSSDInfo $Description: this is used for both USSD types (confirm and request). - The USSD request is keep going after "showUSSDInfo" - function and open the editor to enter the string. + The USSD request is keep going after "showUSSDInfo" + function and open the editor to enter the string. $Returns: @@ -3752,7 +3705,6 @@ *******************************************************************************/ - static void showUSSDInfo (T_MFW_HND win, USHORT ident, T_MFW_SS_PARA * ss_cnf, USHORT sk1, USHORT sk2) { #ifdef NEW_EDITOR @@ -3828,7 +3780,6 @@ /* create the dialog handler */ editor_start(ss_data.win, &editor_data); /* start the editor */ #endif /* NEW_EDITOR */ - } @@ -3849,11 +3800,9 @@ { TRACE_FUNCTION("showUSSDREQ"); showUSSDInfo(win, ServicesUSSD_REQ_OK, ss_cnf, TxtSoftOK, TxtSoftBack); - } - /******************************************************************************* $Function: showUSSDCNF @@ -3869,7 +3818,6 @@ static void showUSSDCNF (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf) { - T_DISPLAY_DATA display_info; int nPixels = 0; int nchar = 0; @@ -3884,9 +3832,9 @@ T_AUI_EDITOR_DATA display_editor_info; TRACE_FUNCTION("showUSSDCNF"); - /* API - 09-07-03 - CQ10728 - Add this check to use either the editor or the bubble depending + /* API - 09-07-03 - CQ10728 - Add this check to use either the editor or the bubble depending on the size of the returned string */ - /* API - 27-08-03 - CQ10728 - Update, calculate the length of the string in number of pixels */ + /* API - 27-08-03 - CQ10728 - Update, calculate the length of the string in number of pixels */ //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V //Bug : Unable to compose a one or two digit number @@ -3896,23 +3844,23 @@ if(win) { win_data = ((T_MFW_HDR *)win)->data; - if(win_data) + if(win_data) data = (T_ss * )win_data->user; } - nchar = strlen((char *)ss_cnf->ussd_info.ussd); - nPixels = dspl_GetTextExtent( (char *)ss_cnf->ussd_info.ussd, nchar); - /* API - 27-08-03 - CQ10728 - END */ + nchar = strlen((char *)ss_cnf->ussd_info.ussd); + nPixels = dspl_GetTextExtent( (char *)ss_cnf->ussd_info.ussd, nchar); + /* API - 27-08-03 - CQ10728 - END */ if (nPixels >= SCREEN_SIZE_X && (data != NULL)) /* x0039928 - Lint warning removal */ { - //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V - //Bug : Unable to compose a one or two digit number - //Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled. - //The read only editor with the service provider message that comes up when a one or two digit is dialled - //was not handled properly. So altered the editor handling to cater for the long message. - AUI_edit_SetDefault(&display_editor_info); - AUI_edit_SetMode(&display_editor_info, ED_MODE_READONLY, ED_CURSOR_UNDERLINE); + //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V + //Bug : Unable to compose a one or two digit number + //Fix : This bug is reproducible when a very long message is sent by the service provider when an invalid one or two digit number is dialled. + //The read only editor with the service provider message that comes up when a one or two digit is dialled + //was not handled properly. So altered the editor handling to cater for the long message. + AUI_edit_SetDefault(&display_editor_info); + AUI_edit_SetMode(&display_editor_info, ED_MODE_READONLY, ED_CURSOR_UNDERLINE); //x0pleela 29 Aug, 2006 DR: OMAPS00083503 //Dynamically changing the dcs value in editor settings @@ -3921,32 +3869,32 @@ else AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_ASCII, (UBYTE*)ss_cnf->ussd_info.ussd, (USHORT)ss_cnf->ussd_info.len); - AUI_edit_SetTextStr(&display_editor_info, TxtNull, TxtSoftBack,TxtNull,NULL); - AUI_edit_SetEvents(&display_editor_info, 0, FALSE, FOREVER, (T_AUI_EDIT_CB)services_info_cb); - display_editor_info.Identifier = ServicesUSSD_CNF_OK; - data->info_win = AUI_edit_Start(data->win, &display_editor_info); + AUI_edit_SetTextStr(&display_editor_info, TxtNull, TxtSoftBack,TxtNull,NULL); + AUI_edit_SetEvents(&display_editor_info, 0, FALSE, FOREVER, (T_AUI_EDIT_CB)services_info_cb); + display_editor_info.Identifier = ServicesUSSD_CNF_OK; + data->info_win = AUI_edit_Start(data->win, &display_editor_info); } + else + { + if (strlen((char *)ss_cnf->ussd_info.ussd) == 0) + { + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtCommand, TxtCompleted, COLOUR_STATUS); + } else { - if (strlen((char *)ss_cnf->ussd_info.ussd) == 0) - { - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtCommand, TxtCompleted, COLOUR_STATUS); - } - else - { - dlg_initDisplayData_TextStr(&display_info, TxtSoftOK, TxtNull, (char *)ss_cnf->ussd_info.ussd, NULL, COLOUR_STATUS); - } - - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT); - display_info.Identifier = ServicesUSSD_CNF_OK; + dlg_initDisplayData_TextStr(&display_info, TxtSoftOK, TxtNull, (char *)ss_cnf->ussd_info.ussd, NULL, COLOUR_STATUS); + } + + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT); + display_info.Identifier = ServicesUSSD_CNF_OK; /* - * Display Dialog Info Screen - */ + * Display Dialog Info Screen + */ ss_data.info_win = info_dialog (ss_data.win, &display_info); - } - /*API - 09-07-03 CQ10728- END*/ + } + /*API - 09-07-03 CQ10728- END*/ } @@ -3967,22 +3915,21 @@ // unsigned int tLen = ussd_senddata->ussd_info.len; // RAVI - ss_cnf = ussd_senddata; - - if (ss_send_ussd( (T_MFW_SS_USSD *) ss_cnf ) == MFW_SS_FAIL) + ss_cnf = ussd_senddata; + + if (ss_send_ussd( (T_MFW_SS_USSD *) ss_cnf ) == MFW_SS_FAIL) { - /* ussd data is wrong */ + /* ussd data is wrong */ showFailed( ss_data.win ); } - else - if (servicesState == ServicesUSSDSendEdit) - { - servicesExec(ServicesUSSDSendEdit_Ok, 0); - } - else - { - servicesExec(ServicesUSSDEnter_Send, 0); -} + else if (servicesState == ServicesUSSDSendEdit) + { + servicesExec(ServicesUSSDSendEdit_Ok, 0); + } + else + { + servicesExec(ServicesUSSDEnter_Send, 0); + } } @@ -4003,12 +3950,11 @@ { T_DISPLAY_DATA display_info; T_ss_feature_cf_data * pFeature; - static char str[50]; - + static char str[50]; TRACE_FUNCTION("showCFStatus"); - //MC got rid of dodgy pointer arithmetic + //MC got rid of dodgy pointer arithmetic pFeature = &data->mfw_ss_cf->ss[data->current_feature]; if (data->max_feature == 1) @@ -4078,7 +4024,6 @@ *******************************************************************************/ - static void showCBStatus (T_MFW_HND win , T_ss * data) { T_DISPLAY_DATA display_info; @@ -4086,22 +4031,22 @@ TRACE_FUNCTION("showCBStatus"); - //MC got rid of dodgy pointer arithmetic + //MC got rid of dodgy pointer arithmetic pFeature = &data->mfw_ss_cb->ss[data->current_feature]; if (data->max_feature == 1) { - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, pFeature->status, COLOUR_STATUS); - //Jun 04,2004 CRR:13601 xpradipg - SASKEN + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, pFeature->status, COLOUR_STATUS); + //Jun 04,2004 CRR:13601 xpradipg - SASKEN //Timer value changed from FOREVER to FIVE_SECS - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT); } else { - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, pFeature->status, COLOUR_STATUS); - //Jun 04,2004 CRR:13601 xpradipg - SASKEN - //Timer value changed from FOREVER to FIVE_SECS - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT ); + dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, pFeature->status, COLOUR_STATUS); + //Jun 04,2004 CRR:13601 xpradipg - SASKEN + //Timer value changed from FOREVER to FIVE_SECS + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT ); } display_info.Identifier = E_SS_CB_CNF; // can be used also for CF and CW @@ -4146,7 +4091,6 @@ default: break; } - } @@ -4192,8 +4136,6 @@ } - - /******************************************************************************* $Function: getCFNumber @@ -4208,12 +4150,10 @@ static void getCFNumber(char * pSSstring) { - strcat(pSSstring, ss_data.edt_buf_number); } - /******************************************************************************* $Function: getCFService @@ -4237,7 +4177,7 @@ break; /*MC SPR 742, handle line 2, auxiliary telephony*/ case CFAuxVoice: - strcat(pSSstring, "*89"); + strcat(pSSstring, "*89"); break; case CFFax: strcat(pSSstring, "*13"); @@ -4251,7 +4191,6 @@ } - /******************************************************************************* $Function: servicesSendCallDivert @@ -4265,20 +4204,19 @@ *******************************************************************************/ - static int servicesSendCallDivert( char * divert_number) { char SS_string[60] = {'\0'}; /* build up SS string according to menu selections */ - getCFAction(SS_string); - getCFType(SS_string); + getCFAction(SS_string); + getCFType(SS_string); if (divert_number) strcat(SS_string, divert_number); else - getCFNumber(SS_string); - getCFService(SS_string); - strcat(SS_string, "#"); + getCFNumber(SS_string); + getCFService(SS_string); + strcat(SS_string, "#"); /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar) Description : CPHS Call Forwarding feature implementation @@ -4287,15 +4225,14 @@ TRACE_FUNCTION(SS_string); - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) - { + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + { showFailed( ss_data.win ); - } - return 0; + } + return 0; } - /******************************************************************************* $Function: servicesActivateCLIR @@ -4309,23 +4246,22 @@ *******************************************************************************/ int servicesActivateCLIR(MfwMnu* m, MfwMnuItem* i) { - char actstr[8]; - - CFAction = CFActivate; - strcpy(actstr, "#31#"); - - if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) - showFailed( ss_data.win ); - else - { + char actstr[8]; + + CFAction = CFActivate; + strcpy(actstr, "#31#"); + + if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) + showFailed( ss_data.win ); + else + { strcpy(actstr, "*#31#"); if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) - showFailed( ss_data.win ); - } - - - return 0; + showFailed( ss_data.win ); + } + + return 0; } @@ -4343,22 +4279,22 @@ int servicesDeactivateCLIR(MfwMnu* m, MfwMnuItem* i) { - char actstr[8]; - - CFAction = CFDeactivate; - strcpy(actstr, "*31#"); - - if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) - showFailed( ss_data.win ); - else - { + char actstr[8]; + + CFAction = CFDeactivate; + strcpy(actstr, "*31#"); + + if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) + showFailed( ss_data.win ); + else + { strcpy(actstr, "*#31#"); if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) - showFailed( ss_data.win ); - } - - return 0; + showFailed( ss_data.win ); + } + + return 0; } /******************************************************************************* @@ -4374,18 +4310,17 @@ *******************************************************************************/ - int servicesCheckCLIR(MfwMnu* m, MfwMnuItem* i) { - char actstr[8]; - - CFAction = CFCheck; - - strcpy(actstr, "*#31#"); - - if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) + char actstr[8]; + + CFAction = CFCheck; + + strcpy(actstr, "*#31#"); + + if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - return 0; + return 0; } @@ -4402,14 +4337,14 @@ *******************************************************************************/ int servicesCheckCWaiting(MfwMnu* m, MfwMnuItem* i) { - char actstr[8]; - - strcpy(actstr, "*#43#"); - - if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) + char actstr[8]; + + strcpy(actstr, "*#43#"); + + if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - return 0; + return 0; } @@ -4427,16 +4362,15 @@ int servicesActivateCWaiting(MfwMnu* m, MfwMnuItem* i) { - char actstr[8]; - - -/* JVJ #1586 Changed *43*10# to *43*# */ - strcpy(actstr, "*43*#"); - - if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) + char actstr[8]; + + /* JVJ #1586 Changed *43*10# to *43*# */ + strcpy(actstr, "*43*#"); + + if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } @@ -4453,22 +4387,19 @@ *******************************************************************************/ - int servicesDeactivateCWaiting(MfwMnu* m, MfwMnuItem* i) { - char actstr[8]; - -/* JVJ #1586 Changed #43*10# to #43# */ - strcpy(actstr, "#43#"); - - if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) + char actstr[8]; + + /* JVJ #1586 Changed #43*10# to #43# */ + strcpy(actstr, "#43#"); + + if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } - - /******************************************************************************* $Function: servicesInterCFU @@ -4482,194 +4413,20 @@ *******************************************************************************/ - - int servicesInterCFU(void) { - char actstr[8]; - - strcpy(actstr, "*#21#"); + char actstr[8]; + + strcpy(actstr, "*#21#"); ss_execute_transaction((UBYTE*)actstr, 0); - return 0; -} - - - - - - - - - -#if(0) /* x0039928 - Lint warning removal */ -/******************************************************************************* - - $Function: ServiceGetStatus - - $Description: return the code for the MMI text string for the service status. - - $Returns: - - $Arguments: - -*******************************************************************************/ - - -unsigned int ServiceGetStatus( UBYTE pStatus) -{ - unsigned int strStatusCode = 0; - - TRACE_FUNCTION("++ ServiceGetStatus"); - - if (pStatus & SS_STAT_ACTIVE) - strStatusCode = TxtActivated; - /* Marcus: Issue 1652: 03/02/2003: Removed NDH 10/06/03 */ - else - strStatusCode = TxtDeActivated; - return strStatusCode; + return 0; } /******************************************************************************* - $Function: serviceGetServiceType - - $Description: return the code for the MMI text string for the service type. - - $Returns: - - $Arguments: - -*******************************************************************************/ - - -unsigned int serviceGetServiceType( UBYTE ss_telecom_type, UBYTE ss_telecom_service) -{ - unsigned int strServCode = 0; - - TRACE_FUNCTION("++ serviceGetServiceType"); - switch ( ss_telecom_type ) - { - case MFW_BST_UNKNOWN: - break; - - case MFW_BST_TELE: - switch ( ss_telecom_service ) - { - case MFW_TS_ALL_TS: strServCode = TxtAllCalls; break;/* all teleservices */ - case MFW_TS_ALL_SPCH: /* All speech transmission services */ - case MFW_TS_TLPHNY: /* telephony */ - case MFW_TS_EMRGNCY: /* emergency calls */ - strServCode = TxtVoice; - break; - case MFW_TS_ALL_SMS: /* all SMS services */ - case MFW_TS_SMS_MT: /* SMS MT PP */ - case MFW_TS_SMS_MO: /* SMS MO PP */ - /*strServCode = TxtSMS;*/ - break; - case MFW_TS_ALL_FAX: /* all FAX transmission services */ - case MFW_TS_FAX3_ALT_SPCH: /* FAX group 3 alter. speech */ - case MFW_TS_FAX3_AUTO: /* FAX group 3 automatic */ - case MFW_TS_FAX4: /* FAX group 4 */ - strServCode = TxtFax; - break; - case MFW_TS_ALL_DATA: strServCode = TxtData; break;/* all FAX and SMS services */ - case MFW_TS_ALL_XCPT_SMS: strServCode = TxtNotImplemented; - TRACE_FUNCTION("all x SMS"); break;/* all FAX and speech services */ - case MFW_TS_ALL_PSSS: strServCode = 0; break;/* all PLMN specific TS */ - case MFW_TS_PLMN1: /* PLMN specific TS 1 */ - case MFW_TS_PLMN2: /* PLMN specific TS 2 */ - case MFW_TS_PLMN3: /* PLMN specific TS 3 */ - case MFW_TS_PLMN4: /* PLMN specific TS 4 */ - case MFW_TS_PLMN5: /* PLMN specific TS 5 */ - case MFW_TS_PLMN6: /* PLMN specific TS 6 */ - case MFW_TS_PLMN7: /* PLMN specific TS 7 */ - case MFW_TS_PLMN8: /* PLMN specific TS 8 */ - case MFW_TS_PLMN9: /* PLMN specific TS 9 */ - case MFW_TS_PLMNA: /* PLMN specific TS A */ - case MFW_TS_PLMNB: /* PLMN specific TS B */ - case MFW_TS_PLMNC: /* PLMN specific TS C */ - case MFW_TS_PLMND: /* PLMN specific TS D */ - case MFW_TS_PLMNE: /* PLMN specific TS E */ - case MFW_TS_PLMNF: /* PLMN specific TS F */ - strServCode = 0; - break; - - default: break; - - } - break; - - /* NOTE that we are returning "Data" for all Bearer services until otherwise spec'ed */ - case MFW_BST_BEARER: - switch ( ss_telecom_service ) - { - case MFW_BS_ALL_BS : strServCode = TxtNotImplemented; /* strServCode = TxtAllServices; */ break; /* all bearer services */ - case MFW_BS_ALL_DATA_CDA : /* all data CDA services */ - case MFW_BS_CDA_300 : /* data CDA 300 bps */ - case MFW_BS_CDA_1200 : /* data CDA 1200 bps */ - case MFW_BS_CDA_1200_75 : /* data CDA 1200/75 bps */ - case MFW_BS_CDA_2400 : /* data CDA 2400 bps */ - case MFW_BS_CDA_4800 : /* data CDA 4800 bps */ - case MFW_BS_CDA_9600 : /* data CDA 9600 bps */ - case MFW_BS_ALL_DATA_CDS : /* all data CDS services */ - case MFW_BS_CDS_1200 : /* data CDS 1200 bps */ - case MFW_BS_CDS_2400 : /* data CDS 2400 bps */ - case MFW_BS_CDS_4800 : /* data CDS 4800 bps */ - case MFW_BS_CDS_9600 : /* data CDS 9600 bps */ - case MFW_BS_ALL_DATA_PAD : /* all data PAD services */ - case MFW_BS_PAD_300 : /* data PAD 300 bps */ - case MFW_BS_PAD_1200 : /* data PAD 1200 bps */ - case MFW_BS_PAD_1200_75 : /* data PAD 1200/75 bps */ - case MFW_BS_PAD_2400 : /* data PAD 2400 bps */ - case MFW_BS_PAD_4800 : /* data PAD 4800 bps */ - case MFW_BS_PAD_9600 : /* data PAD 9600 bps */ - case MFW_BS_ALL_DATA_PDS : /* all data PDS services */ - case MFW_BS_PDS_2400 : /* data PDS 2400 bps */ - case MFW_BS_PDS_4800 : /* data PDS 4800 bps */ - case MFW_BS_PDS_9600 : /* data PDS 9600 bps */ - case MFW_BS_SPCH_ALT_CDA : /* all data CDA alter. speech */ - case MFW_BS_SPCH_ALT_CDS : /* all data CDS alter. speech */ - case MFW_BS_SPCH_FLD_CDA : /* all data speech followed CDA */ - case MFW_BS_SPCH_FLD_CDS : /* all data speech followed CDA */ - case MFW_BS_ALL_DC_ASYN : /* all data circuit asynchronous */ - case MFW_BS_ALL_ASYN : /* all asynchronous services */ - case MFW_BS_ALL_DC_SYN : /* all data circuit synchronous */ - case MFW_BS_ALL_SYN : /* all synchronous services */ - case MFW_BS_ALL_PSSS : /* all PLMN specific BS */ - case MFW_BS_PLMN1 : /* PLMN specific 1 */ - case MFW_BS_PLMN2 : /* PLMN specific 2 */ - case MFW_BS_PLMN3 : /* PLMN specific 3 */ - case MFW_BS_PLMN4 : /* PLMN specific 4 */ - case MFW_BS_PLMN5 : /* PLMN specific 5 */ - case MFW_BS_PLMN6 : /* PLMN specific 6 */ - case MFW_BS_PLMN7 : /* PLMN specific 7 */ - case MFW_BS_PLMN8 : /* PLMN specific 8 */ - case MFW_BS_PLMN9 : /* PLMN specific 9 */ - case MFW_BS_PLMNA : /* PLMN specific A */ - case MFW_BS_PLMNB : /* PLMN specific B */ - case MFW_BS_PLMNC : /* PLMN specific C */ - case MFW_BS_PLMND : /* PLMN specific D */ - case MFW_BS_PLMNE : /* PLMN specific E */ - case MFW_BS_PLMNF : /* PLMN specific F */ - strServCode = 0; break; - - default: break; - - } - break; - - default: - break; - } - return strServCode; -} - -#endif -/******************************************************************************* - $Function: serviceGetError $Description: @@ -4681,7 +4438,6 @@ *******************************************************************************/ - static unsigned int serviceGetError( T_MFW_SS_ERROR ss_error ) { unsigned int errStrCode = TxtNotAvailable; @@ -4798,7 +4554,7 @@ case MFW_SS_ERR_FATAL_SS_ENT: errStrCode = TxtFatRes; break; -default: + default: break; } return errStrCode; @@ -4822,7 +4578,7 @@ { unsigned int strTypeCode = 0; - TRACE_FUNCTION("++ serviceGetType"); + TRACE_FUNCTION("++ serviceGetType"); switch (type) { @@ -4913,50 +4669,6 @@ return strTypeCode; } -#if(0) /* x0039928 -Lint warning removal */ -/******************************************************************************* - - $Function: serviceGetCategory - - $Description: return the code for the MMI text string for the service category. - - $Returns: - - $Arguments: - -*******************************************************************************/ - -unsigned int serviceGetCategory( T_MFW_SS_CATEGORY cat ) -{ - unsigned int strCatCode = 0; - - TRACE_FUNCTION("++ serviceGetCategory"); - - switch ( cat ) - { - case SS_CTG_UNKNOWN: - break; - - case SS_REGISTRATION: - case SS_ACTIVATION: - strCatCode = TxtActivated; - break; - - case SS_ERASURE: - case SS_DEACTIVATION: - strCatCode = TxtDeActivated; - break; - - case SS_INTERROGATION: - TRACE_FUNCTION("SS Interrogation"); - break; - - default: - break; - } - return strCatCode; -} -#endif /******************************************************************************* @@ -4971,7 +4683,6 @@ *******************************************************************************/ - void servicesDivertActivate(void) { TRACE_FUNCTION("servicesDivertActivate"); @@ -5005,16 +4716,15 @@ CFAction = CFCheck; - getCFAction(SS_string); - getCFType(SS_string); - getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck. - strcat(SS_string, "#"); - - TRACE_FUNCTION(SS_string); - - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + getCFAction(SS_string); + getCFType(SS_string); + getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck. + strcat(SS_string, "#"); + + TRACE_FUNCTION(SS_string); + + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - } /******************************************************************************* @@ -5034,7 +4744,6 @@ *******************************************************************************/ - void servicesDivertDeactivate(void) { char SS_string[60] = {'\0'}; @@ -5045,18 +4754,18 @@ CFAction = CFDeactivate; - getCFAction(SS_string); - getCFType(SS_string); - getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck. - SS_string[strlen(SS_string)] = '#'; + getCFAction(SS_string); + getCFType(SS_string); + getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck. + SS_string[strlen(SS_string)] = '#'; TRACE_FUNCTION(SS_string); /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar) Description : CPHS Call Forwarding feature implementation Solution : previous code is deleted because it was setting CF flag in flash before getting network confirmation*/ - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - } /******************************************************************************* @@ -5072,12 +4781,11 @@ *******************************************************************************/ - void servicesDivertVoice(void) { TRACE_FUNCTION("servicesDivertVoice"); /*mc SPR 742 check if line2 is the current line*/ - if (!ALSPresent(NULL, NULL, NULL) && GetAlsLine() == MFW_SERV_LINE2/*FFS_flashData.als_selLine == MFW_SERV_LINE2*/) + if (!ALSPresent(NULL, NULL, NULL) && GetAlsLine() == MFW_SERV_LINE2/*FFS_flashData.als_selLine == MFW_SERV_LINE2*/) CFService = CFAuxVoice; else /*mc end*/ CFService = CFVoice; @@ -5096,7 +4804,6 @@ *******************************************************************************/ - void servicesDivertFax(void) { TRACE_FUNCTION("servicesDivertFax"); @@ -5136,7 +4843,6 @@ *******************************************************************************/ - void servicesDivertActionAll(void) { TRACE_FUNCTION("servicesDivertActionAll"); @@ -5294,7 +5000,6 @@ *******************************************************************************/ - void servicesBarringInternational(void) { TRACE_FUNCTION("servicesBarringInternational"); @@ -5334,7 +5039,6 @@ *******************************************************************************/ - void servicesBarringAllIncoming(void) { TRACE_FUNCTION("servicesBarringAllIncoming"); @@ -5380,11 +5084,11 @@ T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_services_input * data = (T_services_input *)win_data->user; - TRACE_FUNCTION("services_get_voice_number_cb"); - - switch (reason) - { - case INFO_KCD_LEFT: + TRACE_FUNCTION("services_get_voice_number_cb"); + + switch (reason) + { + case INFO_KCD_LEFT: TRACE_FUNCTION("SERVICES_INPUT_LEFT"); services_input_destroy(ss_data.input_number_win); /* send number if one has been entered */ @@ -5392,25 +5096,24 @@ SEND_EVENT(data->parent_win, SERVICES_DO_CALL_VOICE_DIVERT, 0, 0); break; - case INFO_KCD_ALTERNATELEFT: + case INFO_KCD_ALTERNATELEFT: TRACE_FUNCTION("SERVICES_INPUT_ALTERNATELEFT"); - /* Go to phone book */ - if (bookPhoneBookLoading()==BOOK_SUCCESS) - { - // T_MFW_HND phbk_win; // RAVI - bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed Assignment phbk_win = . - } - + /* Go to phone book */ + if (bookPhoneBookLoading()==BOOK_SUCCESS) + { + // T_MFW_HND phbk_win; // RAVI + bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed Assignment phbk_win = . + } break; case INFO_KCD_HUP: case INFO_KCD_RIGHT: - TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP"); + TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP"); services_input_destroy(ss_data.input_number_win); break; - default: - break; - } + default: + break; + } } #else /* NEW_EDITOR */ @@ -5418,16 +5121,16 @@ { TRACE_FUNCTION("services_get_voice_number_cb"); - switch (reason){ - case SERVICES_INPUT_LEFT: + switch (reason){ + case SERVICES_INPUT_LEFT: TRACE_FUNCTION("SERVICES_INPUT_LEFT"); /* send number if one has been entered */ if (strlen(ss_data.edt_buf_number) > 0 ) SEND_EVENT(win, SERVICES_DO_CALL_VOICE_DIVERT, 0, 0); break; - default: - break; - } + default: + break; + } } #endif /* NEW_EDITOR */ @@ -5446,8 +5149,6 @@ *******************************************************************************/ - - void servicesDoVoiceMailNumber(void) { char voiceNum[30] = {'\0'}; @@ -5467,19 +5168,17 @@ T_input_properties input; memset(data->edt_buf_number,'\0',PHB_MAX_LEN); - input.abc = FALSE; - input.text = TxtEnterNumber; - /* SPR#1428 - SH - New Editor changes - no longer required */ + input.abc = FALSE; + input.text = TxtEnterNumber; + /* SPR#1428 - SH - New Editor changes - no longer required */ #ifndef NEW_EDITOR - input.edt_attr_input = &data->edt_attr_number; + input.edt_attr_input = &data->edt_attr_number; #endif /* ifndef NEW_EDITOR */ - input.left_soft_key = TxtSoftOK; - input.right_soft_key = TxtSoftBack; - input.callback = services_get_voice_number_cb; - data->input_number_win = services_input_start(data->win,&input); - + input.left_soft_key = TxtSoftOK; + input.right_soft_key = TxtSoftBack; + input.callback = services_get_voice_number_cb; + data->input_number_win = services_input_start(data->win,&input); } - } @@ -5501,38 +5200,37 @@ // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI // T_services_input * data = (T_services_input *)win_data->user; // RAVI - TRACE_FUNCTION("services_get_voice_number_cb"); - - switch (reason) - { - case INFO_KCD_LEFT: + TRACE_FUNCTION("services_get_voice_number_cb"); + + switch (reason) + { + case INFO_KCD_LEFT: TRACE_FUNCTION("SERVICES_INPUT_LEFT"); /* send number if one has been entered */ - SEND_EVENT(ss_data.win, ServicesDoCallDivert, 0, 0); + SEND_EVENT(ss_data.win, ServicesDoCallDivert, 0, 0); services_input_destroy(ss_data.input_number_win); ss_data.input_number_win = NULL; break; - case INFO_KCD_ALTERNATELEFT: + case INFO_KCD_ALTERNATELEFT: TRACE_FUNCTION("SERVICES_INPUT_ALTERNATELEFT"); - /* Go to phone book */ - if (bookPhoneBookLoading()==BOOK_SUCCESS) - { - //T_MFW_HND phbk_win; // RAVI - bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed assignment phbk_win = - } - + /* Go to phone book */ + if (bookPhoneBookLoading()==BOOK_SUCCESS) + { + //T_MFW_HND phbk_win; // RAVI + bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed assignment phbk_win = + } break; case INFO_KCD_HUP: case INFO_KCD_RIGHT: - TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP"); + TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP"); services_input_destroy(ss_data.input_number_win); ss_data.input_number_win = NULL; break; - default: - break; - } + default: + break; + } } #else /* NEW_EDITOR */ @@ -5540,18 +5238,18 @@ { TRACE_FUNCTION("services_get_number_cb"); - switch (reason){ - case SERVICES_INPUT_LEFT: + switch (reason){ + case SERVICES_INPUT_LEFT: TRACE_FUNCTION("SERVICES_INPUT_LEFT"); SEND_EVENT(win, ServicesDoCallDivert, 0, 0); break; - case SERVICES_INPUT_RIGHT: + case SERVICES_INPUT_RIGHT: TRACE_FUNCTION("SERVICES_INPUT_RIGHT"); SEND_EVENT(win, ServicesDoCallDivert, 0, 0); - break; - default: - break; - } + break; + default: + break; + } } #endif /* NEW_EDITOR */ @@ -5568,8 +5266,6 @@ *******************************************************************************/ - - static void ServicesGetOtherNumber(T_MFW_HND win) { T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; @@ -5577,21 +5273,21 @@ T_input_properties input; - TRACE_EVENT("ServicesGetOtherNumber"); + TRACE_EVENT("ServicesGetOtherNumber"); memset(data->edt_buf_number,'\0',PHB_MAX_LEN); - input.abc = FALSE; - input.text = TxtEnterNumber; - /* SPR#1428 - SH - New Editor changes - no longer required */ + input.abc = FALSE; + input.text = TxtEnterNumber; + /* SPR#1428 - SH - New Editor changes - no longer required */ #ifndef NEW_EDITOR - input.edt_attr_input = &data->edt_attr_number; + input.edt_attr_input = &data->edt_attr_number; #endif /* ifndef NEW_EDITOR */ - input.left_soft_key = TxtSoftOK; - //Oct 20, 2004 REF: CRR 25772 Deepa M.D - //The RSK name has been set to Delete. - input.right_soft_key = TxtDelete; - input.callback = services_get_number_cb; - data->input_number_win = services_input_start(win,&input); + input.left_soft_key = TxtSoftOK; + //Oct 20, 2004 REF: CRR 25772 Deepa M.D + //The RSK name has been set to Delete. + input.right_soft_key = TxtDelete; + input.callback = services_get_number_cb; + data->input_number_win = services_input_start(win,&input); } /******************************************************************************* @@ -5609,12 +5305,10 @@ void servicesDoOtherNumber(void) { - TRACE_FUNCTION("servicesDoOtherNumber"); SEND_EVENT(ss_data.win, ServicesOtherNumber, 0, 0); - /* this is function called from menu, it will also send a signal to start window being displayed for editing or calling phonebook */ /* set up and show edit field */ @@ -5639,31 +5333,9 @@ TRACE_FUNCTION("servicesStoreVoiceMailNumber"); getCFNumber(voiceNum); - } -#if(0) /* x0039928 -Lint warning removal */ -/******************************************************************************* - - $Function: servicesStoreUSSD - - $Description: Store selected USSD to NVM. - - $Returns: - - $Arguments: - -*******************************************************************************/ - - - -static void servicesStoreUSSD(void) -{ - TRACE_FUNCTION("servicesStoreUSSD"); -} -#endif - /******************************************************************************* $Function: servicesActivateIRDA @@ -5808,35 +5480,35 @@ static void dialog_ext_info_destroy (T_MFW_HND own_window) { - T_MFW_WIN * win = ((T_MFW_HDR *)own_window)->data; - T_dialog_ext_info * data = (T_dialog_ext_info *)win->user; - - TRACE_FUNCTION ("dialog_ext_info_destroy()"); - - if (own_window == NULL) - { - TRACE_EVENT ("Error : Called with NULL Pointer"); - return; - } - - if (data) - { - /* - * Exit TIMER & KEYBOARD Handle - */ - kbd_delete (data->info_kbd); - kbd_delete (data->info_kbd_long); - tim_delete (data->info_tim); - - /* - * Delete WIN Handler - */ - win_delete (data->info_win); - /* - * Free Memory - */ - FREE_MEMORY ((void *)data, sizeof (T_dialog_ext_info)); - } + T_MFW_WIN * win = ((T_MFW_HDR *)own_window)->data; + T_dialog_ext_info * data = (T_dialog_ext_info *)win->user; + + TRACE_FUNCTION ("dialog_ext_info_destroy()"); + + if (own_window == NULL) + { + TRACE_EVENT ("Error : Called with NULL Pointer"); + return; + } + + if (data) + { + /* + * Exit TIMER & KEYBOARD Handle + */ + kbd_delete (data->info_kbd); + kbd_delete (data->info_kbd_long); + tim_delete (data->info_tim); + + /* + * Delete WIN Handler + */ + win_delete (data->info_win); + /* + * Free Memory + */ + FREE_MEMORY ((void *)data, sizeof (T_dialog_ext_info)); + } } /******************************************************************************* @@ -5890,7 +5562,7 @@ break; case DIALOG_DESTROY: - dialog_ext_info_destroy(win); + dialog_ext_info_destroy(win); break; } } @@ -5908,7 +5580,6 @@ *******************************************************************************/ - static int dialog_ext_info_win_cb (T_MFW_EVENT event, T_MFW_WIN * win) { T_dialog_ext_info * data = (T_dialog_ext_info *)win->user; @@ -5936,7 +5607,7 @@ /* * Print information */ - if (data->TextId1 NEQ 0) + if (data->TextId1 NEQ 0) { displayAlignedText(CENTER, Mmi_layout_line(1), 0, GET_TEXT(data->TextId1)); } @@ -6018,27 +5689,27 @@ case KCD_LEFT: if (data->KeyEvents & KEY_LEFT) { - dialog_ext_info_destroy (win); - if (Callback) - (Callback) (parent_win, Identifier, INFO_KCD_LEFT); + dialog_ext_info_destroy (win); + if (Callback) + (Callback) (parent_win, Identifier, INFO_KCD_LEFT); } break; case KCD_RIGHT: - if (data->KeyEvents & KEY_RIGHT) + if (data->KeyEvents & KEY_RIGHT) { - dialog_ext_info_destroy (win); - if (Callback) - (Callback) (parent_win, Identifier, INFO_KCD_RIGHT); + dialog_ext_info_destroy (win); + if (Callback) + (Callback) (parent_win, Identifier, INFO_KCD_RIGHT); } break; case KCD_HUP: - if (data->KeyEvents & KEY_CLEAR) + if (data->KeyEvents & KEY_CLEAR) { - dialog_ext_info_destroy (win); - if (Callback) - (Callback) (parent_win, Identifier, INFO_KCD_HUP); + dialog_ext_info_destroy (win); + if (Callback) + (Callback) (parent_win, Identifier, INFO_KCD_HUP); } break; /* dialog_ext_info_destroy (win); */ /* Unreachable Code - x0020906 - 24-08-2006 */ @@ -6046,13 +5717,13 @@ case KCD_MNUUP: dialog_ext_info_destroy (win); if (Callback) - (Callback) (parent_win, Identifier, INFO_KCD_UP); + (Callback) (parent_win, Identifier, INFO_KCD_UP); break; case KCD_MNUDOWN: dialog_ext_info_destroy (win); if (Callback) - (Callback) (parent_win, Identifier, INFO_KCD_DOWN); + (Callback) (parent_win, Identifier, INFO_KCD_DOWN); break; default: @@ -6073,11 +5744,6 @@ *******************************************************************************/ - - - - - static int dialog_ext_info_kbd_long_cb (T_MFW_EVENT e, T_MFW_KBD *k) { T_MFW_HND win = mfw_parent (mfw_header()); @@ -6122,23 +5788,17 @@ *******************************************************************************/ - - - -static T_MFW_HND services_input_create(MfwHnd parent){ - - - T_MFW_WIN * win_data; - T_services_input * data = (T_services_input *)ALLOC_MEMORY (sizeof (T_services_input)); - - - - TRACE_FUNCTION ("services_input_create()"); - - data->win = win_create (parent, 0, E_WIN_VISIBLE, (T_MFW_CB)services_input_win_cb); - - if (data->win EQ 0) - return 0; +static T_MFW_HND services_input_create(MfwHnd parent) +{ + T_MFW_WIN * win_data; + T_services_input * data = (T_services_input *)ALLOC_MEMORY (sizeof (T_services_input)); + + TRACE_FUNCTION ("services_input_create()"); + + data->win = win_create (parent, 0, E_WIN_VISIBLE, (T_MFW_CB)services_input_win_cb); + + if (data->win EQ 0) + return 0; /* * Create window handler @@ -6146,7 +5806,7 @@ data->mmi_control.dialog = (T_DIALOG_FUNC)services_input; data->mmi_control.data = data; win_data = ((T_MFW_HDR *)data->win)->data; - win_data->user = (void *)data; + win_data->user = (void *)data; /* * return window handle @@ -6154,14 +5814,13 @@ /* SPR#1428 - SH - New Editor changes - no longer required */ #ifndef NEW_EDITOR - data->kbd = kbdCreate(data->win,KEY_ALL,(MfwCb)services_input_kbd_cb); + data->kbd = kbdCreate(data->win,KEY_ALL,(MfwCb)services_input_kbd_cb); data->kbd_long = kbdCreate(data->win,KEY_ALL|KEY_LONG,(MfwCb)services_input_kbd_long_cb); #endif /* ifndef NEW_EDITOR */ - data->parent_win = parent; + data->parent_win = parent; return data->win; - } @@ -6177,36 +5836,33 @@ *******************************************************************************/ - - - - -static void services_input_destroy(MfwHnd window){ - T_MFW_WIN * win = ((T_MFW_HDR *)window)->data; - T_services_input * data = (T_services_input *)win->user; - - TRACE_FUNCTION ("services_input_destroy()"); - - if (window == NULL) - { - TRACE_EVENT ("Error : Called with NULL Pointer"); - return; - } - - if (data) - { +static void services_input_destroy(MfwHnd window) +{ + T_MFW_WIN * win = ((T_MFW_HDR *)window)->data; + T_services_input * data = (T_services_input *)win->user; + + TRACE_FUNCTION ("services_input_destroy()"); + + if (window == NULL) + { + TRACE_EVENT ("Error : Called with NULL Pointer"); + return; + } + + if (data) + { /* SPR#1428 - SH - Destroy new editor */ #ifdef NEW_EDITOR - AUI_edit_Destroy(data->edit_win); + AUI_edit_Destroy(data->edit_win); #else /* NEW_EDITOR */ editDeactivate(); #endif /* NEW_EDITOR */ - winDelete (data->win); - /* * Free Memory + winDelete (data->win); + /* * Free Memory */ - FREE_MEMORY ((void *)data, sizeof (T_services_input)); - } + FREE_MEMORY ((void *)data, sizeof (T_services_input)); + } } @@ -6222,10 +5878,8 @@ *******************************************************************************/ - static MfwHnd services_input_start(MfwHnd parent,T_input_properties *properties) { - T_MFW_HND win; TRACE_FUNCTION ("services_input_start()"); @@ -6257,83 +5911,82 @@ T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data; T_services_input * data = (T_services_input *)win_data->user; - T_input_properties* properties = (T_input_properties*) parameter; + T_input_properties* properties = (T_input_properties*) parameter; #ifdef NEW_EDITOR - T_AUI_EDITOR_DATA editor_data; + T_AUI_EDITOR_DATA editor_data; #endif /* NEW_EDITOR */ TRACE_FUNCTION ("T_services_input()"); switch (event) - { - case SERVICES_INPUT_INIT: - /* SPR#1428 - SH - New Editor changes - replace old custom editor - * with a standard AUI Editor */ + { + case SERVICES_INPUT_INIT: + /* SPR#1428 - SH - New Editor changes - replace old custom editor + * with a standard AUI Editor */ #ifdef NEW_EDITOR - AUI_edit_SetDefault(&editor_data); - AUI_edit_SetTextStr(&editor_data, properties->left_soft_key, properties->right_soft_key, properties->text, NULL); - AUI_edit_SetEvents(&editor_data, 0, FALSE, FOREVER, properties->callback); - //Oct 20, 2004 REF: CRR 25772 Deepa M.D - //The alternate text string when the editor content is empty is set and - //the change_rsk_on_empty flag is set to true. - AUI_edit_SetAltTextStr(&editor_data, 1, TxtNames, TRUE, TxtSoftBack); - AUI_edit_SetDisplay(&editor_data, SERVICE_CREATE_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT); - - if (properties->abc) - { - AUI_edit_SetMode(&editor_data, ED_MODE_ALPHA, ED_CURSOR_BAR); - AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_name, sizeof(ss_data.edt_buf_name)); - } - else - { - AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE); - AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_number, sizeof(ss_data.edt_buf_number)); - - } - TRACE_EVENT("SERVICES_INPUT_INIT"); - - data->edit_win = AUI_edit_Start(data->win, &editor_data); + AUI_edit_SetDefault(&editor_data); + AUI_edit_SetTextStr(&editor_data, properties->left_soft_key, properties->right_soft_key, properties->text, NULL); + AUI_edit_SetEvents(&editor_data, 0, FALSE, FOREVER, properties->callback); + //Oct 20, 2004 REF: CRR 25772 Deepa M.D + //The alternate text string when the editor content is empty is set and + //the change_rsk_on_empty flag is set to true. + AUI_edit_SetAltTextStr(&editor_data, 1, TxtNames, TRUE, TxtSoftBack); + AUI_edit_SetDisplay(&editor_data, SERVICE_CREATE_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT); + + if (properties->abc) + { + AUI_edit_SetMode(&editor_data, ED_MODE_ALPHA, ED_CURSOR_BAR); + AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_name, sizeof(ss_data.edt_buf_name)); + } + else + { + AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE); + AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_number, sizeof(ss_data.edt_buf_number)); + + } + TRACE_EVENT("SERVICES_INPUT_INIT"); + + data->edit_win = AUI_edit_Start(data->win, &editor_data); #else /*NEW_EDITOR*/ - data->properties.abc = properties->abc; - data->properties.text = properties->text; - data->properties.edt_attr_input = properties->edt_attr_input; - data->properties.left_soft_key = properties->left_soft_key; - data->properties.right_soft_key = properties->right_soft_key; - data->properties.callback = properties->callback; - data->edt_input = edtCreate(data->win,data->properties.edt_attr_input,0,0); - editDeactivate(); - editActivate (data->edt_input,properties->abc); - edtUnhide(data->edt_input); - winShow(data->win); + data->properties.abc = properties->abc; + data->properties.text = properties->text; + data->properties.edt_attr_input = properties->edt_attr_input; + data->properties.left_soft_key = properties->left_soft_key; + data->properties.right_soft_key = properties->right_soft_key; + data->properties.callback = properties->callback; + data->edt_input = edtCreate(data->win,data->properties.edt_attr_input,0,0); + editDeactivate(); + editActivate (data->edt_input,properties->abc); + edtUnhide(data->edt_input); + winShow(data->win); #endif /* NEW_EDITOR */ - break; - - case SERVICES_INPUT_DESTROY: - TRACE_FUNCTION("SERVICES_INPUT_DESTROY"); - services_input_destroy(data->win); - break; - - case DIVERT_PHBK_NUMBER: - /* SPR#1428 - SH - New Editor changes - buffer changed, send event to - * update editors */ + break; + + case SERVICES_INPUT_DESTROY: + TRACE_FUNCTION("SERVICES_INPUT_DESTROY"); + services_input_destroy(data->win); + break; + + case DIVERT_PHBK_NUMBER: + /* SPR#1428 - SH - New Editor changes - buffer changed, send event to + * update editors */ #ifdef NEW_EDITOR - { - T_ATB_TEXT text; - text.dcs = ATB_DCS_ASCII; - text.data = (UBYTE *)parameter; - text.len = ATB_string_Length(&text); - SEND_EVENT(data->edit_win, E_ED_INSERT, 0, (void *)&text); - } + { + T_ATB_TEXT text; + text.dcs = ATB_DCS_ASCII; + text.data = (UBYTE *)parameter; + text.len = ATB_string_Length(&text); + SEND_EVENT(data->edit_win, E_ED_INSERT, 0, (void *)&text); + } #else /* NEW_EDITOR */ - strncpy(ss_data.edt_buf_number, (char *)parameter, strlen((char *)parameter)+1); + strncpy(ss_data.edt_buf_number, (char *)parameter, strlen((char *)parameter)+1); #endif /* NEW_EDITOR */ - break; - default: + break; + default: return; - } - + } } @@ -6349,25 +6002,26 @@ *******************************************************************************/ -static int services_input_win_cb (MfwEvt e, MfwWin *w){ +static int services_input_win_cb (MfwEvt e, MfwWin *w) +{ /* Warning Removal - x0020906 - 24-08-2006 */ #ifndef NEW_EDITOR - T_services_input * data = (T_services_input *)w->user; + T_services_input * data = (T_services_input *)w->user; #endif - //int i =0; // RAVI + //int i =0; // RAVI TRACE_FUNCTION ("services_input_win_cb()"); /* SPR#1428 - SH - New Editor changes - this window is now * invisible, AUI editor sits on top*/ #ifdef NEW_EDITOR - return 0; + return 0; #else /* NEW_EDITOR */ - switch (e) + switch (e) { case MfwWinVisible: - edtShow(data->edt_input); + edtShow(data->edt_input); PROMPT(menuArea.px,menuArea.py,0,data->properties.text); displaySoftKeys(data->properties.left_soft_key,data->properties.right_soft_key); break; @@ -6377,168 +6031,9 @@ #endif /* NEW_EDITOR */ /* return 1; */ /* Unreachable Code - x0020906 - 24-08-2006 */ - } -/* SPR#1428 - SH - New Editor changes - no longer required*/ -#ifndef NEW_EDITOR -/******************************************************************************* - - $Function: services_input_kbd_cb - - $Description: - - $Returns: - - $Arguments: - -*******************************************************************************/ - -static int services_input_kbd_cb (MfwEvt e, MfwKbd *k){ - - - T_MFW_HND win = mfwParent(mfw_header()); - T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; - T_services_input * data = (T_services_input *)win_data->user; - - TRACE_FUNCTION ("services_input_kbd_cb()"); - - if (activeEditor() NEQ data->edt_input) - editActivate(data->edt_input,data->properties.abc); - - switch (k->code) - { - case KCD_MNUUP: - edtChar(data->edt_input,ecRight); - break; - - case KCD_MNUDOWN: - edtChar(data->edt_input,ecLeft); - break; - - case KCD_LEFT: - TRACE_FUNCTION("left key pressed"); - data->properties.callback(data->parent_win,SERVICES_INPUT_LEFT); - break; - - case KCD_HUP: - /* if edit field is empty then exit, else delete one char */ - data->properties.callback(data->parent_win,SERVICES_INPUT_CLEAR); - - if (strlen(data->properties.edt_attr_input->text) > 0) - { - edtChar(data->edt_input,ecBack); - if(strlen(data->properties.edt_attr_input->text) == 0) - data->properties.right_soft_key=TxtContacts; - else - data->properties.right_soft_key=TxtDelete; - winShow(data->win); - } - else - services_input_destroy(data->win); - break; - - case KCD_RIGHT: - // Check if there is a digit in the edit buffer softkey should be delete. - if (strlen(data->properties.edt_attr_input->text) > 0) - { - edtChar(data->edt_input,ecBack); - if(strlen(data->properties.edt_attr_input->text) == 0) - { - data->properties.right_soft_key=TxtContacts; - winShow(data->win); - } - } - else - { - // MZ 26/02/01 services_input_destroy(data->win); - // Activate phone book . - if (bookPhoneBookLoading()==BOOK_SUCCESS) - { - T_MFW_HND phbk_win; - phbk_win = bookPhonebookStart(data->win,PhbkFromDivert); - } - - } - - break; - default: - editEventKey (e,k); - if(strlen(data->properties.edt_attr_input->text) > 0) - data->properties.right_soft_key=TxtDelete; - else - data->properties.right_soft_key=TxtContacts; - winShow(data->win); - - break; - } - return MFW_EVENT_CONSUMED; -} - - -/******************************************************************************* - - $Function: services_input_kbd_long_cb - - $Description: - - $Returns: - - $Arguments: - -*******************************************************************************/ - - - - -static int services_input_kbd_long_cb (MfwEvt e, MfwKbd *k){ - - T_MFW_HND win = mfwParent(mfw_header()); - T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; - T_services_input * data = (T_services_input *)win_data->user; - - - if ((e & KEY_CLEAR) && (e & KEY_LONG)) - { - edtClear(data->edt_input); - services_input_destroy(data->win); - return MFW_EVENT_CONSUMED; - } - return MFW_EVENT_CONSUMED; -} - - -/******************************************************************************* - - $Function: services_number_input_cb - - $Description: - - $Returns: - - $Arguments: - -*******************************************************************************/ - -void services_number_input_cb(T_MFW_HND win, UBYTE identifier, USHORT reason){ - - switch(reason){ - - case SERVICES_INPUT_LEFT: - break; - case SERVICES_INPUT_RIGHT: - break; - case SERVICES_INPUT_CLEAR: - break; - default: - return; - } -} - -#endif /* ifndef NEW_EDITOR */ - - /******************************************************************************* $Function: servicesCallBarringCheck @@ -6551,7 +6046,6 @@ *******************************************************************************/ - void servicesCallBarringCheck(void) { char SS_string[60] = {'\0'}; @@ -6560,8 +6054,8 @@ CBAction = CBCheck; - getCBAction(SS_string); - getCBType(SS_string); + getCBAction(SS_string); + getCBType(SS_string); //x0pleela 23 Aug, 2006 DR: OMAPS00090419 //Removing the below code as it doesn't result in a valid SS. @@ -6573,9 +6067,8 @@ TRACE_FUNCTION(SS_string); - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - } /******************************************************************************* @@ -6591,7 +6084,6 @@ *******************************************************************************/ - void servicesCallBarringDeactivate(void) { char SS_string[60] = {'\0'}; @@ -6600,9 +6092,9 @@ CBAction = CBDeactivate; - getCBAction(SS_string); - getCBType(SS_string); - getCBPassword(SS_string); + getCBAction(SS_string); + getCBType(SS_string); + getCBPassword(SS_string); //x0pleela 23 Aug, 2006 DR: OMAPS00090419 //Removing the below code as it doesn't result in a valid SS. @@ -6611,21 +6103,19 @@ // getCBService(SS_string); //#endif - //x0pleela 03 May, 2007 DR: OMAPs00129383 - //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE - //to deactivate both Tele and Bearere services - - //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu - //Adding the basic service code 10(all teleservices) to the SS string during deactivation - strcat(SS_string,TELE_BEARER_SERVICE_CODE); - SS_string[strlen(SS_string)] = '#'; + //x0pleela 03 May, 2007 DR: OMAPs00129383 + //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE + //to deactivate both Tele and Bearere services + + //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu + //Adding the basic service code 10(all teleservices) to the SS string during deactivation + strcat(SS_string,TELE_BEARER_SERVICE_CODE); + SS_string[strlen(SS_string)] = '#'; TRACE_FUNCTION(SS_string); - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - - } //Jun 02,2004 CRR:13649 xpradipg-SASKEN @@ -6643,7 +6133,6 @@ void servicesCallBarringDeactivatePassword(void) { - CBFlag=CBDeactivate; requestCBPassword(); } @@ -6660,7 +6149,6 @@ *******************************************************************************/ - void servicesCallBarringActivate(void) { char SS_string[60] = {'\0'}; @@ -6669,9 +6157,9 @@ CBAction = CBActivate; - getCBAction(SS_string); - getCBType(SS_string); - getCBPassword(SS_string); + getCBAction(SS_string); + getCBType(SS_string); + getCBPassword(SS_string); //x0pleela 23 Aug, 2006 DR: OMAPS00090419 //Removing the below code as it doesn't result in a valid SS. //x0pleela 25 May, 2006 DR: OMAPS00070657 @@ -6679,20 +6167,19 @@ // getCBService(SS_string); //#endif - //x0pleela 03 May, 2007 DR: OMAPs00129383 - //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE - //to activate both Tele and Bearere services - - //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu - //Adding the basic service code 10(all teleservices) to the SS string during activation - strcat(SS_string,TELE_BEARER_SERVICE_CODE); - SS_string[strlen(SS_string)] = '#'; + //x0pleela 03 May, 2007 DR: OMAPs00129383 + //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE + //to activate both Tele and Bearere services + + //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu + //Adding the basic service code 10(all teleservices) to the SS string during activation + strcat(SS_string,TELE_BEARER_SERVICE_CODE); + SS_string[strlen(SS_string)] = '#'; TRACE_FUNCTION(SS_string); - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - } //Jun 02,2004 CRR:13649 xpradipg-SASKEN @@ -6710,7 +6197,6 @@ void servicesCallBarringActivatePassword(void) { - CBFlag=CBActivate; requestCBPassword(); } @@ -6728,23 +6214,20 @@ *******************************************************************************/ - void servicesCallBarringCancelAll(void) { char SS_string[60] = {'\0'}; TRACE_FUNCTION("servicesCallBarringCancelAll"); - strcat(SS_string, "#330*"); getCBPassword(SS_string); SS_string[strlen(SS_string)-1] = '#'; TRACE_FUNCTION(SS_string); - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) showFailed( ss_data.win ); - } //Jun 02,2004 CRR:13649 xpradipg-SASKEN @@ -6778,7 +6261,6 @@ *******************************************************************************/ - static void getCBAction(char * pSSstring) { switch (CBAction) @@ -6809,11 +6291,8 @@ *******************************************************************************/ - static void getCBType(char* pSSstring) { - - switch (CBType) { case CBAllOutgoing: @@ -6848,48 +6327,13 @@ *******************************************************************************/ - static void getCBPassword(char* pSSstring) { TRACE_FUNCTION("getCBPassword"); - strcat(pSSstring, (char*)ss_data.edt_buf_cb_password); - strcat(pSSstring, "*"); + strcat(pSSstring, (char*)ss_data.edt_buf_cb_password); + strcat(pSSstring, "*"); } -#if(0) /* x0039928 - Lint warning removal */ -/******************************************************************************* - - $Function: getCBService - - $Description: - - $Returns: - - $Arguments: - -*******************************************************************************/ -//x0pleela 25 May, 2006 DR: OMAPS00070657 -#ifdef FF_CPHS -static void getCBService(char * pSSstring) -{ - int nservice; - nservice =GetAlsLine(); - switch (nservice) - { - case CBVoice: - strcat(pSSstring, "*11"); //SPR#0776 - DS -changed from 10 to 11 - break; - /*MC SPR 742, handle line 2, auxiliary telephony*/ - case CBAuxVoice: - strcat(pSSstring, "*89"); - break; - default: - break; - } -} -#endif -#endif - //CQ-16432 start /******************************************************************************* @@ -6904,17 +6348,14 @@ *******************************************************************************/ - void requestSatCBPassword(void) { - - #ifdef NEW_EDITOR T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor changes */ #else /* NEW_EDITOR */ T_EDITOR_DATA editor_data; #endif /* NEW_EDITOR */ - T_MFW_HND win = mfw_parent(mfw_header()); + T_MFW_HND win = mfw_parent(mfw_header()); /* T_MFW_HND satPswdWin; */ /* Not Used - warning removal */ /*x0020906 - 24-08-2006 */ TRACE_FUNCTION("requestSatCBPassword"); //SPR#1014 - DS - Reset editor data @@ -6937,7 +6378,7 @@ AUI_edit_SetAltTextStr(&editor_data, CB_PSW_LEN, TxtNull, FALSE, TxtNull); AUI_edit_SetEvents(&editor_data, CBEnterSatPassword, TRUE, FOREVER, (T_AUI_EDIT_CB)CB_password_cb); /* satPswdWin = AUI_edit_Start(win, &editor_data); */ /* start the editor */ /* Warning Removal - x0020906 - 24-08-2006*/ - AUI_edit_Start(win, &editor_data); /* start the editor */ + AUI_edit_Start(win, &editor_data); /* start the editor */ TRACE_EVENT_P1("satPassword contents: %s",satPassword); #else /* NEW_EDITOR */ TRACE_FUNCTION("New editor is not defined"); @@ -6974,8 +6415,6 @@ *******************************************************************************/ - - void requestCBPassword(void) { #ifdef NEW_EDITOR @@ -6995,7 +6434,7 @@ /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR -TRACE_FUNCTION("NEW_EDITOR"); + TRACE_FUNCTION("NEW_EDITOR"); AUI_edit_SetDefault(&editor_data); AUI_edit_SetDisplay(&editor_data, RPWD_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT); AUI_edit_SetMode(&editor_data, ED_MODE_HIDDEN, ED_CURSOR_UNDERLINE); @@ -7006,7 +6445,7 @@ ss_data.info_win = AUI_edit_Start(ss_data.win, &editor_data); /* start the editor */ #else /* NEW_EDITOR */ -TRACE_FUNCTION("Old_editor"); + TRACE_FUNCTION("Old_editor"); bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0, (char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr ); editor_data.LeftSoftKey = TxtSoftOK; @@ -7038,88 +6477,86 @@ *******************************************************************************/ - - static void CB_password_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) { //16432 TRACE_FUNCTION("CB_password_cb"); switch (identifier) { - case CBCheckPassword: - //Jun 02,2004 CRR:13649 xpradipg-SASKEN - //keyevents right and hangup are handled initially - switch (reason) - { - case INFO_KCD_HUP: + case CBCheckPassword: + //Jun 02,2004 CRR:13649 xpradipg-SASKEN + //keyevents right and hangup are handled initially + switch (reason) + { + case INFO_KCD_HUP: // Change by Sasken ( VadiRaj) on March 29th 2004 // Issue Number : MMI-SPR-12882 // Subject: No functionality for the right softkey. // Bug : No functionality for the right softkey // Solution : Added functionality for the right "BACK" softeky - case INFO_KCD_RIGHT: - ss_data.info_win = 0; - CBFlag=CBActionNone;; - break; - default: - break; - } - //Jun 02,2004 CRR:13649 xpradipg-SASKEN - //depending on the action selected by the user the respective functions are invoked - switch(CBFlag) - { - case CBDeactivate: - CBFlag=CBActionNone; //reset the flag - servicesCallBarringDeactivate(); //initiates the callbarring deactivation for the selected service - break; - case CBActivate: - CBFlag=CBActionNone; //reset the flag - servicesCallBarringActivate(); //initiates the callbarring activation for the selected service - break; - case CBCancelAll: - CBFlag=CBActionNone; //reset the flag - servicesCallBarringCancelAll(); //initiates the cancelling of all barring services - break; - case CBNewPassword: - CBFlag=CBActionNone; //reset the flag - enterNewCBPassword(); //prompt for the new password - break; - default: - CBFlag=CBActionNone;; - break; - } + case INFO_KCD_RIGHT: ss_data.info_win = 0; + CBFlag=CBActionNone;; + break; + default: + break; + } + //Jun 02,2004 CRR:13649 xpradipg-SASKEN + //depending on the action selected by the user the respective functions are invoked + switch(CBFlag) + { + case CBDeactivate: + CBFlag=CBActionNone; //reset the flag + servicesCallBarringDeactivate(); //initiates the callbarring deactivation for the selected service + break; + case CBActivate: + CBFlag=CBActionNone; //reset the flag + servicesCallBarringActivate(); //initiates the callbarring activation for the selected service + break; + case CBCancelAll: + CBFlag=CBActionNone; //reset the flag + servicesCallBarringCancelAll(); //initiates the cancelling of all barring services + break; + case CBNewPassword: + CBFlag=CBActionNone; //reset the flag + enterNewCBPassword(); //prompt for the new password + break; + default: + CBFlag=CBActionNone;; + break; + } + ss_data.info_win = 0; break; - case CBNewPassword: - ss_data.info_win = 0; - switch (reason) - { - case INFO_KCD_LEFT: - confirmNewCBPassword(); - break; - default: - break; - } + case CBNewPassword: + ss_data.info_win = 0; + switch (reason) + { + case INFO_KCD_LEFT: + confirmNewCBPassword(); + break; + default: + break; + } break; - case CBConfirmNewPassword: - ss_data.info_win = 0; - switch (reason) - { - case INFO_KCD_LEFT: - changeCBPassword(); - break; - default: - break; - } + case CBConfirmNewPassword: + ss_data.info_win = 0; + switch (reason) + { + case INFO_KCD_LEFT: + changeCBPassword(); + break; + default: + break; + } break; //CQ-16432 start - case CBEnterSatPassword: + case CBEnterSatPassword: /*a0393213 warnings removal- CLCK_FAC_Ox changed to FAC_Ox as a result of ACI interface change*/ - ss_set_clck(FAC_Ox, CLCK_MOD_NotPresent, satPassword, CLASS_NotPresent, MFW_MODUL_UNKNOWN); + ss_set_clck(FAC_Ox, CLCK_MOD_NotPresent, satPassword, CLASS_NotPresent, MFW_MODUL_UNKNOWN); //CQ-16432 end - break; - default: - break; + break; + default: + break; } } @@ -7153,7 +6590,6 @@ *******************************************************************************/ - void enterNewCBPassword(void) { #ifdef NEW_EDITOR @@ -7209,7 +6645,6 @@ *******************************************************************************/ - void confirmNewCBPassword(void) { #ifdef NEW_EDITOR @@ -7252,7 +6687,6 @@ editor_data.destroyEditor = TRUE; ss_data.info_win = editor_start(ss_data.win, &editor_data); #endif /* NEW_EDITOR */ - } /******************************************************************************* @@ -7267,49 +6701,45 @@ *******************************************************************************/ - void changeCBPassword(void){ - char SS_string[60] = {'\0'}; T_DISPLAY_DATA display_info; TRACE_FUNCTION("changeCBPassword"); - if (strcmp((char*)ss_data.edt_buf_cb_new_password, (char*)ss_data.edt_buf_cb_conf_new_password)) - { - /* - ** The New and Confirm Passwords do not match, restart the process and display a dialog to - ** explain. (The dialog is done second so that it will display on top of the new prompt) - */ - enterNewCBPassword(); - - // Jul 23, 2004 REF: CRR 16107 xvilliva - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtPasswords, TxtMismatch, COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, THREE_SECS, 0); - display_info.Identifier = ServicesFailed; - - /* - * Call Info Screen - */ - ss_data.info_win = info_dialog (ss_data.win, &display_info); - } - else - { - strcat(SS_string, "**03*330*"); - strcat(SS_string,(char*)ss_data.edt_buf_cb_password); - strcat(SS_string,"*"); - strcat(SS_string,(char*)ss_data.edt_buf_cb_new_password); - strcat(SS_string,"*"); - strcat(SS_string,(char*)ss_data.edt_buf_cb_conf_new_password); - strcat(SS_string,"#"); - - TRACE_FUNCTION(SS_string); - - if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) - showFailed( ss_data.win ); - } - - + if (strcmp((char*)ss_data.edt_buf_cb_new_password, (char*)ss_data.edt_buf_cb_conf_new_password)) + { + /* + ** The New and Confirm Passwords do not match, restart the process and display a dialog to + ** explain. (The dialog is done second so that it will display on top of the new prompt) + */ + enterNewCBPassword(); + + // Jul 23, 2004 REF: CRR 16107 xvilliva + dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtPasswords, TxtMismatch, COLOUR_STATUS); + dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, THREE_SECS, 0); + display_info.Identifier = ServicesFailed; + + /* + * Call Info Screen + */ + ss_data.info_win = info_dialog (ss_data.win, &display_info); + } + else + { + strcat(SS_string, "**03*330*"); + strcat(SS_string,(char*)ss_data.edt_buf_cb_password); + strcat(SS_string,"*"); + strcat(SS_string,(char*)ss_data.edt_buf_cb_new_password); + strcat(SS_string,"*"); + strcat(SS_string,(char*)ss_data.edt_buf_cb_conf_new_password); + strcat(SS_string,"#"); + + TRACE_FUNCTION(SS_string); + + if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) + showFailed( ss_data.win ); + } } @@ -7349,5 +6779,4 @@ */ info_dialog(win, &display_info); - }