FreeCalypso > hg > freecalypso-sw

changeset 550:6455c06fceb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
L1: l1_cmplx.c compiles for XRAM
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Sun, 03 Aug 2014 18:12:05 +0000
parents b1e2dbb3c751
children 2e662daa7441
files gsm-fw/L1/cfile/Makefile gsm-fw/L1/cfile/l1_cmplx.c
diffstat 2 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/L1/cfile/Makefile	Sun Aug 03 17:25:07 2014 +0000
+++ b/gsm-fw/L1/cfile/Makefile	Sun Aug 03 18:12:05 2014 +0000
@@ -5,7 +5,7 @@
 LD=	arm-elf-ld
 
 IOBJS=	l1_api_hisr.o
-XOBJS=	l1_afunc.o l1_async.o
+XOBJS=	l1_afunc.o l1_async.o l1_cmplx.o
 
 all:	${IOBJS} ${XOBJS}
 
--- a/gsm-fw/L1/cfile/l1_cmplx.c	Sun Aug 03 17:25:07 2014 +0000
+++ b/gsm-fw/L1/cfile/l1_cmplx.c	Sun Aug 03 18:12:05 2014 +0000
@@ -11,8 +11,9 @@
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -73,7 +74,7 @@
   extern T_hw FAR hw;
 
 #else
-  #include "abb.h"
+  #include "../../bsp/abb+spi/abb.h"
   #include <string.h>
   #include "l1_types.h"
   #include "sys_types.h"
@@ -108,7 +109,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "cust_os.h"
+  #include "../../gpf/inc/cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -133,9 +134,9 @@
 #endif
 
 #if(RF_FAM == 61)
-	#include "l1_rf61.h"
-#endif
-#include "tpudrv61.h"
+  #include "l1_rf61.h"
+  #include "tpudrv61.h"
+#endif
 #include "l1_ctl.h"
 
 #if W_A_DSP1
@@ -2243,9 +2244,9 @@
                       new_tpu_offset,
                       offset_smscb,
                       TRUE,
-                      FALSE,
-                      csf_filter_choice
+                      FALSE
                     #if (RF_FAM == 61)
+                      ,csf_filter_choice
                       ,if_ctl
                     #endif
                     #if (NEW_SNR_THRESHOLD == 1)
@@ -2757,9 +2758,9 @@
         new_synchro,
         new_offset,
         TRUE,
-        adc_active,
-        csf_filter_choice
+        adc_active
         #if (RF_FAM == 61)
+	   ,csf_filter_choice
 	   ,if_ctl
 	#endif
     #if (NEW_SNR_THRESHOLD == 1)
@@ -4842,9 +4843,9 @@
                         lna_off,
                         l1s.tpu_offset,
                         l1s.tpu_offset,
-                        FALSE,INACTIVE,
-                        csf_filter_choice
+                        FALSE,INACTIVE
                       #if (RF_FAM == 61)
+			    ,csf_filter_choice
 			    ,if_ctl
                       #endif
           #if (NEW_SNR_THRESHOLD == 1)
@@ -5566,11 +5567,11 @@
                             lna_off,
                             l1s.tpu_offset,
                             l1s.tpu_offset,
-                            FALSE,adc_active_dl,
-                            csf_filter_choice
-                         #if (RF_FAM == 61)
+                            FALSE,adc_active_dl
+                          #if (RF_FAM == 61)
+				,csf_filter_choice
 				,if_ctl
-			    #endif
+			  #endif
                           #if (NEW_SNR_THRESHOLD == 1)
                             ,saic_flag
                           #endif /* NEW_SNR_THRESHOLD */