FreeCalypso > hg > freecalypso-sw
changeset 830:56e3d8560d69
L1 audio: vocoder mute functions made independent of AUDIO_TASK
| author | Space Falcon <falcon@ivan.Harhan.ORG> |
|---|---|
| date | Wed, 22 Apr 2015 16:30:11 +0000 |
| parents | f74c5d3d3b06 |
| children | 549b7ac60300 |
| files | gsm-fw/L1/audio_cfile/Makefile gsm-fw/L1/audio_cfile/l1audio_drive.c |
| diffstat | 2 files changed, 16 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/L1/audio_cfile/Makefile Sat Apr 18 22:47:59 2015 +0000 +++ b/gsm-fw/L1/audio_cfile/Makefile Wed Apr 22 16:30:11 2015 +0000 @@ -5,7 +5,7 @@ CFLAGS= -O2 -fno-builtin -mthumb-interwork LD= arm-elf-ld -XOBJS= l1audio_abb.o l1audio_init.o +XOBJS= l1audio_abb.o l1audio_drive.o l1audio_init.o all: xipcode.o
--- a/gsm-fw/L1/audio_cfile/l1audio_drive.c Sat Apr 18 22:47:59 2015 +0000 +++ b/gsm-fw/L1/audio_cfile/l1audio_drive.c Wed Apr 22 16:30:11 2015 +0000 @@ -11,10 +11,11 @@ /* Include files... */ /************************************/ -#include "l1_macro.h" +#include "config.h" #include "l1_confg.h" +#include "l1_macro.h" -#if (AUDIO_TASK == 1) +#if 1 //(AUDIO_TASK == 1) #include "l1_types.h" #include "sys_types.h" @@ -113,7 +114,7 @@ #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 "l1_varex.h" @@ -121,15 +122,15 @@ #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" // Clockm ("eva3.lib") #include "l1_ctl.h" #include "l1_time.h" @@ -173,7 +174,7 @@ { // Set the DL vocoder mute bit in the d_tch_mode register l1s_dsp_com.dsp_ndb_ptr->d_tch_mode |= (0x01<<14); - } + } else { // Reset the DL vocoder mute bit in the d_tch_mode register @@ -198,7 +199,7 @@ { // Set the UL vocoder mute bit in the d_tch_mode register l1s_dsp_com.dsp_ndb_ptr->d_tch_mode |= (0x01<<15); - } + } else { // Reset the UL vocoder mute bit in the d_tch_mode register