FreeCalypso > hg > fc-tourmaline
changeset 201:360034896a82
mmiCall.c: rm dead code, first pass
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Mon, 29 Mar 2021 04:44:46 +0000 |
| parents | f51fb87f4ae1 |
| children | 6f699aa78431 |
| files | src/ui/bmi/mmiCall.c |
| diffstat | 1 files changed, 66 insertions(+), 1337 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui/bmi/mmiCall.c Mon Mar 29 02:52:27 2021 +0000 +++ b/src/ui/bmi/mmiCall.c Mon Mar 29 04:44:46 2021 +0000 @@ -416,17 +416,6 @@ #include "mfw_sat.h" #include "mfw_sms.h" #include "mfw_cm.h" -// Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER -#include "mfw_midi.h" -#endif //FF_MIDI_RINGER - -//Apr 06, 2005 REF: ENH 30011 xdeepadh -#ifdef FF_MMI_TEST_CAMERA -//e-armanetsaid 19/08/04 -#include "mfw_cam.h" -//e-armanetsaid 19/08/04 -#endif //FF_MMI_TEST_CAMERA #include "dspl.h" @@ -477,15 +466,6 @@ #include "mmiColours.h" -// xpradipg - LOCOSTO-ENH-31154 : 22 Aug 2005 -#ifdef FF_MMI_TEST_CAMERA -#include "r2d/r2d.h" -#endif - -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -#ifdef FF_PCM_VM_VB -#include "Mfw_aud.h" -#endif // June 08, 2004 REF: CRR MMI-SPR-13877 Ajith K P // Issue description: CHW : AUDIO : CW tone not stopped // 1 call is active @@ -500,21 +480,6 @@ // from the remote side/network side, the waiting tone should change to ringing tone. - -/* SPR#1983 - SH - Required for WAP disconnect event */ -#ifdef FF_WAP -#include "AUIWapext.h" -#endif - -//x0pleela 07 Apr, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK -#include "MmiPins.h" -#endif //FF_PHONE_LOCK - - -//x0pleela 23 Aug, 2006 DR: OMAPS00083503 -//EXTERN USHORT get_nm_status(void); - /* Marcus: Issue 1057: 21/01/2003: Added the following two external prototypes */ extern T_MFW_HND sat_get_setup_menu_win (void); extern T_MFW_HND sat_get_call_setup_win (void); @@ -552,15 +517,6 @@ //#define TRACE_EVENT(a) #endif -#if defined (WIN32) -#define TONES_AUTH_NUM 3 -#define TONES_BUSY 4 -#define TONES_DROPPED 5 -#define TONES_CONGEST 6 -#endif - - - #ifndef MFW_EVENT_PASSED #define MFW_EVENT_PASSED 0 #endif @@ -634,13 +590,6 @@ COLOUR_LIST_NETWORK, TxtNull, NULL, MNUATTRSPARE }; -#if 0 /* FreeCalypso */ -//Daisy tang added for Real Resume feature 20071107 -BOOL IsRealPaused=FALSE; -extern BOOL IsMP3Playing; -static MfwHnd mp3playTimer; -#endif - /* CCBS related local function prototypes */ static void call_ccbs_show_status(void); static void call_initialise_ccbs_list(T_MFW_HND win); // Marcus: CCBS: 14/11/2002 @@ -919,19 +868,9 @@ ********************************************************************* **********************************************************************/ -//x0pleela 27 Mar, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK -extern T_MFW_HND phlock_win_handle; /* to hold the win handle of phone unlock editor window */ -extern T_MFW_HND phlock_kbd_handle; /* to hold the kbd handle of phone unlock editor window */ -extern T_MFW_HND phlock_mtc_win_handle; /* to hold the win handle of MT call window */ -#endif //FF_PHONE_LOCK - - T_call call_data; - -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -#ifdef FF_PCM_VM_VB -EXTERN T_voice_buffering voice_buffering_data; -#endif + +T_call call_data; + void call(T_MFW_HND win, USHORT event, SHORT value, void * parameter); @@ -992,7 +931,6 @@ static int call_menu_mnu_cb (MfwEvt e, MfwMnu *m); - /********************************************************************* ********************************************************************** @@ -1027,7 +965,6 @@ **********************************************************************/ - typedef struct { T_MMI_CONTROL mmi_control; @@ -1044,8 +981,6 @@ } T_call_scratchpad; - - T_MFW_HND call_scratchpad_create(MfwHnd parent); void call_scratchpad_exit (void); static int call_scratchpad_kbd_cb (MfwEvt e, MfwKbd *k); @@ -1055,12 +990,6 @@ void call_scratchpad (T_MFW_HND win, USHORT event, SHORT value, void * parameter); T_MFW_HND call_scratchpad_start (T_MFW_HND win_parent,char character,UBYTE mode, UBYTE callstatus); -#ifdef NEPTUNE_BOARD -#ifdef MMI_POWER_MANAGEMENT_TEST -int iIncomingCall = 0; /* Variable for Incoming Call */ -#endif -#endif - //x0pleela 03 Nov, 2006 DR: OMAPS000101158 GLOBAL void mfw_set_OtherSrc_Value(UBYTE otherSrc); GLOBAL UBYTE mfw_get_OtherSrc_Value(void); @@ -1077,27 +1006,6 @@ Private Methods *******************************************************************************/ -#if 0 /* FreeCalypso */ -//Daisy tang added for Real Resume feature 20071107 -static void mp3_test_real_resume(void) -{ - IsRealPaused = FALSE; - IsMP3Playing = TRUE; - mfw_fm_audRealResume(); -} - - -static int mp3_test_play_Timer_cb( MfwEvt e, MfwTim *tc ) -{ - if (mp3playTimer != NULL ) - { - timStop(mp3playTimer); - timDelete (mp3playTimer); - } - mp3_test_real_resume(); - return MFW_EVENT_CONSUMED; -} -#endif /******************************************************************************* @@ -1146,8 +1054,6 @@ } - - /******************************************************************************* $Function: callAutoRedialKeyEvent @@ -1187,24 +1093,17 @@ } - /******************************************************************************* $Function: callCmEvent - $Description: call management event handler - $Returns: 1, processed, 0 ignored - $Arguments: event and parameter - -*******************************************************************************/ - - +*******************************************************************************/ int callCmEvent(MfwEvt e, void *para) { @@ -1234,15 +1133,10 @@ // activeCall_Id gets the index of a ACTIVE call. SHORT activeCall_Id; -//x0pleela 09 Feb, 2007 DR: OMAPS00114834 //This definition is required to get the current ringer settings -#ifndef FF_MIDI_RINGER UBYTE currentRinger; -#endif - -#ifndef FF_MIDI_RINGER + currentRinger = getCurrentRingerSettings(); -#endif TRACE_EVENT_P2("%s %d","callCmEvent ",e); @@ -1263,31 +1157,6 @@ break; case E_CM_CW: -//Apr 06, 2005 REF: ENH 30011 xdeepadh -#ifdef FF_MMI_TEST_CAMERA -#ifdef RVM_CAMA_SWE -#ifdef RVM_CAMD_SWE - //e-armanetsaid 18/08/04 -enable R2D back when incoming call -might have been disabled by camera test module -//Sept 15, 2005 REF: LOCOSTO-ENH-34257 - xpradipg -//replaced the flag with the function call, to migrate to the new Lcd APIs - if(dspl_control(DSPL_ACCESS_QUERY) == DSPL_ACCESS_DISABLE) - { -//Sept 15, 2005 REF: LOCOSTO-ENH-34257 - xpradipg -//replaced the flag with the function call, to migrate to the new Lcd APIs - dspl_control(DSPL_ACCESS_ENABLE); - mfw_cam_disable_sensor(); - } - //e-armanetsaid 18/08/04 -enable R2D back when incoming call -might have been disabled by camera test module -#endif -#endif -#endif //FF_MMI_TEST_CAMERA - - /* Set the Incoming Call Variable */ -#ifdef NEPTUNE_BOARD -#ifdef MMI_POWER_MANAGEMENT_TEST - iIncomingCall = 1; -#endif -#endif if(para) incomingCall((T_MFW_CM_CW_INFO*)para); @@ -1358,24 +1227,12 @@ else { // stop this ringing tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); - - /*August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) -- Start */ - - /* Set the Incoming Call Ringer Status as "Stopped" */ - bmi_incomingcall_set_ringer_status(BMI_INCOMING_CALL_RINGERSTOPPED); - - /*August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) -- End */ - -#else #ifdef FF_MMI_RINGTONE /* Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else // This is to stop the buzzer audio_StopSoundbyID( AUDIO_BUZZER, getCurrentRingerSettings() ); #endif -#endif } } break; @@ -1401,8 +1258,6 @@ #endif mfw_hook_unregister(); - - #endif //xvilliva SPR13698, After receiving the "E_CM_DISCONNECT_ALL" @@ -1413,24 +1268,6 @@ cm_mo_call((UBYTE *)strECC, VOICE_CALL); } -//x0pleela 24 Mar, 2006 ER:OMAPS00067709 -//stop voice recording -#ifdef FF_PCM_VM_VB - if( (get_voice_memo_type() EQ VOICE_BUFFERING) AND - (!voice_buffering_data.incoming_call_discon) ) - { - if(voice_buffering_data.call_active AND (!voice_buffering_data.play_stopped )) - voice_buffering_stop_playing(); - if( !voice_buffering_data.recording_possible) - voice_buffering_stop_recording(); - } -#endif - -#if 0 /* FreeCalypso */ - //Daisy tang added for Real Resume feature 20071107 - if(IsRealPaused) - timStart( mp3playTimer ); -#endif break; case E_CM_DISCONNECT: @@ -1453,11 +1290,6 @@ } } -#ifdef FF_WAP - /* SPR#1983 - SH - Inform WAP of a disconnection */ - AUI_wap_call_disconnect(dc->call_number); -#endif - /* MZ cq11080 25-07-03 Check to see if call is muted then Unmute.*/ if (call_data.calls.muted) { @@ -1469,26 +1301,7 @@ } if (call_data.ignore_disconnect) - { - //x0pleela 15 Mar, 2006 ER:OMAPS00067709 - //stop voice recording -#ifdef FF_PCM_VM_VB - if( get_voice_memo_type() EQ VOICE_BUFFERING ) - { - if(voice_buffering_data.call_active AND (!voice_buffering_data.play_stopped )) - voice_buffering_stop_playing(); - if( !voice_buffering_data.recording_possible) - voice_buffering_stop_recording(); - } -#endif -#if 0 /* FreeCalypso */ - //Daisy tang added for Real Resume feature 20071107 - if(IsRealPaused) - timStart( mp3playTimer ); -#endif - return 1; - } if (LocalRing) @@ -1502,7 +1315,6 @@ } - TRACE_EVENT("Disconnect Event"); cm_get_aoc_value(CM_AOC_CCM,&call_data.aocInfo); @@ -1594,23 +1406,7 @@ { // If there is no other calls, stop the waiting tone and start ringing tone. audio_StopSoundbyID( AUDIO_MICROPHONE, TONES_CW); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh -#ifdef FF_MIDI_RINGER - mfw_ringer_start(AS_RINGER_MODE_IC,true,sounds_midi_ringer_start_cb); -#else -#ifdef NEPTUNE_BOARD -#ifdef FF_MMI_RINGTONE /* MSL Ring Tone */ - audio_PlaySoundID( AUDIO_BUZZER, CALLTONE_SELECT, 0 , AUDIO_PLAY_INFINITE); -#else - audio_PlaySoundID( AUDIO_BUZZER, getCurrentRingerSettings(), - getCurrentVoulmeSettings(), AUDIO_PLAY_INFINITE); -#endif -#else audio_PlaySoundID( AUDIO_BUZZER, getCurrentRingerSettings(), 0 , AUDIO_PLAY_INFINITE); -#endif -/* END RAVI */ -#endif } } } @@ -1627,18 +1423,12 @@ // Solution: If E_CM_DISCONNECT event comes and if incoming call alert is there // stop the ringing tone. -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /* Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, getCurrentRingerSettings()); #endif - #endif TRACE_EVENT("Dialog Destroy No 1"); if(idwithheld == TRUE) idCounter = idCounter + 1; @@ -1659,12 +1449,6 @@ else { TRACE_EVENT("NDH >>> Stopping current Rigner on the Buzzer"); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh -#ifdef FF_MIDI_RINGER - // Stopping the current ring tone. - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else /* x0045876, 14-Aug-2006 (WR - "currentRinger" was set but never used) */ /* currentRinger = getCurrentRingerSettings(); */ @@ -1676,14 +1460,9 @@ audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif } //Check if incoming call has been rejected by user, call is not regarded as a missed call. MZ -#ifdef FF_2TO1_PS - if(dc->cause != M_CC_CAUSE_USER_BUSY ) /*SPR#2217 - DS - Changed MNCC_CAUSE_USER_BUSY to CAUSE_USER_BUSY */ -#else if(dc->cause != M_CC_CAUSE_USER_BUSY ) -#endif { TRACE_EVENT("Add missed call"); if (call_data.globalCWInfo.type EQ VOICE_CALL) @@ -1704,27 +1483,6 @@ call_tty_revert(); #endif -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -//stop voice recording -#ifdef FF_PCM_VM_VB - if( (get_voice_memo_type() EQ VOICE_BUFFERING) AND - (!voice_buffering_data.incoming_call_discon) ) - { - if(voice_buffering_data.call_active AND (!voice_buffering_data.play_stopped )) - voice_buffering_stop_playing(); - if( !voice_buffering_data.recording_possible) - voice_buffering_stop_recording(); - voice_buffering_data.call_active = FALSE; - vocoder_mute_ul(0); - } - -#endif - -#if 0 /* FreeCalypso */ - //Daisy tang added for Real Resume feature 20071107 - if(IsRealPaused) - timStart( mp3playTimer ); -#endif return 1; } } @@ -1790,21 +1548,6 @@ } } } -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -//stop voice recording -#ifdef FF_PCM_VM_VB - if( (get_voice_memo_type() EQ VOICE_BUFFERING) AND - (!voice_buffering_data.incoming_call_discon) ) - { - if(voice_buffering_data.call_active AND (!voice_buffering_data.play_stopped )) - voice_buffering_stop_playing(); - if( !voice_buffering_data.recording_possible) - voice_buffering_stop_recording(); - voice_buffering_data.call_active = FALSE; - vocoder_mute_ul(0); - } - -#endif // Jun 02, 2006 DRT OMAPS00079213 x0039928(sumanth) // Fix: Hook is unregistered for the last call. @@ -1819,11 +1562,6 @@ if(call_data.calls.numCalls == 0) mfw_hook_unregister(); #endif -#if 0 /* FreeCalypso */ - //Daisy tang added for Real Resume feature 20071107 - if(IsRealPaused) - timStart( mp3playTimer ); -#endif break; case E_CM_CONNECT_ACK: @@ -1887,25 +1625,17 @@ } else { -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Since there is no other call the ringing tone will be Buzzer, // So stop this ringing tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /* Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else // This is to stop the buzzer audio_StopSoundbyID( AUDIO_BUZZER, getCurrentRingerSettings() ); #endif -#endif } } - - if ((*cid==call_data.incCall)&&(call_data.win_incoming)) { SEND_EVENT(call_data.win_incoming,DIALOG_DESTROY,0,0); @@ -1934,27 +1664,18 @@ callConnect(*cid); //xrashmic 21 Aug, 2005 OMAPS00090198 //The mmeSetVolume is skippen when in a TTY call - #ifdef MMI_TTY_ENABLED + #ifdef MMI_TTY_ENABLED if( call_data.tty == CALL_TTY_OFF ) - #endif + #endif { mmeSetVolume (1, FFS_flashData.output_volume); } -#ifdef MMI_TTY_ENABLED + #ifdef MMI_TTY_ENABLED else { audio_set_tty(3); } - #endif - //x0pleela 09 Mar, 2006 ER:OMAPS00067709 - //Playing the recorded voice for PTT -#ifdef FF_PCM_VM_VB - if( get_voice_memo_type() EQ VOICE_BUFFERING ) - { - voice_buffering_data.call_active = TRUE; - voice_buffering_playback_start(); - } -#endif + #endif break; case E_CM_CONNECT: TRACE_EVENT("E_CM_CONNECT !!"); @@ -2033,14 +1754,12 @@ // Aug 24, 2004 REF: CRR MMI-SPR-15750 xkundadu // If number of calls greater than one, set the mode to CallConference. - if(call_data.calls.numCalls >1) { call_data.calls.mode = CallConference; } - break; case CM_SWAP: TRACE_EVENT("call CM_SWAP received"); @@ -2197,8 +1916,6 @@ /* */ - - if (call_data.win_calling) { SEND_EVENT(call_data.win_calling,DIALOG_DESTROY,0,0); @@ -2276,21 +1993,6 @@ /* SPR#1983 - SH - Notify WAP if a data call is set up */ -#ifdef FF_WAP - { - T_MFW_CM_CALL_STAT stat; - UBYTE ton; - UBYTE mode; - - cm_search_callStat(*cid, &stat, &ton, &mode); - - if (mode == DATA_CALL) - { - AUI_wap_call_connect(*cid); - } - } -#endif - /* set the outcall ID */ call_data.outCall = *cid; call_data.call_direction = MFW_CM_MOC; @@ -2407,12 +2109,7 @@ // Description: SMS : class 2 and 3 SMSMT : icon not displayed when 2 active calls // Fix: condition "call_data.calls.mode == CallSingle" is removed to make the sms icon visible // even if there are more than one calls present. - if (winIsFocussed(call_data.win) - //x0pleela 27 Mar, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK - || ((!phlock_win_handle) || (mmiPinsEmergencyCall())) -#endif //FF_PHONE_LOCK - ) + if (winIsFocussed(call_data.win)) winShow(call_data.win); break; case E_CM_CPI: @@ -2433,17 +2130,8 @@ /* RAVI - 20-1-2006 */ /* Silent Implementation */ -#ifdef NEPTUNE_BOARD -#ifdef FF_MMI_RINGTONE - audio_PlaySoundID(AUDIO_MICROPHONE, CALLTONE_SELECT, 0, AUDIO_PLAY_INFINITE); -#else - audio_PlaySoundID( AUDIO_MICROPHONE, TONES_RINGING_TONE, - getCurrentVoulmeSettings(), AUDIO_PLAY_INFINITE); -#endif -#else /* Testcase 26.8.x - generated internal alert */ audio_PlaySoundID(AUDIO_MICROPHONE, TONES_RINGING_TONE, 0, AUDIO_PLAY_INFINITE); -#endif LocalRing = TRUE; } else if (LocalRing) @@ -2563,39 +2251,6 @@ } - -#if(0) /* x0039928 - Commented for lint warning removal */ -/******************************************************************************* - - $Function: callWaitingAnswerKeyEvent - - $Description: - - $Returns: 1, processed, 0 ignored - - $Arguments: event and parameter - -*******************************************************************************/ - -static int callWaitingAnswerKeyEvent (MfwEvt e, MfwKbd *k) -{ - TRACE_FUNCTION("callWaitingAnswerKeyEvent"); - switch (k->code) - { - - case KCD_LEFT: - cm_command_abort(call_data.current_command); - break; - default: - break; - } - return 1; -} - -#endif - - - /******************************************************************************* $Function: showDefault @@ -2608,8 +2263,6 @@ *******************************************************************************/ - - static void showDefault (void) { dspl_ClearAll(); @@ -2635,11 +2288,6 @@ } - - - - - /******************************************************************************* $Function: showSelectPrivateCall @@ -2657,94 +2305,6 @@ #define STR_DISPLAY_NCHAR ((SCREEN_SIZE_X-CALLID_NUM_XPOS)/6) -#if(0) /* x0039928 - Lint warning fix */ -static void showSelectPrivateCall(void){ - - - int i = 0; - char stat; - char line[MAX_LINE]; - char tag[MAX_CHAR]; - int topLine; - TRACE_FUNCTION("showSelectPrivateCall"); - - showDefault(); - memset(tag,'\0',sizeof(tag)); - if (call_data.calls.numCalls<MAX_CALLS) - topLine = Mmi_layout_line(2); - else - topLine = Mmi_layout_line(1); - for (i=0;i<call_data.calls.numCalls;i++) - { - memset(line,'\0',sizeof(line)); - memset(tag,'\0',sizeof(tag)); - sprintf(line,"%d",i+1); - if (call_data.calls.status[i].stat == CALL_ACTIVE) - stat = 'A'; - else - stat = 'H'; - sprintf(line,"%d.%c.",i+1,stat); - if (i==callIndex(call_data.calls.selected)) - dspl_TextOut(CALLINFO_X_AH, (USHORT)(topLine+Mmi_layout_line_height()*i), DSPL_TXTATTR_INVERS, line); - else - dspl_TextOut(CALLINFO_X_AH, (USHORT)(topLine+Mmi_layout_line_height()*i), 0, line); - -#ifdef NO_ASCIIZ - /*MC, SPR 1257, merge from 3.3.3*/ - if (call_data.calls.status[i].name.len > 0) - { - resources_truncate_to_screen_width((char*)call_data.calls.status[i].name.data,call_data.calls.status[i].name.len ,(char*)tag,MAX_CHAR-2, SCREEN_SIZE_X,FALSE); - } -/*MC end*/ -#else - if (strlen((char*)call_data.calls.status[i].name) > 0) - { - resources_truncate_to_screen_width(call_data.calls.status[i].name,0 ,(char*)tag,MAX_CHAR-2, SCREEN_SIZE_X,FALSE); - } -#endif - else - if (strlen((char*)call_data.calls.status[i].number) > 0) - { - resources_truncate_to_screen_width((char*)call_data.calls.status[i].number,0 ,(char*)tag,MAX_CHAR-2, SCREEN_SIZE_X,FALSE); - } - else - { - resources_truncate_to_screen_width(GET_TEXT(TxtSoftCall),0 ,(char*)tag,MAX_CHAR-2, SCREEN_SIZE_X,TRUE); - } - if (i==callIndex(call_data.calls.selected)) - dspl_TextOut(CALLINFO_X_TAGPOS,(USHORT)(topLine+Mmi_layout_line_height()*i), DSPL_TXTATTR_INVERS, tag); - else - dspl_TextOut(CALLINFO_X_TAGPOS,(USHORT)(topLine+Mmi_layout_line_height()*i), 0, tag); - } - displaySoftKeys(TxtSoftSelect,TxtEnd); -} - - - -/******************************************************************************* - - $Function: showWaitingAnswer - - $Description: - - $Returns: - - $Arguments: - -*******************************************************************************/ - - -static void showWaitingAnswer(void){ - - - TRACE_FUNCTION("showWaitingAnswer"); - showDefault(); - PROMPT(TXTMESSAGE_X, Mmi_layout_line(2), 0, TxtPleaseWait); - displaySoftKeys(TxtCancel,'\0'); -} - -#endif - /******************************************************************************* $Function: showSendingDTMF @@ -2757,10 +2317,8 @@ *******************************************************************************/ - void showSendingDTMF(void){ - TRACE_FUNCTION("showSendingDTMF"); showDefault(); PROMPT(TXTMESSAGE_X, Mmi_layout_line(2), 0, TxtSendingDTMF); @@ -2768,9 +2326,6 @@ } - - - /******************************************************************************* $Function: showInformation @@ -2783,19 +2338,14 @@ *******************************************************************************/ - void showInformation(void){ - TRACE_FUNCTION("showInformation"); showDefault(); dspl_TextOut(24, 16, 0, callInformation); } - - - /******************************************************************************* $Function: callSetMode @@ -2808,12 +2358,11 @@ *******************************************************************************/ -static void callSetMode (int mode, BOOL dialogDisp){ +static void callSetMode (int mode, BOOL dialogDisp) +{ T_DISPLAY_DATA display_info; - - switch (mode){ case ViewConnect: if (call_data.calls.numCalls) @@ -2937,10 +2486,6 @@ } - - - - /******************************************************************************* $Function: contactsExec @@ -3226,8 +2771,6 @@ } - - /******************************************************************************* $Function: swapExec @@ -3326,32 +2869,6 @@ } - -/******************************************************************************* - - $Function: transferExec - - $Description: - - $Returns: - - $Arguments: - -*******************************************************************************/ -/* x0039928 - Commented for lint warning removal */ -/* -static int transferExec(MfwMnu* m, MfwMnuItem* i){ - - cm_command(0,CM_ETC,'\0'); - call_data.current_command = CM_ETC; - callSetMode(ViewWaitingAnswer, TRUE); - return 1; - -} -*/ - - - /******************************************************************************* $Function: removeCall @@ -3364,8 +2881,6 @@ *******************************************************************************/ - - // May 9, 2006 REF:DR OMAPS00074884 xrashmic int removeCall(SHORT cid, BOOL dialogDisp, BOOL allCallsEnded) { @@ -3455,9 +2970,6 @@ *******************************************************************************/ - - - int removeAllCalls(void) { int i; @@ -3497,9 +3009,8 @@ *******************************************************************************/ - -int addCall(SHORT cid) { - +int addCall(SHORT cid) +{ MmiModuleDel(ModuleInCall); if (!call_data.calls.numCalls){ @@ -3562,8 +3073,8 @@ *******************************************************************************/ - -int callIndex(SHORT cid) { +int callIndex(SHORT cid) +{ int i; @@ -3586,9 +3097,8 @@ *******************************************************************************/ - - -void callConnect(SHORT cid){ +void callConnect(SHORT cid) +{ TRACE_FUNCTION("Call Connect"); addCall(cid); @@ -3607,8 +3117,6 @@ $Arguments: *******************************************************************************/ - - void callNumber(UBYTE *number) { T_MFW res; @@ -3787,9 +3295,8 @@ $Arguments: *******************************************************************************/ - - -void getTimeString(long time,char *timeString){ +void getTimeString(long time,char *timeString) +{ int hour,min,sec; @@ -3812,10 +3319,8 @@ $Arguments: *******************************************************************************/ - - - -static void refreshCallTimer(){ +static void refreshCallTimer() +{ int i; @@ -3838,8 +3343,6 @@ $Arguments: None *******************************************************************************/ - - UBYTE call_HeadsetKeyDetection (void) { if (call_data.incCall || call_data.outCall || call_data.calls.numCalls) @@ -3849,8 +3352,6 @@ } - - /******************************************************************************* $Function: endingCall @@ -3862,9 +3363,8 @@ $Arguments: *******************************************************************************/ - - -static void endingCall(void){ +static void endingCall(void) +{ TRACE_FUNCTION("Ending call"); call_data.accessEnd = TRUE; @@ -3897,7 +3397,6 @@ } - /******************************************************************************* $Function: rebuildCalls @@ -3909,9 +3408,8 @@ $Arguments: *******************************************************************************/ - - -static void rebuildCalls(void){ +static void rebuildCalls(void) +{ int i; @@ -3950,7 +3448,8 @@ *******************************************************************************/ //Sandip - 18261 . Setup call Reset fix -static int getCallStatus(SHORT call_number,T_MFW_CM_STATUS* call){ +static int getCallStatus(SHORT call_number,T_MFW_CM_STATUS* call) +{ char prov[MFW_TAG_LEN]; int p; @@ -3986,43 +3485,6 @@ } -#if(0) /* x0039928 - Lint warning fix */ -/******************************************************************************* - - $Function: exeSendMessage - - $Description: - - $Returns: - - $Arguments: -*******************************************************************************/ - - -int exeSendMessage(MfwMnu* m, MfwMnuItem* i) -{ - return 0; -} - - -/******************************************************************************* - - $Function: callExeNameEnter - - $Description: - - $Returns: - - $Arguments: -*******************************************************************************/ - - - -static int callExeNameEnter(MfwMnu* m, MfwMnuItem* i){ - return 0; -} - -#endif /******************************************************************************* @@ -4035,7 +3497,6 @@ $Arguments: *******************************************************************************/ -#ifdef FF_2TO1_PS static void callFailureCause(UBYTE cause) { @@ -4048,31 +3509,15 @@ case M_CC_CAUSE_NUM_FORMAT: case M_CC_CAUSE_BARRED_IN_CUG: case M_CC_CAUSE_USER_NOT_IN_CUG: -/* RAVI - 20-1-2006 */ -/* Silent Implementation */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), - AUDIO_PLAY_ONCE); -#else /* Oct 07, 2004 REF: CRR 23873 xnkulkar(Sasken) */ /* Play the Error tone if the call failure is due to above causes. */ audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_ONCE); -#endif -/* END RAVI */ bookShowInformation(idle_get_window(),TxtCheckNumber,NULL,(T_VOID_FUNC)call_failure_cb); break; case M_CC_CAUSE_USER_BUSY: -/* RAVI - 20-1-2006 */ -/* Silent Implementation */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), - AUDIO_PLAY_THRICE); -#else -/* Jun 30, 2004 REF: CRR 15685 xkundadu(Sasken) */ +/* Jun 30, 2004 REF: CRR 15685 xkundadu(Sasken) */ /* Play the beep sound if the called party is busy. */ audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_THRICE); -#endif -/* END RAVI */ bookShowInformation(idle_get_window(),TxtNumberBusy,NULL,(T_VOID_FUNC)call_failure_cb); break; case M_CC_CAUSE_NO_RESPONSE: @@ -4093,121 +3538,10 @@ case M_CC_CAUSE_ACM_MAX: case M_CC_CAUSE_FACILITY_NOT_IMPLEM: case M_CC_CAUSE_SERVICE_NOT_IMPLEM: -/* RAVI - 20-1-2006 */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), AUDIO_PLAY_ONCE); -#else +/* Silent Implementation */ /* Oct 07, 2004 REF: CRR 23873 xnkulkar(Sasken) */ /* Play the Error tone if the call failure is due to above causes. */ audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_ONCE); -#endif -/* END RAVI */ - bookShowInformation(idle_get_window(),TxtOperationNotAvail,NULL,(T_VOID_FUNC)call_failure_cb); - - break; - case M_CC_CAUSE_NO_CHAN_AVAIL: - case M_CC_CAUSE_TEMP_FAIL: - case M_CC_CAUSE_SWITCH_CONGEST: - case M_CC_CAUSE_REQ_CHAN_UNAVAIL: - - bookShowInformation(idle_get_window(),TxtNetworkBusy,NULL,(T_VOID_FUNC)call_failure_cb); - break; - case M_CC_CAUSE_FACILITY_UNSUBSCRIB: - case M_CC_CAUSE_BEARER_CAP_AUTHORIZ: - bookShowInformation(idle_get_window(),TxtNotSubscribed,NULL,(T_VOID_FUNC)call_failure_cb); - break; - - //GW-SPR#1035 - Added SAT changed - /*NM, 110702 - the "202" stands for timer 303 expired; - unfortunately there is no define for that in the SAP/MNCC */ - case 202: - bookShowInformation(idle_get_window(),TxtCallTimeout,NULL,(T_VOID_FUNC)call_failure_cb); - break; - /*NM, 110702 END*/ - default: - /* RAVI - 20-1-2006 */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), - AUDIO_PLAY_ONCE); -#else - /* Oct 07, 2004 REF: CRR 23873 xnkulkar(Sasken) */ - /* Play the Error tone if the call failure is due to any other reason. */ - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_ONCE); -#endif -/* END RAVI */ - bookShowInformation(idle_get_window(),TxtOperationNotAvail,NULL,(T_VOID_FUNC)call_failure_cb); - break; - } - return; -} - -#else /* FF_2TO1_PS */ -static void callFailureCause(UBYTE cause) -{ - - TRACE_FUNCTION("callFailureCause()"); - - switch(cause) - { - case M_CC_CAUSE_UNASSIGN: - case M_CC_CAUSE_BARRED: - case M_CC_CAUSE_NUM_FORMAT: - case M_CC_CAUSE_BARRED_IN_CUG: - case M_CC_CAUSE_USER_NOT_IN_CUG: -/* RAVI - 20-1-2006 */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), - AUDIO_PLAY_ONCE); -#else - /* Oct 07, 2004 REF: CRR 23873 xnkulkar(Sasken) */ - /* Play the Error tone if the call failure is due to above causes. */ - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_ONCE); -#endif -/* END RAVI */ - bookShowInformation(idle_get_window(),TxtCheckNumber,NULL,(T_VOID_FUNC)call_failure_cb); - break; - case M_CC_CAUSE_USER_BUSY: -/* RAVI - 20-1-2006 */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), AUDIO_PLAY_THRICE); -#else -/* Jun 30, 2004 REF: CRR 15685 xkundadu(Sasken) */ -/* Play the beep sound if the called party is busy. */ - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_THRICE); -#endif -/* END RAVI*/ - bookShowInformation(idle_get_window(),TxtNumberBusy,NULL,(T_VOID_FUNC)call_failure_cb); - break; - case M_CC_CAUSE_NO_RESPONSE: - case M_CC_CAUSE_ALERT_NO_ANSWER: - case M_CC_CAUSE_CALL_REJECT: - bookShowInformation(idle_get_window(),TxtNoAnswer,NULL,(T_VOID_FUNC)call_failure_cb); - break; - case M_CC_CAUSE_NUM_CHANGED: - bookShowInformation(idle_get_window(),TxtNumberChanged,NULL,(T_VOID_FUNC)call_failure_cb); - break; - case M_CC_CAUSE_FACILITY_REJECT: - case M_CC_CAUSE_STATUS_ENQUIRY: - case M_CC_CAUSE_QOS_UNAVAIL: - - case M_CC_CAUSE_BEARER_CAP_UNAVAIL: - case M_CC_CAUSE_SERVICE_UNAVAIL: - case M_CC_CAUSE_BEARER_NOT_IMPLEM: - case M_CC_CAUSE_ACM_MAX: - case M_CC_CAUSE_FACILITY_NOT_IMPLEM: - case M_CC_CAUSE_SERVICE_NOT_IMPLEM: -/* RAVI - 20-1-2006 */ -/* Silent Implementation */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), - AUDIO_PLAY_ONCE); -#else - /* Oct 07, 2004 REF: CRR 23873 xnkulkar(Sasken) */ - /* Play the Error tone if the call failure is due to above causes. */ - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_ONCE); -#endif -/* END RAVI */ bookShowInformation(idle_get_window(),TxtOperationNotAvail,NULL,(T_VOID_FUNC)call_failure_cb); break; case M_CC_CAUSE_NO_CHAN_AVAIL: @@ -4230,24 +3564,16 @@ break; /*NM, 110702 END*/ default: - /* RAVI - 20-1-2006 */ /* Silent Implementation */ - #ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, getCurrentVoulmeSettings(), - AUDIO_PLAY_ONCE); - #else /* Oct 07, 2004 REF: CRR 23873 xnkulkar(Sasken) */ /* Play the Error tone if the call failure is due to any other reason. */ audio_PlaySoundID( AUDIO_SPEAKER, TONES_BUSY, 0 , AUDIO_PLAY_ONCE); - #endif - /* END RAVI */ bookShowInformation(idle_get_window(),TxtOperationNotAvail,NULL,(T_VOID_FUNC)call_failure_cb); break; } return; } -#endif /* !FF_2TO1_PS */ /******************************************************************************* @@ -4263,7 +3589,6 @@ static void sendDTMFString(void) { - call_data.sendingDTMF = TRUE; callSetMode(ViewSendingDTMF, TRUE); if (call_data.charSent<strlen(call_data.edtBufDTMF)){ @@ -4279,97 +3604,6 @@ } -#if(0) /* x0039928 - Commented for lint warning removal */ -/******************************************************************************* - - $Function: callCalcCost - - $Description: - - $Returns: - - $Arguments: -*******************************************************************************/ - - -static void callCalcCost (char* line) -{ - char line2[MAX_LINE]; - char *pdest,*src,*dst,*POINT; - LONG result; - int ch = '.'; - UBYTE counter=0; - - memset(line2,'\0',sizeof(line2)); - - cm_get_aoc_value(CM_AOC_CCM,&call_data.aocInfo); /* Get CCM */ - cm_get_aoc_value(CM_AOC_PUCT,&call_data.aocInfo); /* Get currency and price per unit */ - - /* Search for '.' */ - pdest = strchr((char*) call_data.aocInfo.ppu, ch ); - if( pdest EQ NULL ) /* '.' not founded */ - { - result = atol((char*)call_data.aocInfo.ppu ); /* STRING => LONG */ - result= result * call_data.aocInfo.ccm; /* CCM * PPU */ - sprintf(line, "%ld %s", result,call_data.aocInfo.cur); /* LONG => STRING */ - } - else /* '.' found */ - { - /* - * '.' found, *pdest EQ '.' - */ - counter = strlen(pdest + 1); /* store the decimal place */ - - src = (char*)call_data.aocInfo.ppu; - dst = line; - do /* remove the '.' */ - { - if (*src NEQ '.') - { - *dst++ = *src; - } - } while (*src++ NEQ '\0'); - /* STRING => LONG */ - result= atol(line) * call_data.aocInfo.ccm; /* CCM * PPU */ - sprintf(line, "%ld", result); /* LONG => STRING */ - - if(strlen(line) < counter) - { - src = line; - dst = line2; - *dst++ = '0'; - *dst++ = '.'; - counter = counter - strlen(line); - do /* fill up with '0' */ - { - *dst++ = '0'; - } while (--counter NEQ 0); - - memcpy (dst,src,sizeof(src)); - sprintf(line, "%s %s", line2,call_data.aocInfo.cur); /* add the currency */ - return; - } - src = line; - dst = line2; - POINT= src + strlen(src) - counter; - do /* set the '.' */ - { - if (src EQ POINT) - { - *dst++ = '.'; - } - *dst++ = *src++; - - } while (*src NEQ '\0'); - if (line2[0] EQ '.') - sprintf(line, "0%s %s", line2,call_data.aocInfo.cur); /* add the currency */ - if (line2[0] NEQ '.') - sprintf(line, "%s %s", line2,call_data.aocInfo.cur); /* add the currency */ - } - return; -} -#endif - /******************************************************************************* $Function: call_create @@ -4381,10 +3615,8 @@ $Arguments: *******************************************************************************/ - - - -T_MFW_HND call_create (T_MFW_HND parent_window){ +T_MFW_HND call_create (T_MFW_HND parent_window) +{ T_call * data = &call_data; T_MFW_WIN * win; @@ -4412,17 +3644,6 @@ data->kbd = kbd_create (data->win,KEY_ALL,(T_MFW_CB)call_kbd_cb); data->kbd_long = kbd_create (data->win,KEY_ALL|KEY_LONG,(T_MFW_CB)call_kbd_long_cb); -//x0pleela 07 Apr, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK - if( phlock_win_handle && ( call_data.call_direction == MFW_CM_MTC ) ) - { - phlock_mtc_win_handle = data->win; - - kbd_delete(data->kbd); - data->kbd = phlock_kbd_handle; //set the kbd handle of unlock screen - } -#endif //FF_PHONE_LOCK - data->cm = cm_create(data->win, E_CM_ALL_SERVICES, (MfwCb)callCmEvent); /* SPR#1428 - SH - New Editor changes */ @@ -4434,27 +3655,12 @@ data->editCall = edtCreate(data->win,&data->edtAttrCall,0,0); #endif /* NEW_EDITOR */ SEND_EVENT(data->win,CALL_INIT,0,0); -//x0pleela 27 Mar, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK -if( ( !phlock_win_handle) || (mmiPinsEmergencyCall()) ) -#endif //FF_PHONE_LOCK winShow(data->win); -//x0pleela 27 Mar, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK -else -{ - //show phone unlock window - winShow(phlock_win_handle ); -} -#endif //FF_PHONE_LOCK /* * return window handle */ return data->win; - - - } @@ -4469,15 +3675,14 @@ $Arguments: *******************************************************************************/ - -void call_destroy (T_MFW_HND own_window){ +void call_destroy (T_MFW_HND own_window) +{ T_MFW_WIN * win; T_call * data; TRACE_FUNCTION("call_destroy()"); - if (own_window) { win = ((T_MFW_HDR *)own_window)->data; @@ -4565,22 +3770,10 @@ win_delete (data->win); data->win=0; - //x0pleela 07 Apr, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK - if(( call_data.call_direction == MFW_CM_MTC )&& phlock_mtc_win_handle ) - { - phlock_mtc_win_handle = NULL; - } -#endif //FF_PHONE_LOCK } idleEvent(IdleUpdate);/* NDH SPR 1584, update idle screen*/ -#ifdef NEPTUNE_BOARD -#ifdef MMI_POWER_MANAGEMENT_TEST - iIncomingCall = 0; -#endif -#endif } } @@ -4650,14 +3843,12 @@ $Arguments: *******************************************************************************/ - void call (T_MFW_HND win, USHORT event, SHORT value, void * parameter) { T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data; T_call * data = (T_call *)win_data->user; int i; - TRACE_FUNCTION ("call()"); switch (event) @@ -4665,7 +3856,6 @@ case CALL_INIT: { - memset(&data->calls,0,sizeof(data->calls)); memset(call_data.colp_number,'\0',sizeof(call_data.colp_number)); phb_set_auto_off(PHB_AUTO_ON); @@ -4702,10 +3892,6 @@ //Commented mmesetvolume.since the speaker volume will be set, //once the call is acknowledged. //mmeSetVolume (1, FFS_flashData.output_volume); -//x0pleela 27 Mar, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK -if ( (!phlock_win_handle) || (mmiPinsEmergencyCall()) ) -#endif //FF_PHONE_LOCK winUnhide(call_data.win); } break; @@ -5266,7 +4452,8 @@ *******************************************************************************/ //GW-SPR#???-Truncate phone numbers at the beginning (lose first x chars) -static int call_win_cb(MfwEvt e, MfwWin *w){ +static int call_win_cb(MfwEvt e, MfwWin *w) +{ // int j; // RAVI int i = 0; char line[/*MAX_LINE*/PHB_MAX_LEN]; @@ -5298,14 +4485,6 @@ return 1; } -#ifdef FF_PHONE_LOCK - if( ( call_data.call_direction == MFW_CM_MTC ) && ( phlock_mtc_win_handle ) ) - { - TRACE_EVENT("dialog_info_win_resize_cb: creating mtc kbd handler"); - call_data.kbd= kbd_create (phlock_mtc_win_handle, KEY_ALL, (T_MFW_CB)call_kbd_cb); - } -#endif //FF_PHONE_LOCK - switch(call_data.calls.mode){ case CallSingle : if (call_data.calls.muted) @@ -5682,8 +4861,6 @@ } - - /******************************************************************************* $Function: call_kbd_cb @@ -5695,8 +4872,8 @@ $Arguments: *******************************************************************************/ - -static int call_kbd_cb (MfwEvt e, MfwKbd *k){ +static int call_kbd_cb (MfwEvt e, MfwKbd *k) +{ T_MFW_HND win = mfwParent(mfw_header()); //GW Added int index; @@ -5897,25 +5074,9 @@ break; case KCD_HUP: -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -//updating voice buffering data -#ifdef FF_PCM_VM_VB - if( get_voice_memo_type() EQ VOICE_BUFFERING ) - { - voice_buffering_data.rec_stop_reason = CALLING_PARTY_END_CALL; - } -#endif cm_end_all(); break; case KCD_RIGHT: -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -//updating voice buffering data -#ifdef FF_PCM_VM_VB - if( get_voice_memo_type() EQ VOICE_BUFFERING ) - { - voice_buffering_data.rec_stop_reason = CALLING_PARTY_END_CALL; - } -#endif if (!call_data.calls.numCalls) { cm_force_disconnect(); @@ -5944,7 +5105,6 @@ // the disconnection. bhostDisconnection = TRUE; - switch (call_data.calls.mode) { case CallConference: @@ -5992,8 +5152,6 @@ } return 1; - - } /******************************************************************************* @@ -6007,17 +5165,11 @@ $Arguments: *******************************************************************************/ - - -static int call_kbd_long_cb (MfwEvt e, MfwKbd *k){ - - TRACE_FUNCTION("callConnectKeyEvent"); +static int call_kbd_long_cb (MfwEvt e, MfwKbd *k) +{ + TRACE_FUNCTION("callConnectKeyEvent"); return MFW_EVENT_CONSUMED; - - -} - - +} /******************************************************************************* @@ -6037,11 +5189,9 @@ // T_call * data = (T_call *)win_data->user; // RAVI /* a0393213 (WR - "currentRinger" was set but never used) */ -#ifndef FF_MIDI_RINGER #ifndef FF_MMI_RINGTONE UBYTE currentRinger; #endif -#endif /* * special case: Identifier is used only for the Multicall Control */ @@ -6053,11 +5203,9 @@ /*SPR 2646, don't reset window variable till window is destroyed*/ /* a0393213 (WR - "currentRinger" was set but never used) */ -#ifndef FF_MIDI_RINGER #ifndef FF_MMI_RINGTONE currentRinger = getCurrentRingerSettings(); #endif -#endif switch (reason) { @@ -6098,19 +5246,8 @@ case INFO_KCD_LEFT: call_data.win_incoming = 0;/*SPR 2646, the dialog is destroyed here too*/ - /* SPR#1983 - SH - Destroy WAP if WAP call is active */ -#ifdef FF_WAP - if (AUI_wap_in_call()) - { - AUI_wap_browser_disconnect(); - } - else { cm_mt_accept(); -#else - { - cm_mt_accept(); -#endif /* MZ cq11080 25/07/03 Remove mute, when incoming call is accepted. */ if (call_data.calls.muted) { @@ -6138,18 +5275,12 @@ break; //this is for the auto answer case INFO_TIMEOUT: -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*MSL Stop */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif cm_mt_accept(); call_data.win_incoming = 0;/*SPR 2646, this is the only point where this variable should be reset*/ break; @@ -6163,18 +5294,12 @@ { TRACE_EVENT ("call_incoming_cb() with Anykeyanswer"); mmeAudioTone(0, 0, TONE_SWT_OFF); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif cm_mt_accept(); } else /* open the scratchpad for the Multicall Control */ @@ -6191,40 +5316,6 @@ } } -#if(0) /* x0039928 - Commented for lint warning removal */ -/******************************************************************************* - - $Function: call_incoming_animation_cb - - $Description: callback for the in-call animation timer expiring - - $Returns: 1 - - $Arguments: e - event (unused) - t - timer control block (unused) - - $ History - GW #1555 15/01/03 - Disabled animation code for GOLite b+w display - GW #1555 15/01/03 - Changed code to use data from the icon structure instead of hard - coded values. - -*******************************************************************************/ -static int call_incoming_animation_cb (MfwEvt e, MfwTim *t) -{ -#ifdef COLOURDISPLAY - MfwIcnAttr *anim; - call_data.animationScreen = (call_data.animationScreen + 1) % CALLANIMATION ; - - if (call_data.incCall != 0) - { - anim = (MfwIcnAttr *)&incoming_call_animate[call_data.animationScreen]; - dspl_BitBlt2(anim->area.px,anim->area.py,anim->area.sx,anim->area.sy,(void*)anim->icons,0,anim->icnType); - timStart(call_data.timer); - } -#endif - return 1; -} -#endif /******************************************************************************* @@ -6242,25 +5333,12 @@ void incomingCall(const T_MFW_CM_CW_INFO* p_pCwInfo) { - int phbMatch=0; /*May 10,2007 DR:OMAP00127983 x0066814(Geetha)*/ T_MFW_PHB_TEXT *new_cnap_name; TRACE_FUNCTION("incomingCall()"); -//x0pleela 14 Mar, 2006 ER: OMAPS00067709 -#ifdef FF_PCM_VM_VB - //Reject the incoming call if in buffering phase - if( (get_voice_memo_type() EQ VOICE_BUFFERING) AND voice_buffering_data.buffering_phase) - { - voice_buffering_data.incoming_call_discon = TRUE; - cm_mt_reject(); - return; - } - -#endif - /* API - 10/11/2003 - SPR 2472 - Place the call to turn on the backlight here so the backlight comes on for all calls */ mme_backlightOnEvent(); /* API - 10/11/2003 - SPR 2472 - END */ @@ -6271,11 +5349,6 @@ if(p_pCwInfo == 0) return; - //x0pleela 03 Apr, 2007 ER: OMAPS00122561 -#ifdef FF_PHONE_LOCK - call_data.call_direction = MFW_CM_MTC; -#endif //FF_PHONE_LOCK - if (!call_data.win) call_create(0); @@ -6298,98 +5371,18 @@ call_data.incCall = p_pCwInfo->call_number; call_data.call_direction = MFW_CM_MTC; - - /* SPR#1983 - SH - Detect if WAP call is in progress */ -#ifdef FF_WAP - if (AUI_wap_in_call()) - { - dlg_initDisplayData_TextId( &call_data.inc_call_data, TxtEndWap, TxtReject, TxtNull, TxtNull , COLOUR_STATUS_INCOMINGCALL); - } - else -#endif - { - dlg_initDisplayData_TextId( &call_data.inc_call_data, TxtAccept, TxtReject, TxtNull, TxtNull , COLOUR_STATUS_INCOMINGCALL); - } - /* end SPR#1983 */ - -#if 0 /* FreeCalypso */ - //Daisy tang added for Real Resume feature 20071107 - //start - if(IsMP3Playing) - { - UINT i; - - IsRealPaused = TRUE; - mfw_fm_audRealPause(); - mp3playTimer = timCreate( 0, 800, (MfwCb)mp3_test_play_Timer_cb); -#if 1 - for(i = 0;i<50;i++) - { - /* - #define AS_STATE_STARTING 3 - #define AS_STATE_STOPPING 5 - */ - if((as_get_state() EQ 3) OR (as_get_state() EQ 5)) - vsi_t_sleep(0,10); /* small delay */ - else - break; - } -#endif - } -#endif + dlg_initDisplayData_TextId( &call_data.inc_call_data, TxtAccept, TxtReject, TxtNull, TxtNull , COLOUR_STATUS_INCOMINGCALL); /* MZ 1/08/03 issue 2359, generate a call waiting tone/indication in the ear piece. */ if(call_data.calls.numCalls) - /* RAVI - 20-1-2006 */ /* Silent Implementation */ -#ifdef NEPTUNE_BOARD - audio_PlaySoundID( AUDIO_MICROPHONE, TONES_CW, getCurrentVoulmeSettings(), - AUDIO_PLAY_INFINITE); -#else audio_PlaySoundID( AUDIO_MICROPHONE, TONES_CW, 0, AUDIO_PLAY_INFINITE); -#endif -/* END RAVI */ else -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh -#ifdef FF_MIDI_RINGER - mfw_ringer_start(AS_RINGER_MODE_IC,true,sounds_midi_ringer_start_cb); - -//May 16, 2007 DRT OMAPS00116526 x0066692(Asha) -//mfw_hook_register() is called after starting the Ringer. -#ifdef FF_MMI_AUDIO_PROFILE -// Aug 17, 2006 REF:OMAPS00090196 x0039928 -#ifdef MMI_TTY_ENABLED - -if(FFS_flashData.ttyAlwaysOn == FALSE && call_data.tty == CALL_TTY_OFF) - -#endif - mfw_hook_register(); -#endif - -#else -/* RAVI - 20-1-2006 */ -#ifdef NEPTUNE_BOARD -#ifdef FF_MMI_RINGTONE /* MSL Ring Tone */ - audio_PlaySoundID( AUDIO_BUZZER, CALLTONE_SELECT, 0 , AUDIO_PLAY_INFINITE); -#else - { - UBYTE currentRinger; - currentRinger=getCurrentRingerSettings(); - audio_PlaySoundID( AUDIO_BUZZER, currentRinger, getCurrentVoulmeSettings(), - AUDIO_PLAY_INFINITE); - } -#endif -#else { UBYTE currentRinger; currentRinger=getCurrentRingerSettings(); audio_PlaySoundID( AUDIO_BUZZER, currentRinger, 0 , AUDIO_PLAY_INFINITE); } -#endif -/* END RAVI */ - -#endif call_data.inc_call_data.TextId2 = 0; call_data.inc_call_data.TextString2 = NULL;/*a0393213 lint warnings removal - '\0' changed to NULL*/ @@ -6584,8 +5577,6 @@ } - - /******************************************************************************* $Function: call_calling_show @@ -6597,9 +5588,6 @@ $Arguments: *******************************************************************************/ - - - static void call_calling_show (USHORT Identifier) { @@ -6656,7 +5644,6 @@ $Arguments: *******************************************************************************/ - void call_calling_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) { // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI @@ -6673,14 +5660,6 @@ case INFO_KCD_HUP: case INFO_KCD_RIGHT: -//x0pleela 09 Mar, 2006 ER:OMAPS00067709 -//updating voice buffering data -#ifdef FF_PCM_VM_VB - if( get_voice_memo_type() EQ VOICE_BUFFERING ) - { - voice_buffering_data.rec_stop_reason = CALL_END_BEF_SETUP; - } -#endif /* destroy the redial windows if exit*/ cm_redial_abort(); @@ -6770,7 +5749,6 @@ $Arguments: *******************************************************************************/ - void call_menu_end_cb(void) { call_data.win_menu=0; @@ -6788,7 +5766,6 @@ $Arguments: *******************************************************************************/ - void call_waiting_answer_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) { // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI @@ -6798,7 +5775,6 @@ */ TRACE_FUNCTION ("call_waiting_answer_cb()"); - call_data.win_waiting=0; switch (reason) @@ -6826,7 +5802,6 @@ $Arguments: *******************************************************************************/ - void call_sending_dtmf_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) { // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI @@ -6851,7 +5826,6 @@ } - /******************************************************************************* $Function: call_ending_cb @@ -6869,8 +5843,6 @@ * call is not in the "No credit" situation */ - - void call_ending_cb(T_MFW_HND win, UBYTE identifier, UBYTE reason) { // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI @@ -6961,8 +5933,6 @@ } - - /******************************************************************************* $Function: call_menu_create @@ -6974,13 +5944,12 @@ $Arguments: *******************************************************************************/ - -static T_MFW_HND call_menu_create(MfwHnd parent){ +static T_MFW_HND call_menu_create(MfwHnd parent) +{ T_MFW_WIN * win_data; T_call_menu * data = (T_call_menu *)ALLOC_MEMORY (sizeof (T_call_menu)); - TRACE_FUNCTION ("call_menu_create()"); data->win = win_create (parent, 0, E_WIN_VISIBLE, (T_MFW_CB)call_menu_win_cb); @@ -7003,11 +5972,7 @@ data->kbd = kbdCreate(data->win,KEY_ALL,(MfwCb)call_menu_kbd_cb); data->kbd_long = kbdCreate(data->win,KEY_ALL|KEY_LONG,(MfwCb)call_menu_kbd_long_cb); - return data->win; - - - } /******************************************************************************* @@ -7021,9 +5986,8 @@ $Arguments: *******************************************************************************/ - - -static void call_menu_destroy(MfwHnd window){ +static void call_menu_destroy(MfwHnd window) +{ T_MFW_WIN * win_data = ((T_MFW_HDR *)window)->data; T_call_menu * data = (T_call_menu *)win_data->user; @@ -7059,10 +6023,8 @@ $Arguments: *******************************************************************************/ - - -T_MFW_HND call_menu_start(MfwHnd parent,MfwMnuAttr* menuAttr,T_VOID_FUNC func_cb){ - +T_MFW_HND call_menu_start(MfwHnd parent,MfwMnuAttr* menuAttr,T_VOID_FUNC func_cb) +{ T_MFW_HND win; @@ -7073,11 +6035,7 @@ SEND_EVENT (win, CALL_INIT, 0, (MfwMnuAttr*) menuAttr); } return win; - - - -} - +} /******************************************************************************* @@ -7091,7 +6049,6 @@ $Arguments: *******************************************************************************/ - void call_menu (T_MFW_HND win, USHORT event, SHORT value, void * parameter) { T_MFW_WIN * win_data = ((T_MFW_HDR *) win)->data; @@ -7124,9 +6081,6 @@ $Arguments: *******************************************************************************/ - - - static int call_menu_win_cb (MfwEvt e, MfwWin *w) { T_call_menu * data = (T_call_menu *)w->user; @@ -7160,10 +6114,8 @@ $Arguments: *******************************************************************************/ - - -static int call_menu_kbd_cb (MfwEvt e, MfwKbd *k){ - +static int call_menu_kbd_cb (MfwEvt e, MfwKbd *k) +{ T_MFW_HND win = mfwParent(mfw_header()); T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; @@ -7171,7 +6123,6 @@ TRACE_FUNCTION ("call_menu_kbd_cb()"); - switch (k->code) { case KCD_MNUUP: @@ -7215,16 +6166,13 @@ $Arguments: *******************************************************************************/ - - - -static int call_menu_kbd_long_cb (MfwEvt e, MfwKbd *k){ +static int call_menu_kbd_long_cb (MfwEvt e, MfwKbd *k) +{ T_MFW_HND win = mfwParent(mfw_header()); T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_call_menu * data = (T_call_menu *)win_data->user; - if ((e & KEY_CLEAR) && (e & KEY_LONG)) { mnuEscape(data->menu); @@ -7245,9 +6193,8 @@ $Arguments: *******************************************************************************/ - - -static int call_menu_mnu_cb (MfwEvt e, MfwMnu *m){ +static int call_menu_mnu_cb (MfwEvt e, MfwMnu *m) +{ T_MFW_HND win = mfwParent(mfw_header()); // T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; // RAVI @@ -7268,8 +6215,6 @@ } - - /******************************************************************************* $Function: call_scratchpad_create @@ -7281,14 +6226,11 @@ $Arguments: *******************************************************************************/ - T_MFW_HND call_scratchpad_create (T_MFW_HND parent_window) { T_MFW_WIN * win; T_call_scratchpad * data = (T_call_scratchpad *)ALLOC_MEMORY (sizeof (T_call_scratchpad)); - - data->win = win_create (parent_window, 0, E_WIN_VISIBLE, (T_MFW_CB)call_scratchpad_win_cb); if (data->win EQ 0) @@ -7327,9 +6269,6 @@ } - - - /******************************************************************************* $Function: call_scratchpad_destroy @@ -7392,10 +6331,8 @@ T_MFW_WIN *win_data; T_call_scratchpad * data; - T_MFW_HND win = call_scratchpad_create (win_parent); - if (win NEQ NULL) { win_data = ((T_MFW_HDR *) win)->data; @@ -7409,7 +6346,6 @@ } - /******************************************************************************* $Function: call_scratchpad @@ -7460,8 +6396,6 @@ } - - /******************************************************************************* $Function: call_scratchpad_win_cb @@ -7498,23 +6432,6 @@ } -#if(0) /* x0039928 - Commented for lint warning removal */ -static void call_display_call_ended(void) -{ - T_DISPLAY_DATA display_info; - - dlg_initDisplayData_TextId( &display_info, TxtNull, TxtNull, TxtCallEnded, TxtNull, COLOUR_STATUS); - dlg_initDisplayData_events( &display_info, NULL, THREE_SECS, KEY_CLEAR ); - - /* - * Call Info Screen - */ - info_dialog (0, &display_info); - - - return; -} -#endif /******************************************************************************* $Function: call_scratchpad_kbd_cb @@ -7526,7 +6443,6 @@ $Arguments: *******************************************************************************/ - static int call_scratchpad_kbd_cb (MfwEvt e, MfwKbd *k) { T_MFW_HND win = mfw_parent (mfw_header()); @@ -7550,7 +6466,7 @@ { switch (k->code) { - case KCD_0: + case KCD_0: case KCD_1: case KCD_2: case KCD_3: @@ -7559,7 +6475,7 @@ case KCD_6: case KCD_7: case KCD_8: - case KCD_9: + case KCD_9: case KCD_STAR: case KCD_HASH: // xnkulkar SPR-18262: A key has been released. Call cm_command() function with CM_DTMF_INACTIVE @@ -7594,7 +6510,7 @@ case KCD_6: case KCD_7: case KCD_8: - case KCD_9: + case KCD_9: case KCD_STAR: case KCD_HASH: @@ -7664,7 +6580,7 @@ } break; case KCD_CALL: - case KCD_LEFT: + case KCD_LEFT: callNumber((UBYTE*)call_data.edtBufDTMF); call_scratchpad_destroy(win); @@ -7700,7 +6616,7 @@ case KCD_6: case KCD_7: case KCD_8: - case KCD_9: + case KCD_9: case KCD_STAR: case KCD_HASH: /* SPR#1428 - SH - New Editor changes */ @@ -7834,8 +6750,6 @@ } } - - break; case KCD_RIGHT: TRACE_EVENT ("press right"); @@ -7892,7 +6806,6 @@ break; } - /* if true, call the incoming call screen back on the screen because it was destroyed by the scratchpad function */ if (callstatus EQ ViewMulticallControlIncomingCall && data EQ NULL) @@ -7919,9 +6832,6 @@ } - - - /******************************************************************************* $Function: call_scratchpad_kbd_long_cb @@ -7935,7 +6845,7 @@ static int call_scratchpad_kbd_long_cb (MfwEvt e, MfwKbd *k) { - T_MFW_HND win = mfw_parent (mfw_header()); + T_MFW_HND win = mfw_parent (mfw_header()); T_MFW_WIN * win_data = ((T_MFW_HDR *)win)->data; T_call_scratchpad * data = (T_call_scratchpad *)win_data->user; @@ -7993,7 +6903,8 @@ return MFW_EVENT_PASSED; } -UBYTE call_status(void){ +UBYTE call_status(void) +{ return call_data.callStatus; } @@ -8059,14 +6970,12 @@ $Arguments: *******************************************************************************/ - - -MfwHnd call_get_window(void){ +MfwHnd call_get_window(void) +{ return call_data.win; } - /******************************************************************************* $Function: showCCNotify @@ -8079,7 +6988,6 @@ $Arguments: *******************************************************************************/ - static void showCCNotify (T_MFW_HND win, T_MFW_CM_NOTIFY * cc_notify) { T_DISPLAY_DATA display_info; @@ -8087,7 +6995,6 @@ TRACE_FUNCTION("++ showCCNotify"); - switch (cc_notify->notification) { case MFW_CM_HOLD: @@ -9412,24 +8319,7 @@ if ((ccbs_recall.win = AUI_edit_Start(NULL, &editor_data)) != NULL) { TRACE_EVENT_P3("AUI_edit_Start(%p, %p): %p", NULL, &editor_data, ccbs_recall.win); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh -#ifdef FF_MIDI_RINGER - mfw_ringer_start(AS_RINGER_MODE_IC,true,sounds_midi_ringer_start_cb); -#else -#ifdef NEPTUNE_BOARD -#ifdef FF_MMI_RINGTONE /* MSL Ring tone */ - audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0 , AUDIO_PLAY_ONCE ); -#else - audio_PlaySoundID(AUDIO_BUZZER, getCurrentRingerSettings(), - getCurrentVoulmeSettings(), AUDIO_PLAY_ONCE ); /* GW#2355 /CQ11341 */ -#endif -#else audio_PlaySoundID(AUDIO_BUZZER, getCurrentRingerSettings(), 0 , AUDIO_PLAY_ONCE ); /* GW#2355 /CQ11341 */ -#endif -/* END RAVI */ - -#endif } else { @@ -9444,23 +8334,7 @@ { TRACE_EVENT_P3("editor_start(%p, %p): %p", NULL, &editor_data, ccbs_recall.win); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh -#ifdef FF_MIDI_RINGER - mfw_ringer_start(AS_RINGER_MODE_IC,true,sounds_midi_ringer_start_cb); -#else -#ifdef NEPTUNE_BOARD -#ifdef FF_MMI_RINGTONE /* MSL Ring Tone */ - audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0 , AUDIO_PLAY_ONCE ); -#else - audio_PlaySoundID(AUDIO_BUZZER, getCurrentRingerSettings(), - getCurrentVoulmeSettings(), AUDIO_PLAY_ONCE ); /* GW#2355 /CQ11341 */ -#endif -#else audio_PlaySoundID(AUDIO_BUZZER, getCurrentRingerSettings(), 0 , AUDIO_PLAY_ONCE ); /* GW#2355 /CQ11341 */ -#endif -/* END RAVI */ -#endif } else { @@ -9540,18 +8414,12 @@ * so the window handle is no longer valid. */ ccbs_recall.win = NULL; -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID(AUDIO_BUZZER,getCurrentRingerSettings()); #endif -#endif return res; } @@ -9591,18 +8459,12 @@ editor_destroy(ccbs_recall.win); #endif /* NEW_EDITOR */ ccbs_recall.win = NULL; -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID(AUDIO_BUZZER,getCurrentRingerSettings()); #endif -#endif } size = fill_ccbs_recall_text_buffer(TxtId); @@ -9899,9 +8761,6 @@ } - - - /******************************************************************************* $Function: cm_mt_deflect @@ -9919,8 +8778,6 @@ TRACE_FUNCTION("cm_mt_deflect"); TRACE_EVENT_P1("cm_mt_deflect reason=%d",reason); - - switch (reason) { case INFO_KCD_LEFT: @@ -10001,7 +8858,6 @@ } - /******************************************************************************* $Function: call_deflection_cb @@ -10015,11 +8871,9 @@ T_call * data = (T_call *)win_data->user; /* a0393213 (WR - "currentRinger" was set but never used) */ -#ifndef FF_MIDI_RINGER #ifndef FF_MMI_RINGTONE UBYTE currentRinger; #endif -#endif #ifdef NEW_EDITOR T_AUI_EDITOR_DATA editor_data; @@ -10032,15 +8886,12 @@ TRACE_EVENT_P1("number %s",call_data.globalCWInfo.number); -#ifndef WIN32 -// EF 2nd call causes windows crash /*a0393213 lint warnings:structure passed instead of char* */ #ifdef NO_ASCIIZ TRACE_EVENT_P1("name %s",call_data.entry.name.data); #else TRACE_EVENT_P1("name %s",call_data.entry.name); #endif -#endif /*special case: Identifier is used only for the Multicall Control */ call_data.win_incoming = 0; @@ -10049,11 +8900,9 @@ call_data.win_deflecting = 0; /* a0393213 (WR - "currentRinger" was set but never used) */ -#ifndef FF_MIDI_RINGER #ifndef FF_MMI_RINGTONE currentRinger = getCurrentRingerSettings(); #endif -#endif switch (reason) { @@ -10061,35 +8910,23 @@ case INFO_KCD_HUP: case INFO_KCD_RIGHT: TRACE_EVENT("reject deflection"); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // terminate the ringing -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif cm_mt_reject(); break; //deflect case INFO_KCD_LEFT: TRACE_EVENT("deflect call"); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif /* SPR#1428 - SH - New editor */ #ifdef NEW_EDITOR AUI_edit_SetDefault(&editor_data); @@ -10128,18 +8965,12 @@ case INFO_KCD_OFFHOOK: TRACE_EVENT("accept call -deflection"); -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif cm_mt_accept(); break; @@ -10147,18 +8978,12 @@ //this is for the auto answer case INFO_TIMEOUT: -// Apr 05, 2005 REF: ENH 29994 xdeepadh -//Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh // Stopping the current ring tone. -#ifdef FF_MIDI_RINGER - mfw_ringer_stop(sounds_midi_ringer_stop_cb); -#else #ifdef FF_MMI_RINGTONE /*Stop MSL */ audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else audio_StopSoundbyID( AUDIO_BUZZER, currentRinger ); #endif -#endif cm_mt_accept(); break; @@ -10171,8 +8996,6 @@ } - - /******************************************************************************* $Function: deflPhbExec @@ -10185,8 +9008,6 @@ *******************************************************************************/ - - static int deflPhbExec() { @@ -10202,7 +9023,6 @@ /* SPR#1352 - SH */ #ifdef MMI_TTY_ENABLED - /******************************************************************************* $Function: call_tty_init @@ -10485,90 +9305,6 @@ return 1; } -#ifdef NEPTUNE_BOARD /* Mar 27, 2006 REF:ER OMAPS00071798 */ - -/******************************************************************************* - - $Function: ctty_audio_mode_text - - $Description: sets the audio mode then requests the ACI appropriately. - - $Returns None - - $Arguments: None - -*******************************************************************************/ -int ctty_audio_mode_text(MfwMnu* m, MfwMnuItem* i) -{ - T_MFW_HND win = mfwParent( mfw_header() ); - T_DISPLAY_DATA display_info; - - FFS_flashData.tty_audio_mode = AUDIO_MODE_TEXT; - flash_write(); - - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtAudioModeText, TxtActivated, COLOUR_STATUS); - dlg_initDisplayData_events(&display_info, (T_VOID_FUNC)NULL, THREE_SECS, KEY_LEFT); - - info_dialog( win, &display_info ); - -} - - -/******************************************************************************* - - $Function: ctty_audio_mode_text - - $Description: sets the audio mode then requests the ACI appropriately. - - $Returns None - - $Arguments: None - -*******************************************************************************/ - -int ctty_audio_mode_vco(MfwMnu* m, MfwMnuItem* i) -{ - T_MFW_HND win = mfwParent( mfw_header() ); - T_DISPLAY_DATA display_info; - - FFS_flashData.tty_audio_mode = AUDIO_MODE_VCO; - flash_write(); - - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtAudioModeVco, TxtActivated, COLOUR_STATUS); - dlg_initDisplayData_events(&display_info, (T_VOID_FUNC)NULL, THREE_SECS, KEY_LEFT); - - info_dialog( win, &display_info ); -} - - -/******************************************************************************* - - $Function: ctty_audio_mode_text - - $Description: sets the audio mode then requests the ACI appropriately. - - $Returns None - - $Arguments: None - -*******************************************************************************/ - -int ctty_audio_mode_unknown(MfwMnu* m, MfwMnuItem* i) -{ - T_MFW_HND win = mfwParent( mfw_header() ); - T_DISPLAY_DATA display_info; - - FFS_flashData.tty_audio_mode = AUDIO_MODE_Unknown; - flash_write(); - - dlg_initDisplayData_TextId( &display_info, TxtSoftOK, TxtNull, TxtAudioModeUnknown, TxtActivated, COLOUR_STATUS); - dlg_initDisplayData_events(&display_info, (T_VOID_FUNC)NULL, THREE_SECS, KEY_LEFT); - - info_dialog( win, &display_info ); - -} - -#endif /******************************************************************************* @@ -10681,12 +9417,6 @@ */ idleEvent(IdleUpdate); -#ifdef NEPTUNE_BOARD -#ifdef MMI_POWER_MANAGEMENT_TEST - iIncomingCall = 0; -#endif -#endif - return; } @@ -11063,4 +9793,3 @@ } /*August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) -- End */ -