# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1476505438 0
# Node ID 6a2b09d3b1b430f825597f93409e6832819d3aa7
# Parent  b76c78b62e5e98bc47511c95302d0536abf66a9d
disable L1_DYN_DSP_DWNLD and AMR by default

diff -r b76c78b62e5e -r 6a2b09d3b1b4 cfgmagic/processconf.sh
--- a/cfgmagic/processconf.sh	Sat Oct 15 04:07:40 2016 +0000
+++ b/cfgmagic/processconf.sh	Sat Oct 15 04:23:58 2016 +0000
@@ -23,7 +23,8 @@
 FLASH_BOOT_VIA_BOOTROM=1
 FLASHIMAGE_BASE_ADDR=0x2000
 DWNLD=1
-L1_DYN_DSP_DWNLD=1
+L1_DYN_DSP_DWNLD=0
+ALLOW_AMR_CODEC=0
 
 # We always export CONFIG_INCLUDE_xxx to config.h and config.mk, whether
 # enabled or disabled.  This way enabling any of these components is
@@ -103,6 +104,10 @@
 	export_to_c	L1_DYN_DSP_DWNLD DWNLD
 	export_to_mk	L1_DYN_DSP_DWNLD
 fi
+if [ "$CONFIG_INCLUDE_PCM" = 1 ]
+then
+	export_to_c	ALLOW_AMR_CODEC
+fi
 
 # The list of build components: we have some invariants that are always
 # included, and some others that are included depending on the configuration.
diff -r b76c78b62e5e -r 6a2b09d3b1b4 services/pcm/pcmdata.c
--- a/services/pcm/pcmdata.c	Sat Oct 15 04:07:40 2016 +0000
+++ b/services/pcm/pcmdata.c	Sat Oct 15 04:23:58 2016 +0000
@@ -135,17 +135,16 @@
    * Field MOBILE CAPABILITIES - MSCAP
    ********************************************************************/
   /*
-   * FreeCalypso: the change of L1 to the reconstructed TCS211 version
-   * has fixed the EFR codec, so we can re-enable it now, but AMR is
-   * still broken, hence we are going to advertise as non-AMR-capable
-   * despite running on AMR-capable silicon.
-   *
-   * If you would like to experiment with different codec
-   * configurations, you can do so without having to recompile
-   * and reflash the firmware each time: just write a /pcm/MSCAP
-   * file into FFS with whatever setting you wish to try.
+   * FreeCalypso: this Citrine firmware only runs on AMR-capable
+   * silicon, but we have a build configuration setting to allow or
+   * disallow AMR.  As far as we can tell, the AMR codec support
+   * in TI's TCS211 fw that serves as our reference depends on a
+   * dynamically downloaded DSP patch (L1_DYN_DSP_DWNLD), but we are
+   * having some reliability problems with the latter functionality,
+   * hence we have made AMR enabling a conditional feature to err
+   * on the side of safety.
    */
-  #if 0 //((DSP == 34) || (DSP == 35) || (DSP == 36)) // ROM Codes including AMR feature.
+  #if ALLOW_AMR_CODEC
     #if (STD == 1) // GSM 900
       #if defined (FAX_AND_DATA) 
         0xB1,   0xC7,   0x00,