diff --git a/bsp/stm32_radio/libwma/wmadeci.c b/bsp/stm32_radio/libwma/wmadeci.c index de9726041dc92fe1bde01b2e6ec8dbdc1558e62c..1f0758b3771b841f6b002d0207ec56938c710dc0 100644 --- a/bsp/stm32_radio/libwma/wmadeci.c +++ b/bsp/stm32_radio/libwma/wmadeci.c @@ -315,10 +315,6 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx) fixed32 *temp[5]; - #ifdef CPU_COLDFIRE - coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); - #endif - /*clear stereo setting to avoid glitches when switching stereo->mono*/ s->channel_coded[0]=0; s->channel_coded[1]=0; @@ -367,7 +363,7 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx) s->frame_len_bits = 11; } s->frame_len = 1 << s->frame_len_bits; - if (s-> use_variable_block_len) + if (s->use_variable_block_len) { int nb_max, nb; nb = ((flags2 >> 3) & 3) + 1; diff --git a/bsp/stm32_radio/project.Uv2 b/bsp/stm32_radio/project.Uv2 index d87a028de51dd9eab659541c7c4e39b688f9a90d..3a5fcc687b6dd5e098ee620216830278f4f29569 100644 --- a/bsp/stm32_radio/project.Uv2 +++ b/bsp/stm32_radio/project.Uv2 @@ -1,7 +1,7 @@ ### uVision2 Project, (C) Keil Software ### Do not modify ! -Target (RT-Thread/STM32-Radio), 0x0004 // Tools: 'ARM-ADS' +Target (RT-Thread STM32 Radio), 0x0004 // Tools: 'ARM-ADS' Group (Startup) Group (Library) @@ -11,7 +11,6 @@ Group (finsh) Group (Filesystem) Group (LwIP) Group (mp3) -Group (libwma) File 1,1,<.\application.c> File 1,1,<.\board.c> @@ -27,7 +26,6 @@ File 1,1,<.\rtc.c> File 1,1,<.\mp3.c> File 1,1,<.\wm8753.c> File 1,1,<.\wav.c> -File 1,1,<.\wma.c> File 2,1,<.\library\src\stm32f10x_adc.c> File 2,1,<.\library\src\stm32f10x_bkp.c> File 2,1,<.\library\src\stm32f10x_can.c> @@ -155,15 +153,9 @@ File 8,1,<.\mp3\real\subband.c> File 8,1,<.\mp3\real\trigtabs.c> File 8,2,<.\mp3\real\arm\asmpoly_thumb2.s> File 8,2,<.\mp3\real\arm\asmmisc.s> -File 9,1,<.\libwma\wmabitstream.c> -File 9,1,<.\libwma\wmadeci.c> -File 9,1,<.\libwma\wmafixed.c> -File 9,1,<.\libwma\mdct2.c> -File 9,2,<.\libwma\mdct_arm.S> -File 9,2,<.\libwma\wma_arm.S> -Options 1,0,0 // Target 'RT-Thread/STM32-Radio' +Options 1,0,0 // Target 'RT-Thread STM32 Radio' Device (STM32F103ZE) Vendor (STMicroelectronics) Cpu (IRAM(0x20000000-0x2000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3")) @@ -215,7 +207,7 @@ Options 1,0,0 // Target 'RT-Thread/STM32-Radio' OCMADSIRAM { 0,0,0,0,32,0,0,1,0 } OCMADSIROM { 1,0,0,0,8,0,0,8,0 } OCMADSXRAM { 0,0,0,0,0,0,0,0,0 } - OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,8,0,0,8,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,8,0,0,0,0,0,0,0,0,0,0 } + OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,8,0,0,8,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,1,0,0,0,0,0,0,0,0,0,0 } RV_STAVEC () ADSCCFLG { 5,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ADSCMISC () @@ -249,7 +241,7 @@ Options 1,0,0 // Target 'RT-Thread/STM32-Radio' OPTDBG 48117,7,()()()()()()()()()() (Segger\JL2CM3.dll)()()() FLASH1 { 1,0,0,0,1,0,0,0,5,16,0,0,0,0,0,0,0,0,0,0 } FLASH2 (Segger\JL2CM3.dll) - FLASH3 ("" ()) + FLASH3 () FLASH4 () EndOpt diff --git a/bsp/stm32_radio/stm32f10x.h b/bsp/stm32_radio/stm32f10x.h new file mode 100644 index 0000000000000000000000000000000000000000..7460805ec4c37532dfb566a0461c6834190e8ba1 --- /dev/null +++ b/bsp/stm32_radio/stm32f10x.h @@ -0,0 +1,6 @@ +#ifndef __STM32F10X_H__ +#define __STM32F10X_H__ + +#include + +#endif