FreeCalypso > hg > freecalypso-citrine

changeset 9:b80f0c5016ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
L1/cfile: new code compiles
author Mychaela Falconia <falcon@freecalypso.org>
date Thu, 09 Jun 2016 06:28:19 +0000
parents b36540edb046
children 9ffe74065152
files L1/cfile/Makefile L1/cfile/l1_afunc.c L1/cfile/l1_api_hisr.c L1/cfile/l1_async.c L1/cfile/l1_cmplx.c L1/cfile/l1_ctl.c L1/cfile/l1_drive.c L1/cfile/l1_func.c L1/cfile/l1_init.c L1/cfile/l1_mfmgr.c L1/cfile/l1_pwmgr.c L1/cfile/l1_sync.c L1/cfile/l1_trace.c
diffstat 13 files changed, 66 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/L1/cfile/Makefile	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/Makefile	Thu Jun 09 06:28:19 2016 +0000
@@ -1,7 +1,7 @@
 CC=	arm-elf-gcc
 CPPFLAGS=-I../../include -I../include -I../audio_include -I../audio_cust0 \
 	-I../dyn_dwl_include -I../tm_include -I../tm_cust0 -I../cust0 \
-	-I../tpudrv -DMOVE_IN_INTERNAL_RAM
+	-I../tpudrv -I../../bsp -I../../bsp/abb+spi -DMOVE_IN_INTERNAL_RAM
 CFLAGS=	-O2 -fno-builtin -mthumb-interwork
 ASFLAGS=-mthumb-interwork
 LD=	arm-elf-ld
--- a/L1/cfile/l1_afunc.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_afunc.c	Thu Jun 09 06:28:19 2016 +0000
@@ -9,8 +9,9 @@
 
 #define  L1_AFUNC_C
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -84,7 +85,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"
--- a/L1/cfile/l1_api_hisr.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_api_hisr.c	Thu Jun 09 06:28:19 2016 +0000
@@ -7,15 +7,16 @@
  *
  ************* Revision Controle System Header *************/
 
+#include "config.h"
 #include "l1_confg.h"
-#include "nucleus.h"
+#include "../../nucleus/nucleus.h"
 #include "sys_types.h"
 #include "l1_types.h"
 #include "l1audio_cust.h"
 #include "l1audio_defty.h"
 #include "l1audio_const.h"
 #include "l1_const.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "l1tm_defty.h"
 #if (L1_GTT == 1)
   #include "l1gtt_const.h"
--- a/L1/cfile/l1_async.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_async.c	Thu Jun 09 06:28:19 2016 +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"
@@ -282,7 +283,7 @@
   #if (L1_AGC_DL == 1)
     extern void l1a_mmi_agc_dl_process          (xSignalHeaderRec *msg);
   #endif
-#if (L1_DRC == 1)
+  #if (L1_DRC == 1)
     extern void l1a_mmi_drc_process             (xSignalHeaderRec *msg);
   #endif
   #if (L1_LIMITER == 1)
--- a/L1/cfile/l1_cmplx.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_cmplx.c	Thu Jun 09 06:28:19 2016 +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>
@@ -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"
--- a/L1/cfile/l1_ctl.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_ctl.c	Thu Jun 09 06:28:19 2016 +0000
@@ -9,8 +9,9 @@
 
 #define  L1_CTL_C
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -103,7 +104,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"
--- a/L1/cfile/l1_drive.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_drive.c	Thu Jun 09 06:28:19 2016 +0000
@@ -9,6 +9,7 @@
 
 #define  L1_DRIVE_C
 
+#include "config.h"
 #include "l1_confg.h"
 
 #if (RF_FAM == 61)
@@ -18,7 +19,7 @@
 #define	W_A_DSP_PR20037	1	/* FreeCalypso */
 
 #if ((L1M_WAIT_DSP_RESTART_AFTER_VOCODER_ENABLE ==1)&&(W_A_DSP_PR20037 == 1))
-  #include "nucleus.h"
+  #include "../../nucleus/nucleus.h"
 #endif
 #include "l1_macro.h"
 #if (CODE_VERSION == SIMULATION)
@@ -107,7 +108,7 @@
   #endif
   #include "l1_defty.h"
   #include "l1_varex.h"
-  #include "cust_os.h"
+  #include "../../gpf/inc/cust_os.h"
   #include "l1_msgty.h"
   #if TESTMODE
     #include "l1tm_varex.h"
--- a/L1/cfile/l1_func.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_func.c	Thu Jun 09 06:28:19 2016 +0000
@@ -9,8 +9,9 @@
 
 #define  L1_FUNC_C
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -103,7 +104,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"
@@ -118,7 +119,7 @@
   #include "rhea_arm.h"
   #include "dma.h"
   #include "ulpd.h"
-  #include "leadapi.h"
+  #include "../dsp/leadapi.h"
 
   #if (OP_L1_STANDALONE)
   #if (CHIPSET == 4) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || \
@@ -149,20 +150,20 @@
 
   /* DSP patch */
   #if (DWNLD == NO_DWNLD)
-    const UWORD8  patch_array[1];
-    const UWORD8  DspCode_array[1] ;
-    const UWORD8  DspData_array[1];
+    const UWORD8  patch_array[1] = {0};
+    const UWORD8  DspCode_array[1] = {0};
+    const UWORD8  DspData_array[1] = {0};
   #elif (DWNLD == PATCH_DWNLD)
-    extern const UWORD8  patch_array[] ;
-    const UWORD8  DspCode_array[1] ;
-    const UWORD8  DspData_array[1];
+    extern const UWORD8  patch_array[];
+    const UWORD8  DspCode_array[1] = {0};
+    const UWORD8  DspData_array[1] = {0};
   #elif (DWNLD == DSP_DWNLD)
-    const UWORD8 patch_array[1] ;
-    extern const UWORD8 DspCode_array[] ;
+    const UWORD8 patch_array[1] = {0};
+    extern const UWORD8 DspCode_array[];
     extern const UWORD8 DspData_array[];
   #else
-    extern const UWORD8  patch_array[] ;
-    extern const UWORD8  DspCode_array[] ;
+    extern const UWORD8  patch_array[];
+    extern const UWORD8  DspCode_array[];
     extern const UWORD8  DspData_array[];
   #endif
 
--- a/L1/cfile/l1_init.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_init.c	Thu Jun 09 06:28:19 2016 +0000
@@ -9,6 +9,7 @@
 
 #define  L1_INIT_C
 
+#include "config.h"
 #include "l1_confg.h"
 
 #define	W_A_DSP_PR20037	1	/* FreeCalypso */
@@ -84,10 +85,10 @@
 #else // NO SIMULATION
 
   #include <string.h>
-  #include "tm_defs.h"
+  /* #include "tm_defs.h" */
   #include "l1_types.h"
   #include "sys_types.h"
-  #include "leadapi.h"
+  #include "../dsp/leadapi.h"
   #include "l1_const.h"
   #include "l1_macro.h"
   #include "l1_time.h"
@@ -130,7 +131,7 @@
   #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"
--- a/L1/cfile/l1_mfmgr.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_mfmgr.c	Thu Jun 09 06:28:19 2016 +0000
@@ -1,4 +1,3 @@
-
 /************* Revision Controle System Header *************
  *                  GSM Layer 1 software
  * L1_MFMGR.C
@@ -10,8 +9,9 @@
 
 #define  L1_MFMGR_C
 
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -72,7 +72,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"
--- a/L1/cfile/l1_pwmgr.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_pwmgr.c	Thu Jun 09 06:28:19 2016 +0000
@@ -10,19 +10,14 @@
 #define  L1_PWMGR_C
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
 
-#include "timer/timer2.h"
-#include "armio/armio.h"
-
-//omaps00090550 #include "l1_macro.h"
+#include "config.h"
 #include "l1_confg.h"
 
-#if (OP_L1_STANDALONE == 1)
-  #include "uart/serialswitch_core.h"
-#else
-  #include "uart/serialswitch.h"
-#endif
+#include "../../bsp/timer2.h"
+#include "../../bsp/armio.h"
+#include "../../serial/serialswitch.h"
 
-#if (OP_L1_STANDALONE == 0)
+#if 0 //(OP_L1_STANDALONE == 0)
   #include "sim/sim.h"
   #include "rv_swe.h"
 #endif
@@ -98,17 +93,13 @@
   extern NU_TASK L1S_task;
   STATUS status;
 
-
-
 #else // NO SIMULATION
 
-
-
   #include "l1_types.h"
   #include "l1_const.h"
 
-  #include "abb/abb.h"
-  #include "dma/sys_dma.h"
+  #include "../../bsp/abb+spi/abb.h"
+  /* #include "dma/sys_dma.h" */
 
   #if (OP_BT == 1)
     #include "hci_ll_simul.h"
@@ -145,11 +136,11 @@
   #include "l1_tabs.h"
   #include "sys_types.h"
   #include "tpudrv.h"
-  #include "cust_os.h"
+  #include "../../gpf/inc/cust_os.h"
   #include "l1_msgty.h"
   #include "l1_proto.h"
   #include "l1_trace.h"
-  #include "timer/timer.h"
+  #include "../../bsp/timer.h"
 
   #if (CHIPSET == 12) || (CHIPSET == 15)
     #include "timer/timer_sec.h"
@@ -158,13 +149,12 @@
     /* FreeCalypso: massive #if (CHIPSET == 15) chunk removed */
 
   #else  //(CHIPSET == 12) || (CHIPSET == 15)
-    #include "inth/iq.h"
-    #include "inth/inth.h"
+    #include "iq.h"
+    #include "inth.h"
   #endif
-//  #include "timer1.h"
-  #include "ulpd/ulpd.h"
-  #include "clkm/clkm.h"
-  #include "memif/mem.h"
+  #include "ulpd.h"
+  #include "clkm.h"
+  #include "mem.h"
   #if L2_L3_SIMUL
     #include "hw_debug.h"
   #endif
--- a/L1/cfile/l1_sync.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_sync.c	Thu Jun 09 06:28:19 2016 +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
@@ -129,7 +130,7 @@
   #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"
@@ -7998,7 +7999,7 @@
 	 * TCS211 binary object; it appears neither in the LoCosto nor
 	 * in the TSM30 source.
 	 */
-        #if (AEC)
+        #if (AUDIO_TASK && AEC)
 	  if((l1s.aec.aec_control & 0x0002) || (l1s.aec.aec_control & 0x0004)) {
 	    l1s.aec.aec_control = l1a_l1s_com.aec_task.parameters.aec_control
 				  | 0x0001;
--- a/L1/cfile/l1_trace.c	Thu Jun 09 05:45:03 2016 +0000
+++ b/L1/cfile/l1_trace.c	Thu Jun 09 06:28:19 2016 +0000
@@ -10,13 +10,10 @@
 #define  L1_TRACE_C
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
-#include "l1sw.cfg"
-#if (OP_L1_STANDALONE == 0)
-  #include "debug.cfg"
-#endif
-
+
+#include "config.h"
+#include "l1_confg.h"
 #include "l1_macro.h"
-#include "l1_confg.h"
 
 #include <string.h>
 #include "l1_types.h"
@@ -66,7 +63,7 @@
 #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"
@@ -106,11 +103,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#if (OP_L1_STANDALONE == 1)
-  #include "serialswitch_core.h"
-#else
-  #include "uart/serialswitch.h"
-#endif
+#include "../../serial/serialswitch.h"
+#include "../../riviera/rv/rv_trace.h"
+#include "../../riviera/rvf/rvf_api.h"
 
 //void dt_trace_event(UWORD16 id, char *fmt_string, ...);
 #if (TRACE_TYPE==7)