--- a/gsm-fw/bsp/niq32.c	Wed Sep 03 22:11:25 2014 +0000
+++ b/gsm-fw/bsp/niq32.c	Wed Sep 03 22:27:24 2014 +0000
@@ -36,6 +36,10 @@
 #include "../serial/serialswitch.h"
 #include "rtc/rtc_config.h"
 
+#if CONFIG_INCLUDE_SIM
+#include "sim.h"
+#endif
+
 #if 0
 
 /* original maze of includes */
@@ -143,10 +147,6 @@
 unsigned IQ_FrameCount;    /* Used to check if Frame IT TPU*/
 unsigned IQ_GsmTimerCount; /* Used to check if GSM Timer IT */
 
-/* FreeCalypso: the following interrupt handlers remain to be integrated */
-#define	SIM_IntHandler		IQ_Dummy
-#define	SIM_CD_IntHandler	IQ_Dummy
-
 /*--------------------------------------------------------------*/
 /*  	irqHandlers                                             */
 /*--------------------------------------------------------------*/
@@ -164,7 +164,7 @@
    IQ_Dummy,               /* AIRQ 3 */   
    IQ_FrameHandler,        /* TPU Frame It AIRQ 4 */
    IQ_Dummy,               /* AIRQ 5 */
-#if 1 //(OP_L1_STANDALONE == 0)
+#if CONFIG_INCLUDE_SIM //(OP_L1_STANDALONE == 0)
    SIM_IntHandler,         /* AIRQ 6 */
 #else
    IQ_Dummy,               /* AIRQ 6 */
@@ -271,7 +271,7 @@
     IQ_Dummy,          /* AIRQ 13 Spi Tx Rx interrupt */
     IQ_Dummy,          /* DMA interrupt */
     IQ_Dummy,          /* LEAD */
-  #if 1 //(OP_L1_STANDALONE == 0)
+  #if CONFIG_INCLUDE_SIM //(OP_L1_STANDALONE == 0)
       SIM_CD_IntHandler, /* SIM card-detect fast interrupt */
   #else
       IQ_Dummy,          /* SIM card-detect fast interrupt */