--- a/src/ui3/bmi/mmiCall.h	Sun Jan 21 04:32:27 2018 +0000
+++ b/src/ui3/bmi/mmiCall.h	Sun Jan 21 04:48:16 2018 +0000
@@ -294,7 +294,7 @@
 typedef enum
 {
 	BMI_INCOMING_CALL_NONE = 0,
-	BMI_INCOMING_CALL_RINGERSTOPPED,
+	BMI_INCOMING_CALL_RINGERSTOPPED
 }
 E_IN_CALL_RINGER_STATUS;
 

--- a/src/ui3/bmi/mmiIdle.c	Sun Jan 21 04:32:27 2018 +0000
+++ b/src/ui3/bmi/mmiIdle.c	Sun Jan 21 04:48:16 2018 +0000
@@ -381,7 +381,7 @@
 #else
 #include "MmiEditor.h"
 #endif
-#if (BOARD != 71) && !defined(NEPTUNE_BOARD) /*a0393213 warnings removal-Don't include for locosto and neptune*/
+#if 0 //(BOARD != 71) && !defined(NEPTUNE_BOARD) /*a0393213 warnings removal-Don't include for locosto and neptune*/
 #include "mmimmsmenu.h" //xrashmic 26 Aug, 2004 MMI-SPR-23931
 #endif
 #include "MmiSounds.h"
@@ -430,6 +430,7 @@
 #include "usb/usb_api.h"
 #endif /* FF_PHONE_LOCK */
 
+#if 0	/* FreeCalypso */
 #include "mfw_camapp.h"
 #include "MmiCameraApp.h"
 T_AUDIO_MMS_PLAY_FROM_FFS_PARAMETER *wefilename=NULL;
@@ -440,6 +441,7 @@
 
 static UBYTE modem_boot_done; /*OMAPS00091029 x0039928(sumanth) - flag to indicate modem boot has happenned*/
 static UBYTE network_sync_done; /*OMAPS00091029 x0039928(sumanth) - flag to indicate network sync has happenned*/
+#endif
 
 /*********************************************************************
 **********************************************************************
@@ -2015,6 +2017,7 @@
 				  	 idle_displayData(IDLE_NETWORK_NAME,TxtNull,(char*)current_network.service_provider_name);
 				}
 
+#if 0	/* FreeCalypso */
 			if(network_sync_done==0)
 	  		{
 	  		/*OMAPS00091029 x0039928(sumanth) - to mark the end of network sync event*/
@@ -2022,6 +2025,7 @@
 			       TRACE_EVENT("Boot Time Snapshot - ENetworkSync");
 				network_sync_done=1;
 	  		}
+#endif
                 /* Marcus: Issue 1618: 24/01/2003: End */
 
 //x0pleela 25 May, 2006  DR: OMAPS00070657
@@ -2077,6 +2081,7 @@
 
 			case NETWORK_SEARCH_NETWORK :
 				idle_displayData(IDLE_NETWORK_NAME,TxtSearching,NULL);
+#if 0	/* FreeCalypso */
 				 if(modem_boot_done==0)
 	  			{
 	  			/*OMAPS00091029 x0039928(sumanth) - to mark the end of modem boot event*/
@@ -2084,6 +2089,7 @@
 					TRACE_EVENT("Boot Time Snapshot - EModemBoot");
 					modem_boot_done=1;
 	  			}
+#endif
 				break;
 			case NETWORK_NO_SERVICE :
 				if (sim_status == SIM_NOT_ACTIVE)
@@ -4457,12 +4463,15 @@
 	char				edt_buf_prov[EDITOR_SIZE];
 	/* try to establish if we have information in the phone book
 	*/
+
+#if 0	/* FreeCalypso */
      T_RV_RETURN_PATH            return_path = {0, NULL};
 	 T_AUDIO_RET  ret;
 	int wei;
 
       char *str1 = "/FFS/mmi/tones/a.amr";
-	
+#endif
+
 	TRACE_FUNCTION ("idle_dialling_kbd_cb()");
 
 	/* SPR#1428 - SH - New Editor changes - By default, set this flag
@@ -4589,6 +4598,7 @@
             memset(edt_buf_prov,'\0',sizeof(edt_buf_prov));
 			strcpy((char*)edt_buf_prov,(char*)idle_data.edt_buf);
 
+#if 0	/* FreeCalypso */
 //hou peng test begin
            if(strcmp((char*)idle_data.edt_buf, "#1#") == 0)
 			{
@@ -4624,6 +4634,7 @@
 			}
 		
 //hou peng test end
+#endif
 			if(strcmp((char*)idle_data.edt_buf, "###520#") == 0)
 			{
 				ShowVersion(idle_data.win);