From 0dfef2b35e95ddc1e013bb7967425783852de7cd Mon Sep 17 00:00:00 2001 From: wuyangyong Date: Tue, 9 Mar 2010 11:39:23 +0000 Subject: [PATCH] stm32_radio:remove codec version git-svn-id: https://rt-thread.googlecode.com/svn/trunk@472 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/stm32_radio/board.h | 14 ++++----- bsp/stm32_radio/stm32f10x_it.c | 53 ---------------------------------- 2 files changed, 6 insertions(+), 61 deletions(-) diff --git a/bsp/stm32_radio/board.h b/bsp/stm32_radio/board.h index aa4c4517d5..0536809972 100644 --- a/bsp/stm32_radio/board.h +++ b/bsp/stm32_radio/board.h @@ -19,7 +19,7 @@ /* board configuration */ // SDCard Driver <1=>SDIO sdcard <0=>SPI MMC card // Default: 1 -#define STM32_USE_SDIO 1 +#define STM32_USE_SDIO 1 /* whether use board external SRAM memory */ // Use external SRAM memory on the board @@ -40,15 +40,13 @@ // Console on USART: <0=> no console <1=>USART 1 <2=>USART 2 <3=> USART 3 // Default: 1 -#define STM32_CONSOLE_USART 1 +#define STM32_CONSOLE_USART 1 -// Codec Version <1=>Version 1 <2=>Version 2 +// LCD Modul Version +// <1=>Version 1:fmt0371 +// <2=>Version 2:ili9320/9325 // Default: 1 -#define CODEC_VERSION 1 - -// LCD Modul Version <1=>Version 1 <2=>Version 2 -// Default: 1 -#define LCD_VERSION 1 +#define LCD_VERSION 1 void rt_hw_board_led_on(int n); void rt_hw_board_led_off(int n); diff --git a/bsp/stm32_radio/stm32f10x_it.c b/bsp/stm32_radio/stm32f10x_it.c index afe4d6833e..dbf57ceba5 100644 --- a/bsp/stm32_radio/stm32f10x_it.c +++ b/bsp/stm32_radio/stm32f10x_it.c @@ -344,7 +344,6 @@ void DMA1_Channel4_IRQHandler(void) { } -#if CODEC_VERSION == 1 /******************************************************************************* * Function Name : DMA1_Channel5_IRQHandler * Description : This function handles DMA1 Channel 5 interrupt request. @@ -372,7 +371,6 @@ void DMA1_Channel5_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } -#endif /******************************************************************************* * Function Name : DMA1_Channel6_IRQHandler @@ -425,7 +423,6 @@ void EXTI9_5_IRQHandler(void) #endif } -#if CODEC_VERSION == 1 /******************************************************************************* * Function Name : SPI2_IRQHandler * Description : This function handles SPI2 global interrupt request. @@ -445,7 +442,6 @@ void SPI2_IRQHandler(void) /* leave interrupt */ rt_interrupt_leave(); } -#endif /******************************************************************************* * Function Name : USART1_IRQHandler @@ -640,55 +636,6 @@ void SDIO_IRQHandler(void) #endif } -#if CODEC_VERSION == 2 -/******************************************************************************* -* Function Name : SPI3_IRQHandler -* Description : This function handles SPI3 global interrupt request. -* Input : None -* Output : None -* Return : None -*******************************************************************************/ -void SPI3_IRQHandler(void) -{ - extern void wm8978_isr(void); - - /* enter interrupt */ - rt_interrupt_enter(); - - wm8978_isr(); - - /* leave interrupt */ - rt_interrupt_leave(); -} - -/******************************************************************************* -* Function Name : DMA2_Channel2_IRQHandler -* Description : This function handles DMA2 Channel 2 interrupt request. -* Input : None -* Output : None -* Return : None -*******************************************************************************/ -void DMA2_Channel2_IRQHandler(void) -{ - extern void wm8978_dma_isr(void); - - /* enter interrupt */ - rt_interrupt_enter(); - - if (DMA_GetITStatus(DMA2_IT_TC2)) - { - /* clear DMA flag */ - DMA_ClearFlag(DMA2_FLAG_TC2 | DMA2_FLAG_TE2); - - /* transmission complete, invoke serial dma tx isr */ - wm8978_dma_isr(); - } - - /* leave interrupt */ - rt_interrupt_leave(); -} -#endif - /* add on 2009-12-31 for usb */ extern void CTR_HP(void); extern void USB_Istr(void);