--- a/gsm-fw/L1/include/l1_confg.h	Fri Aug 01 16:46:33 2014 +0000
+++ b/gsm-fw/L1/include/l1_confg.h	Fri Aug 01 18:07:16 2014 +0000
@@ -10,15 +10,6 @@
 #ifndef __L1_CONFG_H__
 #define __L1_CONFG_H__
 
-#ifndef _WINDOWS
-#include "l1sw.cfg"    // Configuration Software
-#include "board.cfg"
-#include "chipset.cfg"
-#include "rf.cfg"
-#include "swconfig.cfg"
-#include "sys.cfg"
-#endif
-
 // Traces...
 // TRACE_TYPE == 1,2,3 are used in standalone mode (L2-L3 Simul) with USART
 // TRACE_TYPE == 4 is used on A-sample only (with UART): L1 + protocol stack
@@ -63,6 +54,7 @@
 //============
 // CODE CHOICE
 //============
+#if 0
 #if (OP_L1_STANDALONE==0)
 #define CODE_VERSION NOT_SIMULATION
 #else // OP_L1_STANDALONE
@@ -72,6 +64,32 @@
   #define CODE_VERSION  NOT_SIMULATION
 #endif // WIN32
 #endif // OP_L1_STANDALONE
+#endif // #if 0
+
+/* FreeCalypso */
+#define	CODE_VERSION	NOT_SIMULATION
+#define	AMR		1
+#define	L1_12NEIGH	1
+#define	L1_DYN_DSP_DWNLD	0	/* for now */
+#define	L1_EOTD		0
+#define	L1_GTT		0
+#define	ORDER2_TX_TEMP_CAL	1
+#define	TRACE_TYPE	4
+#define	VCXO_ALGO	1
+
+/* TESTMODE will be enabled with feature l1tm */
+
+#if CONFIG_AUDIO
+#  define AUDIO_TASK	1  // Enable the L1 audio features
+#  define MELODY_E2	1
+#endif
+
+#if CONFIG_GPRS
+#  define L1_GPRS	1
+#else
+#  define L1_GPRS	0
+#endif
+
 //---------------------------------------------------------------------------------
 // Test with full simulation.
 //---------------------------------------------------------------------------------
@@ -201,7 +219,9 @@
     #define GSM_IDLE_RAM_DEBUG 0
   #endif
 
-#define L1_VPM  1
+//FreeCalypso: L1_VPM commented out, as I suspect it's a LoCosto-ism
+//#define L1_VPM  1
+
   #if (OP_L1_STANDALONE == 1)
     #if (CHIPSET == 15)
       #if ((BOARD == 71) && (FLASH == 0))
@@ -251,14 +271,22 @@
 
   #endif
 
+/*
+ * FreeCalypso: these FF_L1_IT_DSP_USF and FF_L1_IT_DSP_DTX features (?)
+ * are new with the LoCosto L1 headers, i.e., not present in the Leonardo
+ * headers.  I have no idea what they are, and I suspect they may likely
+ * be something that won't work on our Calypso platform, so I'm disabling
+ * them for now.
+ */
+
   #undef FF_L1_IT_DSP_USF
-#if (L1_GPRS == 1)
+#if 0 //(L1_GPRS == 1)
   #define FF_L1_IT_DSP_USF       1
 #else
   #define FF_L1_IT_DSP_USF       0
 #endif
   #undef FF_L1_IT_DSP_DTX
-#if (AMR == 1)
+#if 0 //(AMR == 1)
   #define FF_L1_IT_DSP_DTX     1
 #else
   #define FF_L1_IT_DSP_DTX     0
@@ -296,7 +324,10 @@
   #define ADC_TIMER_ON           0  // Timer for ADC measurements
   #define AFC_ON                 1  // Enable of the Omega AFC module
 
+#if 0
+  /* FreeCalypso: moved to config section above */
   #define AUDIO_TASK             1  // Enable the L1 audio features
+#endif
   #define AUDIO_SIMULATION       0  // Audio simulator for the audio tasks (works only with the new audio design i.e. AUDIO_TASK=1)
   #if (OP_L1_STANDALONE == 1)
     #define AUDIO_L1_STANDALONE    1  // Flag to enable the audio simulator used with the L1 stand-alone (works only with the new audio design i.e. AUDIO_TASK=1)
@@ -375,7 +406,7 @@
       #define VOICE_MEMO       0
     #endif
     #define FIR              1  // Enable FIR feature
-    #if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+    #if (DSP >= 33)
       #define AUDIO_MODE       1  // Enable Audio mode feature
     #else
       #define AUDIO_MODE        0  // Disable Audio mode feature
@@ -404,7 +435,15 @@
   #define FIR               0  // Enable FIR feature
   #define AUDIO_MODE        0  // Enable Audio mode feature
 #endif
-#define L1_MIDI_BUFFER 1
+
+//FreeCalypso: LoCosto-ism below disabled
+//#define L1_MIDI_BUFFER 1
+
+/*
+ * L1_CPORT appears in the Leonardo L1 headers, and is enabled only for
+ * CHIPSET 12.  The LoCosto version doesn't have it at all.
+ */
+#define	L1_CPORT	0
 
 #define L1_AUDIO_BACKGROUND_TASK (SPEECH_RECO | MELODY_E2) // audio background task is used by speech reco and melody_e2
 #if (OP_RIV_AUDIO == 1)
@@ -878,7 +917,7 @@
     #define DSP_DEBUG_GSM_MASK     0x08BD // L1_MCU-SPR-15852
     #define DSP_DEBUG_GPRS_MASK    0x0f3d
   #endif
-#elif (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)      // ROM Code GPRS AMR.
+#elif (DSP >= 36)				// ROM Code GPRS AMR.
 
   #if ((L1_PCM_EXTRACTION) && (SPEECH_RECO))
     #error "PCM extraction and Speech recognition not supported simultaneously"
@@ -889,8 +928,21 @@
   #define CLKSTART   0x29    // ...65 Mips
   #define C_PLL_CONFIG 0x154   // For VTCXO = 13 MHz and max DSP speed = 84.5 Mips
   #define VOC        FR_HR_EFR // FR + HR + EFR (normaly FR_EFR : PBs).
+
+#if 0
+  /* what we got with LoCosto L1 headers */
   #define AEC        0         // AEC/NS not supported.
+  #define L1_NEW_AEC 0
+#else
+  /* what we are used to from the Leonardo version */
+  #define AEC        1         // AEC/NS not supported.
+  #if (OP_RIV_AUDIO == 0)
+    #define L1_NEW_AEC 1
+  #else
+  // Available but not yet tuned with Riviera AUDIO    
     #define L1_NEW_AEC 0
+  #endif
+#endif
 
   #if ((L1_NEW_AEC) && (!AEC))
     // First undef the flag to avoid warnings at compilation time