FreeCalypso > hg > freecalypso-sw
changeset 927:48969469d961
gsm-fw: l1_dyn_dwl code compiles and links
| author | Mychaela Falconia <falcon@ivan.Harhan.ORG> |
|---|---|
| date | Thu, 22 Oct 2015 19:04:36 +0000 |
| parents | 3f178b3ac50a |
| children | 7c247e866369 |
| files | gsm-fw/L1/Makefile gsm-fw/L1/dyn_dwl_cfile/Makefile gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_afunc.c gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_async.c gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_func.c gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_init.c gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_sync.c |
| diffstat | 8 files changed, 52 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/L1/Makefile Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/Makefile Thu Oct 22 19:04:36 2015 +0000 @@ -1,12 +1,16 @@ LD= arm-elf-ld -SUBDIR= audio_cfile cfile cust0 dsp stand tpudrv +SUBDIR= audio_cfile cfile cust0 dsp dyn_dwl_cfile stand tpudrv sinclude ../include/config.mk INT_PIECES= cfile/iramcode.o cust0/iramcode.o tpudrv/iramcode.o EXT_PIECES= audio_cfile/xipcode.o cfile/xipcode.o cust0/xipcode.o +ifeq (${L1_DYN_DSP_DWNLD},1) +EXT_PIECES+= dyn_dwl_cfile/xipcode.o +endif + ifeq (${CONFIG_L1_STANDALONE},1) EXT_PIECES+= stand/xipcode.o endif @@ -25,6 +29,9 @@ cust0/iramcode.o cust0/xipcode.o: cust0 @true +dyn_dwl_cfile/xipcode.o: dyn_dwl_cfile + @true + stand/xipcode.o: stand @true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/Makefile Thu Oct 22 19:04:36 2015 +0000 @@ -0,0 +1,20 @@ +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 +CFLAGS= -O2 -fno-builtin -mthumb-interwork +LD= arm-elf-ld + +XOBJS= l1_dyn_dwl_afunc.o l1_dyn_dwl_apihisr.o l1_dyn_dwl_async.o \ + l1_dyn_dwl_func.o l1_dyn_dwl_init.o l1_dyn_dwl_sync.o + +all: xipcode.o + +${XOBJS}: %.o : %.c + ${CC} ${CFLAGS} ${CPPFLAGS} -mthumb -c $< + +xipcode.o: ${XOBJS} + ${LD} -r -o $@ ${XOBJS} + +clean: + rm -f *.[oa] *.out *errs
--- a/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_afunc.c Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_afunc.c Thu Oct 22 19:04:36 2015 +0000 @@ -7,10 +7,11 @@ * ************* Revision Controle System Header *************/ +#include "config.h" #include "l1_confg.h" #include "l1_types.h" #include "sys_types.h" -#include "cust_os.h" +#include "../../gpf/inc/cust_os.h" #include "l1_macro.h" #include "l1_const.h" #if TESTMODE
--- a/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_apihisr.c Thu Oct 22 19:04:36 2015 +0000 @@ -9,9 +9,11 @@ #include <stdio.h> #include <string.h> -#include "nucleus.h" +#include "config.h" #include "l1_confg.h" #include "sys_types.h" +#include "../../riviera/rv/rv_general.h" +#include "../../nucleus/nucleus.h" #include "l1_types.h" #include "l1audio_cust.h" #include "l1audio_defty.h" @@ -41,7 +43,7 @@ #endif #include "l1_defty.h" -#include "cust_os.h" +#include "../../gpf/inc/cust_os.h" /* #include "nu_main.h" */ #include "l1audio_signa.h" #include "l1audio_cust.h"
--- a/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_async.c Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_async.c Thu Oct 22 19:04:36 2015 +0000 @@ -8,11 +8,13 @@ ************* Revision Controle System Header *************/ #include <stdio.h> #include <string.h> -#include "nucleus.h" +#include "config.h" #include "l1_confg.h" +#include "sys_types.h" +#include "../../riviera/rv/rv_general.h" +#include "../../nucleus/nucleus.h" #include "l1_types.h" -#include "sys_types.h" -#include "cust_os.h" +#include "../../gpf/inc/cust_os.h" #include "l1audio_signa.h" #include "l1audio_const.h" #include "l1audio_cust.h" @@ -44,11 +46,7 @@ #include "l1_defty.h" #include "l1_varex.h" #include "l1_trace.h" -#include "sys_dma.h" - -#if (OP_RIV_AUDIO == 1) - #include "rv/rv_general.h" -#endif +/* #include "sys_dma.h" */ #if (L1_DYN_DSP_DWNLD == 1) @@ -657,7 +655,7 @@ l1a_apihisr_com.dyn_dwnld.command.restart = TRUE; /********** WORKAROUND *************/ -#if (OP_RIV_AUDIO == 1) +#if 1 //(OP_RIV_AUDIO == 1) { // WARNING: temporary until os_activate_hisr() is declared in L3 functions extern NU_HISR apiHISR;
--- a/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_func.c Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_func.c Thu Oct 22 19:04:36 2015 +0000 @@ -9,6 +9,7 @@ #include <stdio.h> #include <string.h> +#include "config.h" #include "l1_confg.h" #include "l1_types.h" #include "l1_const.h"
--- a/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_init.c Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_init.c Thu Oct 22 19:04:36 2015 +0000 @@ -6,9 +6,11 @@ * Copyright 2004 (C) Texas Instruments * ************* Revision Controle System Header *************/ -#include "nucleus.h" +#include "config.h" #include "l1_confg.h" #include "sys_types.h" +#include "../../riviera/rv/rv_general.h" +#include "../../nucleus/nucleus.h" #include "l1_types.h" #include "l1audio_const.h" #include "l1audio_cust.h" @@ -37,7 +39,7 @@ #endif //L1_AAC #include "l1_defty.h" -#include "cust_os.h" +#include "../../gpf/inc/cust_os.h" /* #include "nu_main.h" */ #include "l1audio_signa.h" #include "l1_varex.h"
--- a/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_sync.c Thu Oct 22 18:41:05 2015 +0000 +++ b/gsm-fw/L1/dyn_dwl_cfile/l1_dyn_dwl_sync.c Thu Oct 22 19:04:36 2015 +0000 @@ -10,11 +10,13 @@ #include <stdio.h> #include <string.h> -#include "nucleus.h" +#include "config.h" #include "l1_confg.h" +#include "sys_types.h" +#include "../../riviera/rv/rv_general.h" +#include "../../nucleus/nucleus.h" #include "l1_types.h" -#include "sys_types.h" -#include "cust_os.h" +#include "../../gpf/inc/cust_os.h" #include "l1audio_signa.h" #include "l1audio_const.h" #include "l1audio_cust.h" @@ -46,7 +48,7 @@ #include "l1_defty.h" #include "l1_varex.h" #include "l1_trace.h" -#include "sys_dma.h" +/* #include "sys_dma.h" */ #if (L1_DYN_DSP_DWNLD == 1)