FreeCalypso > hg > freecalypso-sw

changeset 826:b0ac0b8d2d85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed the "concatenated SMS" contribution to the link failure with PS included
author Space Falcon <falcon@ivan.Harhan.ORG>
date Mon, 06 Apr 2015 01:25:08 +0000
parents f8eaff87563f
children 02c65d76881f
files gsm-fw/g23m-aci/aci/Makefile gsm-fw/g23m-aci/aci/cmh_smss.c
diffstat 2 files changed, 12 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/g23m-aci/aci/Makefile	Mon Apr 06 00:24:07 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/Makefile	Mon Apr 06 01:25:08 2015 +0000
@@ -18,7 +18,7 @@
 	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_ssf.o cmh_ssq.o \
 	cmh_ssr.o cmh_sss.o cmh_tsts.o cmh_uartf.o cmh_uartr.o cmh_uarts.o \
-	conc_sms.o cphs.o cphs_aci.o dti_cntrl_mng.o hl_audio_drv.o \
+	cphs.o cphs_aci.o dti_cntrl_mng.o hl_audio_drv.o \
 	line_edit.o line_split.o phb.o \
 	psa_ccf.o psa_ccp.o psa_ccs.o psa_f.o psa_mmf.o psa_mmif.o psa_mmip.o \
 	psa_mmis.o psa_mmp.o psa_mms.o psa_satf.o psa_satp.o psa_sats.o \
--- a/gsm-fw/g23m-aci/aci/cmh_smss.c	Mon Apr 06 00:24:07 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_smss.c	Mon Apr 06 01:25:08 2015 +0000
@@ -1120,7 +1120,7 @@
 
   PURPOSE : For Riv-MMI if conc. is not needed.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PlusCMGS ( T_ACI_CMD_SRC  srcId,
                                    CHAR*          da,
                                    T_ACI_TOA*     toda,
@@ -1134,7 +1134,7 @@
   return sAT_PlusCMGS_Gl(srcId, da, toda, src_data, NULL, sca, tosca,
                            isReply, rAT_PlusCMGS, rAT_PlusCMS);  
 }
-#endif /*#if defined FF_MMI_RIV*/
+
 /*
 +-------------------------------------------------------------------+
 | PROJECT : GSM-PS (6147)    MODULE  : CMH_SMSS                     |
@@ -1158,6 +1158,7 @@
     return sAT_PlusCMGS_Gl(srcId, da, toda, src_data, udh_data, sca, tosca,
                            isReply, rAT_PlusCMGS, rAT_PlusCMS);  
 }
+#endif /*#if defined FF_MMI_RIV*/
 
 /*
  * The following function has been conditioned out for the FreeCalypso build
@@ -1805,7 +1806,7 @@
 
   PURPOSE : For Riv-MMI.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PlusCMSS ( T_ACI_CMD_SRC srcId,
                                    UBYTE         index,
                                    CHAR*         da,
@@ -2141,7 +2142,7 @@
 
   PURPOSE : For Riv-MMI.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PlusCMGD ( T_ACI_CMD_SRC  srcId,
                                    UBYTE          index,
                                    UBYTE          status )
@@ -2339,7 +2340,7 @@
 
   PURPOSE : For Riv-MMI if conc. is not needed.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PlusCMGW ( T_ACI_CMD_SRC  srcId,
                                    SHORT          index,
                                    CHAR*          address,
@@ -2351,11 +2352,6 @@
                                    T_ACI_TOA*     tosca,
                                    SHORT          isReply )
 {
-
-
-
-
-
   TRACE_FUNCTION ("sAT_PlusCMGW ()");
 
     return sAT_PlusCMGW_Gl(srcId, index, address, toa, stat,
@@ -2779,7 +2775,7 @@
 
  #if defined SMI OR defined MFW OR defined FF_MMI_RIV
    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 */
 
   /*
    *-----------------------------------------------------------------
@@ -2908,7 +2904,7 @@
   PURPOSE : New Plus CMGC command for handling the conc module on 
             the Riv-MMI side.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PlusCMGC ( T_ACI_CMD_SRC   srcId,
                                    SHORT           fo,
                                    SHORT           ct,
@@ -3183,7 +3179,7 @@
  #if defined SMI OR defined MFW OR defined FF_MMI_RIV
     smsShrdPrm.rplyCB.cmgc  = rAT_PlusCMGC;
     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 */
 
   /*
    *-------------------------------------------------------------------
@@ -3290,7 +3286,7 @@
   PURPOSE : New Plus CMGR command for handling the conc module on 
             the Riv-MMI side.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PlusCMGR ( T_ACI_CMD_SRC  srcId,
                                    UBYTE          index,
                                    T_ACI_SMS_READ rdMode )
@@ -4344,7 +4340,7 @@
   PURPOSE :  %CMGR command for handling the conc module on 
             the Riv-MMI side.
 */
-#if defined (FF_MMI_RIV) OR !defined TI_PS_FF_CONC_SMS
+#if defined (FF_MMI_RIV) /* OR !defined TI_PS_FF_CONC_SMS */
 GLOBAL T_ACI_RETURN sAT_PercentCMGR ( T_ACI_CMD_SRC  srcId,
                                       UBYTE          index,
                                       T_ACI_SMS_READ rdMode )