# HG changeset patch # User Space Falcon # Date 1428194301 0 # Node ID 9b2ed89a1adc2d904a48b71d2ea46c6eb25ded33 # Parent 28f24c230edd681cc1131d99dfbd6774107a07ed aci: cmh_sms?.c compile diff -r 28f24c230edd -r 9b2ed89a1adc gsm-fw/g23m-aci/aci/Makefile --- a/gsm-fw/g23m-aci/aci/Makefile Sat Apr 04 22:51:00 2015 +0000 +++ b/gsm-fw/g23m-aci/aci/Makefile Sun Apr 05 00:38:21 2015 +0000 @@ -15,7 +15,8 @@ cmh_emq.o cmh_emr.o cmh_f.o cmh_mmf.o cmh_mmiq.o cmh_mmir.o cmh_mmis.o \ 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_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 all: ${OBJS} diff -r 28f24c230edd -r 9b2ed89a1adc gsm-fw/g23m-aci/aci/cmh_smsf.c --- a/gsm-fw/g23m-aci/aci/cmh_smsf.c Sat Apr 04 22:51:00 2015 +0000 +++ b/gsm-fw/g23m-aci/aci/cmh_smsf.c Sun Apr 05 00:38:21 2015 +0000 @@ -23,6 +23,11 @@ #define CMH_SMSF_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" @@ -66,9 +71,9 @@ /* temporary solution to get ffs.h included without GPRS to be set ! */ #ifdef GPRS -#include "ffs/ffs.h" +#include "../../services/ffs/ffs.h" #else -#include "ffs/ffs.h" +#include "../../services/ffs/ffs.h" #undef GPRS #endif /* GPRS */ diff -r 28f24c230edd -r 9b2ed89a1adc gsm-fw/g23m-aci/aci/cmh_smsq.c --- a/gsm-fw/g23m-aci/aci/cmh_smsq.c Sat Apr 04 22:51:00 2015 +0000 +++ b/gsm-fw/g23m-aci/aci/cmh_smsq.c Sun Apr 05 00:38:21 2015 +0000 @@ -23,6 +23,11 @@ #define CMH_SMSQ_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 28f24c230edd -r 9b2ed89a1adc gsm-fw/g23m-aci/aci/cmh_smsr.c --- a/gsm-fw/g23m-aci/aci/cmh_smsr.c Sat Apr 04 22:51:00 2015 +0000 +++ b/gsm-fw/g23m-aci/aci/cmh_smsr.c Sun Apr 05 00:38:21 2015 +0000 @@ -24,6 +24,11 @@ #define CMH_SMSR_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" @@ -52,7 +57,7 @@ #include "psa_sim.h" #include "cmh_sim.h" #include "psa_util.h" -#include "Phb.h" +#include "phb.h" #ifdef SIM_TOOLKIT #include "psa_sat.h" @@ -210,7 +215,7 @@ * new message indication *----------------------------------------------------------------- */ - #ifdef FF_MMI_RIV +#ifdef FF_MMI_RIV { T_ACI_CMGF_MOD sms_input_mode = CMGF_MOD_NotPresent; @@ -461,7 +466,7 @@ return AT_FAIL; } } -/*-----------------------------------------------------------------------* + /*-----------------------------------------------------------------------* * The below code is the new code added on 07/08/2003 due to the new * * flag for CMGD command as mentioned in R99. This flag handles the * * deletion of multiple messages. The deletion of concatination is * @@ -2070,11 +2075,11 @@ //start if (smsShrdPrm.smsEntStat.curCmd!=AT_CMD_CMGL) { - smsShrdPrm.smsEntStat.curCmd = AT_CMD_NONE; - smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE; - smsShrdPrm.smsEntStat.entOwn = CMD_SRC_NONE; - - smsShrdPrm.pDecMsg = NULL; + smsShrdPrm.smsEntStat.curCmd = AT_CMD_NONE; + smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE; + smsShrdPrm.smsEntStat.entOwn = CMD_SRC_NONE; + + smsShrdPrm.pDecMsg = NULL; } //end if (mnsms_read_cnf->rec_next EQ SMS_RECORD_NOT_EXIST) diff -r 28f24c230edd -r 9b2ed89a1adc gsm-fw/g23m-aci/aci/cmh_smss.c --- a/gsm-fw/g23m-aci/aci/cmh_smss.c Sat Apr 04 22:51:00 2015 +0000 +++ b/gsm-fw/g23m-aci/aci/cmh_smss.c Sun Apr 05 00:38:21 2015 +0000 @@ -23,6 +23,11 @@ #define CMH_SMSS_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" @@ -48,7 +53,7 @@ #include "cmh.h" #include "cmh_sms.h" #include "pcm.h" -#include "Phb.h" +#include "phb.h" #include "cmh_phb.h" #ifdef SIM_TOOLKIT @@ -722,12 +727,7 @@ return ( AT_FAIL ); } } - - - -#endif - - +#endif /* SMS_PDU_SUPPORT */ /* +-------------------------------------------------------------------+ @@ -791,11 +791,8 @@ *----------------------------------------------------------------- */ if ( mt EQ CNMI_MT_NotPresent ) - chkMt = smsShrdPrm.CNMImt; - else - chkMt = mt; /* @@ -821,11 +818,8 @@ *----------------------------------------------------------------- */ if ( bm EQ CNMI_BM_NotPresent ) - chkBm = smsShrdPrm.CNMIbm; - else - chkBm = bm; /* @@ -850,11 +844,8 @@ *----------------------------------------------------------------- */ if ( ds EQ CNMI_DS_NotPresent ) - chkDs = smsShrdPrm.CNMIds; - else - chkDs = ds; /* @@ -1167,6 +1158,14 @@ return sAT_PlusCMGS_Gl(srcId, da, toda, src_data, udh_data, sca, tosca, isReply, rAT_PlusCMGS, rAT_PlusCMS); } + +/* + * The following function has been conditioned out for the FreeCalypso build + * as it was failing compilation; it does not appear in the TCS211 version; + * to be investigated later. + */ + +#if 0 GLOBAL T_ACI_RETURN sAT_PlusCMGS_byPort( T_ACI_CMD_SRC srcId, CHAR* da, T_ACI_TOA* toda, @@ -1226,7 +1225,7 @@ isReply, rAT_PlusCMGS, rAT_PlusCMS); } } - +#endif /* +-------------------------------------------------------------------+ @@ -1582,7 +1581,7 @@ #if defined SMI OR defined MFW OR defined FF_MMI_RIV smsShrdPrm.rplyCB.cmgs = rAT_PlusCMGS; smsShrdPrm.errorCB = rAT_PlusCMS; - #endif /* defined SMI OR defined MFW OR defined FF_MMI_RIV */ +#endif /* defined SMI OR defined MFW OR defined FF_MMI_RIV */ /* *------------------------------------------------------------------- @@ -1728,7 +1727,7 @@ ** process the command later. */ smsShrdPrm.smsEntStat.curCmd = AT_CMD_NONE; - smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE; + smsShrdPrm.owner = (T_OWN)CMD_SRC_NONE; smsShrdPrm.smsEntStat.entOwn = CMD_SRC_NONE; return( AT_EXCT );