# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1407086707 0
# Node ID b1e2dbb3c75168d78d74642deaa661866a56ab4b
# Parent  67ab5f240b7d0c92b2e227b1b6a899e57f22c3dd
L1: l1_async.c compiles

diff -r 67ab5f240b7d -r b1e2dbb3c751 gsm-fw/L1/cfile/Makefile
--- a/gsm-fw/L1/cfile/Makefile	Sun Aug 03 16:13:52 2014 +0000
+++ b/gsm-fw/L1/cfile/Makefile	Sun Aug 03 17:25:07 2014 +0000
@@ -1,11 +1,11 @@
 CC=	arm-elf-gcc
 CPPFLAGS=-I../../include -I../include -I../audio_include -I../audio_cust0 \
-	-I../tm_include -I../tm_cust0 -I../tpudrv
+	-I../tm_include -I../tm_cust0 -I../tpudrv -DMOVE_IN_INTERNAL_RAM
 CFLAGS=	-O2 -fno-builtin -mthumb-interwork
 LD=	arm-elf-ld
 
 IOBJS=	l1_api_hisr.o
-XOBJS=	l1_afunc.o
+XOBJS=	l1_afunc.o l1_async.o
 
 all:	${IOBJS} ${XOBJS}
 
diff -r 67ab5f240b7d -r b1e2dbb3c751 gsm-fw/L1/cfile/l1_async.c
--- a/gsm-fw/L1/cfile/l1_async.c	Sun Aug 03 16:13:52 2014 +0000
+++ b/gsm-fw/L1/cfile/l1_async.c	Sun Aug 03 17:25:07 2014 +0000
@@ -8,8 +8,9 @@
  ************* Revision Controle System Header *************/
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 
 #if !((MOVE_IN_INTERNAL_RAM == 1) && (GSM_IDLE_RAM !=0))  // MOVE TO INTERNAL MEM IN CASE GSM_IDLE_RAM enabled
@@ -87,7 +88,7 @@
   #include "l1_const.h"
   #include "l1_time.h"
   #include "l1_signa.h"
-  #include "cust_os.h"
+  #include "../../gpf/inc/cust_os.h"
   #if TESTMODE
     #include "l1tm_defty.h"
     #include "l1tm_signa.h"
@@ -140,11 +141,10 @@
     #if ((CHIPSET == 12) || (CHIPSET == 15))
         #include "sys_inth.h"
     #else
-        #include "iq.h"
-        #include "inth.h"
-        #include "mem.h"
+        #include "../../bsp/iq.h"
+        #include "../../bsp/inth.h"
+        #include "../../bsp/mem.h"
     #endif
-
   #endif
 
   #if (VCXO_ALGO == 1)
diff -r 67ab5f240b7d -r b1e2dbb3c751 gsm-fw/L1/include/l1_confg.h
--- a/gsm-fw/L1/include/l1_confg.h	Sun Aug 03 16:13:52 2014 +0000
+++ b/gsm-fw/L1/include/l1_confg.h	Sun Aug 03 17:25:07 2014 +0000
@@ -1129,9 +1129,14 @@
 // Possible choice for dll_dcch_downlink interface (with FN or without FN)
 #define SEND_FN_TO_L2_IN_DCCH 0
 
-
-#define L1_CHECK_COMPATIBLE 1    //Check L1A message compatiblity
-
+/*
+ * FreeCalypso change: I'm disabling L1_CHECK_COMPATIBLE (a new "feature"
+ * added with LoCosto version of L1, not present in the Leonardo version)
+ * because l1_async.c fails to compile with it enabled.  Examination of
+ * the code reveals that this "compatibility check" involves things
+ * which we won't be enabling any time soon, if ever.
+ */
+#define L1_CHECK_COMPATIBLE 0    //Check L1A message compatiblity
 
 //---------------------------------------------------------------------------------