# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1413062664 0
# Node ID 7f68d2ab0d33ab5acbde1e6e5527ef98a1465c0e
# Parent  ec171ca4afb4b60721e80be087367949d564673e
SIM_TOOLKIT re-enabled: the SIM entity code is broken without it

diff -r ec171ca4afb4 -r 7f68d2ab0d33 gsm-fw/g23m-gsm/sim/Makefile
--- a/gsm-fw/g23m-gsm/sim/Makefile	Sat Oct 11 20:48:22 2014 +0000
+++ b/gsm-fw/g23m-gsm/sim/Makefile	Sat Oct 11 21:24:24 2014 +0000
@@ -5,7 +5,7 @@
 CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
 	-I../../cdginc
 
-OBJS=	sim_app.o sim_em.o sim_fkt.o
+OBJS=	sim_app.o sim_em.o sim_fkt.o sim_pei.o
 
 all:	${OBJS}
 
diff -r ec171ca4afb4 -r 7f68d2ab0d33 gsm-fw/g23m-gsm/sim/sim_pei.c
--- a/gsm-fw/g23m-gsm/sim/sim_pei.c	Sat Oct 11 20:48:22 2014 +0000
+++ b/gsm-fw/g23m-gsm/sim/sim_pei.c	Sat Oct 11 21:24:24 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef SIM_PEI_C
 #define SIM_PEI_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_SIM
 
 /*==== INCLUDES ===================================================*/
@@ -589,7 +593,7 @@
 #endif
 
 #ifdef FF_EM_MODE
-        em_init_sim_event_trace();
+  em_init_sim_event_trace();
 #endif /* FF_EM_MODE */
   cl_shrd_init(sim_handle);
   return PEI_OK;
@@ -645,43 +649,43 @@
 
 static void sim_timeout (USHORT index)
 {
-   if (index EQ SIM_TIMER)
-   {
-     if(sleepTimerRunning == TRUE)
-      {
-         TIMER_STOP(sim_handle, SLEEP_TIMER);
-      }
-          sleepTimerRunning = FALSE;
-      app_sim_timeout (SIM_TIMER);
-   }
-   else if(index EQ SLEEP_TIMER)
-   { 
-       sleepTimerRunning = FALSE;
-       app_sim_timeout (SLEEP_TIMER); 
-   } 
+  if (index EQ SIM_TIMER)
+  {
+    if(sleepTimerRunning == TRUE)
+    {
+      TIMER_STOP(sim_handle, SLEEP_TIMER);
+    }
+    sleepTimerRunning = FALSE;
+    app_sim_timeout (SIM_TIMER);
+  }
+  else if(index EQ SLEEP_TIMER)
+  { 
+    sleepTimerRunning = FALSE;
+    app_sim_timeout (SLEEP_TIMER); 
+  } 
 #ifdef SIM_TOOLKIT
   else
-   {
-      if(sleepTimerRunning == TRUE)
-       {
-	     TIMER_STOP(sim_handle, SLEEP_TIMER);
-       }
-      sleepTimerRunning = FALSE;
-      stk_timeout (index); 
-   } 
+  {
+    if(sleepTimerRunning == TRUE)
+    {
+      TIMER_STOP(sim_handle, SLEEP_TIMER);
+    }
+    sleepTimerRunning = FALSE;
+    stk_timeout (index); 
+  } 
 #endif
 
-if((startTimerPollOff == TRUE)&&(sim_data.idle_polling != TRUE))
- {
-	startTimerPollOff = FALSE;
-	sleepTimerRunning = TRUE;
-	TIMER_START(sim_handle,SLEEP_TIMER,35000); // this will not be effective as the SIM TIMER will expire before this and stop it.	Just to takecare of Sleep after the POLLING_OFF   STK command 
- } 
-
+  if((startTimerPollOff == TRUE)&&(sim_data.idle_polling != TRUE))
+  {
+     startTimerPollOff = FALSE;
+     sleepTimerRunning = TRUE;
+     TIMER_START(sim_handle,SLEEP_TIMER,35000);
+     // this will not be effective as the SIM TIMER will expire before this and
+     // stop it. Just to takecare of Sleep after the POLLING_OFF STK command
+  } 
 }
 
 
-
 #ifdef _SIMULATION_
 /*
 +--------------------------------------------------------------------+
diff -r ec171ca4afb4 -r 7f68d2ab0d33 gsm-fw/include/condat-features.h
--- a/gsm-fw/include/condat-features.h	Sat Oct 11 20:48:22 2014 +0000
+++ b/gsm-fw/include/condat-features.h	Sat Oct 11 21:24:24 2014 +0000
@@ -20,11 +20,7 @@
 #define	FF_HOMEZONE		1
 #define	FF_MMI_SMS_DYNAMIC	1
 #define	HAS_FLASH_EPROM		1
+#define	SIM_TOOLKIT		1
 #define	UART			1
 #define	USE_L1FD_FUNC_INTERFACE	1
 #define	VOCODER_FUNC_INTERFACE	1
-
-/* let's disable SIM toolkit for now */
-#if 0
-#define	SIM_TOOLKIT		1
-#endif