FreeCalypso > hg > freecalypso-sw
changeset 800:21b9eb4d02d9
aci: cmh_ss?.c done
| author | Space Falcon <falcon@ivan.Harhan.ORG> |
|---|---|
| date | Sun, 05 Apr 2015 03:56:11 +0000 |
| parents | 9b2ed89a1adc |
| children | c64bfc13292c |
| files | gsm-fw/g23m-aci/aci/Makefile gsm-fw/g23m-aci/aci/cmh_ssf.c gsm-fw/g23m-aci/aci/cmh_ssq.c gsm-fw/g23m-aci/aci/cmh_ssr.c gsm-fw/g23m-aci/aci/cmh_sss.c |
| diffstat | 5 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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}
--- 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
--- 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"
--- 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"
--- 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 ); - - - - /* *-------------------------------------------------------------------