# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1426193489 0
# Node ID ac7e4de3e23bb59394b044c138d62c996eb231f7
# Parent  e8f37d3414b67009f8996da40a800f2c7ea648b2
aci/cmh_ccs.c: candidate fix for the +CVHU sans PSI breakage

diff -r e8f37d3414b6 -r ac7e4de3e23b gsm-fw/g23m-aci/aci/cmh_ccs.c
--- a/gsm-fw/g23m-aci/aci/cmh_ccs.c	Thu Mar 12 19:14:58 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_ccs.c	Thu Mar 12 20:51:29 2015 +0000
@@ -1087,7 +1087,17 @@
   /* 
    * 3GPP standard 27007 
    * (+CVHU)
+   *
+   * FreeCalypso note: +CVHU support was not present in the TCS211 version
+   * of ACI, but it appears in the version we got from the LoCosto source.
+   * The following stanza is a new addition with this LoCosto version,
+   * and it was broken for our sans-PSI configuration: the reference to
+   * to psiShrdPrm only works when PSI is there, and it is a compilation
+   * failure otherwise.  The conditional on FF_PSI and the #else version
+   * have been added by Space Falcon; the correctness of the latter is
+   * not yet known.
    */
+#ifdef FF_PSI
   if( ccShrdPrm.cvhu EQ CVHU_DropDTR_ATH_IGNORED OR
     ((psiShrdPrm.dtr_clearcall EQ TRUE) AND 
      (ccShrdPrm.cvhu EQ CVHU_DropDTR_IGNORED)) )
@@ -1095,6 +1105,11 @@
     psiShrdPrm.dtr_clearcall = FALSE;  
     return (AT_CMPL);
   }
+#else
+  if( ccShrdPrm.cvhu EQ CVHU_DropDTR_ATH_IGNORED )
+    return (AT_CMPL);
+#endif
+
 /*
  *-------------------------------------------------------------------
  * check for a call with CCBS possible