changeset 67:40d5d4addfb2

mmiIcons.c: trailing white space fixes
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 23 Oct 2020 01:29:36 +0000
parents 74a034762083
children e9a4b683f697
files src/ui/bmi/mmiIcons.c
diffstat 1 files changed, 326 insertions(+), 326 deletions(-) [+]
line wrap: on
line diff
--- a/src/ui/bmi/mmiIcons.c	Fri Oct 23 01:22:30 2020 +0000
+++ b/src/ui/bmi/mmiIcons.c	Fri Oct 23 01:29:36 2020 +0000
@@ -2,52 +2,52 @@
 
 					CONDAT (UK)
 
-********************************************************************************                                                                              
+********************************************************************************
 
  This software product is the property of Condat (UK) Ltd and may not be
- disclosed to any third party without the express permission of the owner.                                 
-                                                                              
+ disclosed to any third party without the express permission of the owner.
+
 ********************************************************************************
 
- $Project name:	Basic MMI                                                      
- $Project code:	BMI (6349)                                                           
+ $Project name:	Basic MMI
+ $Project code:	BMI (6349)
  $Module:		Icons
  $File:		    Mmiicons.h
- $Revision:		1.0                                                       
-                                                                              
- $Author:		Condat(UK)                                                         
- $Date:		    25/10/00                                                      
-                                                                               
+ $Revision:		1.0
+
+ $Author:		Condat(UK)
+ $Date:		    25/10/00
+
 ********************************************************************************
-                                                                              
+
  Description:
 
     This provides the implementation of the icon handling in the basic MMI
-                        
+
 ********************************************************************************
  $History: Mmiicons.h
- 
+
        Jun 09, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)
        Description : CPHS Roaming indication feature implementation
        Solution     : As part of the implementation, in this file, roaming icon (small yellow triangle) is shown based on a global roaming flag
-       		      
+
 	Apr 17, 2006    REF: ER OMAPS00075178 x0pleela
    	Description: When the charger connect to phone(i-sample), the charger driver works, but the MMI and App don't work
    	Solution: Added  a counter to animate battery charging icons
    			Added Timer handler for Battery charging indication
-   			Added new function BattChargeEventTim which is the callback called 
-   				for the timeout of battery charging timer 
+   			Added new function BattChargeEventTim which is the callback called
+   				for the timeout of battery charging timer
 
 	Oct 28, 2004    REF: CRR 25886 xnkulkar
  	Description: SMS Icon is not seen in Idle Screen.
  	Solution: A check is done to determine if sms memory is full when the phone is in idle screen or
 			when any calls are present and blinking sms icon is displayed.
-			
-	Apr 27, 2004    REF: ENH 12646  Deepa M.D 
-	Fix:		When the SMS memory is full,the SMS icon is made to blink   
+
+	Apr 27, 2004    REF: ENH 12646  Deepa M.D
+	Fix:		When the SMS memory is full,the SMS icon is made to blink
 	SPR:12822 vvadiraj : Network Icon status info displayed always
-	25/10/00			Original Condat(UK) BMI version.	
-	   
+	25/10/00			Original Condat(UK) BMI version.
+
  $End
 *******************************************************************************/
 
@@ -55,9 +55,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 Include Files
-                                                                              
+
 *******************************************************************************/
 
 #define ENTITY_MFW
@@ -139,7 +139,7 @@
 #include "MmiTimers.h"
 /* sbh...21/01/02 */
 #ifdef MMI_GPRS_ENABLED
-#include "MmiGprs.h" 
+#include "MmiGprs.h"
 #endif
 #include "MmiResources.h"
 #include "mmiColours.h"
@@ -153,19 +153,19 @@
 
 //x0pleela 11 Apr, 2006 ER: OMAPS00075178
 //static counter to animate battery charging icons
-static int icon_ctr; 
+static int icon_ctr;
 /*******************************************************************************
-                                                                              
+
                                 Local definitions
-                                                                              
+
 *******************************************************************************/
 
 #define CLEAR_BOTTOM_ZONE_ICON dspl_Clear(42,54,52,60)
 
 /*******************************************************************************
-                                                                              
+
                                 Local function prototypes
-                                                                              
+
 *******************************************************************************/
 /* ADDED - 28-11-2005 */
 EXTERN BOOL smsidle_get_memory_full(void);
@@ -179,7 +179,7 @@
 #endif
 //  Apr 27, 2004    REF: ENH 12646  Deepa M.D
 static UBYTE smsStatus=0;  //Used to blink the SMS icon.0=Icon visible 1=Icon invisible
-MfwHnd sms_animate;      // Timer for SMS Full Icon 
+MfwHnd sms_animate;      // Timer for SMS Full Icon
 //x0pleela 11 Apr, 2006 ER: OMAPS00075178
 // Timer for Battery charging indication
 MfwHnd battery_charging_animate;
@@ -193,9 +193,9 @@
 #endif
 
 /*******************************************************************************
-										
+
 								  Icon Bitmaps
-                                                                              
+
 *******************************************************************************/
 
 /* battery  0-4%
@@ -203,52 +203,52 @@
 #ifndef COLOURDISPLAY
 static  const unsigned char idlBattery4[] =
 {
-    0xff,0x81,0x81,0x81,0xff            
+    0xff,0x81,0x81,0x81,0xff
 };
 
-/* battery  5-14%           
+/* battery  5-14%
 */
 static  const unsigned char idlBattery14[] =
 {
-    0xff,0xc1,0xc1,0xc1,0xff            
+    0xff,0xc1,0xc1,0xc1,0xff
 };
 
-/* battery  15-24%          
+/* battery  15-24%
 */
 static  const unsigned char idlBattery24[] =
 {
-    0xff,0xe1,0xe1,0xe1,0xff            
+    0xff,0xe1,0xe1,0xe1,0xff
 };
 
-/* battery  25-49%          
+/* battery  25-49%
 */
 static  const unsigned char idlBattery49[] =
 {
-    0xff,0xf9,0xf9,0xf9,0xff            
+    0xff,0xf9,0xf9,0xf9,0xff
 };
 
-/* battery  50-100%         
+/* battery  50-100%
 */
 static  const unsigned char idlBattery100[] =
 {
-    0xff,0xff,0xff,0xff,0xff         
+    0xff,0xff,0xff,0xff,0xff
 };
 
-/* SMS                      
+/* SMS
 */
 static  const unsigned char idlSMS[] =
 {
-   0xff,0xc3,0xa5,0x99,0xff             
+   0xff,0xc3,0xa5,0x99,0xff
 };
 
-/* Voice                    
+/* Voice
 */
 static const unsigned char idlVoice[] =
 {
   0x00,0x00,0x3F,0xC0,0x50,0xE0,0x89,0xF0,0x50,0xE0,0x00,0x00
 };
 
-/* Call forwarding uncond   
+/* Call forwarding uncond
 */
 static const unsigned char idlCallforw[] =
 {
@@ -257,11 +257,11 @@
 
 
 
-/* Keypad locked            
+/* Keypad locked
 */
 static const unsigned char idlKeypLock[] =
 {
-   0x41,0xa1,0xbe,0xa0,0x40             
+   0x41,0xa1,0xbe,0xa0,0x40
 };
 
 
@@ -269,84 +269,84 @@
 */
 static const unsigned char idlCipheringActiv[] =
 {
-   0x18,0x24,0x3c,0x24,0x3c             
+   0x18,0x24,0x3c,0x24,0x3c
 };
 
 static const unsigned char idlCipheringDeActiv[] =
 {
-   0x28,0x44,0x6c,0x6c,0x6c             
+   0x28,0x44,0x6c,0x6c,0x6c
 };
 
 
-/* Signal strength 0-49     
+/* Signal strength 0-49
 */
 static const unsigned char idlSigStr49[] =
 {
-    0x00,0x00,0x00,0x00,0x00            
+    0x00,0x00,0x00,0x00,0x00
 };
 
-/* Signal strength 50-99    
+/* Signal strength 50-99
 */
 static const unsigned char idlSigStr99[] =
 {
-    0x00,0x00,0x00,0x80,0x80            
+    0x00,0x00,0x00,0x80,0x80
 };
 
-/* Signal strength 100-149  
+/* Signal strength 100-149
 */
 static const unsigned char idlSigStr149[] =
 {
-    0x00,0x00,0x20,0xa0,0xa0            
+    0x00,0x00,0x20,0xa0,0xa0
 };
 
-/* Signal strength 150-199  
+/* Signal strength 150-199
 */
 static const unsigned char idlSigStr199[] =
 {
-    0x00,0x08,0x28,0xa8,0xa8            
+    0x00,0x08,0x28,0xa8,0xa8
 };
 
-/* Signal strength 200-255  
+/* Signal strength 200-255
 */
 static const unsigned char idlSigStr255[] =
 {
-    0x02,0x0a,0x2a,0xaa,0xaa            
+    0x02,0x0a,0x2a,0xaa,0xaa
 };
 
-/* sbh...18/01/02. GPRS On icon - appears when GPRS is on            
+/* sbh...18/01/02. GPRS On icon - appears when GPRS is on
 */
 static const unsigned char idlGPRSOn[] =
 {
-   0x3E,0x60,0x6E,0x66,0x3E             
+   0x3E,0x60,0x6E,0x66,0x3E
 };
 
-/* Homezone icon            
+/* Homezone icon
 */
 static const unsigned char idlHomezone[] =
 {
-   0x38,0x7C,0xFE,0xAA,0xEE             
+   0x38,0x7C,0xFE,0xAA,0xEE
 };
 
-/* SPR#1352 - SH - TTY icon            
+/* SPR#1352 - SH - TTY icon
 */
 static const unsigned char idlTTY[] =
 {
-   0x7D,0x7D,0x2A,0x2A,0x2A  
+   0x7D,0x7D,0x2A,0x2A,0x2A
 };
 #endif
 
-/* Silent ringer            
+/* Silent ringer
 */
 static const unsigned char idlSilRinger[] =
 {
-   0xa4,0xa4,0xbf,0xae,0x44             
+   0xa4,0xa4,0xbf,0xae,0x44
 };
 
 #ifdef NEPTUNE_BOARD
 /* OMAPS00074454 - Edge icon*/
 static const unsigned char idlEDGEOn[] =
 {
-   0x7E,0x40,0x78,0x40,0x7E             
+   0x7E,0x40,0x78,0x40,0x7E
 };
 /* END */
 #endif
@@ -706,7 +706,7 @@
 
 #endif
 
-/*Calculator Icon 
+/*Calculator Icon
 */
 #ifndef COLOURDISPLAY  /* x0039928 - Lint warning removal */
 static const unsigned char iconMainCalculator[] =
@@ -734,7 +734,7 @@
 
 };
 
-/*CallDivert Icon 
+/*CallDivert Icon
 */
 static const unsigned char iconMainCallDivert[] =
 {
@@ -760,7 +760,7 @@
 	0x00,0x00,0x00,0x00,0x00,0x00,
 };
 
-/*Messages Icon 
+/*Messages Icon
 */
 static const unsigned char iconMainMessages[] =
 {
@@ -786,7 +786,7 @@
 	0x00,0x00,0x0F,0xFF,0xFE,0x00,
 };
 
-/*Phonebook Icon 
+/*Phonebook Icon
 */
 static const unsigned char iconMainPhonebook[] =
 {
@@ -812,7 +812,7 @@
 	0x0B,0x00,0x00,0xFE,0x00,0x00,
 };
 
-/*RecentCalls Icon 
+/*RecentCalls Icon
 */
 static const unsigned char iconMainRecentCalls[] =
 {
@@ -838,7 +838,7 @@
 	0x00,0x00,0x00,0x00,0x00,0x00,
 };
 
-/*Security Icon 
+/*Security Icon
 */
 static const unsigned char iconMainSecurity[] =
 {
@@ -864,7 +864,7 @@
 	0x00,0x06,0x08,0x16,0x0C,0x18,
 };
 
-/*Settings Icon 
+/*Settings Icon
 */
 static const unsigned char iconMainSettings[] =
 {
@@ -890,7 +890,7 @@
 	0x14,0xFF,0xFD,0x00,0x00,0x00,
 };
 
-/*SimToolkit Icon 
+/*SimToolkit Icon
 */
 static const unsigned char iconMainSimToolkit[] =
 {
@@ -917,7 +917,7 @@
 };
 
 
-/*WAP Icon 
+/*WAP Icon
 */
 static const unsigned char iconMainWAP[] =
 {
@@ -945,16 +945,16 @@
 #endif
 #if 0
 //Old Condat logo
-/*animframe01 Icon 
+/*animframe01 Icon
 */
 static const unsigned char animframe01[] =
 {
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,
 	0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
-	
+
 };
 
-/*animframe0 Icon 
+/*animframe0 Icon
 */
 static const unsigned char animframe0[] =
 {
@@ -962,10 +962,10 @@
 	0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x1C, 0x00,0x00,0x00,0x00,0x00,0x00,0x1E,0x00,
 	0x00,0x00,0x00,0x00,0x00,0x1F,0x80,0x00, 0x00,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	
+
 };
 
-/*animframe1 Icon 
+/*animframe1 Icon
 */
 static const unsigned char animframe1[] =
 {
@@ -978,10 +978,10 @@
 	0x00,0x00,0x00,0x00,0x3F,0xC0,0x00,0x00, 0x00,0x00,0x00,0x3F,0x80,0x00,0x00,0x00,
 	0x00,0x00,0x0F,0x00,0x00,0x00,0x00,0x00, 0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x00,0x00,
-	
+
 };
 
-/*animframe2 Icon 
+/*animframe2 Icon
 */
 static const unsigned char animframe2[] =
 {
@@ -995,9 +995,9 @@
 	0x00,0x00,0x7F,0xC0,0x00,0x00,0x00,0x00, 0x00,0x3F,0x80,0x00,0x00,0x00,0x00,0x00,
 	0x0F,0x00,0x00,0x00,0x00,0x00,0x00,0x02, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,
-};	
-
-/*animframe3 Icon 
+};
+
+/*animframe3 Icon
 */
 static const unsigned char animframe3[] =
 {
@@ -1014,11 +1014,11 @@
 	0x00,
 };
 
-/*animframe4 Icon 
+/*animframe4 Icon
 */
 static const unsigned char animframe4[] =
 {
-	
+
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x1F,0xF8,0x00,0x00,0x00,0x00,
 	0x00,0x3F,0xF0,0x00,0x00,0x00,0x00,0x00, 0x7F,0xE0,0x00,0x00,0x00,0x00,0x00,0xFF,
 	0xC0,0x00,0x00,0x00,0x00,0x01,0xFF,0x80, 0x00,0x00,0x00,0x00,0x03,0xFF,0x00,0x00,
@@ -1033,11 +1033,11 @@
 	0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,
 };
 
-/*animframe5 Icon 
+/*animframe5 Icon
 */
 static const unsigned char animframe5[] =
 {
-	
+
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x2A,0xAA,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00, 0x9F,0xFE,0x00,0x00,0x00,0x00,0x00,0x3F,
 	0xFC,0x80,0x00,0x00,0x00,0x02,0x7F,0xF9, 0x00,0x00,0x00,0x00,0x00,0xFF,0xF0,0x00,
@@ -1054,11 +1054,11 @@
 	0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 };
 
-/*animframe6 Icon 
+/*animframe6 Icon
 */
 static const unsigned char animframe6[] =
 {
-	
+
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x22,0x22,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x01, 0x2A,0xAA,0x00,0x00,0x00,0x00,0x00,0x00,
 	0x00,0x80,0x00,0x00,0x00,0x04,0x9F,0xFE, 0x08,0x00,0x00,0x00,0x08,0x3F,0xFC,0x80,
@@ -1075,15 +1075,15 @@
 	0x00,0x00,0x00,0x10,0x47,0x05,0x00,0x00, 0x00,0x00,0x02,0x10,0x40,0x00,0x00,0x00,
 	0x00,0x04,0x45,0x14,0x00,0x00,0x00,0x00, 0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,
 	0x11,0x10,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
-	
-	
+
+
 };
 
-/*animframe7 Icon 
+/*animframe7 Icon
 */
 static const unsigned char animframe7[] =
 {
-	
+
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x80,0xA0,0x40,0x00,0x00,0x00,
 	0x00,0x10,0x08,0x04,0x00,0x00,0x00,0x08, 0x00,0x00,0x40,0x00,0x00,0x00,0x01,0x22,
 	0x22,0x00,0x00,0x00,0x00,0x00,0x14,0x51, 0x00,0x00,0x00,0x00,0x85,0x3F,0xFF,0x20,
@@ -1103,15 +1103,15 @@
 	0x00,0x00,0x00,0x00,0x00,0x11,0x12,0x00, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00, 0x00,0x00,0x80,0x40,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x00,0x00,0x00,
-	
-	
+
+
 };
 
-/*animframe8 Icon 
+/*animframe8 Icon
 */
 static const unsigned char animframe8[] =
 {
-	
+
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x80,0xA0,0x40,0x00,0x00,0x00,
 	0x00,0x10,0x08,0x04,0x00,0x00,0x00,0x08, 0x00,0x00,0x40,0x00,0x00,0x00,0x01,0x22,
 	0x22,0x00,0x00,0x00,0x00,0x00,0x55,0x55, 0x40,0x00,0x00,0x00,0x85,0x7F,0xFF,0xA0,
@@ -1131,8 +1131,8 @@
 	0x00,0x00,0x00,0x00,0x00,0x11,0x12,0x00, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00, 0x00,0x00,0x80,0x40,0x00,0x00,0x00,0x00,
 	0x00,0x00,0x00,0x00,0x00,0x00,
-	
-	
+
+
 };
 #endif
 
@@ -1142,7 +1142,7 @@
 /* eZitext Icon
 */
 
-static const unsigned char TextIconeZiText[] = 
+static const unsigned char TextIconeZiText[] =
 {
 	0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 	0x00,0x07,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -1354,7 +1354,7 @@
 /*    May 30, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)
        Description : CPHS Roaming indication feature implementation
        Solution     : As part of this implementation, here we adding the hexdump of the roaming icon(small yellow triangle)*/
-       
+
 #ifdef WIDEICONS
 /*21 x 22*/
 const unsigned char RoamingIcon[] = {
@@ -1410,9 +1410,9 @@
 
 #endif
 /*******************************************************************************
-                                                                              
+
                                 Icon Attribute structures
-                                                                              
+
 *******************************************************************************/
 //GW #1555 - Adapted icons for large monochrome display by scaling 2xwidth, 4xheight
 #ifndef COLOURDISPLAY
@@ -1441,10 +1441,10 @@
     { { 50,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCallforw  },	/* call forwarding uncond.  */
     { { 59,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlSilRinger },  	/* silent ringer            */
     /* Jun 09, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)*/
-    { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICONTYPE,  0 },					/*roaming icon*/ 
+    { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICONTYPE,  0 },					/*roaming icon*/
     { { 60,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlKeypLock  },   /* keypad locked            */
-    { { 23,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringActiv },		/* Ciphering       */    
-    { { 23,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringDeActiv },		/* Ciphering       */    
+    { { 23,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringActiv },		/* Ciphering       */
+    { { 23,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringDeActiv },		/* Ciphering       */
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICONTYPE,  0 },					/*ringer icon*/
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICONTYPE,  0 },					/*vibrator icon*/
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICONTYPE,  0 },					/*ringvibrator icon*/
@@ -1462,7 +1462,7 @@
     { { 60,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlTTY  },	/* SPR#1352 - SH - TTY icon           */
 #ifdef NEPTUNE_BOARD
 /* OMAPS00074454 - Edge icon display specification */
-    { { 60,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlEDGEOn  }		/* SH - EDGE On icon */		
+    { { 60,  1,  8,  5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlEDGEOn  }		/* SH - EDGE On icon */
 /*END  */
 #endif
 };
@@ -1477,10 +1477,10 @@
     { { 50*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCallforw  },	/* call forwarding uncond.  */
     { { 59*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlSilRinger },  	/* silent ringer            */
         /* Jun 09, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)*/
-    { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*roaming icon*/ 
+    { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*roaming icon*/
     { { 60*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlKeypLock  },   /* keypad locked            */
-    { { 23*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringActiv },		/* Ciphering       */    
-    { { 23*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringDeActiv },		/* Ciphering       */    
+    { { 23*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringActiv },		/* Ciphering       */
+    { { 23*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlCipheringDeActiv },		/* Ciphering       */
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*ringer icon*/
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*vibrator icon*/
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*ringvibrator icon*/
@@ -1498,7 +1498,7 @@
     { { 60*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlTTY  },	/* SPR#1352 - SH - TTY icon           */
 #ifdef NEPTUNE_BOARD
 /* OMAPS00074454 - Edge Icon display specification */
-    { { 60*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlEDGEOn  }		/* SH - EDGE On icon  */        
+    { { 60*ICNSX,  ICON_Y_OFS,  8*ICNSX,  5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlEDGEOn  }		/* SH - EDGE On icon  */
 /*END */
 #endif
 };
@@ -1522,7 +1522,7 @@
 #define ICON_POS_X_SIG		(ICON_WIDTH*7)
 #define ICON_POS_X_SRNG		(0)
 #else
-#define ICON_SX			(19)	
+#define ICON_SX			(19)
 #define ICON_WIDTH 			((SCREEN_SIZE_X)/9)
 #define ICON_POS_X_BATT		(0)
 #define ICON_POS_X_CPR		(ICON_WIDTH)
@@ -1548,8 +1548,8 @@
 	Roaming icon is made to overlap with voice mail indication icon since there's no space in the first row of the screen*/
     { { ICON_POS_X_VMAIL, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) RoamingIcon  },   /* Roaming Indication            */
     { { ICON_POS_X_KLK, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_klkColour  },   /* keypad locked            */
-    { { ICON_POS_X_CPR, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_cipheringActivColour },		/* Ciphering       */    
-    { { ICON_POS_X_CPR, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_cipheringDeactivColour },		/* Ciphering       */    
+    { { ICON_POS_X_CPR, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_cipheringActivColour },		/* Ciphering       */
+    { { ICON_POS_X_CPR, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_cipheringDeactivColour },		/* Ciphering       */
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*ringer icon*/
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*vibrator icon*/
     { {  0,  0,  0,  0 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  0 },					/*ringvibrator icon*/
@@ -1567,7 +1567,7 @@
     { { ICON_POS_X_HZONE,  ICON_POS_Y,  15,  14 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) idlTTYLarge  },	/* SPR#1958 - SH - TTY icon now larger,colour */
 #ifdef NEPTUNE_BOARD
 /* OMAPS00074454 - Edge icon - 24-04-2006*/
-    { { ICON_POS_X_GPRS, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,   (char *)I_edgeColour  },		/* sbh - EDGE On icon */	
+    { { ICON_POS_X_GPRS, ICON_POS_Y, ICON_SX, ICON_SY }, 	1, COLOUR_ICON_XX, ICON_TYPE_256_COL,   (char *)I_edgeColour  },		/* sbh - EDGE On icon */
 /* END */
 #endif
 };
@@ -1583,7 +1583,7 @@
     { { 3*ICNSX, ICON_Y_OFS, 8*ICNSX, 5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlBattery24  },	   	/* battery status 15-24%    */
     { { 3*ICNSX, ICON_Y_OFS, 8*ICNSX, 5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlBattery49  }, 		/* battery status 25-49%    */
     { { 3*ICNSX, ICON_Y_OFS, 8*ICNSX, 5*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlBattery100 }	    /* battery status 50-100%   */
-};	
+};
 #else
 const MfwIcnAttr batt_Attr [iconBattMax] =  	        /* all batt icon attributes */
 {
@@ -1592,7 +1592,7 @@
     { { 3, 1, 8, 5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlBattery24  },	   	/* battery status 15-24%    */
     { { 3, 1, 8, 5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlBattery49  }, 		/* battery status 25-49%    */
     { { 3, 1, 8, 5 }, 1, COLOUR_ICON_XX, ICONTYPE,  (char *) idlBattery100 }	    /* battery status 50-100%   */
-};	
+};
 #endif
 #else
 const MfwIcnAttr batt_Attr [iconBattMax] =  	        /* all batt icon attributes */
@@ -1602,7 +1602,7 @@
     { { ICON_POS_X_BATT, ICON_POS_Y, ICON_SX, ICON_SY }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_batColour24  },	   	/* battery status 15-24%    */
     { { ICON_POS_X_BATT, ICON_POS_Y, ICON_SX, ICON_SY }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_batColour49  }, 		/* battery status 25-49%    */
     { { ICON_POS_X_BATT, ICON_POS_Y, ICON_SX, ICON_SY }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) I_batColour100 }	    /* battery status 50-100%   */
-};	
+};
 #endif
 
 #ifndef COLOURDISPLAY
@@ -1642,15 +1642,15 @@
 #ifndef COLOURDISPLAY
 const MfwIcnAttr goodbye_Attr [animGoodbye] =  	        /* all goodby icon attributes */
 {
-/*    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe8 }, 		
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe7 },	    
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe6 },	   
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe5 }, 		
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe4 },	    
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe3 }, 	
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe2 },	   
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe1 }, 
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe0 },	    
+/*    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe8 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe7 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe6 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe5 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe4 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe3 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe2 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe1 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe0 },
     { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe01 }	    */
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
@@ -1662,20 +1662,20 @@
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] }
-};	
-
-const MfwIcnAttr welcome_Attr [animwelcome] =  	        
+};
+
+const MfwIcnAttr welcome_Attr [animwelcome] =
 {
-/*    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe01 },		
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe0 },	   
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe1 },	   
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe2 }, 	
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe3 },	  
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe4 }, 		
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe5 },	    
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe6 }, 		
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe7 },	    
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe8 }	    
+/*    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe01 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe0 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe1 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe2 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe3 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe4 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe5 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe6 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe7 },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *) animframe8 }
 */
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
@@ -1687,85 +1687,85 @@
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] },
 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] }
-};	
+};
 
 #else
 
-const MfwIcnAttr welcome_Attr [animwelcome] =  	    
+const MfwIcnAttr welcome_Attr [animwelcome] =
 {
-	{ { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  },	
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  }	
+	{ { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  }
 
 };
 /* GW #1471 11/12/02 - Add TI logo as powerdown animation */
 const MfwIcnAttr goodbye_Attr [animGoodbye] =  	        /* all goodby icon attributes */
 {
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  },	
-    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  }	
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  },
+    { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *)&TIlogColour[0]  }
 };
 
 
 #endif
 
 #ifdef COLOURDISPLAY
-const MfwIcnAttr incoming_call_animate [CALLANIMATION] = { 
+const MfwIcnAttr incoming_call_animate [CALLANIMATION] = {
 	{{40,5,100,80},1,COLOUR_ICON_XX,BMP_FORMAT_32BIT_COLOUR, (char *)callAnimation1},
 	{{40,5,100,80},1,COLOUR_ICON_XX,BMP_FORMAT_32BIT_COLOUR, (char *)callAnimation2},
 	{{40,5,100,80},1,COLOUR_ICON_XX,BMP_FORMAT_32BIT_COLOUR, (char *)callAnimation3},
 	{{40,5,100,80},1,COLOUR_ICON_XX,BMP_FORMAT_32BIT_COLOUR, (char *)callAnimation2}
-	
+
 };
 
 #endif
 #if(0) /* x0039928 - Lint warning removal */
-/* test                     
+/* test
 */
-static const MfwIcnAttr simtool     =			
+static const MfwIcnAttr simtool     =
 {
     { 24, 18, 40, 28 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) SIMToolAll
 };
 
-/* icon messages            
+/* icon messages
 */
-static const MfwIcnAttr mess        =			
+static const MfwIcnAttr mess        =
 {
     { 24, 18, 40, 28 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) MessageAll
 };
 
-/* icon organiser           
+/* icon organiser
 */
-static const MfwIcnAttr organ       =			
+static const MfwIcnAttr organ       =
 {
     { 0, 0, 0, 0 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, 0
 };
 
-/* icon sounds              
+/* icon sounds
 */
-static const MfwIcnAttr sound       =			
+static const MfwIcnAttr sound       =
 {
     { 0, 0, 0, 0 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, 0
 };
 
 
-/* icon settings            
+/* icon settings
 */
-static const MfwIcnAttr sett         =			
+static const MfwIcnAttr sett         =
 {
     { 0, 0, 0, 0 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, 0
 };
 
 
-/* icon services            
+/* icon services
 */
-static const MfwIcnAttr servic       =			
+static const MfwIcnAttr servic       =
 {
     { 0, 0, 0, 0 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, 0
 };
 
 
-/* icon extras              
+/* icon extras
 */
-static const MfwIcnAttr extr         =			
+static const MfwIcnAttr extr         =
 {
     { 0, 0, 0, 0 }, 4, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, 0
 };
@@ -1773,7 +1773,7 @@
 
 /*** MAIN ICONS **/
 
-MfwIcnAttr mainIconSimToolkit        =			
+MfwIcnAttr mainIconSimToolkit        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainSimToolkit
@@ -1782,7 +1782,7 @@
 #endif
 };
 
-MfwIcnAttr mainIconCalculator        =			
+MfwIcnAttr mainIconCalculator        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainCalculator
@@ -1795,7 +1795,7 @@
 #endif
 };
 
-MfwIcnAttr mainIconSettings        =			
+MfwIcnAttr mainIconSettings        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainSettings
@@ -1808,7 +1808,7 @@
 #endif
 };
 
-MfwIcnAttr mainIconRecentCalls        =	
+MfwIcnAttr mainIconRecentCalls        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainRecentCalls
@@ -1821,7 +1821,7 @@
 
 #endif
 };
-MfwIcnAttr mainIconCallDivert        =			
+MfwIcnAttr mainIconCallDivert        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainCallDivert
@@ -1831,10 +1831,10 @@
 #else
 	{ 0, 12, 96, 96 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL,  (char *) netWorkServices96x96_bmp
 #endif
-	
+
 #endif
 };
-MfwIcnAttr mainIconSecurity        =			
+MfwIcnAttr mainIconSecurity        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainSecurity
@@ -1846,7 +1846,7 @@
 #endif
 #endif
 };
-MfwIcnAttr mainIconMessages        =			
+MfwIcnAttr mainIconMessages        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainMessages
@@ -1859,7 +1859,7 @@
 #endif
 };
 
-MfwIcnAttr mainIconPhonebook        =		
+MfwIcnAttr mainIconPhonebook        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainPhonebook
@@ -1872,7 +1872,7 @@
 #endif
 };
 
-MfwIcnAttr mainIconWAP		        =		
+MfwIcnAttr mainIconWAP		        =
 {
 #ifndef COLOURDISPLAY
     { 2, 8, 80*ICNSX, 31*ICNSY }, 1, COLOUR_ICON_XX, ICONTYPE, (char *) iconMainWAP
@@ -1885,10 +1885,10 @@
 #endif
 };
 
-MfwIcnAttr mainIconGoodbye        =		
+MfwIcnAttr mainIconGoodbye        =
 {
 //    { 13, 0, 56, 48 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8
-	{ WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0] 
+	{ WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y   ,  56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED,  (char *)&TILogo_bw[0]
 };
 
 #ifdef EASY_TEXT_ENABLED
@@ -1897,28 +1897,28 @@
 #ifdef COLOURDISPLAY
 MfwIcnAttr IconTexteZiText			=
 {
-	{(SCREEN_SIZE_X / 2) - 40, (SCREEN_SIZE_Y / 2) - 10, 80, 20}, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) TextIconeZiText 
+	{(SCREEN_SIZE_X / 2) - 40, (SCREEN_SIZE_Y / 2) - 10, 80, 20}, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) TextIconeZiText
 };
 #else
 MfwIcnAttr IconTexteZiText			=
 {
-	{2, 8, 80, 20}, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) TextIconeZiText 
+	{2, 8, 80, 20}, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) TextIconeZiText
 };
 #endif
 /* API - 03/09/03 - SPR2383 - END*/
 
 MfwIcnAttr IconTexteZiTextSmall			=
 {
-	{2, 12, 8, 8}, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) TextIconeZiTextSmall 
+	{2, 12, 8, 8}, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) TextIconeZiTextSmall
 };
 
 #endif
 
 #ifdef COLOURDISPLAY
-MfwIcnAttr mainIconBackground = 
+MfwIcnAttr mainIconBackground =
 	{{ 0, 0, 176, 220 }, 1, COLOUR_ICON_XX, COLOUR_ICON_XX,  (char *)bmpDataSquares };
 #else
-MfwIcnAttr mainIconBackground = 
+MfwIcnAttr mainIconBackground =
 	{{ 0, 0, SCREEN_SIZE_X, SCREEN_SIZE_Y  }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED,  NULL };
 #endif
 
@@ -1927,16 +1927,16 @@
  $Function:    	icon_setMainBgdBitmap
 
  $Description:	Change the background bitmap for the main menu to the id supplied
- 
+
  $Returns:		None.
 
  $Arguments:	bmpId - enumerated type for background bitmaps
- 
+
 *******************************************************************************/
 void icon_setMainBgdBitmap (int bmpId)
 {
 	TRACE_FUNCTION("icon_setMainBgdBitmap()");
-	icon_getBitmapFromId(bmpId,  &mainIconBackground);		
+	icon_getBitmapFromId(bmpId,  &mainIconBackground);
 }
 
 
@@ -1949,11 +1949,11 @@
     { { 34, 8, 16, 26 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) screenpart2 },	   	/* screenpart2*/
     { { 50, 8, 16, 26 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) screenpart3 }, 	/* screenpart3*/
     { { 66, 8, 16, 26 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) screenpart4 }	    /* screenpart4*/
-};	
+};
 /*******************************************************************************
-                                                                              
+
                                 Additional type definitions
-                                                                              
+
 *******************************************************************************/
 
 typedef struct iconStateTag             /* state icons              */
@@ -1964,9 +1964,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 Static data
-                                                                              
+
 *******************************************************************************/
 
 static IconState state[ idlIdMax ];
@@ -1977,9 +1977,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 Private Methods
-                                                                              
+
 *******************************************************************************/
 
 
@@ -1988,11 +1988,11 @@
  $Function:    	iconsEvent
 
  $Description:	handle an icon event, empty handler
- 
+
  $Returns:		None.
 
  $Arguments:	e, event, i, icon
- 
+
 *******************************************************************************/
 
 static void iconsEvent( MfwEvt e, MfwIcn *i )
@@ -2005,11 +2005,11 @@
  $Function:    	iconsBattEvent
 
  $Description:	handle a battery icon event, empty handler
- 
+
  $Returns:		None.
 
  $Arguments:	e, event, i, icon
- 
+
 *******************************************************************************/
 
 static void iconsBattEvent( MfwEvt e, MfwIcn *i )
@@ -2023,11 +2023,11 @@
  $Function:    	iconsSignEvent
 
  $Description:	handle a signal icon event, empty handler
- 
+
  $Returns:		None.
 
  $Arguments:	e, event, i, icon
- 
+
 *******************************************************************************/
 
 static void iconsSignEvent( MfwEvt e, MfwIcn *i )
@@ -2041,11 +2041,11 @@
  $Function:    	iconsScreenDelete
 
  $Description:	Clears the icon area of all currently displayed icons
- 
+
  $Returns:		None.
 
  $Arguments:	None.
- 
+
 *******************************************************************************/
 
 static void iconsScreenDelete( void )
@@ -2061,11 +2061,11 @@
  $Function:    	iconsShowIcon
 
  $Description:	display a single icon if it is currently visible
- 
+
  $Returns:		None
 
  $Arguments:	Icon, pointer to the icon in question
- 
+
 *******************************************************************************/
 
 static void iconsShowIcon( IconState *Icon )
@@ -2081,9 +2081,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 Public Methods
-                                                                              
+
 *******************************************************************************/
 
 /*******************************************************************************
@@ -2091,11 +2091,11 @@
  $Function:    	iconsInit
 
  $Description:	Initialise the MMI Icon handling
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 void iconsInit()
@@ -2137,11 +2137,11 @@
  $Function:    	iconsExit
 
  $Description:	Exit the MMI icons handling
- 
+
  $Returns:		None.
 
  $Arguments:	None.
- 
+
 *******************************************************************************/
 
 void iconsExit( void )
@@ -2168,11 +2168,11 @@
  $Function:    	iconsGetState
 
  $Description:	Get the state of an icon ICON_VISIBLE/ICON_INVISIBLE
- 
+
  $Returns:		Return state of icon.
 
  $Arguments:	iconId, the id of the icon to be set
- 
+
 *******************************************************************************/
 
 U8 iconsGetState( int iconId )
@@ -2192,11 +2192,11 @@
  $Function:    	iconsSetState
 
  $Description:	Sets the state of an icon to be visible
- 
+
  $Returns:		None
 
  $Arguments:	iconId, the id of the icon to be set
- 
+
 *******************************************************************************/
 
 void iconsSetState( int iconId )
@@ -2217,11 +2217,11 @@
  $Function:    	iconsDeleteState
 
  $Description:	Sets the state of an icon to be invisible
- 
+
  $Returns:		None
 
  $Arguments:	iconId, the id of the icon to be deleted
- 
+
 *******************************************************************************/
 
 void iconsDeleteState( int iconId )
@@ -2241,17 +2241,17 @@
  $Function:    	iconsShow
 
  $Description:	Show the current set of icons on the display
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 void iconsShow( void )
 {
 #ifdef NEPTUNE_BOARD
-    int iResult = 0;  /* Get the GPRS Status */ 
+    int iResult = 0;  /* Get the GPRS Status */
 #endif
 
     TRACE_FUNCTION("iconsShow");
@@ -2274,7 +2274,7 @@
 		  TRACE_EVENT_P1("iconsShow:globalBatteryPicNumber:%d", globalBatteryPicNumber);
 			iconsShowBattery( globalBatteryPicNumber );
 		}
-		
+
 		if ( GlobalIconStatus & GlobalSignalIconFlag )
 			iconsShowSignal( globalSignalPicNumber );
 		//  Apr 27, 2004    REF: ENH 12646  Deepa M.D
@@ -2309,7 +2309,7 @@
 		#ifdef MMI_GPRS_ENABLED
 		if ( GlobalIconStatus & GlobalGPRSOnIconFlag )
 		{
-#ifdef NEPTUNE_BOARD		
+#ifdef NEPTUNE_BOARD
 			iResult = GPRS_Status();
 
 			if (iResult == GPRS_ATTACHED)
@@ -2330,9 +2330,9 @@
 
 		/* SPR#1985 - SH - Only show one of TTY or Homezone icons.
 		 * Homezone takes precedence */
-		 
+
 		/* Show Homezone icon. */
-		
+
 		#ifdef MMI_HOMEZONE_ENABLED
 		if ( GlobalIconStatus & GlobalHomezoneIconFlag )
 		{
@@ -2351,7 +2351,7 @@
 		/* end SH */
 
 
-		
+
 
 		if ( GlobalIconStatus & GlobalAlarmIconFlag )
 			iconsShowIcon( &state[ iconIdAlarm ] );
@@ -2359,7 +2359,7 @@
 /*    May 30, 2006 REF:OMAPS00079650  a0393213 (R.Prabakar)
        Description : CPHS Roaming indication feature implementation
        Solution     : As part of this implementation, roaming icon is showed based on a flag corresponding to roaming*/
- 
+
 		if(GlobalIconStatus & GlobalRoamingIconFlag)
 			iconsShowIcon(&state[iconIdRoaming]);
 	//Change the colour back to what the menu was.
@@ -2371,30 +2371,30 @@
  $Function:    	iconsShowBattery
 
  $Description:	Show battery status icons
- 
+
  $Returns:		0 if error detected, otherwise 1
 
  $Arguments:	batterystatus, the current battery icon to be displayed
- 
+
 *******************************************************************************/
 
 int iconsShowBattery( U8 batterystatus )
 {
   MfwIcn *icn;
   int i;
-  
+
   TRACE_FUNCTION("iconsShowBattery()");
 
   /* If we have an error, ie invalid id then return 0 */
   	/* x0045876, 14-Aug-2006 (WR - pointless comparison of unsigned integer with zero) */
-	/* 	if ( ( batterystatus < 0 ) || ( batterystatus >= iconBattMax ) ) */  
+	/* 	if ( ( batterystatus < 0 ) || ( batterystatus >= iconBattMax ) ) */
 	if (batterystatus >= iconBattMax)
         return 0;
-	
+
   if( (globalMobileMode & (GlobalMobileOn|GlobalCharging)) AND
        (globalBatteryMode NEQ GlobalBatteryFull) )
   {
-    if ( idleIsFocussed() AND battery_charging_animate) 
+    if ( idleIsFocussed() AND battery_charging_animate)
     {
       icn=((MfwHdr *)battstate[ icon_ctr].h)->data;
       dspl_BitBlt2(icn->attr->area.px,icn->attr->area.py,
@@ -2404,7 +2404,7 @@
     }
   }
  else
-  {			
+  {
 	/* Otherwise clear all of the battery icons, and then set the
 	   selected value to be visible
 	*/
@@ -2424,11 +2424,11 @@
  $Function:    	BattChargeEventTim
 
  $Description:	Timer callback for battery charging animation
- 
+
  $Returns:		0 if error detected, otherwise 1
 
- $Arguments:	
- 
+ $Arguments:
+
 *******************************************************************************/
 //x0pleela 11 Apr, 2006  ER: OMAPS00075178
 int BattChargeEventTim( MfwEvt e, MfwTim *tc )
@@ -2454,33 +2454,33 @@
        }
 	battstate[ icon_ctr ].state = ICON_VISIBLE;
 
-	/* and display the current selection */  
+	/* and display the current selection */
 	icnUnhide(battstate[ icon_ctr ].h );
-    	
+
 	windowsUpdate();  //redraw the idle screen again.
 	timStart(battery_charging_animate);
-    }	
+    }
     else    //else stop animation
     {
       if (battery_charging_animate)
         timStop(battery_charging_animate);
-     }	
+     }
    }
   return MFW_EVENT_CONSUMED;
 }
 
 
-//  Apr 27, 2004    REF: ENH 12646  Deepa M.D 
+//  Apr 27, 2004    REF: ENH 12646  Deepa M.D
 /*******************************************************************************
 
   $Function:    	iconsShowSmsFull
-  
-  $Description:	When SMS meory is full,start the timer for blinking the icon. 
-	
+
+  $Description:	When SMS meory is full,start the timer for blinking the icon.
+
   $Returns:		0 if error detected, otherwise 1
-	  
+
   $Arguments:	None
-		
+
 *******************************************************************************/
 int iconsShowSmsFull(  )
 {
@@ -2488,9 +2488,9 @@
 	TRACE_FUNCTION("iconsShowSmsFull");
 	if(isIconBlinking==1)
 	{
-		if(smsStatus==0)  
+		if(smsStatus==0)
 		{
-			
+
 			icn=((MfwHdr *)state[ iconIdSMS ] .h)->data;
 			dspl_BitBlt2(icn->attr->area.px,icn->attr->area.py,
 				icn->attr->area.sx,icn->attr->area.sy,
@@ -2498,50 +2498,50 @@
 		}
 		return 0;
 	}
-	
+
 	isIconBlinking=1;
-	
+
 	if (sms_animate)
 	{
-		
+
 		timStart(sms_animate);
 	}
-	
+
 	return 1;
 }
 
 
-//  Apr 27, 2004    REF: ENH 12646  Deepa M.D 
+//  Apr 27, 2004    REF: ENH 12646  Deepa M.D
 /*******************************************************************************
 
   $Function:    	smsFullEventTim
-  
-  $Description:	Callback function for SMSFull timer.The SMS icon is toggled between visible 
+
+  $Description:	Callback function for SMSFull timer.The SMS icon is toggled between visible
 				and invisible.
-				
+
   $Returns:	Event consumed
-				  
-  $Arguments: unused	
-					
+
+  $Arguments: unused
+
 *******************************************************************************/
 
 int smsFullEventTim( MfwEvt e, MfwTim *tc )
 {
-	
+
 	TRACE_FUNCTION("smsFullEventTim");
 
 //	Oct 28, 2004    REF: CRR 25886 xnkulkar
 // 	Description: SMS Icon is not seen in Idle Screen.
 // 	Solution: A check is done to determine if sms memory is full when the phone is in idle screen or
-//			when any calls are present and blinking sms icon is displayed.		
-	if(idleIsFocussed() ||(call_data.calls.numCalls!=0))    
+//			when any calls are present and blinking sms icon is displayed.
+	if(idleIsFocussed() ||(call_data.calls.numCalls!=0))
 	{
 		smsStatus++;
 		/* x0045876, 14-Aug-2006 (WR - pointless comparison of unsigned integer with zero) */
 		/* if( smsStatus<0 ||  smsStatus>=2) */
 		if(smsStatus>=2)
 			smsStatus=0;
-		
+
 		if(smsStatus==0)   //The icon will be visible
 		{
 			state[ iconIdSMS ] .state = ICON_VISIBLE;
@@ -2557,18 +2557,18 @@
 		{
 			timStart(sms_animate);
 		}
-		
+
 	}
 	else    //else stop the timer for blinking.
 	{
 		isIconBlinking=0;
-		
+
 		if (sms_animate)
 		{
 			timStop(sms_animate);
 		}
 	}
-	
+
 	return MFW_EVENT_CONSUMED;
 }
 
@@ -2577,12 +2577,12 @@
 
  $Function:    	iconShowGoodbye
 
- $Description:	
- 
- $Returns:		
-
- $Arguments:	
- 
+ $Description:
+
+ $Returns:
+
+ $Arguments:
+
 *******************************************************************************/
 
 void iconShowGoodbye( void)
@@ -2597,11 +2597,11 @@
  $Function:    	iconsShowSignal
 
  $Description:	Shows the signal status icons
- 
+
  $Returns:		0 if error detected, otherwise 1
 
  $Arguments:	signalstatus, the current signal icon to be displayed
- 
+
 *******************************************************************************/
 
 int iconsShowSignal (U8 signalstatus)
@@ -2636,11 +2636,11 @@
  $Function:    	iconsInputShow
 
  $Description:	show current input icons
- 
+
  $Returns:		None
 
  $Arguments:	IconInputId, id of icon to be displayed
- 
+
 *******************************************************************************/
 
 void iconsInputShow (int IconInputId)
@@ -2654,11 +2654,11 @@
  $Function:    	iconsMainIconsAreaSet
 
  $Description:	sets the current main icons area
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 #ifndef LSCREEN
@@ -2679,7 +2679,7 @@
 	{
 		iconArea->py = display_area->py + (display_area->sy - iconArea->sy)/2;
 	}
-	else 
+	else
 	{
 		iconArea->py = display_area->py;
 
@@ -2688,7 +2688,7 @@
 #ifndef LSCREEN
 /*With the small screen we change the size of the idle icons (when changing language)*/
 		else
-			iconArea->sy = MAIN_ICON_Y;			
+			iconArea->sy = MAIN_ICON_Y;
 #endif
 	}
 }
@@ -2696,7 +2696,7 @@
 void iconsMainIconsAreaSet (MfwRect selected_area)
 {
 
-	
+
 	copyAreaAttr( &mainIconSimToolkit.area,    &selected_area);
 	copyAreaAttr( &mainIconCalculator.area,	&selected_area);
 	copyAreaAttr( &mainIconSettings.area,	&selected_area);
@@ -2708,7 +2708,7 @@
 	copyAreaAttr( &mainIconPhonebook.area,	&selected_area);
 
 /*
-#ifdef COLOURDISPLAY	
+#ifdef COLOURDISPLAY
 #ifdef USE110X110
 	//No 110x110 for sim toolkit yet
 	mainIconSimToolkit.area.sx   =   96;
@@ -2726,18 +2726,18 @@
 
  $Function:    	()
 
- $Description:	
- 
+ $Description:
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 #ifdef COLOURDISPLAY
 static T_BITMAP bgdBmpBubbles		= 	{{0,0,120,120},1,COLOUR_ICON_XX,BMP_FORMAT_32BIT_COLOUR,(char*) bmpDataBubbles};
 static T_BITMAP bgdBmpCloud 		= 	{{0,0,120,100},1,COLOUR_ICON_XX,BMP_FORMAT_32BIT_COLOUR,(char*) bmpDataCloud};
 /* x0039928 - Lint warning removal
-static T_BITMAP bgdBmpSquares 		= 	{{0,0,176,220},1,COLOUR_ICON_XX, ICON_TYPE_16BIT_COL,  (char *)bmpDataSquares }; 
+static T_BITMAP bgdBmpSquares 		= 	{{0,0,176,220},1,COLOUR_ICON_XX, ICON_TYPE_16BIT_COL,  (char *)bmpDataSquares };
 static T_BITMAP bgdBmpO2 			= 	{{0,0,120,100},1,COLOUR_ICON_XX,BMP_FORMAT_16BIT_LCD_COLOUR,(char*) bmpDataSquares};
 static T_BITMAP bgdBmpTree			= 	{{0,0,120,100},1,COLOUR_ICON_XX,BMP_FORMAT_16BIT_LCD_COLOUR,(char*) bmpDataSquares}; */
 // by Nitin to set the TI Logo position
@@ -2790,7 +2790,7 @@
 			return (&Edinburgh4_Bgd);
 		case BGD_INCALL:
 			return(&call_backdrop);
-			
+
 	}
 #endif
 	return (NULL);
@@ -2803,12 +2803,12 @@
  $Function:    	addnetwork
 
  $Description:	This function adds a link between a bitmap and a network number.
- 
+
  $Returns:		None
 
  $Arguments:	networkBitmap - pointer to the bitmap data
  				networkNo - pointer to the UBYTE array containing the network number
- 
+
 *******************************************************************************/
 #define MAX_NETWORK_NUMBER 50
 typedef struct {
@@ -2846,14 +2846,14 @@
 
  $Function:    	icon_initNetworkBitmaps
 
- $Description:	This procedure initialises the link between a network icon and a network 
+ $Description:	This procedure initialises the link between a network icon and a network
  				number.
  				NB This data should probably be stored in flash.
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 void icon_initNetworkBitmaps( void )
 {
@@ -2862,18 +2862,18 @@
 	{
 		networkBitmap[i].num = NULL;
 		networkBitmap[i].bmp = NULL;
-	} 
+	}
 	//AP - 29-01-03 - initialise the value to true to show the Bitmap
 	//FFS_flashData.ProviderNetworkShow = FFS_flashData.ProviderNetworkShow;
 /* API - 29-01-03 - Allowed to uses these service provider bitmaps O2 is still commented out we
 					dont have this bitmap yet.
-*/	
+*/
 /* T MOBILE Bitmaps */
 	addnetwork(&Tmobile_icon,		"23430");	/* UK */
 	addnetwork(&Tmobile_icon,		"23431");	/* UK */
 	addnetwork(&Tmobile_icon,		"23432");	/* UK */
 	addnetwork(&Tmobile_icon,		"23203");	/* Austria */
-	addnetwork(&Tmobile_icon,		"23001");	/* Czeck */	
+	addnetwork(&Tmobile_icon,		"23001");	/* Czeck */
 	addnetwork(&Tmobile_icon,		"26201");	/* Germany */
 	addnetwork(&Tmobile_icon,		"TMO UK");	/* UK */
 
@@ -2891,16 +2891,16 @@
 	addnetwork(&Tmobile_icon,		"31066");	/* USA */
 	addnetwork(&Tmobile_icon,		"31080");	/* USA */
 
-/* VODAFONE Bitmaps */	
+/* VODAFONE Bitmaps */
 	addnetwork(&Vodafone_icon, 	 	"23415");	/* UK */
 	addnetwork(&Vodafone_icon,		"26202");	/* Germany */
 	addnetwork(&Vodafone_icon,		"27201");	/* Ireland */
 	addnetwork(&Vodafone_icon,		"20404");	/* Holand */
 	addnetwork(&Vodafone_icon,		"24008");	/* Sweden */
-	
+
 /* O2 Bitmaps */
 //	addnetwork(&O2UK_bmp,				"23410");
-	
+
 /* Orange Bitmaps */
 	addnetwork(&orange_icon, 		"34001");
 	addnetwork(&orange_icon, 		"20801");
@@ -2912,15 +2912,15 @@
 
 /*******************************************************************************
 
- $Function:    	
+ $Function:
 
  $Description:	function to convert 'n' characters in an UBYTE array into a positive integer.
- 
+
  $Returns:		Value in the string
 
  $Arguments:	str - pointer to the string
- 				maxChar - last possible char of the number 
- 
+ 				maxChar - last possible char of the number
+
 *******************************************************************************/
 int UbyteToInt(UBYTE* str, int maxChar)
 {
@@ -2941,12 +2941,12 @@
  $Function:    	icon_getNetworkIcon
 
  $Description:	This procedure returns a bitmap based on the suplied network number.
- 
+
  $Returns:		Pointer to the network logo bitmap
 
  $Arguments:	networkNumber - array of data corresponding to the network number
  				NB This may not be null terminated.
- 
+
 *******************************************************************************/
 T_BITMAP* icon_getNetworkIcon( UBYTE* networkNumber)
 {
@@ -2962,7 +2962,7 @@
 	// AP - 29-01-03 - IF this is satisfied we dont want to show provider icon
 	if( FFS_flashData.ProviderNetworkShow == FALSE )
 		return ( NULL );
-	
+
 	//NB: NetworkNumber may not be null terminated
 	for (i=0;i<SIZE_PLMN_NAME;i++)
 		num[i] = (char)networkNumber[i];
@@ -2980,11 +2980,11 @@
  $Function:    	icon_getBitmapIdFromText()
 
  $Description:	This procedure selects a bitmap Id depending on the textid passed to it.
- 
+
  $Returns:		data - enumerated type corresponding to the desired bitmap
 
  $Arguments:	mnuId - text id corresponding to the desired bitmap
- 
+
 *******************************************************************************/
 int icon_getBitmapIdFromText( int mnuId )
 {
@@ -3036,16 +3036,16 @@
  $Description:	This procedure selects a bitmap depending on the bgd id passed to it.
  				The procedure can return a pointer to the data or, if a data structure is
  				already in use, can copy the data out into the new structure.
- 
+
  $Returns:		data - pointer to the bitmap
 
  $Arguments:	bgdId - enumerated type corresponding to the desired bitmap
  				*bmpData - pointer to a structure that can store the bitmap data (if required)
- 
+
 *******************************************************************************/
 T_BITMAP *icon_getBitmapFromId( int bgdId, T_BITMAP *bmpData)
 {
-	T_BITMAP* data; 
+	T_BITMAP* data;
 	TRACE_FUNCTION("icon_getBitmapFromId()");
 
 	data = icon_getBgdBitmap( bgdId );
@@ -3064,10 +3064,10 @@
 			bmpData->area.sx 	= 	data->area.sx;
 			bmpData->area.sy 	= 	data->area.sy;
 			bmpData->area.sx 	= 	data->area.sx;
-    		bmpData->nIcons		=	data->nIcons;       
+    		bmpData->nIcons		=	data->nIcons;
     		bmpData->iconCol	=	data->iconCol;
-    		bmpData->icnType	=	data->icnType;	
-    		bmpData->icons		=	data->icons; 
+    		bmpData->icnType	=	data->icnType;
+    		bmpData->icons		=	data->icons;
 		}
 	}
 	return (data);
@@ -3079,11 +3079,11 @@
  $Function:    	icon_bgdMenuSelected()
 
  $Description:	This procedure is called when a background image is selected from a menu.
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 int icon_bgdMenuSelected(MfwMnu* mnu, MfwMnuItem* mnuItem)
 {
@@ -3099,7 +3099,7 @@
  	//The destination for the bitmap has been storeed by the previous menu selection
 	storedMenuId = MmiBook_getStoredOption();
 	mnuId = (int)mnuItem->str;
-	
+
 	//Get the BMI index corresponding to the text string
 	bmpId = icon_getBitmapIdFromText(mnuId);
 
@@ -3109,7 +3109,7 @@
 	{
 case TxtIdleScreen:
 		/* Update idle screen bitmap */
-		idle_setBgdBitmap(bmpId);		
+		idle_setBgdBitmap(bmpId);
 		FFS_flashData.IdleScreenBgd = bmpId;
 		break;
 case TxtMenuScreen:
@@ -3117,7 +3117,7 @@
 		icon_setMainBgdBitmap(bmpId);
 		FFS_flashData.MainMenuBgd = bmpId;
 		break;
-	
+
 default:	//unknown option
 		break;
 	}
@@ -3131,11 +3131,11 @@
  $Function:    	icon_networkShow
 
  $Description:	Procedure to show acivation of Provider Bitmap
- 
+
  $Returns:		Event consumed
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 int icon_networkShow (MfwMnu* m, MfwMnuItem* i)
@@ -3161,11 +3161,11 @@
  $Function:    	icon_networkDontShow
 
  $Description:	Procedure to show deActivate of Provider Bitmap
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 int icon_networkDontShow (MfwMnu* m, MfwMnuItem* i)
@@ -3195,11 +3195,11 @@
  $Function:    	icon_getNetworkIcon
 
  $Description:	Dummy procedure for non-colour displays
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 T_BITMAP* icon_getNetworkIcon( UBYTE* networkNumber)
 {
@@ -3210,11 +3210,11 @@
  $Function:    	icon_getBitmapFromId
 
  $Description:	Dummy procedure for non-colour displays
- 
+
  $Returns:		None
 
  $Arguments:	None
- 
+
 *******************************************************************************/
 
 T_BITMAP *icon_getBitmapFromId( int bgdId, T_BITMAP *bmpData)
@@ -3224,8 +3224,8 @@
 #endif
 
 /*******************************************************************************
-                                                                              
+
                                 End Of File
-                                                                              
+
 *******************************************************************************/