comparison src/ui/bmi/mmiServices.c @ 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 c0052fe355d3
children
comparison
equal deleted inserted replaced
166:d715ee726526 167:897bdea4cb0b
1 /******************************************************************************* 1 /*******************************************************************************
2 2
3 CONDAT (UK) 3 CONDAT (UK)
4 4
5 ******************************************************************************** 5 ********************************************************************************
6 6
7 This software product is the property of Condat (UK) Ltd and may not be 7 This software product is the property of Condat (UK) Ltd and may not be
8 disclosed to any third party without the express permission of the owner. 8 disclosed to any third party without the express permission of the owner.
9 9
10 ******************************************************************************** 10 ********************************************************************************
11 11
12 $Project name: Basic MMI 12 $Project name: Basic MMI
13 $Project code: BMI (6349) 13 $Project code: BMI (6349)
14 $Module: Supplementary services 14 $Module: Supplementary services
15 $File: MmiServices.c 15 $File: MmiServices.c
16 $Revision: 1.0 16 $Revision: 1.0
17 17
18 $Author: Condat(UK) 18 $Author: Condat(UK)
19 $Date: 25/10/00 19 $Date: 25/10/00
20 20
21 ******************************************************************************** 21 ********************************************************************************
22 22
23 Description 23 Description
24 24
29 $History: MmiServices.c 29 $History: MmiServices.c
30 30
31 May 03, 2007 DR: OMAPS00129383 x0pleela 31 May 03, 2007 DR: OMAPS00129383 x0pleela
32 Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level 32 Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level
33 Solution: Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE to activate 33 Solution: Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE to activate
34 and de-activate both Tele and Bearere services 34 and de-activate both Tele and Bearere services
35 35
36 Feb 27, 2007 ER: OMAPS00113891 x0pleela 36 Feb 27, 2007 ER: OMAPS00113891 x0pleela
37 Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level 37 Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level
38 Solution: Did the following changes: 38 Solution: Did the following changes:
39 - Externed call_data variable 39 - Externed call_data variable
40 - In function showssNotify(), 40 - In function showssNotify(),
41 >> handling the case MFW_SS_MT_FORWARDED: where 41 >> handling the case MFW_SS_MT_FORWARDED: where
42 incoming call dialog will be displayed with proper string for TTY/normal forwarded 42 incoming call dialog will be displayed with proper string for TTY/normal forwarded
43 incoming call. 43 incoming call.
44 >>New case MFW_SS_MT_CALL_FORWARDED is added to display a dialog "Incoming 44 >>New case MFW_SS_MT_CALL_FORWARDED is added to display a dialog "Incoming
45 call forwarde" to the subscriber who has forwarded his all incoming calls 45 call forwarde" to the subscriber who has forwarded his all incoming calls
46 46
47 Nov 27, 2006 OMAPS00098359 a0393213(R.Prabakar) 47 Nov 27, 2006 OMAPS00098359 a0393213(R.Prabakar)
48 Description: CPHS 4.2 : Call Divert doesn't work properly for Line 2 48 Description: CPHS 4.2 : Call Divert doesn't work properly for Line 2
49 49
50 Aug 28, 2006 DR: OMAPS00083503 x0pleela 50 Aug 28, 2006 DR: OMAPS00083503 x0pleela
53 53
54 Aug 28, 2006 DR: OMAPS00083503 x0pleela 54 Aug 28, 2006 DR: OMAPS00083503 x0pleela
55 Description: Result of ss_check_ss_string may be ignored 55 Description: Result of ss_check_ss_string may be ignored
56 Solution: Defined new enumeration T_SS_APLHA for DCS 56 Solution: Defined new enumeration T_SS_APLHA for DCS
57 services(): Checking for dcs and if UCS2 character then display a dialog 57 services(): Checking for dcs and if UCS2 character then display a dialog
58 saying font not supported. Else proceed with the transaction 58 saying font not supported. Else proceed with the transaction
59 showUSSDError():This function displays a dialog saying USSD message received, 59 showUSSDError():This function displays a dialog saying USSD message received,
60 Font not supported for UCS2 characters 60 Font not supported for UCS2 characters
61 61
62 62
63 Aug 23, 2006 DR: OMAPS00090419 x0pleela 63 Aug 23, 2006 DR: OMAPS00090419 x0pleela
64 Descroption:FT Nice/France, Orange (wk32/06) - Call Barring - misleading message: 64 Descroption:FT Nice/France, Orange (wk32/06) - Call Barring - misleading message:
65 Solution:Commented the code (function getCBService()) which appends the ss string with *11 65 Solution:Commented the code (function getCBService()) which appends the ss string with *11
66 or *89 as it is not a valid SS string for checking status, activation and deactivation of 66 or *89 as it is not a valid SS string for checking status, activation and deactivation of
67 call barring feature in functions servicesCallBarringCheck, servicesCallBarringDeactivate, 67 call barring feature in functions servicesCallBarringCheck, servicesCallBarringDeactivate,
68 servicesCallBarringActivate 68 servicesCallBarringActivate
69 69
70 May 30, 2006 REF:OMAPS00079650 a0393213 (R.Prabakar) 70 May 30, 2006 REF:OMAPS00079650 a0393213 (R.Prabakar)
71 Description : CPHS Call Forwarding feature implementation 71 Description : CPHS Call Forwarding feature implementation
72 Solution : As part of implementation, in this file, call to cphs_set_divert_status is called whenever necessary. 72 Solution : As part of implementation, in this file, call to cphs_set_divert_status is called whenever necessary.
73 The current code is put under the else part of #ifdef FF_CPHS. Some clean-up of existing code is also done. 73 The current code is put under the else part of #ifdef FF_CPHS. Some clean-up of existing code is also done.
74 74
75 May 30, 2006 DR: OMAPS00070657 x0pleela 75 May 30, 2006 DR: OMAPS00070657 x0pleela
76 Description: CPHS feature on Locosto-Lite 76 Description: CPHS feature on Locosto-Lite
77 Solution: For ALS feature, 77 Solution: For ALS feature,
78 a) Defined new enumeration "SERVICE_CB_SERVICE" for SS similar to Line 1 and Line 2 78 a) Defined new enumeration "SERVICE_CB_SERVICE" for SS similar to Line 1 and Line 2
79 b) Defined new function "getCBService()" to update psstring based on the current 79 b) Defined new function "getCBService()" to update psstring based on the current
80 line activated while processing SS 80 line activated while processing SS
81 81
82 Apr 10, 2006 REF: OMAPS00052691 x0039928 82 Apr 10, 2006 REF: OMAPS00052691 x0039928
83 Description: FT USA [Cingular(WK42)] - T 8.6 Call Waiting Accept - 83 Description: FT USA [Cingular(WK42)] - T 8.6 Call Waiting Accept -
84 ATD *43# returns "Unknown status" 84 ATD *43# returns "Unknown status"
85 Solution: Proper Text is displyed when network returns status STAT_NONE( 0 ) for 85 Solution: Proper Text is displyed when network returns status STAT_NONE( 0 ) for
86 call waiting activation. 86 call waiting activation.
87 87
88 Dec 07, 2005 REF: OMAPS00050087 x0039928 88 Dec 07, 2005 REF: OMAPS00050087 x0039928
89 Description: Deactivated is displayed while activate Hide Id option is selected 89 Description: Deactivated is displayed while activate Hide Id option is selected
90 Solution: String "Not Activated" is displayed if the Hide Id activation fails. 90 Solution: String "Not Activated" is displayed if the Hide Id activation fails.
91 91
94 Solution: Increased the IMEI_LEN from 15 to 17 for displaying the Cd byte. 94 Solution: Increased the IMEI_LEN from 15 to 17 for displaying the Cd byte.
95 95
96 Jun 16, 2005 REF: CRR 31543 x0021334 96 Jun 16, 2005 REF: CRR 31543 x0021334
97 Issue: SATK: cannot get TR for send ussd command 97 Issue: SATK: cannot get TR for send ussd command
98 Solution: When the user presses "Hang up" key when the SAT USSD session is in progress, 98 Solution: When the user presses "Hang up" key when the SAT USSD session is in progress,
99 a call is made to function 'sAT_end_ussd()' to end the USSD session. 99 a call is made to function 'sAT_end_ussd()' to end the USSD session.
100 100
101 May 12, 2005 REF: CRR 30892 x0021334 101 May 12, 2005 REF: CRR 30892 x0021334
102 Bug: MMI doesn't handle 2nd Interogation of "CW for basic services" using USSD *#43#. 102 Bug: MMI doesn't handle 2nd Interogation of "CW for basic services" using USSD *#43#.
103 Fix: Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification 103 Fix: Set ss_data.info_win to NULL to pass the check in services_ss_cb() for notification
104 104
105 May 02, 2005 REF : LOCOSTO-ENH-30818 - xpradipg 105 May 02, 2005 REF : LOCOSTO-ENH-30818 - xpradipg
106 Description: IMEI retreival by posting a call to ACI sAT_xx API 106 Description: IMEI retreival by posting a call to ACI sAT_xx API
107 Solution: The direct call to cl_get_imeisv() is replaced with the 107 Solution: The direct call to cl_get_imeisv() is replaced with the
108 call to the mmi_imei_store() which inturn calls sAT_Dn() and 108 call to the mmi_imei_store() which inturn calls sAT_Dn() and
109 retrieves the IMEI info and stores it onto the global 109 retrieves the IMEI info and stores it onto the global
110 variable "imei" 110 variable "imei"
111 111
112 Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V 112 Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V
113 Bug : Unable to compose a one or two digit number 113 Bug : Unable to compose a one or two digit number
114 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. 114 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.
115 The read only editor with the service provider message that comes up when a one or two digit is dialled 115 The read only editor with the service provider message that comes up when a one or two digit is dialled
116 was not handled properly. So altered the editor handling to cater for the long message. 116 was not handled properly. So altered the editor handling to cater for the long message.
117 117
118 Oct 20, 2004 REF: CRR 25772 Deepa M.D 118 Oct 20, 2004 REF: CRR 25772 Deepa M.D
119 Bug: Not displaying proper RSK name in call divert edit screens 119 Bug: Not displaying proper RSK name in call divert edit screens
120 Fix: The RSK name will be changed based on whether the editor content is empty or not. 120 Fix: The RSK name will be changed based on whether the editor content is empty or not.
121 121
126 Jun 21,2004 CRR:13650 xpradipg - SASKEN 126 Jun 21,2004 CRR:13650 xpradipg - SASKEN
127 127
128 Jul 16, 2004 REF: CRR 18409 xvilliva 128 Jul 16, 2004 REF: CRR 18409 xvilliva
129 Bug: CHW : message "Deactivated" when it should be "Activated". 129 Bug: CHW : message "Deactivated" when it should be "Activated".
130 Fix: The alert displayed depends on the status code received. If we 130 Fix: The alert displayed depends on the status code received. If we
131 receive the status as zero or 0xFF, we now show an alert saying 131 receive the status as zero or 0xFF, we now show an alert saying
132 "unknown status" instead of "Deactivated". 132 "unknown status" instead of "Deactivated".
133 133
134 134
135 Jun 21,2004 CRR:13650 xpradipg - SASKEN 135 Jun 21,2004 CRR:13650 xpradipg - SASKEN
136 136
137 Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken) 137 Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken)
138 Solution: The CF state is maintained in flash. During bootup the CF icon in the idle screen 138 Solution: The CF state is maintained in flash. During bootup the CF icon in the idle screen
139 is displayed depending upon its state in the ffs 139 is displayed depending upon its state in the ffs
140 140
141 Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken) 141 Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken)
142 Solution: The condition for which Call Forward is activated/deactivated or its staus is checked, 142 Solution: The condition for which Call Forward is activated/deactivated or its staus is checked,
143 is displayed in the message along with the activation/deactivation message 143 is displayed in the message along with the activation/deactivation message
144 144
145 Jun 21,2004 CRR:13650 xpradipg - SASKEN 145 Jun 21,2004 CRR:13650 xpradipg - SASKEN
146 Description: CBA : no basic service sent when using the menu 146 Description: CBA : no basic service sent when using the menu
147 Fix: Basic service code 10(All teleservices) is sent for activation and deactivation thru menus 147 Fix: Basic service code 10(All teleservices) is sent for activation and deactivation thru menus
148
149 148
150 149
151 Jun 04,2004 CRR:13601 xpradipg - SASKEN 150 Jun 04,2004 CRR:13601 xpradipg - SASKEN
152 Description: CFO interrogation display : Timer to long 151 Description: CFO interrogation display : Timer to long
153 Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key 152 Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key
159 case where it was shown up on selecting CallBarring option in the Network Services 158 case where it was shown up on selecting CallBarring option in the Network Services
160 159
161 160
162 Issue Number : SPR#12882 on 29/03/04 by VadiRaj 161 Issue Number : SPR#12882 on 29/03/04 by VadiRaj
163 162
164 25/10/00 Original Condat(UK) BMI version. 163 25/10/00 Original Condat(UK) BMI version.
165 164
166 $End 165 $End
167 166
168 *******************************************************************************/ 167 *******************************************************************************/
169 168
279 static void showError (T_MFW_HND win, T_MFW_SS_ERROR ss_error); 278 static void showError (T_MFW_HND win, T_MFW_SS_ERROR ss_error);
280 static void showCLIStatus (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf ); 279 static void showCLIStatus (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf );
281 static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY * ss_notify); 280 static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY * ss_notify);
282 281
283 282
284
285 static void showIMEI2 (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf); 283 static void showIMEI2 (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf);
286 static void showUSSDREQ (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf); 284 static void showUSSDREQ (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf);
287 static void showUSSDCNF (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf); 285 static void showUSSDCNF (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf);
288 static void showUSSDEnter (void); 286 static void showUSSDEnter (void);
289 static void showUSSDFull (T_MFW_HND win); 287 static void showUSSDFull (T_MFW_HND win);
353 351
354 352
355 T_MFW_HND dialog_ext_info_dialog (T_MFW_HND parent_win, 353 T_MFW_HND dialog_ext_info_dialog (T_MFW_HND parent_win,
356 T_dialog_ext_info * display_info); 354 T_dialog_ext_info * display_info);
357 355
358 static MfwHnd lastFocus; /* store old focus */ 356 static MfwHnd lastFocus; /* store old focus */
359 static MfwHnd win; /* our window */ 357 static MfwHnd win; /* our window */
360 /*x0039928- Lint warning removal */ 358 /*x0039928- Lint warning removal */
361 /* static MfwHnd kbd; // our keyboard handler */ 359 /* static MfwHnd kbd; // our keyboard handler */
362 static MfwHnd times; /* timeout */ 360 static MfwHnd times; /* timeout */
363 361
364 /* x0039928 - Lint warning removal 362 /* x0039928 - Lint warning removal
365 static MmiState nextState; // next state when finished */ 363 static MmiState nextState; // next state when finished */
366 static int servicesState; /* current state of module */ 364 static int servicesState; /* current state of module */
367 365
368 366
369 static T_MFW_SS_PARA *ss_cnf; /* union container for all SS confirmations */ 367 static T_MFW_SS_PARA *ss_cnf; /* union container for all SS confirmations */
370 368
371 /* decode service type - tele/bearer */ 369 /* decode service type - tele/bearer */
374 static unsigned int serviceGetType( T_MFW_SS_CODES type ); 372 static unsigned int serviceGetType( T_MFW_SS_CODES type );
375 static unsigned int ServiceGetStatus( UBYTE pStatus); 373 static unsigned int ServiceGetStatus( UBYTE pStatus);
376 static unsigned int serviceGetError( T_MFW_SS_ERROR ss_error); 374 static unsigned int serviceGetError( T_MFW_SS_ERROR ss_error);
377 375
378 376
379
380 #define SS_STAT_NONE 0 //xvilliva 18409, not registered, not active, 377 #define SS_STAT_NONE 0 //xvilliva 18409, not registered, not active,
381 //not provisioned,not quiescent 378 //not provisioned,not quiescent
382 379
383 //x0pleela 03 May, 2007 DR: OMAPS00129383 380 //x0pleela 03 May, 2007 DR: OMAPS00129383
384 //defined new service code for both Teleservices and Bearer services 381 //defined new service code for both Teleservices and Bearer services
385 #define TELE_BEARER_SERVICE_CODE "09" 382 #define TELE_BEARER_SERVICE_CODE "09"
386 383
409 CBInternational, 406 CBInternational,
410 CBInternationalHome, 407 CBInternationalHome,
411 CBAllIncoming, 408 CBAllIncoming,
412 CBIncomingRoaming 409 CBIncomingRoaming
413 } SERVICE_CB_TYPE; 410 } SERVICE_CB_TYPE;
414
415 411
416 412
417 typedef enum 413 typedef enum
418 { 414 {
419 CFVoice = 0, 415 CFVoice = 0,
449 CBNewPassword, 445 CBNewPassword,
450 CBConfirmNewPassword, 446 CBConfirmNewPassword,
451 //Jun 02, 2004 CRR:13649 - xpradipg-SASKEN 447 //Jun 02, 2004 CRR:13649 - xpradipg-SASKEN
452 //added for holding the state for callbarring service 448 //added for holding the state for callbarring service
453 //CQ-13649:start 449 //CQ-13649:start
454 CBCancelAll, 450 CBCancelAll,
455 CBActionNone, 451 CBActionNone,
456 //CQ-13649:end 452 //CQ-13649:end
457 //CQ-16432 start 453 //CQ-16432 start
458 CBEnterSatPassword 454 CBEnterSatPassword
459 //CQ-16432 end 455 //CQ-16432 end
460 } SERVICE_CB_ACTION; 456 } SERVICE_CB_ACTION;
461
462 457
463 458
464 /* NOTE that these are needed in new architecture */ 459 /* NOTE that these are needed in new architecture */
465 static SERVICE_CF_TYPE CFType; /* Type of Call Forwarding */ 460 static SERVICE_CF_TYPE CFType; /* Type of Call Forwarding */
466 static SERVICE_CF_SERVICE CFService; /* basic service for Call Forwarding */ 461 static SERVICE_CF_SERVICE CFService; /* basic service for Call Forwarding */
479 //CRR:13649 474 //CRR:13649
480 /* x0039928 - Lint warning removal 475 /* x0039928 - Lint warning removal
481 static char CFNumber[MAX_LEN]; number to forward calls to */ 476 static char CFNumber[MAX_LEN]; number to forward calls to */
482 477
483 478
484
485 /* end of bits for USSD */ 479 /* end of bits for USSD */
486
487 480
488 481
489 #define CF_ACTIVE_STATUS 1 482 #define CF_ACTIVE_STATUS 1
490 #define CF_INACTIVE_STATUS 2 483 #define CF_INACTIVE_STATUS 2
491 /* Marcus: Issue 1652: 03/02/2003 */ 484 /* Marcus: Issue 1652: 03/02/2003 */
534 527
535 528
536 static void srv_display_status (UBYTE ss_status); 529 static void srv_display_status (UBYTE ss_status);
537 530
538 531
539
540 typedef struct 532 typedef struct
541 { 533 {
542 int text; 534 int text;
543 #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ 535 #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */
544 T_ED_ATTR *editor_attr_input; 536 T_ED_ATTR *editor_attr_input;
545 #else /* NEW_EDITOR */ 537 #else /* NEW_EDITOR */
546 MfwEdtAttr* edt_attr_input; 538 MfwEdtAttr* edt_attr_input;
547 #endif /* NEW_EDITOR */ 539 #endif /* NEW_EDITOR */
548 int left_soft_key; 540 int left_soft_key;
549 int right_soft_key; 541 int right_soft_key;
550 short abc; /* numeric or alpha? */ 542 short abc; /* numeric or alpha? */
551 #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ 543 #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */
552 T_AUI_EDIT_CB callback; 544 T_AUI_EDIT_CB callback;
553 #else /* NEW_EDITOR */ 545 #else /* NEW_EDITOR */
554 void (* callback)(T_MFW_HND win,USHORT reason); 546 void (* callback)(T_MFW_HND win,USHORT reason);
555 #endif /* NEW_EDITOR */ 547 #endif /* NEW_EDITOR */
556 } T_input_properties; 548 } T_input_properties;
557
558
559 549
560 550
561 typedef struct 551 typedef struct
562 { 552 {
563 T_MMI_CONTROL mmi_control; 553 T_MMI_CONTROL mmi_control;
564 T_MFW_HND parent_win; 554 T_MFW_HND parent_win;
565 T_MFW_HND win; 555 T_MFW_HND win;
566 T_MFW_HND kbd; 556 T_MFW_HND kbd;
567 T_MFW_HND kbd_long; 557 T_MFW_HND kbd_long;
568 #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ 558 #ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */
569 T_MFW_HND edit_win; 559 T_MFW_HND edit_win;
570 #else /* NEW_EDITOR */ 560 #else /* NEW_EDITOR */
571 T_MFW_HND edt_input; 561 T_MFW_HND edt_input;
572 #endif /* NEW_EDITOR */ 562 #endif /* NEW_EDITOR */
573 T_input_properties properties; 563 T_input_properties properties;
574 } T_services_input; 564 } T_services_input;
575 565
576 /* SPR#1428 - SH - New Editor changes - no longer required*/ 566 /* SPR#1428 - SH - New Editor changes - no longer required*/
577 #ifndef NEW_EDITOR 567 #ifndef NEW_EDITOR
578 void services_number_input_cb(T_MFW_HND win, UBYTE identifier, USHORT reason); 568 void services_number_input_cb(T_MFW_HND win, UBYTE identifier, USHORT reason);
579 #endif 569 #endif
580
581 570
582 571
583 static T_MFW_HND services_input_create (MfwHnd parent); 572 static T_MFW_HND services_input_create (MfwHnd parent);
584 static void services_input_destroy (MfwHnd window); 573 static void services_input_destroy (MfwHnd window);
585 static MfwHnd services_input_start(MfwHnd parent,T_input_properties *properties); 574 static MfwHnd services_input_start(MfwHnd parent,T_input_properties *properties);
589 /* SPR#1428 - SH - New Editor changes - no longer required*/ 578 /* SPR#1428 - SH - New Editor changes - no longer required*/
590 #ifndef NEW_EDITOR 579 #ifndef NEW_EDITOR
591 static int services_input_kbd_cb(MfwEvt e, MfwKbd *k); 580 static int services_input_kbd_cb(MfwEvt e, MfwKbd *k);
592 static int services_input_kbd_long_cb(MfwEvt e, MfwKbd *k); 581 static int services_input_kbd_long_cb(MfwEvt e, MfwKbd *k);
593 #endif 582 #endif
594
595 583
596 584
597 /* editor */ 585 /* editor */
598 //GW Moved editor definitions to MmiResources.h 586 //GW Moved editor definitions to MmiResources.h
599 #define SAT_EDITOR_COLOR 0 587 #define SAT_EDITOR_COLOR 0
624 $Arguments: 612 $Arguments:
625 613
626 *******************************************************************************/ 614 *******************************************************************************/
627 615
628 616
629
630 T_MFW_HND servicesInit (T_MFW_HND parent) 617 T_MFW_HND servicesInit (T_MFW_HND parent)
631 { 618 {
632 619 TRACE_FUNCTION("servicesInit function");
633 TRACE_FUNCTION("servicesInit function"); 620
634 621 /*
635 /* 622 * Initialise MFW
636 * Initialise MFW 623 */
637 */
638 ss_mfw_init(); 624 ss_mfw_init();
639 /* 625 /*
640 * Create any other handler 626 * Create any other handler
641 */ 627 */
642 //16432 628 //16432
645 0xFFFF, 631 0xFFFF,
646 (T_MFW_CB)services_ss_cb); 632 (T_MFW_CB)services_ss_cb);
647 633
648 ss_data.win = 0; 634 ss_data.win = 0;
649 return (services_create (0)); 635 return (services_create (0));
650
651
652 } 636 }
653 637
654 638
655 /******************************************************************************* 639 /*******************************************************************************
656 640
661 $Returns: 645 $Returns:
662 646
663 $Arguments: 647 $Arguments:
664 648
665 *******************************************************************************/ 649 *******************************************************************************/
666
667 650
668 651
669 void servicesExit (void) 652 void servicesExit (void)
670 { 653 {
671 TRACE_FUNCTION("servicesExit"); 654 TRACE_FUNCTION("servicesExit");
713 */ 696 */
714 data->info_win = 0; 697 data->info_win = 0;
715 data->info_wait = 0; 698 data->info_wait = 0;
716 data->cb_menu_win = 0; 699 data->cb_menu_win = 0;
717 700
718 /* SPR#1428 - SH - New Editor changes - this editor never used */ 701 /* SPR#1428 - SH - New Editor changes - this editor never used */
719 #if 0 702 #if 0
720 data->ussd_num_win = 0; 703 data->ussd_num_win = 0;
721 data->ussd_name_win = 0; 704 data->ussd_name_win = 0;
722 #endif 705 #endif
723 706
724 data->input_number_win = 0; 707 data->input_number_win = 0;
725 memset(data->edt_buf_name,'\0',sizeof(data->edt_buf_name)); 708 memset(data->edt_buf_name,'\0',sizeof(data->edt_buf_name));
726 memset(data->edt_buf_number,'\0',sizeof(data->edt_buf_number)); 709 memset(data->edt_buf_number,'\0',sizeof(data->edt_buf_number));
727 memset(data->edt_buf_cb_password,'\0',sizeof(data->edt_buf_cb_password)); /* x0039928 - Lint warning fix */ 710 memset(data->edt_buf_cb_password,'\0',sizeof(data->edt_buf_cb_password)); /* x0039928 - Lint warning fix */
728 /* SPR#1428 - SH - New Editor changes - no longer required*/ 711 /* SPR#1428 - SH - New Editor changes - no longer required*/
729 #ifndef NEW_EDITOR 712 #ifndef NEW_EDITOR
730 bookSetEditAttributes(SERVICE_CREATE_EDITOR,COLOUR_EDITOR_XX,0,edtCurBar1,0,(char*)data->edt_buf_name,PHB_MAX_LEN,&data->edt_attr_name); 713 bookSetEditAttributes(SERVICE_CREATE_EDITOR,COLOUR_EDITOR_XX,0,edtCurBar1,0,(char*)data->edt_buf_name,PHB_MAX_LEN,&data->edt_attr_name);
731 bookSetEditAttributes(SERVICE_CREATE_EDITOR,COLOUR_EDITOR_XX,0,edtCurBar1,0,(char*)data->edt_buf_number,PHB_MAX_LEN,&data->edt_attr_number); 714 bookSetEditAttributes(SERVICE_CREATE_EDITOR,COLOUR_EDITOR_XX,0,edtCurBar1,0,(char*)data->edt_buf_number,PHB_MAX_LEN,&data->edt_attr_number);
732 #endif /* ifndef NEW_EDITOR */ 715 #endif /* ifndef NEW_EDITOR */
733 716
734 /* NDH : 28/08/2003 : Intialise cfu_services to "ALL Inactive" */ 717 /* NDH : 28/08/2003 : Intialise cfu_services to "ALL Inactive" */
735 data->cfu_services = 0; 718 data->cfu_services = 0;
736 719
737 winShow (data->win); 720 winShow (data->win);
738 721
739 /* 722 /*
740 * return window handle 723 * return window handle
741 */ 724 */
742 return data->win; 725 return data->win;
743 } 726 }
744 727
745 728
746 /******************************************************************************* 729 /*******************************************************************************
747 730
803 786
804 *******************************************************************************/ 787 *******************************************************************************/
805 788
806 static int services_win_cb(T_MFW_EVENT e, T_MFW_SS_PARA * para) 789 static int services_win_cb(T_MFW_EVENT e, T_MFW_SS_PARA * para)
807 { 790 {
808 /* 791 /*
809 * Top Window has no output 792 * Top Window has no output
810 */ 793 */
811 TRACE_FUNCTION ("services_win_cb()"); 794 TRACE_FUNCTION ("services_win_cb()");
812 switch (e) 795 switch (e)
813 { 796 {
814 case MfwWinVisible: 797 case MfwWinVisible:
815 break; 798 break;
816 default: 799 default:
817 return 0; 800 return 0;
818 } 801 }
819 return 1; 802 return 1;
820
821 } 803 }
822 804
823 /******************************************************************************* 805 /*******************************************************************************
824 806
825 $Function: destroyInfoWindow 807 $Function: destroyInfoWindow
847 { 829 {
848 TRACE_FUNCTION("destroying input window!!!"); 830 TRACE_FUNCTION("destroying input window!!!");
849 SEND_EVENT(ss_data.input_number_win, SERVICES_INPUT_DESTROY, 0, 0); 831 SEND_EVENT(ss_data.input_number_win, SERVICES_INPUT_DESTROY, 0, 0);
850 ss_data.input_number_win = 0; 832 ss_data.input_number_win = 0;
851 } 833 }
852
853 } 834 }
854 835
855 /* 836 /*
856 +--------------------------------------------------------------------+ 837 +--------------------------------------------------------------------+
857 | PROJECT: MMI-Framework (8417) MODULE: MFW_DMY | 838 | PROJECT: MMI-Framework (8417) MODULE: MFW_DMY |
913 // T_MFW_WIN * win; // RAVI 894 // T_MFW_WIN * win; // RAVI
914 // win = (T_MFW_WIN *) ((T_MFW_HDR *)ss_data.win)->data; // RAVI 895 // win = (T_MFW_WIN *) ((T_MFW_HDR *)ss_data.win)->data; // RAVI
915 } 896 }
916 897
917 switch (e) 898 switch (e)
918 { 899 {
919 case E_SS_RES: 900 case E_SS_RES:
920 if (!ss_data.info_wait) 901 if (!ss_data.info_wait)
921 { 902 {
922 TRACE_FUNCTION ("show the wait screen"); 903 TRACE_FUNCTION ("show the wait screen");
923 #ifdef FF_CPHS_REL4 904 #ifdef FF_CPHS_REL4
924 if(interrogate != 1) 905 if(interrogate != 1)
925 { 906 {
926 #endif 907 #endif
927 showWait( ss_data.win ); 908 showWait( ss_data.win );
932 /* 913 /*
933 * ignore the event 914 * ignore the event
934 */ 915 */
935 break; 916 break;
936 917
937 case E_SS_NOTIFY: 918 case E_SS_NOTIFY:
938 if(!ss_data.info_win) 919 if(!ss_data.info_win)
939 SEND_EVENT(ss_data.win,E_SS_NOTIFY,0, para); 920 SEND_EVENT(ss_data.win,E_SS_NOTIFY,0, para);
940
941 destroyInfoWindow(); 921 destroyInfoWindow();
942 break; 922 break;
943 923
944 case E_SS_CF_CNF: 924 case E_SS_CF_CNF:
945 925 if(!ss_data.info_win)
946 if(!ss_data.info_win)
947 SEND_EVENT(ss_data.win,E_SS_CF_CNF,0, para); 926 SEND_EVENT(ss_data.win,E_SS_CF_CNF,0, para);
948
949 destroyInfoWindow(); 927 destroyInfoWindow();
950 break; 928 break;
951 929
952 case E_SS_CF_ICN_UPD: 930 case E_SS_CF_ICN_UPD:
953 931 if(!ss_data.info_win)
954 if(!ss_data.info_win)
955 SEND_EVENT(ss_data.win,E_SS_CF_ICN_UPD,0, para); 932 SEND_EVENT(ss_data.win,E_SS_CF_ICN_UPD,0, para);
956
957 destroyInfoWindow(); 933 destroyInfoWindow();
958 break; 934 break;
959 935
960 case E_SS_CW_CNF: 936 case E_SS_CW_CNF:
961 if(!ss_data.info_win) 937 if(!ss_data.info_win)
962 SEND_EVENT(ss_data.win,E_SS_CW_CNF,0, para); 938 SEND_EVENT(ss_data.win,E_SS_CW_CNF,0, para);
963
964 destroyInfoWindow(); 939 destroyInfoWindow();
965 break; 940 break;
966 941
967 case E_SS_CLI_CNF: 942 case E_SS_CLI_CNF:
968 if(!ss_data.info_win) 943 if(!ss_data.info_win)
969 SEND_EVENT(ss_data.win,E_SS_CLI_CNF,0, para); 944 SEND_EVENT(ss_data.win,E_SS_CLI_CNF,0, para);
970
971 destroyInfoWindow(); 945 destroyInfoWindow();
972 break; 946 break;
973 947
974 case E_SS_CB_CNF: 948 case E_SS_CB_CNF:
975 if(!ss_data.info_win) 949 if(!ss_data.info_win)
976 SEND_EVENT(ss_data.win,E_SS_CB_CNF,0, para); 950 SEND_EVENT(ss_data.win,E_SS_CB_CNF,0, para);
977 951 destroyInfoWindow();
978 destroyInfoWindow();
979 break; 952 break;
980 953
981 /* we must display the ussd info and then edit and send a user ussd */ 954 /* we must display the ussd info and then edit and send a user ussd */
982 case E_SS_USSD_REQ: 955 case E_SS_USSD_REQ:
983 if(!ss_data.info_win) 956 if(!ss_data.info_win)
984 SEND_EVENT(ss_data.win,E_SS_USSD_REQ,0, para); 957 SEND_EVENT(ss_data.win,E_SS_USSD_REQ,0, para);
985
986 destroyInfoWindow(); 958 destroyInfoWindow();
987 break; 959 break;
988 960
989 /* just display the ussd info */ 961 /* just display the ussd info */
990 case E_SS_USSD_CNF: 962 case E_SS_USSD_CNF:
991 if(!ss_data.info_win) 963 if(!ss_data.info_win)
992 SEND_EVENT(ss_data.win,E_SS_USSD_CNF,0, para); 964 SEND_EVENT(ss_data.win,E_SS_USSD_CNF,0, para);
993
994 destroyInfoWindow(); 965 destroyInfoWindow();
995 break; 966 break;
996 967
997 case E_SS_IMEI: 968 case E_SS_IMEI:
998 969 if(!ss_data.info_win)
999 if(!ss_data.info_win)
1000 SEND_EVENT(ss_data.win,E_SS_IMEI,0, para); 970 SEND_EVENT(ss_data.win,E_SS_IMEI,0, para);
1001
1002 destroyInfoWindow(); 971 destroyInfoWindow();
1003 break; 972 break;
1004 973
1005 974 case E_SS_GET_PW:
1006 case E_SS_GET_PW: 975 if(!ss_data.info_win)
1007 976 SEND_EVENT(ss_data.win,E_SS_GET_PW,0, para);
1008 if(!ss_data.info_win)
1009 SEND_EVENT(ss_data.win,E_SS_GET_PW,0, para);
1010
1011 destroyInfoWindow(); 977 destroyInfoWindow();
1012 break; 978 break;
979
1013 //CQ-16432 - start 980 //CQ-16432 - start
1014 case E_SS_SAT_CPWD: 981 case E_SS_SAT_CPWD:
1015 TRACE_EVENT("Received event E_SS_SAT_CPWD in BMI"); 982 TRACE_EVENT("Received event E_SS_SAT_CPWD in BMI");
1016 if(!ss_data.info_win) 983 if(!ss_data.info_win)
1017 SEND_EVENT(ss_data.win,E_SS_SAT_CPWD,0, para); 984 SEND_EVENT(ss_data.win,E_SS_SAT_CPWD,0, para);
1018 destroyInfoWindow(); 985 destroyInfoWindow();
1019 break; 986 break;
1020 //CQ-16432 - end 987 //CQ-16432 - end
1021 default: 988
989 default:
1022 break; 990 break;
1023 } 991 }
1024 992
1025 return 1; /* consumed */ 993 return 1; /* consumed */
1026 } 994 }
1051 1019
1052 TRACE_FUNCTION ("services()"); 1020 TRACE_FUNCTION ("services()");
1053 1021
1054 switch (event) 1022 switch (event)
1055 { 1023 {
1056
1057 1024
1058 case ServicesError: 1025 case ServicesError:
1059 TRACE_FUNCTION ("ServicesError"); 1026 TRACE_FUNCTION ("ServicesError");
1060 showError(win, ss_cnf->cb_cnf.ss_error); 1027 showError(win, ss_cnf->cb_cnf.ss_error);
1061 break; 1028 break;
2117 $Arguments: 2084 $Arguments:
2118 2085
2119 *******************************************************************************/ 2086 *******************************************************************************/
2120 2087
2121 2088
2122
2123 static void srv_get_forwarded_to_number ( char * textString, 2089 static void srv_get_forwarded_to_number ( char * textString,
2124 char * forwarded_to_number, 2090 char * forwarded_to_number,
2125 UBYTE max_chars) 2091 UBYTE max_chars)
2126 { 2092 {
2127 TRACE_FUNCTION("srv_get_forwarded_to_number"); 2093 TRACE_FUNCTION("srv_get_forwarded_to_number");
2142 $Arguments: 2108 $Arguments:
2143 2109
2144 $History: 2110 $History:
2145 2111
2146 //SPR#0776 - DS - Added default value for textId. Changed references from TxtNotImplemented 2112 //SPR#0776 - DS - Added default value for textId. Changed references from TxtNotImplemented
2147 to TxtNull. 2113 to TxtNull.
2148 2114
2149 *******************************************************************************/ 2115 *******************************************************************************/
2150 2116
2151 2117
2152 static UBYTE srv_get_service_type ( USHORT * textId, 2118 static UBYTE srv_get_service_type ( USHORT * textId,
2175 case MFW_TS_TLPHNY: /* telephony */ 2141 case MFW_TS_TLPHNY: /* telephony */
2176 case MFW_TS_PLMN1: /*MC, this is returned for auxiliary telephony status, 742*/ 2142 case MFW_TS_PLMN1: /*MC, this is returned for auxiliary telephony status, 742*/
2177 *textId = TxtVoice; 2143 *textId = TxtVoice;
2178 return TRUE; 2144 return TRUE;
2179 2145
2180 case MFW_TS_ALL_SMS: 2146 case MFW_TS_ALL_SMS:
2181 case MFW_TS_SMS_MO: 2147 case MFW_TS_SMS_MO:
2182 case MFW_TS_SMS_MT: 2148 case MFW_TS_SMS_MT:
2183 *textId = TxtSMS; 2149 *textId = TxtSMS;
2184 return TRUE; 2150 return TRUE;
2185 2151
2186 case MFW_TS_EMRGNCY: 2152 case MFW_TS_EMRGNCY:
2187 case MFW_TS_ALL_XCPT_SMS: 2153 case MFW_TS_ALL_XCPT_SMS:
2188 case MFW_TS_ALL_PSSS: /* all PLMN specific TS */ 2154 case MFW_TS_ALL_PSSS: /* all PLMN specific TS */
2189 case MFW_TS_PLMN2: /* PLMN specific TS 2 */ 2155 case MFW_TS_PLMN2: /* PLMN specific TS 2 */
2190 case MFW_TS_PLMN3: /* PLMN specific TS 3 */ 2156 case MFW_TS_PLMN3: /* PLMN specific TS 3 */
2191 case MFW_TS_PLMN4: /* PLMN specific TS 4 */ 2157 case MFW_TS_PLMN4: /* PLMN specific TS 4 */
2192 case MFW_TS_PLMN5: /* PLMN specific TS 5 */ 2158 case MFW_TS_PLMN5: /* PLMN specific TS 5 */
2206 case MFW_TS_ALL_DATA: 2172 case MFW_TS_ALL_DATA:
2207 *textId = TxtData; 2173 *textId = TxtData;
2208 return TRUE; 2174 return TRUE;
2209 2175
2210 case MFW_TS_ALL_FAX: 2176 case MFW_TS_ALL_FAX:
2211 case MFW_TS_FAX3_ALT_SPCH: 2177 case MFW_TS_FAX3_ALT_SPCH:
2212 case MFW_TS_FAX3_AUTO: 2178 case MFW_TS_FAX3_AUTO:
2213 case MFW_TS_FAX4: 2179 case MFW_TS_FAX4:
2214 *textId = TxtFax; 2180 *textId = TxtFax;
2215 return TRUE; 2181 return TRUE;
2216 } 2182 }
2217 2183
2218 break; 2184 break;
2222 { 2188 {
2223 case MFW_BS_ALL_BS: 2189 case MFW_BS_ALL_BS:
2224 *textId = TxtData; //SPR#933 - DS - Changed TxtNull to TxtData. 2190 *textId = TxtData; //SPR#933 - DS - Changed TxtNull to TxtData.
2225 return TRUE; 2191 return TRUE;
2226 2192
2227 case MFW_BS_ALL_DATA_CDA: //SPR#933 - DS - Added so MMI displays correct info to user. 2193 case MFW_BS_ALL_DATA_CDA: //SPR#933 - DS - Added so MMI displays correct info to user.
2228 *textId = TxtData; 2194 *textId = TxtData;
2229 return TRUE; 2195 return TRUE;
2230 2196
2231 default: 2197 default:
2232 break; 2198 break;
2409 */ 2375 */
2410 return found_entries; 2376 return found_entries;
2411 } 2377 }
2412 2378
2413 2379
2414
2415 /******************************************************************************* 2380 /*******************************************************************************
2416 2381
2417 $Function: services_info_cb 2382 $Function: services_info_cb
2418 2383
2419 $Description: Callback function from information dialog. 2384 $Description: Callback function from information dialog.
2421 $Returns: 2386 $Returns:
2422 2387
2423 $Arguments: 2388 $Arguments:
2424 2389
2425 *******************************************************************************/ 2390 *******************************************************************************/
2426
2427 2391
2428 2392
2429 static int services_info_cb(T_MFW_HND win, USHORT identifier, UBYTE reason) 2393 static int services_info_cb(T_MFW_HND win, USHORT identifier, UBYTE reason)
2430 { 2394 {
2431 2395
2752 $Arguments: 2716 $Arguments:
2753 2717
2754 *******************************************************************************/ 2718 *******************************************************************************/
2755 2719
2756 2720
2757 int servicesNumbers(MfwMnu* m, MfwMnuItem* i){ 2721 int servicesNumbers(MfwMnu* m, MfwMnuItem* i) {
2758 CFAction = CFActivate; 2722 CFAction = CFActivate;
2759 servicesDoOtherNumber(); 2723 servicesDoOtherNumber();
2760 2724
2761 // ADDED BY RAVI - 28-11-2005 2725 // ADDED BY RAVI - 28-11-2005
2762 return 1; 2726 return 1;
2763 //END RAVI - 28-11-2005 2727 //END RAVI - 28-11-2005
2764 } 2728 }
2765 2729
2766 2730
2767 /******************************************************************************* 2731 /*******************************************************************************
2768 2732
2796 { 2760 {
2797 // UBYTE PWD; // RAVI 2761 // UBYTE PWD; // RAVI
2798 T_MFW_HND win = mfw_parent(mfw_header()); 2762 T_MFW_HND win = mfw_parent(mfw_header());
2799 // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI 2763 // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI
2800 2764
2801 2765 /* nextState = next; x0039928 - Lint warning removal */
2802 /* nextState = next; x0039928 - Lint warning removal */ 2766
2803 2767 if (!winIsFocussed(win))
2804 2768 lastFocus = winFocus(win);
2805 if (!winIsFocussed(win)) 2769
2806 lastFocus = winFocus(win); 2770 servicesState = reason; /* save reason now !! */
2807 2771
2808 servicesState = reason; /* save reason now !! */ 2772 switch (reason)
2809
2810 switch (reason)
2811 { 2773 {
2812 case ServicesIdle: /* giving back control to last module*/ 2774 case ServicesIdle: /* giving back control to last module*/
2813 winFocus(lastFocus); 2775 winFocus(lastFocus);
2814 winShow(lastFocus); 2776 winShow(lastFocus);
2815 lastFocus = 0; 2777 lastFocus = 0;
2816 return; /* return from module */ 2778 return; /* return from module */
2817 2779
2818 case ServicesOk: 2780 case ServicesOk:
2819 TRACE_FUNCTION("Service OK"); 2781 TRACE_FUNCTION("Service OK");
2820 winShow(win); 2782 winShow(win);
2821 timStart(times); /* start timer to go back in the submenu */ 2783 timStart(times); /* start timer to go back in the submenu */
2822 break; 2784 break;
2823 2785
2824 case ServicesFailed: 2786 case ServicesFailed:
2825 TRACE_FUNCTION("Service Failed"); 2787 TRACE_FUNCTION("Service Failed");
2826 winShow(win); 2788 winShow(win);
2827 timStart(times); /* start timer to go back in the submenu */ 2789 timStart(times); /* start timer to go back in the submenu */
2828 break; 2790 break;
2829 2791
2830 case ServicesError: 2792 case ServicesError:
2831 TRACE_FUNCTION("Service Error"); 2793 TRACE_FUNCTION("Service Error");
2832 winShow(win); 2794 winShow(win);
2833 timStart(times); /* start timer to go back in the submenu */ 2795 timStart(times); /* start timer to go back in the submenu */
2834 break; 2796 break;
2835 2797
2836 case ServicesExecCF: /* all Call forwarding from menu */ 2798 case ServicesExecCF: /* all Call forwarding from menu */
2837 case ServicesActCF: /* show "Please Wait" screen/animation */ 2799 case ServicesActCF: /* show "Please Wait" screen/animation */
2838 case ServicesDeactCF: 2800 case ServicesDeactCF:
2839 case ServicesCheckCF: 2801 case ServicesCheckCF:
2840 case ServicesActCW: 2802 case ServicesActCW:
2841 case ServicesDeactCW: 2803 case ServicesDeactCW:
2842 case ServicesCheckCW: 2804 case ServicesCheckCW:
2843 case ServicesActCLIR: 2805 case ServicesActCLIR:
2844 case ServicesDeactCLIR: 2806 case ServicesDeactCLIR:
2845 case ServicesCheckCLIR: 2807 case ServicesCheckCLIR:
2846 winShow(win); 2808 winShow(win);
2847 timStart(times); /* start timer to go back in the submenu */ 2809 timStart(times); /* start timer to go back in the submenu */
2848 break; 2810 break;
2849 2811
2850 case ServicesCheckCW_OK: 2812 case ServicesCheckCW_OK:
2851 TRACE_FUNCTION(" ServicesCheckCW_OK"); 2813 TRACE_FUNCTION(" ServicesCheckCW_OK");
2852 winShow(win); 2814 winShow(win);
2853 timStart(times); /* start timer to go back in the submenu */ 2815 timStart(times); /* start timer to go back in the submenu */
2854 break; 2816 break;
2855 2817
2856 case ServicesCheckCLI_OK: 2818 case ServicesCheckCLI_OK:
2857 TRACE_FUNCTION("ServicesCheckCLI_OK"); 2819 TRACE_FUNCTION("ServicesCheckCLI_OK");
2858 winShow(win); 2820 winShow(win);
2859 timStart(times); 2821 timStart(times);
2860 break; 2822 break;
2861 2823
2862 case ServicesIMEI_OK: 2824 case ServicesIMEI_OK:
2863 TRACE_FUNCTION("ServicesIMEI_OK"); 2825 TRACE_FUNCTION("ServicesIMEI_OK");
2864 winShow(win); 2826 winShow(win);
2865 timStart(times); 2827 timStart(times);
2866 break; 2828 break;
2867 case ServicesResShow: 2829
2830 case ServicesResShow:
2868 TRACE_FUNCTION("ServicesResShow"); 2831 TRACE_FUNCTION("ServicesResShow");
2869 winShow(win); 2832 winShow(win);
2870 timStart(times); 2833 timStart(times);
2871 break; 2834 break;
2872 2835
2873 case ServicesCB_OK: 2836 case ServicesCB_OK:
2874 TRACE_FUNCTION("ServicesCB_OK"); 2837 TRACE_FUNCTION("ServicesCB_OK");
2875 lastFocus = winFocus(win); 2838 lastFocus = winFocus(win);
2876 winShow(win); 2839 winShow(win);
2877 timStart(times); 2840 timStart(times);
2878 break; 2841 break;
2879 2842
2880 case ServicesCFU_OK: 2843 case ServicesCFU_OK:
2881 TRACE_FUNCTION("ServicesCFUShow"); 2844 TRACE_FUNCTION("ServicesCFUShow");
2882 lastFocus = winFocus(win); 2845 lastFocus = winFocus(win);
2883 winShow(win); 2846 winShow(win);
2884 timStart(times); 2847 timStart(times);
2885 break; 2848 break;
2886 2849
2887 case ServicesDoCallDivert: 2850 case ServicesDoCallDivert:
2888 servicesSendCallDivert(0); 2851 servicesSendCallDivert(0);
2889 break; 2852 break;
2890 2853
2891 case PIN2_ABORT: 2854 case PIN2_ABORT:
2892 TRACE_FUNCTION("ServicesPin2_Abort"); 2855 TRACE_FUNCTION("ServicesPin2_Abort");
2893 break; 2856 break;
2894 default: 2857
2858 default:
2895 break; 2859 break;
2896 } 2860 }
2897 } 2861 }
2898 2862
2899 #ifdef MMI_LITE 2863 #ifdef MMI_LITE
2900 /******************************************************************************* 2864 /*******************************************************************************
2901 2865
2902 $Function: showUSSDError 2866 $Function: showUSSDError
2903 2867
2904 $Description: This function displays a dialog saying USSD message received, Font not supported 2868 $Description: This function displays a dialog saying USSD message received, Font not supported
2905 for UCS2 characters 2869 for UCS2 characters
2906 2870
2907 $Returns: 2871 $Returns:
2908 2872
2909 $Arguments: 2873 $Arguments:
2910 2874
2912 2876
2913 //x0pleela 24 Aug, 2004 DR: OMAPS00083503 2877 //x0pleela 24 Aug, 2004 DR: OMAPS00083503
2914 2878
2915 static void showUSSDError (T_MFW_HND win) 2879 static void showUSSDError (T_MFW_HND win)
2916 { 2880 {
2917
2918 T_DISPLAY_DATA display_info; 2881 T_DISPLAY_DATA display_info;
2919 2882
2920 TRACE_FUNCTION("showUSSDError"); 2883 TRACE_FUNCTION("showUSSDError");
2921 2884
2922 2885 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtUSSDMsgRxd, TxtFontNotSupported, COLOUR_STATUS);
2923 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtUSSDMsgRxd, TxtFontNotSupported, COLOUR_STATUS); 2886 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
2924 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
2925 display_info.Identifier = ServicesError; 2887 display_info.Identifier = ServicesError;
2926 2888
2927 /* 2889 /*
2928 * Call Info Screen 2890 * Call Info Screen
2929 */ 2891 */
2930 2892
2931 ss_data.info_win = info_dialog (ss_data.win, &display_info); 2893 ss_data.info_win = info_dialog (ss_data.win, &display_info);
2932 2894
2933 } 2895 }
2934 #endif 2896 #endif
2945 2907
2946 *******************************************************************************/ 2908 *******************************************************************************/
2947 2909
2948 static void showWait (T_MFW_HND win) 2910 static void showWait (T_MFW_HND win)
2949 { 2911 {
2950
2951 T_DISPLAY_DATA display_info; 2912 T_DISPLAY_DATA display_info;
2952 2913
2953 TRACE_FUNCTION("showWait"); 2914 TRACE_FUNCTION("showWait");
2954 2915
2955 dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtRequesting, TxtNull, COLOUR_STATUS); 2916 dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtRequesting, TxtNull, COLOUR_STATUS);
2956 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); 2917 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
2957 display_info.Identifier = SS_WAIT; 2918 display_info.Identifier = SS_WAIT;
2958 2919
2959 /* 2920 /*
2960 * Call Info Screen 2921 * Call Info Screen
2961 */ 2922 */
2962 2923
2963 ss_data.info_wait = info_dialog (win, &display_info); 2924 ss_data.info_wait = info_dialog (win, &display_info);
2964 } 2925 }
2965 2926
2966 2927
2976 2937
2977 *******************************************************************************/ 2938 *******************************************************************************/
2978 2939
2979 static void showOk (T_MFW_HND win) 2940 static void showOk (T_MFW_HND win)
2980 { 2941 {
2981
2982 T_DISPLAY_DATA display_info; 2942 T_DISPLAY_DATA display_info;
2983 2943
2984 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtDone, TxtNull, COLOUR_STATUS); 2944 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtDone, TxtNull, COLOUR_STATUS);
2985 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); 2945 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
2986 display_info.Identifier = ServicesOk; 2946 display_info.Identifier = ServicesOk;
2987 2947
2988 /* 2948 /*
2989 * Call Info Screen 2949 * Call Info Screen
2990 */ 2950 */
2991 2951
2992 ss_data.info_win = info_dialog (ss_data.win, &display_info); 2952 ss_data.info_win = info_dialog (ss_data.win, &display_info);
2993
2994 } 2953 }
2995 2954
2996 /******************************************************************************* 2955 /*******************************************************************************
2997 2956
2998 $Function: showFailed 2957 $Function: showFailed
3005 2964
3006 *******************************************************************************/ 2965 *******************************************************************************/
3007 2966
3008 static void showFailed (T_MFW_HND win) 2967 static void showFailed (T_MFW_HND win)
3009 { 2968 {
3010
3011 T_DISPLAY_DATA display_info; 2969 T_DISPLAY_DATA display_info;
3012 2970
3013 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, TxtNull, COLOUR_STATUS); 2971 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, TxtNull, COLOUR_STATUS);
3014 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); 2972 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
3015 display_info.Identifier = ServicesFailed; 2973 display_info.Identifier = ServicesFailed;
3016 2974
3017 /* 2975 /*
3018 * Call Info Screen 2976 * Call Info Screen
3019 */ 2977 */
3020 ss_data.info_win = info_dialog (ss_data.win, &display_info); 2978 ss_data.info_win = info_dialog (ss_data.win, &display_info);
3021 } 2979 }
3022 2980
3023 /******************************************************************************* 2981 /*******************************************************************************
3024 2982
3032 2990
3033 *******************************************************************************/ 2991 *******************************************************************************/
3034 2992
3035 static void showError (T_MFW_HND win, T_MFW_SS_ERROR ss_error) 2993 static void showError (T_MFW_HND win, T_MFW_SS_ERROR ss_error)
3036 { 2994 {
3037
3038 T_DISPLAY_DATA display_info; 2995 T_DISPLAY_DATA display_info;
3039 2996
3040 TRACE_FUNCTION("showError"); 2997 TRACE_FUNCTION("showError");
3041 2998
3042 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, serviceGetError(ss_error), COLOUR_STATUS); 2999 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtFailed, serviceGetError(ss_error), COLOUR_STATUS);
3043 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT ); 3000 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT );
3044 display_info.Identifier = ServicesError; 3001 display_info.Identifier = ServicesError;
3045 3002
3046 /* 3003 /*
3047 * Call Info Screen 3004 * Call Info Screen
3048 */ 3005 */
3049 3006
3050 ss_data.info_win = info_dialog (ss_data.win, &display_info); 3007 ss_data.info_win = info_dialog (ss_data.win, &display_info);
3051
3052 } 3008 }
3053 3009
3054 3010
3055 /******************************************************************************* 3011 /*******************************************************************************
3056 3012
3065 3021
3066 *******************************************************************************/ 3022 *******************************************************************************/
3067 3023
3068 static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY * ss_notify) 3024 static void showSSNotify (T_MFW_HND win, T_MFW_SS_NOTIFY * ss_notify)
3069 { 3025 {
3070
3071 T_DISPLAY_DATA display_info; 3026 T_DISPLAY_DATA display_info;
3072 USHORT TxtId1,TxtId2; 3027 USHORT TxtId1,TxtId2;
3073 3028
3074 TRACE_FUNCTION("++ showSSNotify"); 3029 TRACE_FUNCTION("++ showSSNotify");
3075 3030
3076 TxtId1 = TxtNull; 3031 TxtId1 = TxtNull;
3077 TxtId2 = TxtNull; 3032 TxtId2 = TxtNull;
3078 3033
3079 switch (ss_notify->code) 3034 switch (ss_notify->code)
3080 { 3035 {
3081 case MFW_SS_MO_unconFORWARD: /* CFU activated */ 3036 case MFW_SS_MO_unconFORWARD: /* CFU activated */
3082 { 3037 {
3083 TRACE_EVENT("showSSNotify() MFW_SS_MO_unconFORWARD"); 3038 TRACE_EVENT("showSSNotify() MFW_SS_MO_unconFORWARD");
3084 3039
3085 /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar) 3040 /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar)
3086 Description : CPHS Call Forwarding feature implementation 3041 Description : CPHS Call Forwarding feature implementation
3087 Solution : As part of the implemention, cphs_set_divert_status() is called whenever the network notifies 3042 Solution : As part of the implemention, cphs_set_divert_status() is called whenever the network notifies
3088 about unconditional forward*/ 3043 about unconditional forward*/
3322 *******************************************************************************/ 3277 *******************************************************************************/
3323 3278
3324 3279
3325 static void srv_display_status (UBYTE ss_status) 3280 static void srv_display_status (UBYTE ss_status)
3326 { 3281 {
3327 T_DISPLAY_DATA display_info; 3282 T_DISPLAY_DATA display_info;
3328 USHORT TxtId2; 3283 USHORT TxtId2;
3329 TRACE_FUNCTION("srv_display_status()"); 3284 TRACE_FUNCTION("srv_display_status()");
3330
3331 3285
3332 //GW Swapped text strings over 3286 //GW Swapped text strings over
3333 if (ss_status & SS_STAT_ACTIVE) 3287 if (ss_status & SS_STAT_ACTIVE)
3334 TxtId2 = TxtActivated; 3288 TxtId2 = TxtActivated;
3335 /* Marcus: Issue 1652: 03/02/2003: Removed NDH 10/06/03 */ 3289 /* Marcus: Issue 1652: 03/02/2003: Removed NDH 10/06/03 */
3336 else 3290 else
3337 TxtId2 = TxtDeActivated; 3291 TxtId2 = TxtDeActivated;
3338 3292
3339 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtNull, TxtId2, COLOUR_STATUS); 3293 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtNull, TxtId2, COLOUR_STATUS);
3340 //Jun 04,2004 CRR:13601 xpradipg - SASKEN 3294 //Jun 04,2004 CRR:13601 xpradipg - SASKEN
3341 //Timer value changed from FOREVER to FIVE_SECS 3295 //Timer value changed from FOREVER to FIVE_SECS
3342 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT ); 3296 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT );
3343 display_info.Identifier = E_SS_CB_CNF; // can be used also for CF and CW 3297 display_info.Identifier = E_SS_CB_CNF; // can be used also for CF and CW
3344 3298
3345 /* 3299 /*
3346 * Call Info Screen 3300 * Call Info Screen
3347 */ 3301 */
3348 3302
3349 ss_data.info_win = info_dialog (ss_data.win, &display_info); 3303 ss_data.info_win = info_dialog (ss_data.win, &display_info);
3350 } 3304 }
3351 3305
3352 /******************************************************************************* 3306 /*******************************************************************************
3353 3307
3354 $Function: ysrv_empty_list_result 3308 $Function: srv_empty_list_result
3355 3309
3356 $Description: Indicate a sensefull response to the user if an 3310 $Description: Indicate a sensefull response to the user if an
3357 activation / deactivation or interrogation leads to an 3311 activation / deactivation or interrogation leads to an
3358 empty list. 3312 empty list.
3359 3313
3365 3319
3366 3320
3367 static void srv_empty_list_result (UBYTE ss_category, USHORT event, UBYTE ss_status, UBYTE ss_code) /* Marcus: Issue 1652: 03/02/2002 */ 3321 static void srv_empty_list_result (UBYTE ss_category, USHORT event, UBYTE ss_status, UBYTE ss_code) /* Marcus: Issue 1652: 03/02/2002 */
3368 { 3322 {
3369 T_DISPLAY_DATA display_info; 3323 T_DISPLAY_DATA display_info;
3370 USHORT TxtId1; 3324 USHORT TxtId1;
3371 USHORT TxtId2 = TxtNull; 3325 USHORT TxtId2 = TxtNull;
3372 TRACE_FUNCTION("srv_empty_list_result"); 3326 TRACE_FUNCTION("srv_empty_list_result");
3373 3327
3374 switch (event) 3328 switch (event)
3375 { 3329 {
3376 case E_SS_CB_CNF: 3330 case E_SS_CB_CNF:
3439 { 3393 {
3440 iconsSetState(iconIdCallFor); 3394 iconsSetState(iconIdCallFor);
3441 // Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken) 3395 // Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken)
3442 // Storing the Current state of CF in Flash 3396 // Storing the Current state of CF in Flash
3443 FFS_flashData.CFState=TRUE; 3397 FFS_flashData.CFState=TRUE;
3444 flash_write(); 3398 flash_write();
3445 } 3399 }
3446 /*CQ10690 - END*/ 3400 /*CQ10690 - END*/
3447 if(event==E_SS_CF_CNF) 3401 if(event==E_SS_CF_CNF)
3448 { 3402 {
3449 // Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken) 3403 // Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken)
3482 3436
3483 *******************************************************************************/ 3437 *******************************************************************************/
3484 3438
3485 3439
3486 static void showCWStatus (T_MFW_HND win , T_ss * data) 3440 static void showCWStatus (T_MFW_HND win , T_ss * data)
3487 3441 {
3488 { 3442 T_DISPLAY_DATA display_info;
3489 T_DISPLAY_DATA display_info; 3443 T_ss_feature_cw_data * pFeature;
3490 T_ss_feature_cw_data * pFeature; 3444
3491 3445 TRACE_FUNCTION("showCWStatus");
3492 TRACE_FUNCTION("showCWStatus"); 3446
3493 3447 //MC got rid of dodgy pointer arithmetic
3494 //MC got rid of dodgy pointer arithmetic 3448 pFeature = &data->mfw_ss_cw->ss[data->current_feature];
3495 pFeature = &data->mfw_ss_cw->ss[data->current_feature]; 3449
3496 3450 if (data->max_feature == 1)
3497 if (data->max_feature == 1) 3451 {
3498 { 3452 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS);
3499 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS); 3453 //Jun 04,2004 CRR:13601 xpradipg - SASKEN
3500 //Jun 04,2004 CRR:13601 xpradipg - SASKEN
3501 //Timer value changed from FOREVER to FIVE_SECS 3454 //Timer value changed from FOREVER to FIVE_SECS
3502 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT); 3455 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT);
3503 } 3456 }
3504 else 3457 else
3505 { 3458 {
3506 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS); 3459 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, data->mfw_ss_cw->status, COLOUR_STATUS);
3507 //Jun 04,2004 CRR:13601 xpradipg - SASKEN 3460 //Jun 04,2004 CRR:13601 xpradipg - SASKEN
3508 //Timer value changed from FOREVER to FIVE_SECS 3461 //Timer value changed from FOREVER to FIVE_SECS
3509 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT ); 3462 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT );
3510 } 3463 }
3511 3464
3512 display_info.Identifier = E_SS_CW_CNF; 3465 display_info.Identifier = E_SS_CW_CNF;
3513 3466
3514 /* 3467 /*
3515 * Call Info Screen 3468 * Call Info Screen
3516 */ 3469 */
3517 3470
3518 ss_data.info_win = info_dialog (ss_data.win, &display_info); 3471 ss_data.info_win = info_dialog (ss_data.win, &display_info);
3519 3472
3520 if (ss_data.info_win EQ NULL) 3473 if (ss_data.info_win EQ NULL)
3521 { 3474 {
3522 TRACE_FUNCTION("NOT ENOUGH RESOURCES TO CREATE EXT INFO DIALOG"); 3475 TRACE_FUNCTION("NOT ENOUGH RESOURCES TO CREATE EXT INFO DIALOG");
3523 } 3476 }
3524 } 3477 }
3525 3478
3526 /******************************************************************************* 3479 /*******************************************************************************
3527 3480
3528 $Function: showCLIStatus 3481 $Function: showCLIStatus
3721 #ifndef FF_MMI_ATC_MIGRATION 3674 #ifndef FF_MMI_ATC_MIGRATION
3722 #define IMEI_LEN 17 /* IMEI + check digit = 15, IMEI + SW version = 16, IMEI + check digit + SW version = 17*/ 3675 #define IMEI_LEN 17 /* IMEI + check digit = 15, IMEI + SW version = 16, IMEI + check digit + SW version = 17*/
3723 #endif 3676 #endif
3724 static char imei_array[IMEI_LEN+1]; 3677 static char imei_array[IMEI_LEN+1];
3725 //GW IMEI number is 26 chars long! 3678 //GW IMEI number is 26 chars long!
3726 memset(imei_array,0x00,IMEI_LEN+1); 3679 memset(imei_array,0x00,IMEI_LEN+1);
3727 memcpy(imei_array, ss_cnf->imei_info.imei_number, IMEI_LEN); 3680 memcpy(imei_array, ss_cnf->imei_info.imei_number, IMEI_LEN);
3728 3681
3729 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull,TxtIMEI, TxtNull , COLOUR_STATUS); 3682 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull,TxtIMEI, TxtNull , COLOUR_STATUS);
3730 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_CLEAR | KEY_LEFT ); 3683 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_CLEAR | KEY_LEFT );
3731 display_info.TextString2 = imei_array; 3684 display_info.TextString2 = imei_array;
3732 /* 3685
3733 * Call Info Screen 3686 /*
3734 */ 3687 * Call Info Screen
3688 */
3735 ss_data.info_win = info_dialog (ss_data.win, &display_info); 3689 ss_data.info_win = info_dialog (ss_data.win, &display_info);
3736
3737 } 3690 }
3738 #endif 3691 #endif
3739 3692
3740 /******************************************************************************* 3693 /*******************************************************************************
3741 3694
3742 $Function: showUSSDInfo 3695 $Function: showUSSDInfo
3743 3696
3744 $Description: this is used for both USSD types (confirm and request). 3697 $Description: this is used for both USSD types (confirm and request).
3745 The USSD request is keep going after "showUSSDInfo" 3698 The USSD request is keep going after "showUSSDInfo"
3746 function and open the editor to enter the string. 3699 function and open the editor to enter the string.
3747 3700
3748 $Returns: 3701 $Returns:
3749 3702
3750 $Arguments: 3703 $Arguments:
3751 3704
3752 *******************************************************************************/ 3705 *******************************************************************************/
3753
3754 3706
3755 3707
3756 static void showUSSDInfo (T_MFW_HND win, USHORT ident, T_MFW_SS_PARA * ss_cnf, USHORT sk1, USHORT sk2) 3708 static void showUSSDInfo (T_MFW_HND win, USHORT ident, T_MFW_SS_PARA * ss_cnf, USHORT sk1, USHORT sk2)
3757 { 3709 {
3758 #ifdef NEW_EDITOR 3710 #ifdef NEW_EDITOR
3826 editor_data.destroyEditor = TRUE; 3778 editor_data.destroyEditor = TRUE;
3827 3779
3828 /* create the dialog handler */ 3780 /* create the dialog handler */
3829 editor_start(ss_data.win, &editor_data); /* start the editor */ 3781 editor_start(ss_data.win, &editor_data); /* start the editor */
3830 #endif /* NEW_EDITOR */ 3782 #endif /* NEW_EDITOR */
3831
3832 } 3783 }
3833 3784
3834 3785
3835 /******************************************************************************* 3786 /*******************************************************************************
3836 3787
3847 3798
3848 static void showUSSDREQ (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf) 3799 static void showUSSDREQ (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf)
3849 { 3800 {
3850 TRACE_FUNCTION("showUSSDREQ"); 3801 TRACE_FUNCTION("showUSSDREQ");
3851 showUSSDInfo(win, ServicesUSSD_REQ_OK, ss_cnf, TxtSoftOK, TxtSoftBack); 3802 showUSSDInfo(win, ServicesUSSD_REQ_OK, ss_cnf, TxtSoftOK, TxtSoftBack);
3852 3803 }
3853 }
3854
3855 3804
3856 3805
3857 /******************************************************************************* 3806 /*******************************************************************************
3858 3807
3859 $Function: showUSSDCNF 3808 $Function: showUSSDCNF
3867 *******************************************************************************/ 3816 *******************************************************************************/
3868 3817
3869 3818
3870 static void showUSSDCNF (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf) 3819 static void showUSSDCNF (T_MFW_HND win, T_MFW_SS_PARA * ss_cnf)
3871 { 3820 {
3872
3873 T_DISPLAY_DATA display_info; 3821 T_DISPLAY_DATA display_info;
3874 int nPixels = 0; 3822 int nPixels = 0;
3875 int nchar = 0; 3823 int nchar = 0;
3876 3824
3877 //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V 3825 //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V
3882 T_MFW_WIN *win_data; 3830 T_MFW_WIN *win_data;
3883 T_ss *data = NULL; 3831 T_ss *data = NULL;
3884 T_AUI_EDITOR_DATA display_editor_info; 3832 T_AUI_EDITOR_DATA display_editor_info;
3885 3833
3886 TRACE_FUNCTION("showUSSDCNF"); 3834 TRACE_FUNCTION("showUSSDCNF");
3887 /* API - 09-07-03 - CQ10728 - Add this check to use either the editor or the bubble depending 3835 /* API - 09-07-03 - CQ10728 - Add this check to use either the editor or the bubble depending
3888 on the size of the returned string */ 3836 on the size of the returned string */
3889 /* API - 27-08-03 - CQ10728 - Update, calculate the length of the string in number of pixels */ 3837 /* API - 27-08-03 - CQ10728 - Update, calculate the length of the string in number of pixels */
3890 3838
3891 //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V 3839 //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V
3892 //Bug : Unable to compose a one or two digit number 3840 //Bug : Unable to compose a one or two digit number
3893 //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. 3841 //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.
3894 //The read only editor with the service provider message that comes up when a one or two digit is dialled 3842 //The read only editor with the service provider message that comes up when a one or two digit is dialled
3895 //was not handled properly. So altered the editor handling to cater for the long message. 3843 //was not handled properly. So altered the editor handling to cater for the long message.
3896 if(win) 3844 if(win)
3897 { 3845 {
3898 win_data = ((T_MFW_HDR *)win)->data; 3846 win_data = ((T_MFW_HDR *)win)->data;
3899 if(win_data) 3847 if(win_data)
3900 data = (T_ss * )win_data->user; 3848 data = (T_ss * )win_data->user;
3901 } 3849 }
3902 3850
3903 nchar = strlen((char *)ss_cnf->ussd_info.ussd); 3851 nchar = strlen((char *)ss_cnf->ussd_info.ussd);
3904 nPixels = dspl_GetTextExtent( (char *)ss_cnf->ussd_info.ussd, nchar); 3852 nPixels = dspl_GetTextExtent( (char *)ss_cnf->ussd_info.ussd, nchar);
3905 /* API - 27-08-03 - CQ10728 - END */ 3853 /* API - 27-08-03 - CQ10728 - END */
3906 3854
3907 if (nPixels >= SCREEN_SIZE_X && (data != NULL)) /* x0039928 - Lint warning removal */ 3855 if (nPixels >= SCREEN_SIZE_X && (data != NULL)) /* x0039928 - Lint warning removal */
3908 { 3856 {
3909 //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V 3857 //Feb 17, 2005 REF : CRR 17657 x0012850 Divya.P.V
3910 //Bug : Unable to compose a one or two digit number 3858 //Bug : Unable to compose a one or two digit number
3911 //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. 3859 //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.
3912 //The read only editor with the service provider message that comes up when a one or two digit is dialled 3860 //The read only editor with the service provider message that comes up when a one or two digit is dialled
3913 //was not handled properly. So altered the editor handling to cater for the long message. 3861 //was not handled properly. So altered the editor handling to cater for the long message.
3914 AUI_edit_SetDefault(&display_editor_info); 3862 AUI_edit_SetDefault(&display_editor_info);
3915 AUI_edit_SetMode(&display_editor_info, ED_MODE_READONLY, ED_CURSOR_UNDERLINE); 3863 AUI_edit_SetMode(&display_editor_info, ED_MODE_READONLY, ED_CURSOR_UNDERLINE);
3916 3864
3917 //x0pleela 29 Aug, 2006 DR: OMAPS00083503 3865 //x0pleela 29 Aug, 2006 DR: OMAPS00083503
3918 //Dynamically changing the dcs value in editor settings 3866 //Dynamically changing the dcs value in editor settings
3919 if( ss_getAlphabetCb ( (UBYTE)ss_cnf->ussd_info.dcs EQ SS_ALPHA_16_Bit)) 3867 if( ss_getAlphabetCb ( (UBYTE)ss_cnf->ussd_info.dcs EQ SS_ALPHA_16_Bit))
3920 AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_UNICODE, (UBYTE*)ss_cnf->ussd_info.ussd, (USHORT)ss_cnf->ussd_info.len); 3868 AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_UNICODE, (UBYTE*)ss_cnf->ussd_info.ussd, (USHORT)ss_cnf->ussd_info.len);
3921 else 3869 else
3922 AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_ASCII, (UBYTE*)ss_cnf->ussd_info.ussd, (USHORT)ss_cnf->ussd_info.len); 3870 AUI_edit_SetBuffer(&display_editor_info, ATB_DCS_ASCII, (UBYTE*)ss_cnf->ussd_info.ussd, (USHORT)ss_cnf->ussd_info.len);
3923 3871
3924 AUI_edit_SetTextStr(&display_editor_info, TxtNull, TxtSoftBack,TxtNull,NULL); 3872 AUI_edit_SetTextStr(&display_editor_info, TxtNull, TxtSoftBack,TxtNull,NULL);
3925 AUI_edit_SetEvents(&display_editor_info, 0, FALSE, FOREVER, (T_AUI_EDIT_CB)services_info_cb); 3873 AUI_edit_SetEvents(&display_editor_info, 0, FALSE, FOREVER, (T_AUI_EDIT_CB)services_info_cb);
3926 display_editor_info.Identifier = ServicesUSSD_CNF_OK; 3874 display_editor_info.Identifier = ServicesUSSD_CNF_OK;
3927 data->info_win = AUI_edit_Start(data->win, &display_editor_info); 3875 data->info_win = AUI_edit_Start(data->win, &display_editor_info);
3928 } 3876 }
3877 else
3878 {
3879 if (strlen((char *)ss_cnf->ussd_info.ussd) == 0)
3880 {
3881 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtCommand, TxtCompleted, COLOUR_STATUS);
3882 }
3929 else 3883 else
3930 { 3884 {
3931 if (strlen((char *)ss_cnf->ussd_info.ussd) == 0) 3885 dlg_initDisplayData_TextStr(&display_info, TxtSoftOK, TxtNull, (char *)ss_cnf->ussd_info.ussd, NULL, COLOUR_STATUS);
3932 { 3886 }
3933 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtCommand, TxtCompleted, COLOUR_STATUS); 3887
3934 } 3888 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT);
3935 else 3889 display_info.Identifier = ServicesUSSD_CNF_OK;
3936 {
3937 dlg_initDisplayData_TextStr(&display_info, TxtSoftOK, TxtNull, (char *)ss_cnf->ussd_info.ussd, NULL, COLOUR_STATUS);
3938 }
3939
3940 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FOREVER, KEY_HUP| KEY_LEFT);
3941 display_info.Identifier = ServicesUSSD_CNF_OK;
3942 3890
3943 /* 3891 /*
3944 * Display Dialog Info Screen 3892 * Display Dialog Info Screen
3945 */ 3893 */
3946 3894
3947 ss_data.info_win = info_dialog (ss_data.win, &display_info); 3895 ss_data.info_win = info_dialog (ss_data.win, &display_info);
3948 } 3896 }
3949 /*API - 09-07-03 CQ10728- END*/ 3897 /*API - 09-07-03 CQ10728- END*/
3950 } 3898 }
3951 3899
3952 3900
3953 /******************************************************************************* 3901 /*******************************************************************************
3954 3902
3965 static void sendUSSD (T_MFW_SS_PARA *ussd_senddata) 3913 static void sendUSSD (T_MFW_SS_PARA *ussd_senddata)
3966 { 3914 {
3967 3915
3968 // unsigned int tLen = ussd_senddata->ussd_info.len; // RAVI 3916 // unsigned int tLen = ussd_senddata->ussd_info.len; // RAVI
3969 3917
3970 ss_cnf = ussd_senddata; 3918 ss_cnf = ussd_senddata;
3971 3919
3972 if (ss_send_ussd( (T_MFW_SS_USSD *) ss_cnf ) == MFW_SS_FAIL) 3920 if (ss_send_ussd( (T_MFW_SS_USSD *) ss_cnf ) == MFW_SS_FAIL)
3973 { 3921 {
3974 /* ussd data is wrong */ 3922 /* ussd data is wrong */
3975 showFailed( ss_data.win ); 3923 showFailed( ss_data.win );
3976 } 3924 }
3977 else 3925 else if (servicesState == ServicesUSSDSendEdit)
3978 if (servicesState == ServicesUSSDSendEdit) 3926 {
3979 { 3927 servicesExec(ServicesUSSDSendEdit_Ok, 0);
3980 servicesExec(ServicesUSSDSendEdit_Ok, 0); 3928 }
3981 } 3929 else
3982 else 3930 {
3983 { 3931 servicesExec(ServicesUSSDEnter_Send, 0);
3984 servicesExec(ServicesUSSDEnter_Send, 0); 3932 }
3985 }
3986 } 3933 }
3987 3934
3988 3935
3989 /******************************************************************************* 3936 /*******************************************************************************
3990 3937
4001 3948
4002 static void showCFStatus (T_MFW_HND win , T_ss * data) 3949 static void showCFStatus (T_MFW_HND win , T_ss * data)
4003 { 3950 {
4004 T_DISPLAY_DATA display_info; 3951 T_DISPLAY_DATA display_info;
4005 T_ss_feature_cf_data * pFeature; 3952 T_ss_feature_cf_data * pFeature;
4006 static char str[50]; 3953 static char str[50];
4007
4008 3954
4009 TRACE_FUNCTION("showCFStatus"); 3955 TRACE_FUNCTION("showCFStatus");
4010 3956
4011 //MC got rid of dodgy pointer arithmetic 3957 //MC got rid of dodgy pointer arithmetic
4012 pFeature = &data->mfw_ss_cf->ss[data->current_feature]; 3958 pFeature = &data->mfw_ss_cf->ss[data->current_feature];
4013 3959
4014 if (data->max_feature == 1) 3960 if (data->max_feature == 1)
4015 { 3961 {
4016 // Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken) 3962 // Jun 10, 2004 REF: CRR MMI-SPR-13614 Rashmi C N(Sasken)
4076 $Arguments: 4022 $Arguments:
4077 4023
4078 *******************************************************************************/ 4024 *******************************************************************************/
4079 4025
4080 4026
4081
4082 static void showCBStatus (T_MFW_HND win , T_ss * data) 4027 static void showCBStatus (T_MFW_HND win , T_ss * data)
4083 { 4028 {
4084 T_DISPLAY_DATA display_info; 4029 T_DISPLAY_DATA display_info;
4085 T_ss_feature_cb_data * pFeature; 4030 T_ss_feature_cb_data * pFeature;
4086 4031
4087 TRACE_FUNCTION("showCBStatus"); 4032 TRACE_FUNCTION("showCBStatus");
4088 4033
4089 //MC got rid of dodgy pointer arithmetic 4034 //MC got rid of dodgy pointer arithmetic
4090 pFeature = &data->mfw_ss_cb->ss[data->current_feature]; 4035 pFeature = &data->mfw_ss_cb->ss[data->current_feature];
4091 4036
4092 if (data->max_feature == 1) 4037 if (data->max_feature == 1)
4093 { 4038 {
4094 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, pFeature->status, COLOUR_STATUS); 4039 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, pFeature->service, pFeature->status, COLOUR_STATUS);
4095 //Jun 04,2004 CRR:13601 xpradipg - SASKEN 4040 //Jun 04,2004 CRR:13601 xpradipg - SASKEN
4096 //Timer value changed from FOREVER to FIVE_SECS 4041 //Timer value changed from FOREVER to FIVE_SECS
4097 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT); 4042 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT);
4098 } 4043 }
4099 else 4044 else
4100 { 4045 {
4101 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, pFeature->status, COLOUR_STATUS); 4046 dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtSoftNext, pFeature->service, pFeature->status, COLOUR_STATUS);
4102 //Jun 04,2004 CRR:13601 xpradipg - SASKEN 4047 //Jun 04,2004 CRR:13601 xpradipg - SASKEN
4103 //Timer value changed from FOREVER to FIVE_SECS 4048 //Timer value changed from FOREVER to FIVE_SECS
4104 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT ); 4049 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, FIVE_SECS, KEY_CLEAR| KEY_LEFT | KEY_RIGHT );
4105 } 4050 }
4106 display_info.Identifier = E_SS_CB_CNF; // can be used also for CF and CW 4051 display_info.Identifier = E_SS_CB_CNF; // can be used also for CF and CW
4107 4052
4108 /* 4053 /*
4109 * Call Info Screen 4054 * Call Info Screen
4144 strcpy(pSSstring, "*#"); 4089 strcpy(pSSstring, "*#");
4145 break; 4090 break;
4146 default: 4091 default:
4147 break; 4092 break;
4148 } 4093 }
4149
4150 } 4094 }
4151 4095
4152 4096
4153 /******************************************************************************* 4097 /*******************************************************************************
4154 4098
4190 break; 4134 break;
4191 } 4135 }
4192 } 4136 }
4193 4137
4194 4138
4195
4196
4197 /******************************************************************************* 4139 /*******************************************************************************
4198 4140
4199 $Function: getCFNumber 4141 $Function: getCFNumber
4200 4142
4201 $Description: 4143 $Description:
4206 4148
4207 *******************************************************************************/ 4149 *******************************************************************************/
4208 4150
4209 static void getCFNumber(char * pSSstring) 4151 static void getCFNumber(char * pSSstring)
4210 { 4152 {
4211
4212 strcat(pSSstring, ss_data.edt_buf_number); 4153 strcat(pSSstring, ss_data.edt_buf_number);
4213 } 4154 }
4214
4215 4155
4216 4156
4217 /******************************************************************************* 4157 /*******************************************************************************
4218 4158
4219 $Function: getCFService 4159 $Function: getCFService
4235 case CFVoice: 4175 case CFVoice:
4236 strcat(pSSstring, "*11"); //SPR#0776 - DS -changed from 10 to 11 4176 strcat(pSSstring, "*11"); //SPR#0776 - DS -changed from 10 to 11
4237 break; 4177 break;
4238 /*MC SPR 742, handle line 2, auxiliary telephony*/ 4178 /*MC SPR 742, handle line 2, auxiliary telephony*/
4239 case CFAuxVoice: 4179 case CFAuxVoice:
4240 strcat(pSSstring, "*89"); 4180 strcat(pSSstring, "*89");
4241 break; 4181 break;
4242 case CFFax: 4182 case CFFax:
4243 strcat(pSSstring, "*13"); 4183 strcat(pSSstring, "*13");
4244 break; 4184 break;
4245 case CFData: 4185 case CFData:
4249 break; 4189 break;
4250 } 4190 }
4251 } 4191 }
4252 4192
4253 4193
4254
4255 /******************************************************************************* 4194 /*******************************************************************************
4256 4195
4257 $Function: servicesSendCallDivert 4196 $Function: servicesSendCallDivert
4258 4197
4259 $Description: Send out Call Divert String to MFW according to static variables. 4198 $Description: Send out Call Divert String to MFW according to static variables.
4263 $Arguments: 4202 $Arguments:
4264 4203
4265 *******************************************************************************/ 4204 *******************************************************************************/
4266 4205
4267 4206
4268
4269 static int servicesSendCallDivert( char * divert_number) 4207 static int servicesSendCallDivert( char * divert_number)
4270 { 4208 {
4271 char SS_string[60] = {'\0'}; 4209 char SS_string[60] = {'\0'};
4272 4210
4273 /* build up SS string according to menu selections */ 4211 /* build up SS string according to menu selections */
4274 getCFAction(SS_string); 4212 getCFAction(SS_string);
4275 getCFType(SS_string); 4213 getCFType(SS_string);
4276 if (divert_number) 4214 if (divert_number)
4277 strcat(SS_string, divert_number); 4215 strcat(SS_string, divert_number);
4278 else 4216 else
4279 getCFNumber(SS_string); 4217 getCFNumber(SS_string);
4280 getCFService(SS_string); 4218 getCFService(SS_string);
4281 strcat(SS_string, "#"); 4219 strcat(SS_string, "#");
4282 4220
4283 /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar) 4221 /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar)
4284 Description : CPHS Call Forwarding feature implementation 4222 Description : CPHS Call Forwarding feature implementation
4285 Solution : previous code is deleted because it was setting CF flag in flash before getting network confirmation*/ 4223 Solution : previous code is deleted because it was setting CF flag in flash before getting network confirmation*/
4286 4224
4287 4225
4288 TRACE_FUNCTION(SS_string); 4226 TRACE_FUNCTION(SS_string);
4289 4227
4290 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 4228 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
4291 { 4229 {
4292 showFailed( ss_data.win ); 4230 showFailed( ss_data.win );
4293 } 4231 }
4294 return 0; 4232 return 0;
4295 } 4233 }
4296
4297 4234
4298 4235
4299 /******************************************************************************* 4236 /*******************************************************************************
4300 4237
4301 $Function: servicesActivateCLIR 4238 $Function: servicesActivateCLIR
4307 $Arguments: 4244 $Arguments:
4308 4245
4309 *******************************************************************************/ 4246 *******************************************************************************/
4310 4247
4311 int servicesActivateCLIR(MfwMnu* m, MfwMnuItem* i) { 4248 int servicesActivateCLIR(MfwMnu* m, MfwMnuItem* i) {
4312 char actstr[8]; 4249 char actstr[8];
4313 4250
4314 CFAction = CFActivate; 4251 CFAction = CFActivate;
4315 strcpy(actstr, "#31#"); 4252 strcpy(actstr, "#31#");
4253
4254 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4255 showFailed( ss_data.win );
4256 else
4257 {
4258 strcpy(actstr, "*#31#");
4316 4259
4317 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) 4260 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4318 showFailed( ss_data.win ); 4261 showFailed( ss_data.win );
4319 else 4262 }
4320 { 4263
4264 return 0;
4265 }
4266
4267
4268 /*******************************************************************************
4269
4270 $Function: servicesSuppressCLIR
4271
4272 $Description: suppress CLIR
4273
4274 $Returns:
4275
4276 $Arguments:
4277
4278 *******************************************************************************/
4279
4280
4281 int servicesDeactivateCLIR(MfwMnu* m, MfwMnuItem* i) {
4282 char actstr[8];
4283
4284 CFAction = CFDeactivate;
4285 strcpy(actstr, "*31#");
4286
4287 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4288 showFailed( ss_data.win );
4289 else
4290 {
4321 strcpy(actstr, "*#31#"); 4291 strcpy(actstr, "*#31#");
4322 4292
4323 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) 4293 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4294 showFailed( ss_data.win );
4295 }
4296
4297 return 0;
4298 }
4299
4300 /*******************************************************************************
4301
4302 $Function: servicesCheckCLIR
4303
4304 $Description:
4305
4306 $Returns:
4307
4308 $Arguments:
4309
4310 *******************************************************************************/
4311
4312
4313 int servicesCheckCLIR(MfwMnu* m, MfwMnuItem* i) {
4314 char actstr[8];
4315
4316 CFAction = CFCheck;
4317
4318 strcpy(actstr, "*#31#");
4319
4320 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4324 showFailed( ss_data.win ); 4321 showFailed( ss_data.win );
4325 } 4322
4326 4323 return 0;
4327 4324 }
4328 return 0; 4325
4329 } 4326
4330 4327 /*******************************************************************************
4331 4328
4332 /******************************************************************************* 4329 $Function: servicesCheckCWaiting
4333 4330
4334 $Function: servicesSuppressCLIR 4331 $Description:
4335 4332
4336 $Description: suppress CLIR 4333 $Returns:
4337 4334
4338 $Returns: 4335 $Arguments:
4339 4336
4340 $Arguments: 4337 *******************************************************************************/
4341 4338
4342 *******************************************************************************/ 4339 int servicesCheckCWaiting(MfwMnu* m, MfwMnuItem* i) {
4343 4340 char actstr[8];
4344 4341
4345 int servicesDeactivateCLIR(MfwMnu* m, MfwMnuItem* i) { 4342 strcpy(actstr, "*#43#");
4346 char actstr[8]; 4343
4347 4344 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4348 CFAction = CFDeactivate;
4349 strcpy(actstr, "*31#");
4350
4351 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4352 showFailed( ss_data.win );
4353 else
4354 {
4355 strcpy(actstr, "*#31#");
4356
4357 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4358 showFailed( ss_data.win ); 4345 showFailed( ss_data.win );
4359 } 4346
4360 4347 return 0;
4361 return 0; 4348 }
4362 } 4349
4363 4350
4364 /******************************************************************************* 4351 /*******************************************************************************
4365 4352
4366 $Function: servicesCheckCLIR 4353 $Function: servicesActivateCWaiting
4367 4354
4368 $Description: 4355 $Description: activate CallWaiting functionality
4369 4356
4370 $Returns: 4357 $Returns:
4371 4358
4372 $Arguments: 4359 $Arguments:
4373 4360
4374 *******************************************************************************/ 4361 *******************************************************************************/
4375 4362
4376 4363
4377 4364 int servicesActivateCWaiting(MfwMnu* m, MfwMnuItem* i) {
4378 int servicesCheckCLIR(MfwMnu* m, MfwMnuItem* i) { 4365 char actstr[8];
4379 char actstr[8]; 4366
4380 4367 /* JVJ #1586 Changed *43*10# to *43*# */
4381 CFAction = CFCheck; 4368 strcpy(actstr, "*43*#");
4382 4369
4383 strcpy(actstr, "*#31#"); 4370 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4384
4385 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4386 showFailed( ss_data.win ); 4371 showFailed( ss_data.win );
4387 4372
4388 return 0; 4373 return MFW_EVENT_CONSUMED;
4389 } 4374 }
4390 4375
4391 4376
4392 /******************************************************************************* 4377 /*******************************************************************************
4393 4378
4394 $Function: servicesCheckCWaiting 4379 $Function: servicesDeactivateCWaiting
4395 4380
4396 $Description: 4381 $Description: deactivate CallWaiting functionality
4397 4382
4398 $Returns: 4383 $Returns:
4399 4384
4400 $Arguments: 4385 $Arguments:
4401 4386
4402 *******************************************************************************/ 4387 *******************************************************************************/
4403 4388
4404 int servicesCheckCWaiting(MfwMnu* m, MfwMnuItem* i) { 4389
4405 char actstr[8]; 4390 int servicesDeactivateCWaiting(MfwMnu* m, MfwMnuItem* i) {
4406 4391 char actstr[8];
4407 strcpy(actstr, "*#43#"); 4392
4408 4393 /* JVJ #1586 Changed #43*10# to #43# */
4409 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL) 4394 strcpy(actstr, "#43#");
4395
4396 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4410 showFailed( ss_data.win ); 4397 showFailed( ss_data.win );
4411 4398
4412 return 0; 4399 return MFW_EVENT_CONSUMED;
4413 } 4400 }
4414
4415
4416 /*******************************************************************************
4417
4418 $Function: servicesActivateCWaiting
4419
4420 $Description: activate CallWaiting functionality
4421
4422 $Returns:
4423
4424 $Arguments:
4425
4426 *******************************************************************************/
4427
4428
4429 int servicesActivateCWaiting(MfwMnu* m, MfwMnuItem* i) {
4430 char actstr[8];
4431
4432
4433 /* JVJ #1586 Changed *43*10# to *43*# */
4434 strcpy(actstr, "*43*#");
4435
4436 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4437 showFailed( ss_data.win );
4438
4439 return MFW_EVENT_CONSUMED;
4440 }
4441
4442
4443 /*******************************************************************************
4444
4445 $Function: servicesDeactivateCWaiting
4446
4447 $Description: deactivate CallWaiting functionality
4448
4449 $Returns:
4450
4451 $Arguments:
4452
4453 *******************************************************************************/
4454
4455
4456
4457 int servicesDeactivateCWaiting(MfwMnu* m, MfwMnuItem* i) {
4458 char actstr[8];
4459
4460 /* JVJ #1586 Changed #43*10# to #43# */
4461 strcpy(actstr, "#43#");
4462
4463 if (ss_execute_transaction((UBYTE*)actstr, 0) == MFW_SS_FAIL)
4464 showFailed( ss_data.win );
4465
4466 return MFW_EVENT_CONSUMED;
4467 }
4468
4469
4470 4401
4471 4402
4472 /******************************************************************************* 4403 /*******************************************************************************
4473 4404
4474 $Function: servicesInterCFU 4405 $Function: servicesInterCFU
4480 $Arguments: 4411 $Arguments:
4481 4412
4482 *******************************************************************************/ 4413 *******************************************************************************/
4483 4414
4484 4415
4485
4486
4487 int servicesInterCFU(void) 4416 int servicesInterCFU(void)
4488 { 4417 {
4489 char actstr[8]; 4418 char actstr[8];
4490 4419
4491 strcpy(actstr, "*#21#"); 4420 strcpy(actstr, "*#21#");
4492 4421
4493 ss_execute_transaction((UBYTE*)actstr, 0); 4422 ss_execute_transaction((UBYTE*)actstr, 0);
4494 4423
4495 return 0; 4424 return 0;
4496 } 4425 }
4497 4426
4498 4427
4499
4500
4501
4502
4503
4504
4505
4506 #if(0) /* x0039928 - Lint warning removal */
4507 /*******************************************************************************
4508
4509 $Function: ServiceGetStatus
4510
4511 $Description: return the code for the MMI text string for the service status.
4512
4513 $Returns:
4514
4515 $Arguments:
4516
4517 *******************************************************************************/
4518
4519
4520 unsigned int ServiceGetStatus( UBYTE pStatus)
4521 {
4522 unsigned int strStatusCode = 0;
4523
4524 TRACE_FUNCTION("++ ServiceGetStatus");
4525
4526 if (pStatus & SS_STAT_ACTIVE)
4527 strStatusCode = TxtActivated;
4528 /* Marcus: Issue 1652: 03/02/2003: Removed NDH 10/06/03 */
4529 else
4530 strStatusCode = TxtDeActivated;
4531 return strStatusCode;
4532 }
4533
4534
4535 /*******************************************************************************
4536
4537 $Function: serviceGetServiceType
4538
4539 $Description: return the code for the MMI text string for the service type.
4540
4541 $Returns:
4542
4543 $Arguments:
4544
4545 *******************************************************************************/
4546
4547
4548 unsigned int serviceGetServiceType( UBYTE ss_telecom_type, UBYTE ss_telecom_service)
4549 {
4550 unsigned int strServCode = 0;
4551
4552 TRACE_FUNCTION("++ serviceGetServiceType");
4553 switch ( ss_telecom_type )
4554 {
4555 case MFW_BST_UNKNOWN:
4556 break;
4557
4558 case MFW_BST_TELE:
4559 switch ( ss_telecom_service )
4560 {
4561 case MFW_TS_ALL_TS: strServCode = TxtAllCalls; break;/* all teleservices */
4562 case MFW_TS_ALL_SPCH: /* All speech transmission services */
4563 case MFW_TS_TLPHNY: /* telephony */
4564 case MFW_TS_EMRGNCY: /* emergency calls */
4565 strServCode = TxtVoice;
4566 break;
4567 case MFW_TS_ALL_SMS: /* all SMS services */
4568 case MFW_TS_SMS_MT: /* SMS MT PP */
4569 case MFW_TS_SMS_MO: /* SMS MO PP */
4570 /*strServCode = TxtSMS;*/
4571 break;
4572 case MFW_TS_ALL_FAX: /* all FAX transmission services */
4573 case MFW_TS_FAX3_ALT_SPCH: /* FAX group 3 alter. speech */
4574 case MFW_TS_FAX3_AUTO: /* FAX group 3 automatic */
4575 case MFW_TS_FAX4: /* FAX group 4 */
4576 strServCode = TxtFax;
4577 break;
4578 case MFW_TS_ALL_DATA: strServCode = TxtData; break;/* all FAX and SMS services */
4579 case MFW_TS_ALL_XCPT_SMS: strServCode = TxtNotImplemented;
4580 TRACE_FUNCTION("all x SMS"); break;/* all FAX and speech services */
4581 case MFW_TS_ALL_PSSS: strServCode = 0; break;/* all PLMN specific TS */
4582 case MFW_TS_PLMN1: /* PLMN specific TS 1 */
4583 case MFW_TS_PLMN2: /* PLMN specific TS 2 */
4584 case MFW_TS_PLMN3: /* PLMN specific TS 3 */
4585 case MFW_TS_PLMN4: /* PLMN specific TS 4 */
4586 case MFW_TS_PLMN5: /* PLMN specific TS 5 */
4587 case MFW_TS_PLMN6: /* PLMN specific TS 6 */
4588 case MFW_TS_PLMN7: /* PLMN specific TS 7 */
4589 case MFW_TS_PLMN8: /* PLMN specific TS 8 */
4590 case MFW_TS_PLMN9: /* PLMN specific TS 9 */
4591 case MFW_TS_PLMNA: /* PLMN specific TS A */
4592 case MFW_TS_PLMNB: /* PLMN specific TS B */
4593 case MFW_TS_PLMNC: /* PLMN specific TS C */
4594 case MFW_TS_PLMND: /* PLMN specific TS D */
4595 case MFW_TS_PLMNE: /* PLMN specific TS E */
4596 case MFW_TS_PLMNF: /* PLMN specific TS F */
4597 strServCode = 0;
4598 break;
4599
4600 default: break;
4601
4602 }
4603 break;
4604
4605 /* NOTE that we are returning "Data" for all Bearer services until otherwise spec'ed */
4606 case MFW_BST_BEARER:
4607 switch ( ss_telecom_service )
4608 {
4609 case MFW_BS_ALL_BS : strServCode = TxtNotImplemented; /* strServCode = TxtAllServices; */ break; /* all bearer services */
4610 case MFW_BS_ALL_DATA_CDA : /* all data CDA services */
4611 case MFW_BS_CDA_300 : /* data CDA 300 bps */
4612 case MFW_BS_CDA_1200 : /* data CDA 1200 bps */
4613 case MFW_BS_CDA_1200_75 : /* data CDA 1200/75 bps */
4614 case MFW_BS_CDA_2400 : /* data CDA 2400 bps */
4615 case MFW_BS_CDA_4800 : /* data CDA 4800 bps */
4616 case MFW_BS_CDA_9600 : /* data CDA 9600 bps */
4617 case MFW_BS_ALL_DATA_CDS : /* all data CDS services */
4618 case MFW_BS_CDS_1200 : /* data CDS 1200 bps */
4619 case MFW_BS_CDS_2400 : /* data CDS 2400 bps */
4620 case MFW_BS_CDS_4800 : /* data CDS 4800 bps */
4621 case MFW_BS_CDS_9600 : /* data CDS 9600 bps */
4622 case MFW_BS_ALL_DATA_PAD : /* all data PAD services */
4623 case MFW_BS_PAD_300 : /* data PAD 300 bps */
4624 case MFW_BS_PAD_1200 : /* data PAD 1200 bps */
4625 case MFW_BS_PAD_1200_75 : /* data PAD 1200/75 bps */
4626 case MFW_BS_PAD_2400 : /* data PAD 2400 bps */
4627 case MFW_BS_PAD_4800 : /* data PAD 4800 bps */
4628 case MFW_BS_PAD_9600 : /* data PAD 9600 bps */
4629 case MFW_BS_ALL_DATA_PDS : /* all data PDS services */
4630 case MFW_BS_PDS_2400 : /* data PDS 2400 bps */
4631 case MFW_BS_PDS_4800 : /* data PDS 4800 bps */
4632 case MFW_BS_PDS_9600 : /* data PDS 9600 bps */
4633 case MFW_BS_SPCH_ALT_CDA : /* all data CDA alter. speech */
4634 case MFW_BS_SPCH_ALT_CDS : /* all data CDS alter. speech */
4635 case MFW_BS_SPCH_FLD_CDA : /* all data speech followed CDA */
4636 case MFW_BS_SPCH_FLD_CDS : /* all data speech followed CDA */
4637 case MFW_BS_ALL_DC_ASYN : /* all data circuit asynchronous */
4638 case MFW_BS_ALL_ASYN : /* all asynchronous services */
4639 case MFW_BS_ALL_DC_SYN : /* all data circuit synchronous */
4640 case MFW_BS_ALL_SYN : /* all synchronous services */
4641 case MFW_BS_ALL_PSSS : /* all PLMN specific BS */
4642 case MFW_BS_PLMN1 : /* PLMN specific 1 */
4643 case MFW_BS_PLMN2 : /* PLMN specific 2 */
4644 case MFW_BS_PLMN3 : /* PLMN specific 3 */
4645 case MFW_BS_PLMN4 : /* PLMN specific 4 */
4646 case MFW_BS_PLMN5 : /* PLMN specific 5 */
4647 case MFW_BS_PLMN6 : /* PLMN specific 6 */
4648 case MFW_BS_PLMN7 : /* PLMN specific 7 */
4649 case MFW_BS_PLMN8 : /* PLMN specific 8 */
4650 case MFW_BS_PLMN9 : /* PLMN specific 9 */
4651 case MFW_BS_PLMNA : /* PLMN specific A */
4652 case MFW_BS_PLMNB : /* PLMN specific B */
4653 case MFW_BS_PLMNC : /* PLMN specific C */
4654 case MFW_BS_PLMND : /* PLMN specific D */
4655 case MFW_BS_PLMNE : /* PLMN specific E */
4656 case MFW_BS_PLMNF : /* PLMN specific F */
4657 strServCode = 0; break;
4658
4659 default: break;
4660
4661 }
4662 break;
4663
4664 default:
4665 break;
4666 }
4667 return strServCode;
4668 }
4669
4670 #endif
4671 /******************************************************************************* 4428 /*******************************************************************************
4672 4429
4673 $Function: serviceGetError 4430 $Function: serviceGetError
4674 4431
4675 $Description: 4432 $Description:
4677 $Returns: 4434 $Returns:
4678 4435
4679 $Arguments: 4436 $Arguments:
4680 4437
4681 *******************************************************************************/ 4438 *******************************************************************************/
4682
4683 4439
4684 4440
4685 static unsigned int serviceGetError( T_MFW_SS_ERROR ss_error ) 4441 static unsigned int serviceGetError( T_MFW_SS_ERROR ss_error )
4686 { 4442 {
4687 unsigned int errStrCode = TxtNotAvailable; 4443 unsigned int errStrCode = TxtNotAvailable;
4796 case MFW_SS_ERR_FATAL_INV_RESULT: 4552 case MFW_SS_ERR_FATAL_INV_RESULT:
4797 case MFW_SS_ERR_FATAL_CCD_DEC: 4553 case MFW_SS_ERR_FATAL_CCD_DEC:
4798 case MFW_SS_ERR_FATAL_SS_ENT: 4554 case MFW_SS_ERR_FATAL_SS_ENT:
4799 errStrCode = TxtFatRes; 4555 errStrCode = TxtFatRes;
4800 break; 4556 break;
4801 default: 4557 default:
4802 break; 4558 break;
4803 } 4559 }
4804 return errStrCode; 4560 return errStrCode;
4805 } 4561 }
4806 4562
4820 4576
4821 unsigned int serviceGetType( T_MFW_SS_CODES type ) 4577 unsigned int serviceGetType( T_MFW_SS_CODES type )
4822 { 4578 {
4823 unsigned int strTypeCode = 0; 4579 unsigned int strTypeCode = 0;
4824 4580
4825 TRACE_FUNCTION("++ serviceGetType"); 4581 TRACE_FUNCTION("++ serviceGetType");
4826 4582
4827 switch (type) 4583 switch (type)
4828 { 4584 {
4829 case SS_CODES_UNKNOWN: 4585 case SS_CODES_UNKNOWN:
4830 /* Marcus: Issue 1652: 03/02/2003: Start */ 4586 /* Marcus: Issue 1652: 03/02/2003: Start */
4911 break; 4667 break;
4912 } 4668 }
4913 return strTypeCode; 4669 return strTypeCode;
4914 } 4670 }
4915 4671
4916 #if(0) /* x0039928 -Lint warning removal */
4917 /*******************************************************************************
4918
4919 $Function: serviceGetCategory
4920
4921 $Description: return the code for the MMI text string for the service category.
4922
4923 $Returns:
4924
4925 $Arguments:
4926
4927 *******************************************************************************/
4928
4929 unsigned int serviceGetCategory( T_MFW_SS_CATEGORY cat )
4930 {
4931 unsigned int strCatCode = 0;
4932
4933 TRACE_FUNCTION("++ serviceGetCategory");
4934
4935 switch ( cat )
4936 {
4937 case SS_CTG_UNKNOWN:
4938 break;
4939
4940 case SS_REGISTRATION:
4941 case SS_ACTIVATION:
4942 strCatCode = TxtActivated;
4943 break;
4944
4945 case SS_ERASURE:
4946 case SS_DEACTIVATION:
4947 strCatCode = TxtDeActivated;
4948 break;
4949
4950 case SS_INTERROGATION:
4951 TRACE_FUNCTION("SS Interrogation");
4952 break;
4953
4954 default:
4955 break;
4956 }
4957 return strCatCode;
4958 }
4959 #endif
4960 4672
4961 /******************************************************************************* 4673 /*******************************************************************************
4962 4674
4963 $Function: servicesDivertActivate 4675 $Function: servicesDivertActivate
4964 4676
4967 $Returns: 4679 $Returns:
4968 4680
4969 $Arguments: 4681 $Arguments:
4970 4682
4971 *******************************************************************************/ 4683 *******************************************************************************/
4972
4973 4684
4974 4685
4975 void servicesDivertActivate(void) 4686 void servicesDivertActivate(void)
4976 { 4687 {
4977 TRACE_FUNCTION("servicesDivertActivate"); 4688 TRACE_FUNCTION("servicesDivertActivate");
5003 */ 4714 */
5004 TRACE_FUNCTION("servicesDivertCheck"); 4715 TRACE_FUNCTION("servicesDivertCheck");
5005 4716
5006 CFAction = CFCheck; 4717 CFAction = CFCheck;
5007 4718
5008 getCFAction(SS_string); 4719 getCFAction(SS_string);
5009 getCFType(SS_string); 4720 getCFType(SS_string);
5010 getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck. 4721 getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck.
5011 strcat(SS_string, "#"); 4722 strcat(SS_string, "#");
5012 4723
5013 TRACE_FUNCTION(SS_string); 4724 TRACE_FUNCTION(SS_string);
5014 4725
5015 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 4726 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
5016 showFailed( ss_data.win ); 4727 showFailed( ss_data.win );
5017
5018 } 4728 }
5019 4729
5020 /******************************************************************************* 4730 /*******************************************************************************
5021 4731
5022 $Function: servicesDivertDeactivate 4732 $Function: servicesDivertDeactivate
5030 $History 4740 $History
5031 4741
5032 //SPR#0776 - DS -Now takes service type into account by calling getCFServiceCheck. 4742 //SPR#0776 - DS -Now takes service type into account by calling getCFServiceCheck.
5033 4743
5034 *******************************************************************************/ 4744 *******************************************************************************/
5035
5036 4745
5037 4746
5038 void servicesDivertDeactivate(void) 4747 void servicesDivertDeactivate(void)
5039 { 4748 {
5040 char SS_string[60] = {'\0'}; 4749 char SS_string[60] = {'\0'};
5043 */ 4752 */
5044 TRACE_FUNCTION("servicesDivertDeactivate"); 4753 TRACE_FUNCTION("servicesDivertDeactivate");
5045 4754
5046 CFAction = CFDeactivate; 4755 CFAction = CFDeactivate;
5047 4756
5048 getCFAction(SS_string); 4757 getCFAction(SS_string);
5049 getCFType(SS_string); 4758 getCFType(SS_string);
5050 getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck. 4759 getCFService(SS_string); //SPR#929 - DS - Changed from getCFServiceCheck.
5051 SS_string[strlen(SS_string)] = '#'; 4760 SS_string[strlen(SS_string)] = '#';
5052 4761
5053 TRACE_FUNCTION(SS_string); 4762 TRACE_FUNCTION(SS_string);
5054 /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar) 4763 /* 30th May,2006 OMAPS00079650 a0393213 (R.Prabakar)
5055 Description : CPHS Call Forwarding feature implementation 4764 Description : CPHS Call Forwarding feature implementation
5056 Solution : previous code is deleted because it was setting CF flag in flash before getting network confirmation*/ 4765 Solution : previous code is deleted because it was setting CF flag in flash before getting network confirmation*/
5057 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 4766
4767 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
5058 showFailed( ss_data.win ); 4768 showFailed( ss_data.win );
5059
5060 } 4769 }
5061 4770
5062 /******************************************************************************* 4771 /*******************************************************************************
5063 4772
5064 $Function: servicesDivertVoice 4773 $Function: servicesDivertVoice
5068 $Returns: 4777 $Returns:
5069 4778
5070 $Arguments: 4779 $Arguments:
5071 4780
5072 *******************************************************************************/ 4781 *******************************************************************************/
5073
5074 4782
5075 4783
5076 void servicesDivertVoice(void) 4784 void servicesDivertVoice(void)
5077 { 4785 {
5078 TRACE_FUNCTION("servicesDivertVoice"); 4786 TRACE_FUNCTION("servicesDivertVoice");
5079 /*mc SPR 742 check if line2 is the current line*/ 4787 /*mc SPR 742 check if line2 is the current line*/
5080 if (!ALSPresent(NULL, NULL, NULL) && GetAlsLine() == MFW_SERV_LINE2/*FFS_flashData.als_selLine == MFW_SERV_LINE2*/) 4788 if (!ALSPresent(NULL, NULL, NULL) && GetAlsLine() == MFW_SERV_LINE2/*FFS_flashData.als_selLine == MFW_SERV_LINE2*/)
5081 CFService = CFAuxVoice; 4789 CFService = CFAuxVoice;
5082 else /*mc end*/ 4790 else /*mc end*/
5083 CFService = CFVoice; 4791 CFService = CFVoice;
5084 } 4792 }
5085 4793
5094 $Arguments: 4802 $Arguments:
5095 4803
5096 *******************************************************************************/ 4804 *******************************************************************************/
5097 4805
5098 4806
5099
5100 void servicesDivertFax(void) 4807 void servicesDivertFax(void)
5101 { 4808 {
5102 TRACE_FUNCTION("servicesDivertFax"); 4809 TRACE_FUNCTION("servicesDivertFax");
5103 CFService = CFFax; 4810 CFService = CFFax;
5104 } 4811 }
5132 $Returns: 4839 $Returns:
5133 4840
5134 $Arguments: 4841 $Arguments:
5135 4842
5136 *******************************************************************************/ 4843 *******************************************************************************/
5137
5138 4844
5139 4845
5140 void servicesDivertActionAll(void) 4846 void servicesDivertActionAll(void)
5141 { 4847 {
5142 TRACE_FUNCTION("servicesDivertActionAll"); 4848 TRACE_FUNCTION("servicesDivertActionAll");
5292 $Arguments: 4998 $Arguments:
5293 4999
5294 *******************************************************************************/ 5000 *******************************************************************************/
5295 5001
5296 5002
5297
5298 void servicesBarringInternational(void) 5003 void servicesBarringInternational(void)
5299 { 5004 {
5300 TRACE_FUNCTION("servicesBarringInternational"); 5005 TRACE_FUNCTION("servicesBarringInternational");
5301 CBType = CBInternational; 5006 CBType = CBInternational;
5302 } 5007 }
5332 $Arguments: 5037 $Arguments:
5333 5038
5334 *******************************************************************************/ 5039 *******************************************************************************/
5335 5040
5336 5041
5337
5338 void servicesBarringAllIncoming(void) 5042 void servicesBarringAllIncoming(void)
5339 { 5043 {
5340 TRACE_FUNCTION("servicesBarringAllIncoming"); 5044 TRACE_FUNCTION("servicesBarringAllIncoming");
5341 CBType = CBAllIncoming; 5045 CBType = CBAllIncoming;
5342 } 5046 }
5378 static void services_get_voice_number_cb(T_MFW_HND win, USHORT identifier, SHORT reason) 5082 static void services_get_voice_number_cb(T_MFW_HND win, USHORT identifier, SHORT reason)
5379 { 5083 {
5380 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; 5084 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data;
5381 T_services_input * data = (T_services_input *)win_data->user; 5085 T_services_input * data = (T_services_input *)win_data->user;
5382 5086
5383 TRACE_FUNCTION("services_get_voice_number_cb"); 5087 TRACE_FUNCTION("services_get_voice_number_cb");
5384 5088
5385 switch (reason) 5089 switch (reason)
5386 { 5090 {
5387 case INFO_KCD_LEFT: 5091 case INFO_KCD_LEFT:
5388 TRACE_FUNCTION("SERVICES_INPUT_LEFT"); 5092 TRACE_FUNCTION("SERVICES_INPUT_LEFT");
5389 services_input_destroy(ss_data.input_number_win); 5093 services_input_destroy(ss_data.input_number_win);
5390 /* send number if one has been entered */ 5094 /* send number if one has been entered */
5391 if (strlen(ss_data.edt_buf_number) > 0 ) 5095 if (strlen(ss_data.edt_buf_number) > 0 )
5392 SEND_EVENT(data->parent_win, SERVICES_DO_CALL_VOICE_DIVERT, 0, 0); 5096 SEND_EVENT(data->parent_win, SERVICES_DO_CALL_VOICE_DIVERT, 0, 0);
5393 break; 5097 break;
5394 5098
5395 case INFO_KCD_ALTERNATELEFT: 5099 case INFO_KCD_ALTERNATELEFT:
5396 TRACE_FUNCTION("SERVICES_INPUT_ALTERNATELEFT"); 5100 TRACE_FUNCTION("SERVICES_INPUT_ALTERNATELEFT");
5397 /* Go to phone book */ 5101 /* Go to phone book */
5398 if (bookPhoneBookLoading()==BOOK_SUCCESS) 5102 if (bookPhoneBookLoading()==BOOK_SUCCESS)
5399 { 5103 {
5400 // T_MFW_HND phbk_win; // RAVI 5104 // T_MFW_HND phbk_win; // RAVI
5401 bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed Assignment phbk_win = . 5105 bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed Assignment phbk_win = .
5402 } 5106 }
5403
5404 break; 5107 break;
5405 5108
5406 case INFO_KCD_HUP: 5109 case INFO_KCD_HUP:
5407 case INFO_KCD_RIGHT: 5110 case INFO_KCD_RIGHT:
5408 TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP"); 5111 TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP");
5409 services_input_destroy(ss_data.input_number_win); 5112 services_input_destroy(ss_data.input_number_win);
5410 break; 5113 break;
5411 default: 5114 default:
5412 break; 5115 break;
5413 } 5116 }
5414 } 5117 }
5415 5118
5416 #else /* NEW_EDITOR */ 5119 #else /* NEW_EDITOR */
5417 static void services_get_voice_number_cb(T_MFW_HND win, USHORT reason) 5120 static void services_get_voice_number_cb(T_MFW_HND win, USHORT reason)
5418 { 5121 {
5419 TRACE_FUNCTION("services_get_voice_number_cb"); 5122 TRACE_FUNCTION("services_get_voice_number_cb");
5420 5123
5421 switch (reason){ 5124 switch (reason){
5422 case SERVICES_INPUT_LEFT: 5125 case SERVICES_INPUT_LEFT:
5423 TRACE_FUNCTION("SERVICES_INPUT_LEFT"); 5126 TRACE_FUNCTION("SERVICES_INPUT_LEFT");
5424 /* send number if one has been entered */ 5127 /* send number if one has been entered */
5425 if (strlen(ss_data.edt_buf_number) > 0 ) 5128 if (strlen(ss_data.edt_buf_number) > 0 )
5426 SEND_EVENT(win, SERVICES_DO_CALL_VOICE_DIVERT, 0, 0); 5129 SEND_EVENT(win, SERVICES_DO_CALL_VOICE_DIVERT, 0, 0);
5427 break; 5130 break;
5428 default: 5131 default:
5429 break; 5132 break;
5430 } 5133 }
5431 } 5134 }
5432 #endif /* NEW_EDITOR */ 5135 #endif /* NEW_EDITOR */
5433 5136
5434 5137
5435 /******************************************************************************* 5138 /*******************************************************************************
5442 $Returns: 5145 $Returns:
5443 5146
5444 $Arguments: 5147 $Arguments:
5445 5148
5446 *******************************************************************************/ 5149 *******************************************************************************/
5447
5448
5449 5150
5450 5151
5451 void servicesDoVoiceMailNumber(void) 5152 void servicesDoVoiceMailNumber(void)
5452 { 5153 {
5453 char voiceNum[30] = {'\0'}; 5154 char voiceNum[30] = {'\0'};
5465 { 5166 {
5466 T_ss * data = &ss_data; 5167 T_ss * data = &ss_data;
5467 T_input_properties input; 5168 T_input_properties input;
5468 5169
5469 memset(data->edt_buf_number,'\0',PHB_MAX_LEN); 5170 memset(data->edt_buf_number,'\0',PHB_MAX_LEN);
5470 input.abc = FALSE;
5471 input.text = TxtEnterNumber;
5472 /* SPR#1428 - SH - New Editor changes - no longer required */
5473 #ifndef NEW_EDITOR
5474 input.edt_attr_input = &data->edt_attr_number;
5475 #endif /* ifndef NEW_EDITOR */
5476 input.left_soft_key = TxtSoftOK;
5477 input.right_soft_key = TxtSoftBack;
5478 input.callback = services_get_voice_number_cb;
5479 data->input_number_win = services_input_start(data->win,&input);
5480
5481 }
5482
5483 }
5484
5485
5486 /*******************************************************************************
5487
5488 $Function: services_get_number_cb
5489
5490 $Description: callback function for the enter other number window
5491
5492 $Returns:
5493
5494 $Arguments:
5495
5496 *******************************************************************************/
5497
5498 #ifdef NEW_EDITOR
5499 static void services_get_number_cb(T_MFW_HND win, USHORT identifier, SHORT reason)
5500 {
5501 // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI
5502 // T_services_input * data = (T_services_input *)win_data->user; // RAVI
5503
5504 TRACE_FUNCTION("services_get_voice_number_cb");
5505
5506 switch (reason)
5507 {
5508 case INFO_KCD_LEFT:
5509 TRACE_FUNCTION("SERVICES_INPUT_LEFT");
5510 /* send number if one has been entered */
5511 SEND_EVENT(ss_data.win, ServicesDoCallDivert, 0, 0);
5512 services_input_destroy(ss_data.input_number_win);
5513 ss_data.input_number_win = NULL;
5514 break;
5515
5516 case INFO_KCD_ALTERNATELEFT:
5517 TRACE_FUNCTION("SERVICES_INPUT_ALTERNATELEFT");
5518 /* Go to phone book */
5519 if (bookPhoneBookLoading()==BOOK_SUCCESS)
5520 {
5521 //T_MFW_HND phbk_win; // RAVI
5522 bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed assignment phbk_win =
5523 }
5524
5525 break;
5526
5527 case INFO_KCD_HUP:
5528 case INFO_KCD_RIGHT:
5529 TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP");
5530 services_input_destroy(ss_data.input_number_win);
5531 ss_data.input_number_win = NULL;
5532 break;
5533 default:
5534 break;
5535 }
5536 }
5537
5538 #else /* NEW_EDITOR */
5539 static void services_get_number_cb(T_MFW_HND win,USHORT reason)
5540 {
5541 TRACE_FUNCTION("services_get_number_cb");
5542
5543 switch (reason){
5544 case SERVICES_INPUT_LEFT:
5545 TRACE_FUNCTION("SERVICES_INPUT_LEFT");
5546 SEND_EVENT(win, ServicesDoCallDivert, 0, 0);
5547 break;
5548 case SERVICES_INPUT_RIGHT:
5549 TRACE_FUNCTION("SERVICES_INPUT_RIGHT");
5550 SEND_EVENT(win, ServicesDoCallDivert, 0, 0);
5551 break;
5552 default:
5553 break;
5554 }
5555 }
5556 #endif /* NEW_EDITOR */
5557
5558 /*******************************************************************************
5559
5560 $Function: servicesGetOtherNumber
5561
5562 $Description: Sets up an editor for entering another number.
5563
5564 $Returns:
5565
5566 $Arguments:
5567
5568 *******************************************************************************/
5569
5570
5571
5572
5573 static void ServicesGetOtherNumber(T_MFW_HND win)
5574 {
5575 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data;
5576 T_ss * data = (T_ss *)win_data->user;
5577
5578 T_input_properties input;
5579
5580 TRACE_EVENT("ServicesGetOtherNumber");
5581
5582 memset(data->edt_buf_number,'\0',PHB_MAX_LEN);
5583 input.abc = FALSE; 5171 input.abc = FALSE;
5584 input.text = TxtEnterNumber; 5172 input.text = TxtEnterNumber;
5585 /* SPR#1428 - SH - New Editor changes - no longer required */ 5173 /* SPR#1428 - SH - New Editor changes - no longer required */
5586 #ifndef NEW_EDITOR 5174 #ifndef NEW_EDITOR
5587 input.edt_attr_input = &data->edt_attr_number; 5175 input.edt_attr_input = &data->edt_attr_number;
5588 #endif /* ifndef NEW_EDITOR */ 5176 #endif /* ifndef NEW_EDITOR */
5589 input.left_soft_key = TxtSoftOK; 5177 input.left_soft_key = TxtSoftOK;
5590 //Oct 20, 2004 REF: CRR 25772 Deepa M.D 5178 input.right_soft_key = TxtSoftBack;
5591 //The RSK name has been set to Delete. 5179 input.callback = services_get_voice_number_cb;
5592 input.right_soft_key = TxtDelete; 5180 data->input_number_win = services_input_start(data->win,&input);
5593 input.callback = services_get_number_cb; 5181 }
5594 data->input_number_win = services_input_start(win,&input); 5182 }
5183
5184
5185 /*******************************************************************************
5186
5187 $Function: services_get_number_cb
5188
5189 $Description: callback function for the enter other number window
5190
5191 $Returns:
5192
5193 $Arguments:
5194
5195 *******************************************************************************/
5196
5197 #ifdef NEW_EDITOR
5198 static void services_get_number_cb(T_MFW_HND win, USHORT identifier, SHORT reason)
5199 {
5200 // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI
5201 // T_services_input * data = (T_services_input *)win_data->user; // RAVI
5202
5203 TRACE_FUNCTION("services_get_voice_number_cb");
5204
5205 switch (reason)
5206 {
5207 case INFO_KCD_LEFT:
5208 TRACE_FUNCTION("SERVICES_INPUT_LEFT");
5209 /* send number if one has been entered */
5210 SEND_EVENT(ss_data.win, ServicesDoCallDivert, 0, 0);
5211 services_input_destroy(ss_data.input_number_win);
5212 ss_data.input_number_win = NULL;
5213 break;
5214
5215 case INFO_KCD_ALTERNATELEFT:
5216 TRACE_FUNCTION("SERVICES_INPUT_ALTERNATELEFT");
5217 /* Go to phone book */
5218 if (bookPhoneBookLoading()==BOOK_SUCCESS)
5219 {
5220 //T_MFW_HND phbk_win; // RAVI
5221 bookPhonebookStart(win,PhbkFromDivert); // RAVI - Removed assignment phbk_win =
5222 }
5223 break;
5224
5225 case INFO_KCD_HUP:
5226 case INFO_KCD_RIGHT:
5227 TRACE_FUNCTION("SERVICES_INPUT_RIGHT/HUP");
5228 services_input_destroy(ss_data.input_number_win);
5229 ss_data.input_number_win = NULL;
5230 break;
5231 default:
5232 break;
5233 }
5234 }
5235
5236 #else /* NEW_EDITOR */
5237 static void services_get_number_cb(T_MFW_HND win,USHORT reason)
5238 {
5239 TRACE_FUNCTION("services_get_number_cb");
5240
5241 switch (reason){
5242 case SERVICES_INPUT_LEFT:
5243 TRACE_FUNCTION("SERVICES_INPUT_LEFT");
5244 SEND_EVENT(win, ServicesDoCallDivert, 0, 0);
5245 break;
5246 case SERVICES_INPUT_RIGHT:
5247 TRACE_FUNCTION("SERVICES_INPUT_RIGHT");
5248 SEND_EVENT(win, ServicesDoCallDivert, 0, 0);
5249 break;
5250 default:
5251 break;
5252 }
5253 }
5254 #endif /* NEW_EDITOR */
5255
5256 /*******************************************************************************
5257
5258 $Function: servicesGetOtherNumber
5259
5260 $Description: Sets up an editor for entering another number.
5261
5262 $Returns:
5263
5264 $Arguments:
5265
5266 *******************************************************************************/
5267
5268
5269 static void ServicesGetOtherNumber(T_MFW_HND win)
5270 {
5271 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data;
5272 T_ss * data = (T_ss *)win_data->user;
5273
5274 T_input_properties input;
5275
5276 TRACE_EVENT("ServicesGetOtherNumber");
5277
5278 memset(data->edt_buf_number,'\0',PHB_MAX_LEN);
5279 input.abc = FALSE;
5280 input.text = TxtEnterNumber;
5281 /* SPR#1428 - SH - New Editor changes - no longer required */
5282 #ifndef NEW_EDITOR
5283 input.edt_attr_input = &data->edt_attr_number;
5284 #endif /* ifndef NEW_EDITOR */
5285 input.left_soft_key = TxtSoftOK;
5286 //Oct 20, 2004 REF: CRR 25772 Deepa M.D
5287 //The RSK name has been set to Delete.
5288 input.right_soft_key = TxtDelete;
5289 input.callback = services_get_number_cb;
5290 data->input_number_win = services_input_start(win,&input);
5595 } 5291 }
5596 5292
5597 /******************************************************************************* 5293 /*******************************************************************************
5598 5294
5599 $Function: servicesDoOtherNumber 5295 $Function: servicesDoOtherNumber
5607 *******************************************************************************/ 5303 *******************************************************************************/
5608 5304
5609 5305
5610 void servicesDoOtherNumber(void) 5306 void servicesDoOtherNumber(void)
5611 { 5307 {
5612
5613 TRACE_FUNCTION("servicesDoOtherNumber"); 5308 TRACE_FUNCTION("servicesDoOtherNumber");
5614 5309
5615 SEND_EVENT(ss_data.win, ServicesOtherNumber, 0, 0); 5310 SEND_EVENT(ss_data.win, ServicesOtherNumber, 0, 0);
5616
5617 5311
5618 /* this is function called from menu, it will also send a signal to start 5312 /* this is function called from menu, it will also send a signal to start
5619 window being displayed for editing or calling phonebook */ 5313 window being displayed for editing or calling phonebook */
5620 /* set up and show edit field */ 5314 /* set up and show edit field */
5621 } 5315 }
5637 { 5331 {
5638 char voiceNum[30] = {'\0'}; 5332 char voiceNum[30] = {'\0'};
5639 TRACE_FUNCTION("servicesStoreVoiceMailNumber"); 5333 TRACE_FUNCTION("servicesStoreVoiceMailNumber");
5640 5334
5641 getCFNumber(voiceNum); 5335 getCFNumber(voiceNum);
5642 5336 }
5643 } 5337
5644
5645
5646 #if(0) /* x0039928 -Lint warning removal */
5647 /*******************************************************************************
5648
5649 $Function: servicesStoreUSSD
5650
5651 $Description: Store selected USSD to NVM.
5652
5653 $Returns:
5654
5655 $Arguments:
5656
5657 *******************************************************************************/
5658
5659
5660
5661 static void servicesStoreUSSD(void)
5662 {
5663 TRACE_FUNCTION("servicesStoreUSSD");
5664 }
5665 #endif
5666 5338
5667 /******************************************************************************* 5339 /*******************************************************************************
5668 5340
5669 $Function: servicesActivateIRDA 5341 $Function: servicesActivateIRDA
5670 5342
5806 *******************************************************************************/ 5478 *******************************************************************************/
5807 5479
5808 5480
5809 static void dialog_ext_info_destroy (T_MFW_HND own_window) 5481 static void dialog_ext_info_destroy (T_MFW_HND own_window)
5810 { 5482 {
5811 T_MFW_WIN * win = ((T_MFW_HDR *)own_window)->data; 5483 T_MFW_WIN * win = ((T_MFW_HDR *)own_window)->data;
5812 T_dialog_ext_info * data = (T_dialog_ext_info *)win->user; 5484 T_dialog_ext_info * data = (T_dialog_ext_info *)win->user;
5813 5485
5814 TRACE_FUNCTION ("dialog_ext_info_destroy()"); 5486 TRACE_FUNCTION ("dialog_ext_info_destroy()");
5815 5487
5816 if (own_window == NULL) 5488 if (own_window == NULL)
5817 { 5489 {
5818 TRACE_EVENT ("Error : Called with NULL Pointer"); 5490 TRACE_EVENT ("Error : Called with NULL Pointer");
5819 return; 5491 return;
5820 } 5492 }
5821 5493
5822 if (data) 5494 if (data)
5823 { 5495 {
5824 /* 5496 /*
5825 * Exit TIMER & KEYBOARD Handle 5497 * Exit TIMER & KEYBOARD Handle
5826 */ 5498 */
5827 kbd_delete (data->info_kbd); 5499 kbd_delete (data->info_kbd);
5828 kbd_delete (data->info_kbd_long); 5500 kbd_delete (data->info_kbd_long);
5829 tim_delete (data->info_tim); 5501 tim_delete (data->info_tim);
5830 5502
5831 /* 5503 /*
5832 * Delete WIN Handler 5504 * Delete WIN Handler
5833 */ 5505 */
5834 win_delete (data->info_win); 5506 win_delete (data->info_win);
5835 /* 5507 /*
5836 * Free Memory 5508 * Free Memory
5837 */ 5509 */
5838 FREE_MEMORY ((void *)data, sizeof (T_dialog_ext_info)); 5510 FREE_MEMORY ((void *)data, sizeof (T_dialog_ext_info));
5839 } 5511 }
5840 } 5512 }
5841 5513
5842 /******************************************************************************* 5514 /*******************************************************************************
5843 5515
5844 $Function: dialog_ext_info 5516 $Function: dialog_ext_info
5888 tim_start (data->info_tim); 5560 tim_start (data->info_tim);
5889 win_show(win); 5561 win_show(win);
5890 break; 5562 break;
5891 5563
5892 case DIALOG_DESTROY: 5564 case DIALOG_DESTROY:
5893 dialog_ext_info_destroy(win); 5565 dialog_ext_info_destroy(win);
5894 break; 5566 break;
5895 } 5567 }
5896 } 5568 }
5897 5569
5898 /******************************************************************************* 5570 /*******************************************************************************
5904 $Returns: 5576 $Returns:
5905 5577
5906 $Arguments: 5578 $Arguments:
5907 5579
5908 *******************************************************************************/ 5580 *******************************************************************************/
5909
5910 5581
5911 5582
5912 static int dialog_ext_info_win_cb (T_MFW_EVENT event, T_MFW_WIN * win) 5583 static int dialog_ext_info_win_cb (T_MFW_EVENT event, T_MFW_WIN * win)
5913 { 5584 {
5914 T_dialog_ext_info * data = (T_dialog_ext_info *)win->user; 5585 T_dialog_ext_info * data = (T_dialog_ext_info *)win->user;
5934 */ 5605 */
5935 displaySoftKeys(data->LeftSoftKey, data->RightSoftKey); 5606 displaySoftKeys(data->LeftSoftKey, data->RightSoftKey);
5936 /* 5607 /*
5937 * Print information 5608 * Print information
5938 */ 5609 */
5939 if (data->TextId1 NEQ 0) 5610 if (data->TextId1 NEQ 0)
5940 { 5611 {
5941 displayAlignedText(CENTER, Mmi_layout_line(1), 0, GET_TEXT(data->TextId1)); 5612 displayAlignedText(CENTER, Mmi_layout_line(1), 0, GET_TEXT(data->TextId1));
5942 } 5613 }
5943 5614
5944 if (data->TextId2 NEQ 0) 5615 if (data->TextId2 NEQ 0)
6016 switch (keyboard->code) 5687 switch (keyboard->code)
6017 { 5688 {
6018 case KCD_LEFT: 5689 case KCD_LEFT:
6019 if (data->KeyEvents & KEY_LEFT) 5690 if (data->KeyEvents & KEY_LEFT)
6020 { 5691 {
6021 dialog_ext_info_destroy (win); 5692 dialog_ext_info_destroy (win);
6022 if (Callback) 5693 if (Callback)
6023 (Callback) (parent_win, Identifier, INFO_KCD_LEFT); 5694 (Callback) (parent_win, Identifier, INFO_KCD_LEFT);
6024 } 5695 }
6025 break; 5696 break;
6026 5697
6027 case KCD_RIGHT: 5698 case KCD_RIGHT:
6028 if (data->KeyEvents & KEY_RIGHT) 5699 if (data->KeyEvents & KEY_RIGHT)
6029 { 5700 {
6030 dialog_ext_info_destroy (win); 5701 dialog_ext_info_destroy (win);
6031 if (Callback) 5702 if (Callback)
6032 (Callback) (parent_win, Identifier, INFO_KCD_RIGHT); 5703 (Callback) (parent_win, Identifier, INFO_KCD_RIGHT);
6033 } 5704 }
6034 break; 5705 break;
6035 5706
6036 case KCD_HUP: 5707 case KCD_HUP:
6037 if (data->KeyEvents & KEY_CLEAR) 5708 if (data->KeyEvents & KEY_CLEAR)
6038 { 5709 {
6039 dialog_ext_info_destroy (win); 5710 dialog_ext_info_destroy (win);
6040 if (Callback) 5711 if (Callback)
6041 (Callback) (parent_win, Identifier, INFO_KCD_HUP); 5712 (Callback) (parent_win, Identifier, INFO_KCD_HUP);
6042 } 5713 }
6043 break; 5714 break;
6044 /* dialog_ext_info_destroy (win); */ /* Unreachable Code - x0020906 - 24-08-2006 */ 5715 /* dialog_ext_info_destroy (win); */ /* Unreachable Code - x0020906 - 24-08-2006 */
6045 5716
6046 case KCD_MNUUP: 5717 case KCD_MNUUP:
6047 dialog_ext_info_destroy (win); 5718 dialog_ext_info_destroy (win);
6048 if (Callback) 5719 if (Callback)
6049 (Callback) (parent_win, Identifier, INFO_KCD_UP); 5720 (Callback) (parent_win, Identifier, INFO_KCD_UP);
6050 break; 5721 break;
6051 5722
6052 case KCD_MNUDOWN: 5723 case KCD_MNUDOWN:
6053 dialog_ext_info_destroy (win); 5724 dialog_ext_info_destroy (win);
6054 if (Callback) 5725 if (Callback)
6055 (Callback) (parent_win, Identifier, INFO_KCD_DOWN); 5726 (Callback) (parent_win, Identifier, INFO_KCD_DOWN);
6056 break; 5727 break;
6057 5728
6058 default: 5729 default:
6059 return MFW_EVENT_PASSED; 5730 return MFW_EVENT_PASSED;
6060 } 5731 }
6070 $Returns: 5741 $Returns:
6071 5742
6072 $Arguments: 5743 $Arguments:
6073 5744
6074 *******************************************************************************/ 5745 *******************************************************************************/
6075
6076
6077
6078
6079
6080 5746
6081 static int dialog_ext_info_kbd_long_cb (T_MFW_EVENT e, T_MFW_KBD *k) 5747 static int dialog_ext_info_kbd_long_cb (T_MFW_EVENT e, T_MFW_KBD *k)
6082 { 5748 {
6083 T_MFW_HND win = mfw_parent (mfw_header()); 5749 T_MFW_HND win = mfw_parent (mfw_header());
6084 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; 5750 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data;
6120 5786
6121 $Arguments: 5787 $Arguments:
6122 5788
6123 *******************************************************************************/ 5789 *******************************************************************************/
6124 5790
6125 5791 static T_MFW_HND services_input_create(MfwHnd parent)
6126 5792 {
6127 5793 T_MFW_WIN * win_data;
6128 static T_MFW_HND services_input_create(MfwHnd parent){ 5794 T_services_input * data = (T_services_input *)ALLOC_MEMORY (sizeof (T_services_input));
6129 5795
6130 5796 TRACE_FUNCTION ("services_input_create()");
6131 T_MFW_WIN * win_data; 5797
6132 T_services_input * data = (T_services_input *)ALLOC_MEMORY (sizeof (T_services_input)); 5798 data->win = win_create (parent, 0, E_WIN_VISIBLE, (T_MFW_CB)services_input_win_cb);
6133 5799
6134 5800 if (data->win EQ 0)
6135 5801 return 0;
6136 TRACE_FUNCTION ("services_input_create()");
6137
6138 data->win = win_create (parent, 0, E_WIN_VISIBLE, (T_MFW_CB)services_input_win_cb);
6139
6140 if (data->win EQ 0)
6141 return 0;
6142 5802
6143 /* 5803 /*
6144 * Create window handler 5804 * Create window handler
6145 */ 5805 */
6146 data->mmi_control.dialog = (T_DIALOG_FUNC)services_input; 5806 data->mmi_control.dialog = (T_DIALOG_FUNC)services_input;
6147 data->mmi_control.data = data; 5807 data->mmi_control.data = data;
6148 win_data = ((T_MFW_HDR *)data->win)->data; 5808 win_data = ((T_MFW_HDR *)data->win)->data;
6149 win_data->user = (void *)data; 5809 win_data->user = (void *)data;
6150 5810
6151 /* 5811 /*
6152 * return window handle 5812 * return window handle
6153 */ 5813 */
6154 5814
6155 /* SPR#1428 - SH - New Editor changes - no longer required */ 5815 /* SPR#1428 - SH - New Editor changes - no longer required */
6156 #ifndef NEW_EDITOR 5816 #ifndef NEW_EDITOR
6157 data->kbd = kbdCreate(data->win,KEY_ALL,(MfwCb)services_input_kbd_cb); 5817 data->kbd = kbdCreate(data->win,KEY_ALL,(MfwCb)services_input_kbd_cb);
6158 data->kbd_long = kbdCreate(data->win,KEY_ALL|KEY_LONG,(MfwCb)services_input_kbd_long_cb); 5818 data->kbd_long = kbdCreate(data->win,KEY_ALL|KEY_LONG,(MfwCb)services_input_kbd_long_cb);
6159 #endif /* ifndef NEW_EDITOR */ 5819 #endif /* ifndef NEW_EDITOR */
6160 5820
6161 data->parent_win = parent; 5821 data->parent_win = parent;
6162 5822
6163 return data->win; 5823 return data->win;
6164
6165 } 5824 }
6166 5825
6167 5826
6168 /******************************************************************************* 5827 /*******************************************************************************
6169 5828
6175 5834
6176 $Arguments: 5835 $Arguments:
6177 5836
6178 *******************************************************************************/ 5837 *******************************************************************************/
6179 5838
6180 5839 static void services_input_destroy(MfwHnd window)
6181 5840 {
6182 5841 T_MFW_WIN * win = ((T_MFW_HDR *)window)->data;
6183 5842 T_services_input * data = (T_services_input *)win->user;
6184 static void services_input_destroy(MfwHnd window){ 5843
6185 T_MFW_WIN * win = ((T_MFW_HDR *)window)->data; 5844 TRACE_FUNCTION ("services_input_destroy()");
6186 T_services_input * data = (T_services_input *)win->user; 5845
6187 5846 if (window == NULL)
6188 TRACE_FUNCTION ("services_input_destroy()"); 5847 {
6189 5848 TRACE_EVENT ("Error : Called with NULL Pointer");
6190 if (window == NULL) 5849 return;
6191 { 5850 }
6192 TRACE_EVENT ("Error : Called with NULL Pointer"); 5851
6193 return; 5852 if (data)
6194 } 5853 {
6195
6196 if (data)
6197 {
6198 /* SPR#1428 - SH - Destroy new editor */ 5854 /* SPR#1428 - SH - Destroy new editor */
6199 #ifdef NEW_EDITOR 5855 #ifdef NEW_EDITOR
6200 AUI_edit_Destroy(data->edit_win); 5856 AUI_edit_Destroy(data->edit_win);
6201 #else /* NEW_EDITOR */ 5857 #else /* NEW_EDITOR */
6202 editDeactivate(); 5858 editDeactivate();
6203 #endif /* NEW_EDITOR */ 5859 #endif /* NEW_EDITOR */
6204 5860
6205 winDelete (data->win); 5861 winDelete (data->win);
6206 /* * Free Memory 5862 /* * Free Memory
6207 */ 5863 */
6208 FREE_MEMORY ((void *)data, sizeof (T_services_input)); 5864 FREE_MEMORY ((void *)data, sizeof (T_services_input));
6209 } 5865 }
6210 } 5866 }
6211 5867
6212 5868
6213 /******************************************************************************* 5869 /*******************************************************************************
6214 5870
6220 5876
6221 $Arguments: 5877 $Arguments:
6222 5878
6223 *******************************************************************************/ 5879 *******************************************************************************/
6224 5880
6225
6226 static MfwHnd services_input_start(MfwHnd parent,T_input_properties *properties) 5881 static MfwHnd services_input_start(MfwHnd parent,T_input_properties *properties)
6227 { 5882 {
6228
6229 T_MFW_HND win; 5883 T_MFW_HND win;
6230 TRACE_FUNCTION ("services_input_start()"); 5884 TRACE_FUNCTION ("services_input_start()");
6231 5885
6232 win = services_input_create (parent); 5886 win = services_input_create (parent);
6233 5887
6255 void services_input (T_MFW_HND win, USHORT event, SHORT value, void * parameter) 5909 void services_input (T_MFW_HND win, USHORT event, SHORT value, void * parameter)
6256 { 5910 {
6257 T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data; 5911 T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data;
6258 T_services_input * data = (T_services_input *)win_data->user; 5912 T_services_input * data = (T_services_input *)win_data->user;
6259 5913
6260 T_input_properties* properties = (T_input_properties*) parameter; 5914 T_input_properties* properties = (T_input_properties*) parameter;
6261 #ifdef NEW_EDITOR 5915 #ifdef NEW_EDITOR
6262 T_AUI_EDITOR_DATA editor_data; 5916 T_AUI_EDITOR_DATA editor_data;
6263 #endif /* NEW_EDITOR */ 5917 #endif /* NEW_EDITOR */
6264 5918
6265 TRACE_FUNCTION ("T_services_input()"); 5919 TRACE_FUNCTION ("T_services_input()");
6266 5920
6267 switch (event) 5921 switch (event)
6268 { 5922 {
6269 case SERVICES_INPUT_INIT: 5923 case SERVICES_INPUT_INIT:
6270 /* SPR#1428 - SH - New Editor changes - replace old custom editor 5924 /* SPR#1428 - SH - New Editor changes - replace old custom editor
6271 * with a standard AUI Editor */ 5925 * with a standard AUI Editor */
6272 #ifdef NEW_EDITOR 5926 #ifdef NEW_EDITOR
6273 AUI_edit_SetDefault(&editor_data); 5927 AUI_edit_SetDefault(&editor_data);
6274 AUI_edit_SetTextStr(&editor_data, properties->left_soft_key, properties->right_soft_key, properties->text, NULL); 5928 AUI_edit_SetTextStr(&editor_data, properties->left_soft_key, properties->right_soft_key, properties->text, NULL);
6275 AUI_edit_SetEvents(&editor_data, 0, FALSE, FOREVER, properties->callback); 5929 AUI_edit_SetEvents(&editor_data, 0, FALSE, FOREVER, properties->callback);
6276 //Oct 20, 2004 REF: CRR 25772 Deepa M.D 5930 //Oct 20, 2004 REF: CRR 25772 Deepa M.D
6277 //The alternate text string when the editor content is empty is set and 5931 //The alternate text string when the editor content is empty is set and
6278 //the change_rsk_on_empty flag is set to true. 5932 //the change_rsk_on_empty flag is set to true.
6279 AUI_edit_SetAltTextStr(&editor_data, 1, TxtNames, TRUE, TxtSoftBack); 5933 AUI_edit_SetAltTextStr(&editor_data, 1, TxtNames, TRUE, TxtSoftBack);
6280 AUI_edit_SetDisplay(&editor_data, SERVICE_CREATE_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT); 5934 AUI_edit_SetDisplay(&editor_data, SERVICE_CREATE_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT);
6281 5935
6282 if (properties->abc) 5936 if (properties->abc)
6283 { 5937 {
6284 AUI_edit_SetMode(&editor_data, ED_MODE_ALPHA, ED_CURSOR_BAR); 5938 AUI_edit_SetMode(&editor_data, ED_MODE_ALPHA, ED_CURSOR_BAR);
6285 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_name, sizeof(ss_data.edt_buf_name)); 5939 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_name, sizeof(ss_data.edt_buf_name));
6286 } 5940 }
6287 else 5941 else
6288 { 5942 {
6289 AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE); 5943 AUI_edit_SetMode(&editor_data, 0, ED_CURSOR_UNDERLINE);
6290 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_number, sizeof(ss_data.edt_buf_number)); 5944 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_number, sizeof(ss_data.edt_buf_number));
6291 5945
6292 } 5946 }
6293 TRACE_EVENT("SERVICES_INPUT_INIT"); 5947 TRACE_EVENT("SERVICES_INPUT_INIT");
6294 5948
6295 data->edit_win = AUI_edit_Start(data->win, &editor_data); 5949 data->edit_win = AUI_edit_Start(data->win, &editor_data);
6296 5950
6297 #else /*NEW_EDITOR*/ 5951 #else /*NEW_EDITOR*/
6298 5952
6299 data->properties.abc = properties->abc; 5953 data->properties.abc = properties->abc;
6300 data->properties.text = properties->text; 5954 data->properties.text = properties->text;
6301 data->properties.edt_attr_input = properties->edt_attr_input; 5955 data->properties.edt_attr_input = properties->edt_attr_input;
6302 data->properties.left_soft_key = properties->left_soft_key; 5956 data->properties.left_soft_key = properties->left_soft_key;
6303 data->properties.right_soft_key = properties->right_soft_key; 5957 data->properties.right_soft_key = properties->right_soft_key;
6304 data->properties.callback = properties->callback; 5958 data->properties.callback = properties->callback;
6305 data->edt_input = edtCreate(data->win,data->properties.edt_attr_input,0,0); 5959 data->edt_input = edtCreate(data->win,data->properties.edt_attr_input,0,0);
6306 editDeactivate(); 5960 editDeactivate();
6307 editActivate (data->edt_input,properties->abc); 5961 editActivate (data->edt_input,properties->abc);
6308 edtUnhide(data->edt_input); 5962 edtUnhide(data->edt_input);
6309 winShow(data->win); 5963 winShow(data->win);
6310 #endif /* NEW_EDITOR */ 5964 #endif /* NEW_EDITOR */
6311 break; 5965 break;
6312 5966
6313 case SERVICES_INPUT_DESTROY: 5967 case SERVICES_INPUT_DESTROY:
6314 TRACE_FUNCTION("SERVICES_INPUT_DESTROY"); 5968 TRACE_FUNCTION("SERVICES_INPUT_DESTROY");
6315 services_input_destroy(data->win); 5969 services_input_destroy(data->win);
6316 break; 5970 break;
6317 5971
6318 case DIVERT_PHBK_NUMBER: 5972 case DIVERT_PHBK_NUMBER:
6319 /* SPR#1428 - SH - New Editor changes - buffer changed, send event to 5973 /* SPR#1428 - SH - New Editor changes - buffer changed, send event to
6320 * update editors */ 5974 * update editors */
6321 #ifdef NEW_EDITOR 5975 #ifdef NEW_EDITOR
6322 { 5976 {
6323 T_ATB_TEXT text; 5977 T_ATB_TEXT text;
6324 text.dcs = ATB_DCS_ASCII; 5978 text.dcs = ATB_DCS_ASCII;
6325 text.data = (UBYTE *)parameter; 5979 text.data = (UBYTE *)parameter;
6326 text.len = ATB_string_Length(&text); 5980 text.len = ATB_string_Length(&text);
6327 SEND_EVENT(data->edit_win, E_ED_INSERT, 0, (void *)&text); 5981 SEND_EVENT(data->edit_win, E_ED_INSERT, 0, (void *)&text);
6328 } 5982 }
6329 #else /* NEW_EDITOR */ 5983 #else /* NEW_EDITOR */
6330 strncpy(ss_data.edt_buf_number, (char *)parameter, strlen((char *)parameter)+1); 5984 strncpy(ss_data.edt_buf_number, (char *)parameter, strlen((char *)parameter)+1);
6331 #endif /* NEW_EDITOR */ 5985 #endif /* NEW_EDITOR */
6332 break; 5986 break;
6333 default: 5987 default:
6334 return; 5988 return;
6335 } 5989 }
6336
6337 } 5990 }
6338 5991
6339 5992
6340 /******************************************************************************* 5993 /*******************************************************************************
6341 5994
6347 6000
6348 $Arguments: 6001 $Arguments:
6349 6002
6350 *******************************************************************************/ 6003 *******************************************************************************/
6351 6004
6352 static int services_input_win_cb (MfwEvt e, MfwWin *w){ 6005 static int services_input_win_cb (MfwEvt e, MfwWin *w)
6006 {
6353 /* Warning Removal - x0020906 - 24-08-2006 */ 6007 /* Warning Removal - x0020906 - 24-08-2006 */
6354 #ifndef NEW_EDITOR 6008 #ifndef NEW_EDITOR
6355 T_services_input * data = (T_services_input *)w->user; 6009 T_services_input * data = (T_services_input *)w->user;
6356 #endif 6010 #endif
6357 6011
6358 //int i =0; // RAVI 6012 //int i =0; // RAVI
6359 6013
6360 TRACE_FUNCTION ("services_input_win_cb()"); 6014 TRACE_FUNCTION ("services_input_win_cb()");
6361 6015
6362 /* SPR#1428 - SH - New Editor changes - this window is now 6016 /* SPR#1428 - SH - New Editor changes - this window is now
6363 * invisible, AUI editor sits on top*/ 6017 * invisible, AUI editor sits on top*/
6364 #ifdef NEW_EDITOR 6018 #ifdef NEW_EDITOR
6365 return 0; 6019 return 0;
6366 #else /* NEW_EDITOR */ 6020 #else /* NEW_EDITOR */
6367 switch (e) 6021 switch (e)
6368 { 6022 {
6369 case MfwWinVisible: 6023 case MfwWinVisible:
6370 edtShow(data->edt_input); 6024 edtShow(data->edt_input);
6371 PROMPT(menuArea.px,menuArea.py,0,data->properties.text); 6025 PROMPT(menuArea.px,menuArea.py,0,data->properties.text);
6372 displaySoftKeys(data->properties.left_soft_key,data->properties.right_soft_key); 6026 displaySoftKeys(data->properties.left_soft_key,data->properties.right_soft_key);
6373 break; 6027 break;
6374 default: 6028 default:
6375 return 0; 6029 return 0;
6376 } 6030 }
6377 #endif /* NEW_EDITOR */ 6031 #endif /* NEW_EDITOR */
6378 6032
6379 /* return 1; */ /* Unreachable Code - x0020906 - 24-08-2006 */ 6033 /* return 1; */ /* Unreachable Code - x0020906 - 24-08-2006 */
6380 6034 }
6381 }
6382
6383
6384 /* SPR#1428 - SH - New Editor changes - no longer required*/
6385 #ifndef NEW_EDITOR
6386 /*******************************************************************************
6387
6388 $Function: services_input_kbd_cb
6389
6390 $Description:
6391
6392 $Returns:
6393
6394 $Arguments:
6395
6396 *******************************************************************************/
6397
6398 static int services_input_kbd_cb (MfwEvt e, MfwKbd *k){
6399
6400
6401 T_MFW_HND win = mfwParent(mfw_header());
6402 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data;
6403 T_services_input * data = (T_services_input *)win_data->user;
6404
6405 TRACE_FUNCTION ("services_input_kbd_cb()");
6406
6407 if (activeEditor() NEQ data->edt_input)
6408 editActivate(data->edt_input,data->properties.abc);
6409
6410 switch (k->code)
6411 {
6412 case KCD_MNUUP:
6413 edtChar(data->edt_input,ecRight);
6414 break;
6415
6416 case KCD_MNUDOWN:
6417 edtChar(data->edt_input,ecLeft);
6418 break;
6419
6420 case KCD_LEFT:
6421 TRACE_FUNCTION("left key pressed");
6422 data->properties.callback(data->parent_win,SERVICES_INPUT_LEFT);
6423 break;
6424
6425 case KCD_HUP:
6426 /* if edit field is empty then exit, else delete one char */
6427 data->properties.callback(data->parent_win,SERVICES_INPUT_CLEAR);
6428
6429 if (strlen(data->properties.edt_attr_input->text) > 0)
6430 {
6431 edtChar(data->edt_input,ecBack);
6432 if(strlen(data->properties.edt_attr_input->text) == 0)
6433 data->properties.right_soft_key=TxtContacts;
6434 else
6435 data->properties.right_soft_key=TxtDelete;
6436 winShow(data->win);
6437 }
6438 else
6439 services_input_destroy(data->win);
6440 break;
6441
6442 case KCD_RIGHT:
6443 // Check if there is a digit in the edit buffer softkey should be delete.
6444 if (strlen(data->properties.edt_attr_input->text) > 0)
6445 {
6446 edtChar(data->edt_input,ecBack);
6447 if(strlen(data->properties.edt_attr_input->text) == 0)
6448 {
6449 data->properties.right_soft_key=TxtContacts;
6450 winShow(data->win);
6451 }
6452 }
6453 else
6454 {
6455 // MZ 26/02/01 services_input_destroy(data->win);
6456 // Activate phone book .
6457 if (bookPhoneBookLoading()==BOOK_SUCCESS)
6458 {
6459 T_MFW_HND phbk_win;
6460 phbk_win = bookPhonebookStart(data->win,PhbkFromDivert);
6461 }
6462
6463 }
6464
6465 break;
6466 default:
6467 editEventKey (e,k);
6468 if(strlen(data->properties.edt_attr_input->text) > 0)
6469 data->properties.right_soft_key=TxtDelete;
6470 else
6471 data->properties.right_soft_key=TxtContacts;
6472 winShow(data->win);
6473
6474 break;
6475 }
6476 return MFW_EVENT_CONSUMED;
6477 }
6478
6479
6480 /*******************************************************************************
6481
6482 $Function: services_input_kbd_long_cb
6483
6484 $Description:
6485
6486 $Returns:
6487
6488 $Arguments:
6489
6490 *******************************************************************************/
6491
6492
6493
6494
6495 static int services_input_kbd_long_cb (MfwEvt e, MfwKbd *k){
6496
6497 T_MFW_HND win = mfwParent(mfw_header());
6498 T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data;
6499 T_services_input * data = (T_services_input *)win_data->user;
6500
6501
6502 if ((e & KEY_CLEAR) && (e & KEY_LONG))
6503 {
6504 edtClear(data->edt_input);
6505 services_input_destroy(data->win);
6506 return MFW_EVENT_CONSUMED;
6507 }
6508 return MFW_EVENT_CONSUMED;
6509 }
6510
6511
6512 /*******************************************************************************
6513
6514 $Function: services_number_input_cb
6515
6516 $Description:
6517
6518 $Returns:
6519
6520 $Arguments:
6521
6522 *******************************************************************************/
6523
6524 void services_number_input_cb(T_MFW_HND win, UBYTE identifier, USHORT reason){
6525
6526 switch(reason){
6527
6528 case SERVICES_INPUT_LEFT:
6529 break;
6530 case SERVICES_INPUT_RIGHT:
6531 break;
6532 case SERVICES_INPUT_CLEAR:
6533 break;
6534 default:
6535 return;
6536 }
6537 }
6538
6539 #endif /* ifndef NEW_EDITOR */
6540 6035
6541 6036
6542 /******************************************************************************* 6037 /*******************************************************************************
6543 6038
6544 $Function: servicesCallBarringCheck 6039 $Function: servicesCallBarringCheck
6549 6044
6550 $Arguments: 6045 $Arguments:
6551 6046
6552 *******************************************************************************/ 6047 *******************************************************************************/
6553 6048
6554
6555 void servicesCallBarringCheck(void) 6049 void servicesCallBarringCheck(void)
6556 { 6050 {
6557 char SS_string[60] = {'\0'}; 6051 char SS_string[60] = {'\0'};
6558 6052
6559 TRACE_FUNCTION("servicesCallBarringCheck"); 6053 TRACE_FUNCTION("servicesCallBarringCheck");
6560 6054
6561 CBAction = CBCheck; 6055 CBAction = CBCheck;
6562 6056
6563 getCBAction(SS_string); 6057 getCBAction(SS_string);
6564 getCBType(SS_string); 6058 getCBType(SS_string);
6565 6059
6566 //x0pleela 23 Aug, 2006 DR: OMAPS00090419 6060 //x0pleela 23 Aug, 2006 DR: OMAPS00090419
6567 //Removing the below code as it doesn't result in a valid SS. 6061 //Removing the below code as it doesn't result in a valid SS.
6568 //x0pleela 25 May, 2006 DR: OMAPS00070657 6062 //x0pleela 25 May, 2006 DR: OMAPS00070657
6569 //#ifdef FF_CPHS 6063 //#ifdef FF_CPHS
6571 //#endif 6065 //#endif
6572 SS_string[strlen(SS_string)-1] = '#'; 6066 SS_string[strlen(SS_string)-1] = '#';
6573 6067
6574 TRACE_FUNCTION(SS_string); 6068 TRACE_FUNCTION(SS_string);
6575 6069
6576 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 6070 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
6577 showFailed( ss_data.win ); 6071 showFailed( ss_data.win );
6578
6579 } 6072 }
6580 6073
6581 /******************************************************************************* 6074 /*******************************************************************************
6582 6075
6583 $Function: servicesCallBarringDeactivate 6076 $Function: servicesCallBarringDeactivate
6589 $Arguments: 6082 $Arguments:
6590 6083
6591 *******************************************************************************/ 6084 *******************************************************************************/
6592 6085
6593 6086
6594
6595 void servicesCallBarringDeactivate(void) 6087 void servicesCallBarringDeactivate(void)
6596 { 6088 {
6597 char SS_string[60] = {'\0'}; 6089 char SS_string[60] = {'\0'};
6598 6090
6599 TRACE_FUNCTION("servicesCallBarringDeactivate"); 6091 TRACE_FUNCTION("servicesCallBarringDeactivate");
6600 6092
6601 CBAction = CBDeactivate; 6093 CBAction = CBDeactivate;
6602 6094
6603 getCBAction(SS_string); 6095 getCBAction(SS_string);
6604 getCBType(SS_string); 6096 getCBType(SS_string);
6605 getCBPassword(SS_string); 6097 getCBPassword(SS_string);
6606 6098
6607 //x0pleela 23 Aug, 2006 DR: OMAPS00090419 6099 //x0pleela 23 Aug, 2006 DR: OMAPS00090419
6608 //Removing the below code as it doesn't result in a valid SS. 6100 //Removing the below code as it doesn't result in a valid SS.
6609 //x0pleela 25 May, 2006 DR: OMAPS00070657 6101 //x0pleela 25 May, 2006 DR: OMAPS00070657
6610 //#ifdef FF_CPHS 6102 //#ifdef FF_CPHS
6611 // getCBService(SS_string); 6103 // getCBService(SS_string);
6612 //#endif 6104 //#endif
6613 6105
6614 //x0pleela 03 May, 2007 DR: OMAPs00129383 6106 //x0pleela 03 May, 2007 DR: OMAPs00129383
6615 //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE 6107 //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE
6616 //to deactivate both Tele and Bearere services 6108 //to deactivate both Tele and Bearere services
6617 6109
6618 //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu 6110 //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu
6619 //Adding the basic service code 10(all teleservices) to the SS string during deactivation 6111 //Adding the basic service code 10(all teleservices) to the SS string during deactivation
6620 strcat(SS_string,TELE_BEARER_SERVICE_CODE); 6112 strcat(SS_string,TELE_BEARER_SERVICE_CODE);
6621 SS_string[strlen(SS_string)] = '#'; 6113 SS_string[strlen(SS_string)] = '#';
6622 6114
6623 TRACE_FUNCTION(SS_string); 6115 TRACE_FUNCTION(SS_string);
6624 6116
6625 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 6117 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
6626 showFailed( ss_data.win ); 6118 showFailed( ss_data.win );
6627
6628
6629 } 6119 }
6630 6120
6631 //Jun 02,2004 CRR:13649 xpradipg-SASKEN 6121 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
6632 /******************************************************************************* 6122 /*******************************************************************************
6633 6123
6641 6131
6642 *******************************************************************************/ 6132 *******************************************************************************/
6643 6133
6644 void servicesCallBarringDeactivatePassword(void) 6134 void servicesCallBarringDeactivatePassword(void)
6645 { 6135 {
6646
6647 CBFlag=CBDeactivate; 6136 CBFlag=CBDeactivate;
6648 requestCBPassword(); 6137 requestCBPassword();
6649 } 6138 }
6650 6139
6651 /******************************************************************************* 6140 /*******************************************************************************
6658 6147
6659 $Arguments: 6148 $Arguments:
6660 6149
6661 *******************************************************************************/ 6150 *******************************************************************************/
6662 6151
6663
6664 void servicesCallBarringActivate(void) 6152 void servicesCallBarringActivate(void)
6665 { 6153 {
6666 char SS_string[60] = {'\0'}; 6154 char SS_string[60] = {'\0'};
6667 6155
6668 TRACE_FUNCTION("servicesCallBarringActivate"); //SPR#1038 - DS - Changed from DeActivate to Activate. 6156 TRACE_FUNCTION("servicesCallBarringActivate"); //SPR#1038 - DS - Changed from DeActivate to Activate.
6669 6157
6670 CBAction = CBActivate; 6158 CBAction = CBActivate;
6671 6159
6672 getCBAction(SS_string); 6160 getCBAction(SS_string);
6673 getCBType(SS_string); 6161 getCBType(SS_string);
6674 getCBPassword(SS_string); 6162 getCBPassword(SS_string);
6675 //x0pleela 23 Aug, 2006 DR: OMAPS00090419 6163 //x0pleela 23 Aug, 2006 DR: OMAPS00090419
6676 //Removing the below code as it doesn't result in a valid SS. 6164 //Removing the below code as it doesn't result in a valid SS.
6677 //x0pleela 25 May, 2006 DR: OMAPS00070657 6165 //x0pleela 25 May, 2006 DR: OMAPS00070657
6678 //#ifdef FF_CPHS 6166 //#ifdef FF_CPHS
6679 // getCBService(SS_string); 6167 // getCBService(SS_string);
6680 //#endif 6168 //#endif
6681 6169
6682 //x0pleela 03 May, 2007 DR: OMAPs00129383 6170 //x0pleela 03 May, 2007 DR: OMAPs00129383
6683 //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE 6171 //Replaced BASIC_SERVICE_CODE with TELETELE_BEARER_SERVICE_CODE
6684 //to activate both Tele and Bearere services 6172 //to activate both Tele and Bearere services
6685 6173
6686 //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu 6174 //June 21, 2004 - CRR:13650 - CBA : no basic service sent when using the menu
6687 //Adding the basic service code 10(all teleservices) to the SS string during activation 6175 //Adding the basic service code 10(all teleservices) to the SS string during activation
6688 strcat(SS_string,TELE_BEARER_SERVICE_CODE); 6176 strcat(SS_string,TELE_BEARER_SERVICE_CODE);
6689 SS_string[strlen(SS_string)] = '#'; 6177 SS_string[strlen(SS_string)] = '#';
6690 6178
6691 TRACE_FUNCTION(SS_string); 6179 TRACE_FUNCTION(SS_string);
6692 6180
6693 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 6181 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
6694 showFailed( ss_data.win ); 6182 showFailed( ss_data.win );
6695
6696 } 6183 }
6697 6184
6698 //Jun 02,2004 CRR:13649 xpradipg-SASKEN 6185 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
6699 /******************************************************************************* 6186 /*******************************************************************************
6700 6187
6708 6195
6709 *******************************************************************************/ 6196 *******************************************************************************/
6710 6197
6711 void servicesCallBarringActivatePassword(void) 6198 void servicesCallBarringActivatePassword(void)
6712 { 6199 {
6713
6714 CBFlag=CBActivate; 6200 CBFlag=CBActivate;
6715 requestCBPassword(); 6201 requestCBPassword();
6716 } 6202 }
6717 6203
6718 6204
6726 6212
6727 $Arguments: 6213 $Arguments:
6728 6214
6729 *******************************************************************************/ 6215 *******************************************************************************/
6730 6216
6731
6732 void servicesCallBarringCancelAll(void) 6217 void servicesCallBarringCancelAll(void)
6733 { 6218 {
6734 char SS_string[60] = {'\0'}; 6219 char SS_string[60] = {'\0'};
6735 6220
6736 TRACE_FUNCTION("servicesCallBarringCancelAll"); 6221 TRACE_FUNCTION("servicesCallBarringCancelAll");
6737
6738 6222
6739 strcat(SS_string, "#330*"); 6223 strcat(SS_string, "#330*");
6740 getCBPassword(SS_string); 6224 getCBPassword(SS_string);
6741 SS_string[strlen(SS_string)-1] = '#'; 6225 SS_string[strlen(SS_string)-1] = '#';
6742 6226
6743 TRACE_FUNCTION(SS_string); 6227 TRACE_FUNCTION(SS_string);
6744 6228
6745 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 6229 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
6746 showFailed( ss_data.win ); 6230 showFailed( ss_data.win );
6747
6748 } 6231 }
6749 6232
6750 //Jun 02,2004 CRR:13649 xpradipg-SASKEN 6233 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
6751 /******************************************************************************* 6234 /*******************************************************************************
6752 6235
6775 $Returns: 6258 $Returns:
6776 6259
6777 $Arguments: 6260 $Arguments:
6778 6261
6779 *******************************************************************************/ 6262 *******************************************************************************/
6780
6781 6263
6782 static void getCBAction(char * pSSstring) 6264 static void getCBAction(char * pSSstring)
6783 { 6265 {
6784 switch (CBAction) 6266 switch (CBAction)
6785 { 6267 {
6807 6289
6808 $Arguments: 6290 $Arguments:
6809 6291
6810 *******************************************************************************/ 6292 *******************************************************************************/
6811 6293
6812
6813 static void getCBType(char* pSSstring) 6294 static void getCBType(char* pSSstring)
6814 { 6295 {
6815
6816
6817 switch (CBType) 6296 switch (CBType)
6818 { 6297 {
6819 case CBAllOutgoing: 6298 case CBAllOutgoing:
6820 strcat(pSSstring, "33*"); 6299 strcat(pSSstring, "33*");
6821 break; 6300 break;
6846 6325
6847 $Arguments: 6326 $Arguments:
6848 6327
6849 *******************************************************************************/ 6328 *******************************************************************************/
6850 6329
6851
6852 static void getCBPassword(char* pSSstring) 6330 static void getCBPassword(char* pSSstring)
6853 { 6331 {
6854 TRACE_FUNCTION("getCBPassword"); 6332 TRACE_FUNCTION("getCBPassword");
6855 strcat(pSSstring, (char*)ss_data.edt_buf_cb_password); 6333 strcat(pSSstring, (char*)ss_data.edt_buf_cb_password);
6856 strcat(pSSstring, "*"); 6334 strcat(pSSstring, "*");
6857 } 6335 }
6858
6859 #if(0) /* x0039928 - Lint warning removal */
6860 /*******************************************************************************
6861
6862 $Function: getCBService
6863
6864 $Description:
6865
6866 $Returns:
6867
6868 $Arguments:
6869
6870 *******************************************************************************/
6871 //x0pleela 25 May, 2006 DR: OMAPS00070657
6872 #ifdef FF_CPHS
6873 static void getCBService(char * pSSstring)
6874 {
6875 int nservice;
6876 nservice =GetAlsLine();
6877 switch (nservice)
6878 {
6879 case CBVoice:
6880 strcat(pSSstring, "*11"); //SPR#0776 - DS -changed from 10 to 11
6881 break;
6882 /*MC SPR 742, handle line 2, auxiliary telephony*/
6883 case CBAuxVoice:
6884 strcat(pSSstring, "*89");
6885 break;
6886 default:
6887 break;
6888 }
6889 }
6890 #endif
6891 #endif
6892 6336
6893 //CQ-16432 start 6337 //CQ-16432 start
6894 /******************************************************************************* 6338 /*******************************************************************************
6895 6339
6896 $Function: requestSatCBPassword 6340 $Function: requestSatCBPassword
6902 $Arguments: 6346 $Arguments:
6903 6347
6904 *******************************************************************************/ 6348 *******************************************************************************/
6905 6349
6906 6350
6907
6908 void requestSatCBPassword(void) 6351 void requestSatCBPassword(void)
6909 { 6352 {
6910
6911
6912 #ifdef NEW_EDITOR 6353 #ifdef NEW_EDITOR
6913 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor changes */ 6354 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor changes */
6914 #else /* NEW_EDITOR */ 6355 #else /* NEW_EDITOR */
6915 T_EDITOR_DATA editor_data; 6356 T_EDITOR_DATA editor_data;
6916 #endif /* NEW_EDITOR */ 6357 #endif /* NEW_EDITOR */
6917 T_MFW_HND win = mfw_parent(mfw_header()); 6358 T_MFW_HND win = mfw_parent(mfw_header());
6918 /* T_MFW_HND satPswdWin; */ /* Not Used - warning removal */ /*x0020906 - 24-08-2006 */ 6359 /* T_MFW_HND satPswdWin; */ /* Not Used - warning removal */ /*x0020906 - 24-08-2006 */
6919 TRACE_FUNCTION("requestSatCBPassword"); 6360 TRACE_FUNCTION("requestSatCBPassword");
6920 //SPR#1014 - DS - Reset editor data 6361 //SPR#1014 - DS - Reset editor data
6921 memset(&editor_data, '\0', sizeof(editor_data)); 6362 memset(&editor_data, '\0', sizeof(editor_data));
6922 6363
6935 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)satPassword, CB_PSW_LEN+1); 6376 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)satPassword, CB_PSW_LEN+1);
6936 AUI_edit_SetTextStr(&editor_data, TxtSoftOK, TxtSoftBack, TxtPassword, NULL); 6377 AUI_edit_SetTextStr(&editor_data, TxtSoftOK, TxtSoftBack, TxtPassword, NULL);
6937 AUI_edit_SetAltTextStr(&editor_data, CB_PSW_LEN, TxtNull, FALSE, TxtNull); 6378 AUI_edit_SetAltTextStr(&editor_data, CB_PSW_LEN, TxtNull, FALSE, TxtNull);
6938 AUI_edit_SetEvents(&editor_data, CBEnterSatPassword, TRUE, FOREVER, (T_AUI_EDIT_CB)CB_password_cb); 6379 AUI_edit_SetEvents(&editor_data, CBEnterSatPassword, TRUE, FOREVER, (T_AUI_EDIT_CB)CB_password_cb);
6939 /* satPswdWin = AUI_edit_Start(win, &editor_data); */ /* start the editor */ /* Warning Removal - x0020906 - 24-08-2006*/ 6380 /* satPswdWin = AUI_edit_Start(win, &editor_data); */ /* start the editor */ /* Warning Removal - x0020906 - 24-08-2006*/
6940 AUI_edit_Start(win, &editor_data); /* start the editor */ 6381 AUI_edit_Start(win, &editor_data); /* start the editor */
6941 TRACE_EVENT_P1("satPassword contents: %s",satPassword); 6382 TRACE_EVENT_P1("satPassword contents: %s",satPassword);
6942 #else /* NEW_EDITOR */ 6383 #else /* NEW_EDITOR */
6943 TRACE_FUNCTION("New editor is not defined"); 6384 TRACE_FUNCTION("New editor is not defined");
6944 bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0, 6385 bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0,
6945 (char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr ); 6386 (char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr );
6972 6413
6973 $Arguments: 6414 $Arguments:
6974 6415
6975 *******************************************************************************/ 6416 *******************************************************************************/
6976 6417
6977
6978
6979 void requestCBPassword(void) 6418 void requestCBPassword(void)
6980 { 6419 {
6981 #ifdef NEW_EDITOR 6420 #ifdef NEW_EDITOR
6982 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor changes */ 6421 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor changes */
6983 #else /* NEW_EDITOR */ 6422 #else /* NEW_EDITOR */
6993 6432
6994 memset(ss_data.edt_buf_cb_password,'\0',sizeof(ss_data.edt_buf_cb_password)); 6433 memset(ss_data.edt_buf_cb_password,'\0',sizeof(ss_data.edt_buf_cb_password));
6995 6434
6996 /* SPR#1428 - SH - New Editor changes */ 6435 /* SPR#1428 - SH - New Editor changes */
6997 #ifdef NEW_EDITOR 6436 #ifdef NEW_EDITOR
6998 TRACE_FUNCTION("NEW_EDITOR"); 6437 TRACE_FUNCTION("NEW_EDITOR");
6999 AUI_edit_SetDefault(&editor_data); 6438 AUI_edit_SetDefault(&editor_data);
7000 AUI_edit_SetDisplay(&editor_data, RPWD_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT); 6439 AUI_edit_SetDisplay(&editor_data, RPWD_EDITOR, COLOUR_EDITOR_XX, EDITOR_FONT);
7001 AUI_edit_SetMode(&editor_data, ED_MODE_HIDDEN, ED_CURSOR_UNDERLINE); 6440 AUI_edit_SetMode(&editor_data, ED_MODE_HIDDEN, ED_CURSOR_UNDERLINE);
7002 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_cb_password, CB_PSW_LEN+1); 6441 AUI_edit_SetBuffer(&editor_data, ATB_DCS_ASCII, (UBYTE *)ss_data.edt_buf_cb_password, CB_PSW_LEN+1);
7003 AUI_edit_SetTextStr(&editor_data, TxtSoftOK, TxtSoftBack, TxtPassword, NULL); 6442 AUI_edit_SetTextStr(&editor_data, TxtSoftOK, TxtSoftBack, TxtPassword, NULL);
7004 AUI_edit_SetAltTextStr(&editor_data, CB_PSW_LEN, TxtNull, FALSE, TxtNull); 6443 AUI_edit_SetAltTextStr(&editor_data, CB_PSW_LEN, TxtNull, FALSE, TxtNull);
7005 AUI_edit_SetEvents(&editor_data, CBCheckPassword, TRUE, FOREVER, (T_AUI_EDIT_CB)CB_password_cb); 6444 AUI_edit_SetEvents(&editor_data, CBCheckPassword, TRUE, FOREVER, (T_AUI_EDIT_CB)CB_password_cb);
7006 6445
7007 ss_data.info_win = AUI_edit_Start(ss_data.win, &editor_data); /* start the editor */ 6446 ss_data.info_win = AUI_edit_Start(ss_data.win, &editor_data); /* start the editor */
7008 #else /* NEW_EDITOR */ 6447 #else /* NEW_EDITOR */
7009 TRACE_FUNCTION("Old_editor"); 6448 TRACE_FUNCTION("Old_editor");
7010 bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0, 6449 bookSetEditAttributes( RPWD_EDITOR, COLOUR_EDITOR_XX, 0, edtCurBar1, 0,
7011 (char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr ); 6450 (char*)ss_data.edt_buf_cb_password,CB_PSW_LEN+1, &editor_data.editor_attr );
7012 editor_data.LeftSoftKey = TxtSoftOK; 6451 editor_data.LeftSoftKey = TxtSoftOK;
7013 editor_data.AlternateLeftSoftKey = TxtNull; 6452 editor_data.AlternateLeftSoftKey = TxtNull;
7014 editor_data.RightSoftKey = TxtSoftBack; 6453 editor_data.RightSoftKey = TxtSoftBack;
7036 6475
7037 $Arguments: 6476 $Arguments:
7038 6477
7039 *******************************************************************************/ 6478 *******************************************************************************/
7040 6479
7041
7042
7043 static void CB_password_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) 6480 static void CB_password_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason)
7044 { 6481 {
7045 //16432 6482 //16432
7046 TRACE_FUNCTION("CB_password_cb"); 6483 TRACE_FUNCTION("CB_password_cb");
7047 switch (identifier) 6484 switch (identifier)
7048 { 6485 {
7049 case CBCheckPassword: 6486 case CBCheckPassword:
7050 //Jun 02,2004 CRR:13649 xpradipg-SASKEN 6487 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
7051 //keyevents right and hangup are handled initially 6488 //keyevents right and hangup are handled initially
7052 switch (reason) 6489 switch (reason)
7053 { 6490 {
7054 case INFO_KCD_HUP: 6491 case INFO_KCD_HUP:
7055 // Change by Sasken ( VadiRaj) on March 29th 2004 6492 // Change by Sasken ( VadiRaj) on March 29th 2004
7056 // Issue Number : MMI-SPR-12882 6493 // Issue Number : MMI-SPR-12882
7057 // Subject: No functionality for the right softkey. 6494 // Subject: No functionality for the right softkey.
7058 // Bug : No functionality for the right softkey 6495 // Bug : No functionality for the right softkey
7059 // Solution : Added functionality for the right "BACK" softeky 6496 // Solution : Added functionality for the right "BACK" softeky
7060 case INFO_KCD_RIGHT: 6497 case INFO_KCD_RIGHT:
7061 ss_data.info_win = 0;
7062 CBFlag=CBActionNone;;
7063 break;
7064 default:
7065 break;
7066 }
7067 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
7068 //depending on the action selected by the user the respective functions are invoked
7069 switch(CBFlag)
7070 {
7071 case CBDeactivate:
7072 CBFlag=CBActionNone; //reset the flag
7073 servicesCallBarringDeactivate(); //initiates the callbarring deactivation for the selected service
7074 break;
7075 case CBActivate:
7076 CBFlag=CBActionNone; //reset the flag
7077 servicesCallBarringActivate(); //initiates the callbarring activation for the selected service
7078 break;
7079 case CBCancelAll:
7080 CBFlag=CBActionNone; //reset the flag
7081 servicesCallBarringCancelAll(); //initiates the cancelling of all barring services
7082 break;
7083 case CBNewPassword:
7084 CBFlag=CBActionNone; //reset the flag
7085 enterNewCBPassword(); //prompt for the new password
7086 break;
7087 default:
7088 CBFlag=CBActionNone;;
7089 break;
7090 }
7091 ss_data.info_win = 0; 6498 ss_data.info_win = 0;
6499 CBFlag=CBActionNone;;
6500 break;
6501 default:
6502 break;
6503 }
6504 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
6505 //depending on the action selected by the user the respective functions are invoked
6506 switch(CBFlag)
6507 {
6508 case CBDeactivate:
6509 CBFlag=CBActionNone; //reset the flag
6510 servicesCallBarringDeactivate(); //initiates the callbarring deactivation for the selected service
6511 break;
6512 case CBActivate:
6513 CBFlag=CBActionNone; //reset the flag
6514 servicesCallBarringActivate(); //initiates the callbarring activation for the selected service
6515 break;
6516 case CBCancelAll:
6517 CBFlag=CBActionNone; //reset the flag
6518 servicesCallBarringCancelAll(); //initiates the cancelling of all barring services
6519 break;
6520 case CBNewPassword:
6521 CBFlag=CBActionNone; //reset the flag
6522 enterNewCBPassword(); //prompt for the new password
6523 break;
6524 default:
6525 CBFlag=CBActionNone;;
6526 break;
6527 }
6528 ss_data.info_win = 0;
7092 break; 6529 break;
7093 case CBNewPassword: 6530 case CBNewPassword:
7094 ss_data.info_win = 0; 6531 ss_data.info_win = 0;
7095 switch (reason) 6532 switch (reason)
7096 { 6533 {
7097 case INFO_KCD_LEFT: 6534 case INFO_KCD_LEFT:
7098 confirmNewCBPassword(); 6535 confirmNewCBPassword();
7099 break; 6536 break;
7100 default: 6537 default:
7101 break; 6538 break;
7102 } 6539 }
7103 break; 6540 break;
7104 case CBConfirmNewPassword: 6541 case CBConfirmNewPassword:
7105 ss_data.info_win = 0; 6542 ss_data.info_win = 0;
7106 switch (reason) 6543 switch (reason)
7107 { 6544 {
7108 case INFO_KCD_LEFT: 6545 case INFO_KCD_LEFT:
7109 changeCBPassword(); 6546 changeCBPassword();
7110 break; 6547 break;
7111 default: 6548 default:
7112 break; 6549 break;
7113 } 6550 }
7114 break; 6551 break;
7115 //CQ-16432 start 6552 //CQ-16432 start
7116 case CBEnterSatPassword: 6553 case CBEnterSatPassword:
7117 /*a0393213 warnings removal- CLCK_FAC_Ox changed to FAC_Ox as a result of ACI interface change*/ 6554 /*a0393213 warnings removal- CLCK_FAC_Ox changed to FAC_Ox as a result of ACI interface change*/
7118 ss_set_clck(FAC_Ox, CLCK_MOD_NotPresent, satPassword, CLASS_NotPresent, MFW_MODUL_UNKNOWN); 6555 ss_set_clck(FAC_Ox, CLCK_MOD_NotPresent, satPassword, CLASS_NotPresent, MFW_MODUL_UNKNOWN);
7119 //CQ-16432 end 6556 //CQ-16432 end
7120 break; 6557 break;
7121 default: 6558 default:
7122 break; 6559 break;
7123 } 6560 }
7124 } 6561 }
7125 6562
7126 //Jun 02,2004 CRR:13649 xpradipg-SASKEN 6563 //Jun 02,2004 CRR:13649 xpradipg-SASKEN
7127 /******************************************************************************* 6564 /*******************************************************************************
7150 $Returns: 6587 $Returns:
7151 6588
7152 $Arguments: 6589 $Arguments:
7153 6590
7154 *******************************************************************************/ 6591 *******************************************************************************/
7155
7156 6592
7157 void enterNewCBPassword(void) 6593 void enterNewCBPassword(void)
7158 { 6594 {
7159 #ifdef NEW_EDITOR 6595 #ifdef NEW_EDITOR
7160 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor data */ 6596 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor data */
7207 6643
7208 $Arguments: 6644 $Arguments:
7209 6645
7210 *******************************************************************************/ 6646 *******************************************************************************/
7211 6647
7212
7213 void confirmNewCBPassword(void) 6648 void confirmNewCBPassword(void)
7214 { 6649 {
7215 #ifdef NEW_EDITOR 6650 #ifdef NEW_EDITOR
7216 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor data */ 6651 T_AUI_EDITOR_DATA editor_data; /* SPR#1428 - SH - New Editor data */
7217 #else 6652 #else
7250 editor_data.TextString = NULL; 6685 editor_data.TextString = NULL;
7251 editor_data.min_enter = CB_PSW_LEN; 6686 editor_data.min_enter = CB_PSW_LEN;
7252 editor_data.destroyEditor = TRUE; 6687 editor_data.destroyEditor = TRUE;
7253 ss_data.info_win = editor_start(ss_data.win, &editor_data); 6688 ss_data.info_win = editor_start(ss_data.win, &editor_data);
7254 #endif /* NEW_EDITOR */ 6689 #endif /* NEW_EDITOR */
7255
7256 } 6690 }
7257 6691
7258 /******************************************************************************* 6692 /*******************************************************************************
7259 6693
7260 $Function: changeCBPassword 6694 $Function: changeCBPassword
7265 6699
7266 $Arguments: 6700 $Arguments:
7267 6701
7268 *******************************************************************************/ 6702 *******************************************************************************/
7269 6703
7270
7271 void changeCBPassword(void){ 6704 void changeCBPassword(void){
7272
7273 char SS_string[60] = {'\0'}; 6705 char SS_string[60] = {'\0'};
7274 T_DISPLAY_DATA display_info; 6706 T_DISPLAY_DATA display_info;
7275 6707
7276 TRACE_FUNCTION("changeCBPassword"); 6708 TRACE_FUNCTION("changeCBPassword");
7277 6709
7278 if (strcmp((char*)ss_data.edt_buf_cb_new_password, (char*)ss_data.edt_buf_cb_conf_new_password)) 6710 if (strcmp((char*)ss_data.edt_buf_cb_new_password, (char*)ss_data.edt_buf_cb_conf_new_password))
7279 { 6711 {
7280 /* 6712 /*
7281 ** The New and Confirm Passwords do not match, restart the process and display a dialog to 6713 ** The New and Confirm Passwords do not match, restart the process and display a dialog to
7282 ** explain. (The dialog is done second so that it will display on top of the new prompt) 6714 ** explain. (The dialog is done second so that it will display on top of the new prompt)
7283 */ 6715 */
7284 enterNewCBPassword(); 6716 enterNewCBPassword();
7285 6717
7286 // Jul 23, 2004 REF: CRR 16107 xvilliva 6718 // Jul 23, 2004 REF: CRR 16107 xvilliva
7287 dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtPasswords, TxtMismatch, COLOUR_STATUS); 6719 dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtPasswords, TxtMismatch, COLOUR_STATUS);
7288 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, THREE_SECS, 0); 6720 dlg_initDisplayData_events( &display_info, (T_VOID_FUNC)services_info_cb, THREE_SECS, 0);
7289 display_info.Identifier = ServicesFailed; 6721 display_info.Identifier = ServicesFailed;
7290 6722
7291 /* 6723 /*
7292 * Call Info Screen 6724 * Call Info Screen
7293 */ 6725 */
7294 ss_data.info_win = info_dialog (ss_data.win, &display_info); 6726 ss_data.info_win = info_dialog (ss_data.win, &display_info);
7295 } 6727 }
7296 else 6728 else
7297 { 6729 {
7298 strcat(SS_string, "**03*330*"); 6730 strcat(SS_string, "**03*330*");
7299 strcat(SS_string,(char*)ss_data.edt_buf_cb_password); 6731 strcat(SS_string,(char*)ss_data.edt_buf_cb_password);
7300 strcat(SS_string,"*"); 6732 strcat(SS_string,"*");
7301 strcat(SS_string,(char*)ss_data.edt_buf_cb_new_password); 6733 strcat(SS_string,(char*)ss_data.edt_buf_cb_new_password);
7302 strcat(SS_string,"*"); 6734 strcat(SS_string,"*");
7303 strcat(SS_string,(char*)ss_data.edt_buf_cb_conf_new_password); 6735 strcat(SS_string,(char*)ss_data.edt_buf_cb_conf_new_password);
7304 strcat(SS_string,"#"); 6736 strcat(SS_string,"#");
7305 6737
7306 TRACE_FUNCTION(SS_string); 6738 TRACE_FUNCTION(SS_string);
7307 6739
7308 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL) 6740 if (ss_execute_transaction((UBYTE*)SS_string, 0) == MFW_SS_FAIL)
7309 showFailed( ss_data.win ); 6741 showFailed( ss_data.win );
7310 } 6742 }
7311
7312
7313 } 6743 }
7314 6744
7315 6745
7316 /******************************************************************************* 6746 /*******************************************************************************
7317 6747
7347 /* 6777 /*
7348 * Call Info Screen 6778 * Call Info Screen
7349 */ 6779 */
7350 6780
7351 info_dialog(win, &display_info); 6781 info_dialog(win, &display_info);
7352 6782 }
7353 }