# HG changeset patch # User Michael Spacefalcon # Date 1409289485 0 # Node ID 3121e35f422cf6d124c191dd7b0ce975b3bf64da # Parent b8a277d81746920f206003bb718a7ee537b3d540 gsm-fw/L1/audio_cfile/l1audio_init.c: initial preen, doesn't compile yet diff -r b8a277d81746 -r 3121e35f422c gsm-fw/L1/audio_cfile/Makefile --- a/gsm-fw/L1/audio_cfile/Makefile Fri Aug 29 04:59:24 2014 +0000 +++ b/gsm-fw/L1/audio_cfile/Makefile Fri Aug 29 05:18:05 2014 +0000 @@ -5,7 +5,7 @@ CFLAGS= -O2 -fno-builtin -mthumb-interwork LD= arm-elf-ld -XOBJS= l1audio_abb.o +XOBJS= l1audio_abb.o l1audio_init.o all: ${XOBJS} diff -r b8a277d81746 -r 3121e35f422c gsm-fw/L1/audio_cfile/l1audio_init.c --- a/gsm-fw/L1/audio_cfile/l1audio_init.c Fri Aug 29 04:59:24 2014 +0000 +++ b/gsm-fw/L1/audio_cfile/l1audio_init.c Fri Aug 29 05:18:05 2014 +0000 @@ -11,8 +11,9 @@ /* Include files... */ /************************************/ +#include "config.h" +#include "l1_confg.h" #include "l1_macro.h" -#include "l1_confg.h" #include "l1_types.h" @@ -110,22 +111,22 @@ #endif #include "l1_defty.h" - #include "cust_os.h" + #include "../../gpf/inc/cust_os.h" #include "l1_msgty.h" - #include "tpudrv.h" // TPU drivers. ("eva3.lib") + #include "tpudrv.h" #include "l1_varex.h" #include "l1_proto.h" #include "l1_mftab.h" #include "l1_tabs.h" - #include "mem.h" - #include "armio.h" - #include "timer.h" - #include "timer1.h" - #include "dma.h" - #include "inth.h" - #include "ulpd.h" - #include "rhea_arm.h" - #include "clkm.h" // Clockm ("eva3.lib") + #include "../../bsp/mem.h" + #include "../../bsp/armio.h" + #include "../../bsp/timer.h" + #include "../../bsp/timer1.h" + #include "../../bsp/dma.h" + #include "../../bsp/inth.h" + #include "../../bsp/ulpd.h" + #include "../../bsp/rhea_arm.h" + #include "../../bsp/clkm.h" #include "l1_ctl.h" #include "l1_time.h" @@ -360,10 +361,9 @@ #endif - #if (DSP == 38) || (DSP == 39) - //----------------------------------- + //----------------------------------- // AUDIO control words initialization //----------------------------------- @@ -404,9 +404,9 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_fir_shift = (API) 0; for (i=0; i < IIR_4X_FIR_MAX_LENGTH; i++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_fir_taps[i] = (API) 0; - } + } // Set parameters for IIR part l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_enable = (API) 0; @@ -417,13 +417,13 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_fact_form_1 = (API) 0; for (j=0; j < IIR_4X_ORDER_OF_SECTION; j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_den_1[j] = (API) 0; - } + } for (j=0; j < (IIR_4X_ORDER_OF_SECTION + 1); j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_num_1[j] = (API) 0; - } + } l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_num_form_1 = (API) 0; @@ -432,13 +432,13 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_fact_form_2 = (API) 0; for (j=0; j < IIR_4X_ORDER_OF_SECTION; j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_den_2[j] = (API) 0; - } + } for (j=0; j < (IIR_4X_ORDER_OF_SECTION + 1); j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_num_2[j] = (API) 0; - } + } l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_num_form_2 = (API) 0; @@ -447,13 +447,13 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_fact_form_3 = (API) 0; for (j=0; j < IIR_4X_ORDER_OF_SECTION; j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_den_3[j] = (API) 0; - } + } for (j=0; j < (IIR_4X_ORDER_OF_SECTION + 1); j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_num_3[j] = (API) 0; - } + } l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_num_form_3 = (API) 0; @@ -462,13 +462,13 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_fact_form_4 = (API) 0; for (j=0; j < IIR_4X_ORDER_OF_SECTION; j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_den_4[j] = (API) 0; - } + } for (j=0; j < (IIR_4X_ORDER_OF_SECTION + 1); j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_num_4[j] = (API) 0; - } + } l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_num_form_4 = (API) 0; @@ -477,13 +477,13 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_fact_form_5 = (API) 0; for (j=0; j < IIR_4X_ORDER_OF_SECTION; j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_den_5[j] = (API) 0; - } + } for (j=0; j < (IIR_4X_ORDER_OF_SECTION + 1); j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_num_5[j] = (API) 0; - } + } l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_num_form_5 = (API) 0; @@ -492,17 +492,16 @@ l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_fact_form_6 = (API) 0; for (j=0; j < IIR_4X_ORDER_OF_SECTION; j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_den_6[j] = (API) 0; - } + } for (j=0; j < (IIR_4X_ORDER_OF_SECTION + 1); j++) - { + { l1s_dsp_com.dsp_ndb_ptr->a_iir4x_sos_num_6[j] = (API) 0; - } + } l1s_dsp_com.dsp_ndb_ptr->d_iir4x_sos_num_form_6 = (API) 0; - l1s_dsp_com.dsp_ndb_ptr->d_iir4x_gain = (API) 0; #endif @@ -539,7 +538,7 @@ l1s_dsp_com.dsp_ndb_ptr->d_wcm_mode = (API) 0; l1s_dsp_com.dsp_ndb_ptr->d_wcm_frame_size = (API) 0; - l1s_dsp_com.dsp_ndb_ptr->d_wcm_num_sub_frames = (API) 0; + l1s_dsp_com.dsp_ndb_ptr->d_wcm_num_sub_frames = (API) 0; l1s_dsp_com.dsp_ndb_ptr->d_wcm_ratio = (API) 0; l1s_dsp_com.dsp_ndb_ptr->d_wcm_threshold = (API) 0; #endif @@ -637,7 +636,7 @@ l1s.audio_on_off_ctl.l1_audio_ul_switched_off = TRUE; l1s.audio_on_off_ctl.l1_audio_dl_switched_off = TRUE; #endif // L1_AUDIO_MCU_ONOFF - + #if (L1_DRC == 1)