# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1428206171 0
# Node ID 21b9eb4d02d922c244b266ee9f7059df2e0a4658
# Parent  9b2ed89a1adc2d904a48b71d2ea46c6eb25ded33
aci: cmh_ss?.c done

diff -r 9b2ed89a1adc -r 21b9eb4d02d9 gsm-fw/g23m-aci/aci/Makefile
--- a/gsm-fw/g23m-aci/aci/Makefile	Sun Apr 05 00:38:21 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Sun Apr 05 03:56:11 2015 +0000
@@ -16,7 +16,8 @@
 	cmh_mmit.o cmh_mmq.o cmh_mmr.o cmh_mms.o cmh_mmt.o cmh_phbf.o \
 	cmh_phbq.o cmh_phbr.o cmh_phbs.o cmh_phbt.o cmh_satf.o cmh_satq.o \
 	cmh_satr.o cmh_sats.o cmh_simf.o cmh_simq.o cmh_simr.o cmh_sims.o \
-	cmh_smsf.o cmh_smsq.o cmh_smsr.o cmh_smss.o
+	cmh_smsf.o cmh_smsq.o cmh_smsr.o cmh_smss.o cmh_ssf.o cmh_ssq.o \
+	cmh_ssr.o cmh_sss.o
 
 all:	${OBJS}
 
diff -r 9b2ed89a1adc -r 21b9eb4d02d9 gsm-fw/g23m-aci/aci/cmh_ssf.c
--- a/gsm-fw/g23m-aci/aci/cmh_ssf.c	Sun Apr 05 00:38:21 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_ssf.c	Sun Apr 05 03:56:11 2015 +0000
@@ -21,6 +21,12 @@
 #ifndef CMH_SSF_C
 #define CMH_SSF_C
 #endif
+
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci_cmh.h"
@@ -57,6 +63,13 @@
 #include "phb.h"
 #include "aci_ext_pers.h"
 
+/*
+ * FreeCalypso hack: gcc is complaining about integer/pointer mix violations
+ * with regard to NULL being used in integer contexts, so we are going to
+ * silence it as follows:
+ */
+#undef NULL
+#define	NULL	0
 
 /*==== CONSTANTS ==================================================*/
 #ifdef SIM_TOOLKIT
diff -r 9b2ed89a1adc -r 21b9eb4d02d9 gsm-fw/g23m-aci/aci/cmh_ssq.c
--- a/gsm-fw/g23m-aci/aci/cmh_ssq.c	Sun Apr 05 00:38:21 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_ssq.c	Sun Apr 05 03:56:11 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_SSQ_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci.h"
diff -r 9b2ed89a1adc -r 21b9eb4d02d9 gsm-fw/g23m-aci/aci/cmh_ssr.c
--- a/gsm-fw/g23m-aci/aci/cmh_ssr.c	Sun Apr 05 00:38:21 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_ssr.c	Sun Apr 05 03:56:11 2015 +0000
@@ -24,6 +24,11 @@
 #define CMH_SSR_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci_cmh.h"
diff -r 9b2ed89a1adc -r 21b9eb4d02d9 gsm-fw/g23m-aci/aci/cmh_sss.c
--- a/gsm-fw/g23m-aci/aci/cmh_sss.c	Sun Apr 05 00:38:21 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_sss.c	Sun Apr 05 03:56:11 2015 +0000
@@ -23,6 +23,11 @@
 #define CMH_SSS_C
 #endif
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci.h"
@@ -209,10 +214,6 @@
 
     if( retVal NEQ AT_CMPL )
         return( retVal );
-  
-
-
-
 
 /*
  *-------------------------------------------------------------------