# HG changeset patch # User Mychaela Falconia # Date 1611029157 0 # Node ID 053ff6a9496168d4477c867f1f5fce100914bf21 # Parent 2cd1c1abdbb583ad553bb6454ae22abaec744075 mmiStart.c: formatting fixes and dead code elimination diff -r 2cd1c1abdbb5 -r 053ff6a94961 src/ui/bmi/mmiStart.c --- a/src/ui/bmi/mmiStart.c Tue Jan 19 03:44:17 2021 +0000 +++ b/src/ui/bmi/mmiStart.c Tue Jan 19 04:05:57 2021 +0000 @@ -1,6 +1,6 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -11,12 +11,12 @@ $Project name: Basic MMI $Project code: BMI (6349) - $Module: Start - $File: MmiStart.c - $Revision: 1.0 + $Module: Start + $File: MmiStart.c + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -46,16 +46,16 @@ Oct 11, 2005 REF: LOCOSTO-SPR-34629 - xpradipg Description: Temporary removal of animation logo and replacing with - static image - Solution: The Animation at bootup is removed and replaced with a static - image also the display of logo is done before initiating the - AT_CMD_CFUN full functionality + static image + Solution: The Animation at bootup is removed and replaced with a static + image also the display of logo is done before initiating the + AT_CMD_CFUN full functionality - Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken) - Solution: The CF state is maintained in flash. During bootup the CF icon in the idle screen - is displayed depending upon its state in the ffs + Jun 23, 2004 REF: CRR MMI-SPR-13599 Rashmi C N(Sasken) + Solution: The CF state is maintained in flash. During bootup the CF icon in the idle screen + is displayed depending upon its state in the ffs - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. Dec 23, 2005 REF: SR13873 - x0020906 Description : Store the FFS value into current sound structure @@ -66,8 +66,6 @@ *******************************************************************************/ - - /******************************************************************************* Include files @@ -255,83 +253,13 @@ *******************************************************************************/ -#if(0) /* x0039928 - Lint warning fix */ -/******************************************************************************* - - $Function: winEvent - - $Description: Window event handler, handles window visible events and - ignores all others - - $Returns: MFW_EVENT_CONSUMED or MFW_EVENT_PASSED - - $Arguments: e, event to be handles, w, window handle - -*******************************************************************************/ - -static int winEvent( MfwEvt e, MfwWin *w ) -{ - TRACE_FUNCTION("WinEvent(Start)"); - switch( e ) - { - case MfwWinVisible: - { - if (w->flags & MfwWinVisible) - show(); - } - break; - - default: - { - return MFW_EVENT_PASSED; - } - } - - return MFW_EVENT_CONSUMED; -} - - -/******************************************************************************* - - $Function: winanimEvent - - $Description: Handle events during the window animation - - $Returns: None. - - $Arguments: None. - -*******************************************************************************/ - -static int winanimEvent( MfwEvt e, MfwWin *w ) -{ - - TRACE_FUNCTION("winanimEvent"); - - switch( e ) - { - case MfwWinVisible: - dspl_ClearAll(); - - break; - default: - { - return MFW_EVENT_PASSED; - } - } - - return MFW_EVENT_CONSUMED; -} - -#endif - /******************************************************************************* $Function: startregis $Description: All we need to do here is start the SIM - $Returns: None. + $Returns: None. $Arguments: None. @@ -346,9 +274,6 @@ dspl_BitBlt2(WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y,176,60,(char *)&TIlogColour[0],0,ICON_TYPE_256_COL); #endif sim_activate(); - - - } /******************************************************************************* @@ -363,7 +288,7 @@ $Description: Initialises the MMI startup functions - $Returns: None. + $Returns: None. $Arguments: None. @@ -371,7 +296,6 @@ void startInit( void ) { - #ifdef FF_MMI_MMS /* TISHMMS Project */ extern void mms_wap_data_init(void); @@ -384,10 +308,10 @@ */ /* welcome_status = WELCOME; x0039928 - Lint warning fix */ - animation_complete = FALSE; + animation_complete = FALSE; - /* unset the flag for ready state at the beginning*/ - smsidle_unset_ready_state(); + /* unset the flag for ready state at the beginning*/ + smsidle_unset_ready_state(); /* setup signalling and AUTOFOCUS */ @@ -397,42 +321,42 @@ /* API/GW - Set Colour of displays */ colour_initial_colours(); - /* GW-SPR#1035-Added SAT changes by Nebi (changed initialisation order). */ - /* initialise network services */ - simToolkitInit( 0 ); - bookInitialise( 0 ); - callInit( 0 ); - iconsInit(); + /* GW-SPR#1035-Added SAT changes by Nebi (changed initialisation order). */ + /* initialise network services */ + simToolkitInit( 0 ); + bookInitialise( 0 ); + callInit( 0 ); + iconsInit(); #ifdef BTE_MOBILE - mmi_bt_init(); + mmi_bt_init(); #endif - /* Handlers created on windows */ - pin_init( 0 ); - networkInit( 0 ); - smsidle_start(0, NULL); - servicesInit( 0 ); + /* Handlers created on windows */ + pin_init( 0 ); + networkInit( 0 ); + smsidle_start(0, NULL); + servicesInit( 0 ); - idleInit( 0 ); + idleInit( 0 ); #ifndef FF_NO_VOICE_MEMO - voice_memo_init (); + voice_memo_init (); #endif - voice_mail_init (); - sms_cb_init (); + voice_mail_init (); + sms_cb_init (); - mmi_cphs_init(); + mmi_cphs_init(); - /* SPR#2346 - SH - GPRS */ + /* SPR#2346 - SH - GPRS */ #ifdef MMI_GPRS_ENABLED - GPRS_Init(); + GPRS_Init(); #endif /* GPRS */ #ifndef NEPTUNE_BOARD #ifdef FF_EM_MODE - mmi_em_init();/*MC SPR1209 engineering mode*/ + mmi_em_init();/*MC SPR1209 engineering mode*/ #endif /* SPR#2086 - SH - Startup WAP */ @@ -500,9 +424,9 @@ $Function: startExit $Description: Stops the MMI start windows, basically reverses the effect - of the startInit above + of the startInit above - $Returns: None. + $Returns: None. $Arguments: None. @@ -510,33 +434,33 @@ void startExit( void ) { - /* remove keyboard handlers - */ + /* remove keyboard handlers + */ kbdDelete(kbd); - kbd = 0; + kbd = 0; - /* SPR#2346 - SH - GPRS */ - #ifdef MMI_GPRS_ENABLED + /* SPR#2346 - SH - GPRS */ + #ifdef MMI_GPRS_ENABLED GPRS_Exit(); - #endif /* GPRS */ + #endif /* GPRS */ - /* shut down the sim toolkit - */ + /* shut down the sim toolkit + */ simToolkitExit(); - /* close the phonebook, calls, idle, services, icons, sounds - and network handlers - */ - bookExit(); + /* close the phonebook, calls, idle, services, icons, sounds + and network handlers + */ + bookExit(); #ifdef BTE_MOBILE - mmi_bt_exit(); + mmi_bt_exit(); #endif - callExit(); - idleExit(); - smsidle_destroy (); + callExit(); + idleExit(); + smsidle_destroy (); iconsExit(); cphs_exit(); //MC #ifdef NEPTUNE_BOARD @@ -556,10 +480,10 @@ $Description: start window execute method - $Returns: None. + $Returns: None. $Arguments: reason, for invoking the execute method, - next, not used passed for compatibility + next, not used passed for compatibility *******************************************************************************/ @@ -615,7 +539,7 @@ $Description: provides handle of currently focussed window - $Returns: mfwFocus + $Returns: mfwFocus $Arguments: None. @@ -630,9 +554,9 @@ $Function: showwelcome - $Description: shows a welcome Message when swiching on the mobile + $Description: shows a welcome Message when swiching on the mobile - $Returns: none + $Returns: none $Arguments: @@ -640,9 +564,7 @@ void showwelcome (T_MFW_HND win) /* SH - not static, as now externally called */ { - - TRACE_FUNCTION("showwelcome ()"); - + TRACE_FUNCTION("showwelcome ()"); idle_set_starting_up(FALSE); /*SPR#1662-NH Starting is finished for Idle */ // Oct 11, 2005 REF: LOCOSTO-SPR-34629 - xpradipg @@ -676,9 +598,9 @@ $Function: show_welcome_cb - $Description: shows a welcome Message when swiching on the mobile + $Description: shows a welcome Message when swiching on the mobile - $Returns: none + $Returns: none $Arguments: @@ -782,7 +704,6 @@ KEY_8, KEY_9, KEY_STAR, - }; void mfw_keyMap(int mfw_key, int hw_key) @@ -818,8 +739,6 @@ mfw_keyMap(KEY_MNUDOWN, KPD_KEY_DOWN); mfw_keyMap(KEY_MNULEFT, KPD_KEY_LEFT); mfw_keyMap(KEY_MNURIGHT, KPD_KEY_RIGHT); - - } #endif