提交 3d4e5e1f 编写于 作者: B bernard.xiong@gmail.com

update library to 3.5.0; update project file to Keil4.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1557 bbd45198-f89e-11dd-88c7-29a3b14d5316
上级 311e6695
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_cl.s * @file startup_stm32f10x_cl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Connectivity line Devices vector table for Atollic * @brief STM32F10x Connectivity line Devices vector table for Atollic
* toolchain. * toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR * - Set the vector table entries with the exceptions ISR
* address. * address.
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -469,4 +470,4 @@ g_pfnVectors: ...@@ -469,4 +470,4 @@ g_pfnVectors:
.weak OTG_FS_IRQHandler .weak OTG_FS_IRQHandler
.thumb_set OTG_FS_IRQHandler ,Default_Handler .thumb_set OTG_FS_IRQHandler ,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_hd.s * @file startup_stm32f10x_hd.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x High Density Devices vector table for Atollic toolchain. * @brief STM32F10x High Density Devices vector table for Atollic toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address, * - Set the vector table entries with the exceptions ISR address,
* - Configure the clock system * - Configure the clock system
* - Configure external SRAM mounted on STM3210E-EVAL board * - Configure external SRAM mounted on STM3210E-EVAL board
* to be used as data memory (optional, to be enabled by user) * to be used as data memory (optional, to be enabled by user)
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -465,4 +466,4 @@ g_pfnVectors: ...@@ -465,4 +466,4 @@ g_pfnVectors:
.weak DMA2_Channel4_5_IRQHandler .weak DMA2_Channel4_5_IRQHandler
.thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_hd_vl.s * @file startup_stm32f10x_hd_vl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x High Density Value Line Devices vector table for Atollic toolchain. * @brief STM32F10x High Density Value Line Devices vector table for Atollic
* This module performs: * toolchain.
* - Set the initial SP * This module performs:
* - Set the initial PC == Reset_Handler, * - Set the initial SP
* - Set the vector table entries with the exceptions ISR address * - Set the initial PC == Reset_Handler,
* - Configure the clock system * - Set the vector table entries with the exceptions ISR address
* - Configure external SRAM mounted on STM32100E-EVAL board * - Configure the clock system
* to be used as data memory (optional, to be enabled by user) * - Configure external SRAM mounted on STM32100E-EVAL board
* - Branches to main in the C library (which eventually * to be used as data memory (optional, to be enabled by user)
* calls main()). * - Branches to main in the C library (which eventually
* After Reset the Cortex-M3 processor is in Thread mode, * calls main()).
* priority is Privileged, and the Stack is set to Main. * After Reset the Cortex-M3 processor is in Thread mode,
******************************************************************************* * priority is Privileged, and the Stack is set to Main.
* @copy ******************************************************************************
* * @attention
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS *
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> *
*/ * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -191,7 +193,7 @@ g_pfnVectors: ...@@ -191,7 +193,7 @@ g_pfnVectors:
.word TIM14_IRQHandler .word TIM14_IRQHandler
.word 0 .word 0
.word 0 .word 0
.word FSMC_IRQHandler .word 0
.word 0 .word 0
.word TIM5_IRQHandler .word TIM5_IRQHandler
.word SPI3_IRQHandler .word SPI3_IRQHandler
...@@ -412,9 +414,6 @@ g_pfnVectors: ...@@ -412,9 +414,6 @@ g_pfnVectors:
.weak TIM14_IRQHandler .weak TIM14_IRQHandler
.thumb_set TIM14_IRQHandler,Default_Handler .thumb_set TIM14_IRQHandler,Default_Handler
.weak FSMC_IRQHandler
.thumb_set FSMC_IRQHandler,Default_Handler
.weak TIM5_IRQHandler .weak TIM5_IRQHandler
.thumb_set TIM5_IRQHandler,Default_Handler .thumb_set TIM5_IRQHandler,Default_Handler
...@@ -448,5 +447,5 @@ g_pfnVectors: ...@@ -448,5 +447,5 @@ g_pfnVectors:
.weak DMA2_Channel5_IRQHandler .weak DMA2_Channel5_IRQHandler
.thumb_set DMA2_Channel5_IRQHandler,Default_Handler .thumb_set DMA2_Channel5_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_ld.s * @file startup_stm32f10x_ld.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Low Density Devices vector table for Atollic toolchain. * @brief STM32F10x Low Density Devices vector table for Atollic toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address. * - Set the vector table entries with the exceptions ISR address.
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -343,4 +344,4 @@ g_pfnVectors: ...@@ -343,4 +344,4 @@ g_pfnVectors:
.weak USBWakeUp_IRQHandler .weak USBWakeUp_IRQHandler
.thumb_set USBWakeUp_IRQHandler,Default_Handler .thumb_set USBWakeUp_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_ld_vl.s * @file startup_stm32f10x_ld_vl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Low Density Value Line Devices vector table for Atollic toolchain. * @brief STM32F10x Low Density Value Line Devices vector table for Atollic toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -387,5 +388,5 @@ g_pfnVectors: ...@@ -387,5 +388,5 @@ g_pfnVectors:
.weak TIM7_IRQHandler .weak TIM7_IRQHandler
.thumb_set TIM7_IRQHandler,Default_Handler .thumb_set TIM7_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_md.s * @file startup_stm32f10x_md.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Medium Density Devices vector table for Atollic toolchain. * @brief STM32F10x Medium Density Devices vector table for Atollic toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -358,5 +359,5 @@ g_pfnVectors: ...@@ -358,5 +359,5 @@ g_pfnVectors:
.weak USBWakeUp_IRQHandler .weak USBWakeUp_IRQHandler
.thumb_set USBWakeUp_IRQHandler,Default_Handler .thumb_set USBWakeUp_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_md_vl.s * @file startup_stm32f10x_md_vl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Medium Density Value Line Devices vector table for Atollic toolchain. * @brief STM32F10x Medium Density Value Line Devices vector table for Atollic
* This module performs: * toolchain.
* - Set the initial SP * This module performs:
* - Set the initial PC == Reset_Handler, * - Set the initial SP
* - Set the vector table entries with the exceptions ISR address * - Set the initial PC == Reset_Handler,
* - Configure the clock system * - Set the vector table entries with the exceptions ISR address
* - Branches to main in the C library (which eventually * - Configure the clock system
* calls main()). * - Branches to main in the C library (which eventually
* After Reset the Cortex-M3 processor is in Thread mode, * calls main()).
* priority is Privileged, and the Stack is set to Main. * After Reset the Cortex-M3 processor is in Thread mode,
******************************************************************************* * priority is Privileged, and the Stack is set to Main.
* @copy ******************************************************************************
* * @attention
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS *
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> *
*/ * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -402,5 +404,5 @@ g_pfnVectors: ...@@ -402,5 +404,5 @@ g_pfnVectors:
.weak TIM7_IRQHandler .weak TIM7_IRQHandler
.thumb_set TIM7_IRQHandler,Default_Handler .thumb_set TIM7_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_xl.s * @file startup_stm32f10x_xl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x XL-Density Devices vector table for TrueSTUDIO toolchain. * @brief STM32F10x XL-Density Devices vector table for TrueSTUDIO toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system and the external SRAM mounted on * - Configure the clock system and the external SRAM mounted on
* STM3210E-EVAL board to be used as data memory (optional, * STM3210E-EVAL board to be used as data memory (optional,
* to be enabled by user) * to be enabled by user)
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -463,4 +464,4 @@ g_pfnVectors: ...@@ -463,4 +464,4 @@ g_pfnVectors:
.weak DMA2_Channel4_5_IRQHandler .weak DMA2_Channel4_5_IRQHandler
.thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_cl.s ;* File Name : startup_stm32f10x_cl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Connectivity line devices vector table for MDK-ARM ;* Description : STM32F10x Connectivity line devices vector table for MDK-ARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
...@@ -365,4 +365,4 @@ __user_initial_stackheap ...@@ -365,4 +365,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_hd.s ;* File Name : startup_stm32f10x_hd.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x High Density Devices vector table for MDK-ARM ;* Description : STM32F10x High Density Devices vector table for MDK-ARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
...@@ -355,4 +355,4 @@ __user_initial_stackheap ...@@ -355,4 +355,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_hd_vl.s ;* File Name : startup_stm32f10x_hd_vl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x High Density Value Line Devices vector table ;* Description : STM32F10x High Density Value Line Devices vector table
;* for MDK-ARM toolchain. ;* for MDK-ARM toolchain.
;* This module performs: ;* This module performs:
...@@ -126,7 +126,7 @@ __Vectors DCD __initial_sp ; Top of Stack ...@@ -126,7 +126,7 @@ __Vectors DCD __initial_sp ; Top of Stack
DCD TIM14_IRQHandler ; TIM14 DCD TIM14_IRQHandler ; TIM14
DCD 0 ; Reserved DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD FSMC_IRQHandler ; FSMC DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD TIM5_IRQHandler ; TIM5 DCD TIM5_IRQHandler ; TIM5
DCD SPI3_IRQHandler ; SPI3 DCD SPI3_IRQHandler ; SPI3
...@@ -244,7 +244,6 @@ Default_Handler PROC ...@@ -244,7 +244,6 @@ Default_Handler PROC
EXPORT TIM12_IRQHandler [WEAK] EXPORT TIM12_IRQHandler [WEAK]
EXPORT TIM13_IRQHandler [WEAK] EXPORT TIM13_IRQHandler [WEAK]
EXPORT TIM14_IRQHandler [WEAK] EXPORT TIM14_IRQHandler [WEAK]
EXPORT FSMC_IRQHandler [WEAK]
EXPORT TIM5_IRQHandler [WEAK] EXPORT TIM5_IRQHandler [WEAK]
EXPORT SPI3_IRQHandler [WEAK] EXPORT SPI3_IRQHandler [WEAK]
EXPORT UART4_IRQHandler [WEAK] EXPORT UART4_IRQHandler [WEAK]
...@@ -299,7 +298,6 @@ CEC_IRQHandler ...@@ -299,7 +298,6 @@ CEC_IRQHandler
TIM12_IRQHandler TIM12_IRQHandler
TIM13_IRQHandler TIM13_IRQHandler
TIM14_IRQHandler TIM14_IRQHandler
FSMC_IRQHandler
TIM5_IRQHandler TIM5_IRQHandler
SPI3_IRQHandler SPI3_IRQHandler
UART4_IRQHandler UART4_IRQHandler
...@@ -345,4 +343,4 @@ __user_initial_stackheap ...@@ -345,4 +343,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_ld.s ;* File Name : startup_stm32f10x_ld.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Low Density Devices vector table for MDK-ARM ;* Description : STM32F10x Low Density Devices vector table for MDK-ARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
...@@ -294,4 +294,4 @@ __user_initial_stackheap ...@@ -294,4 +294,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_ld_vl.s ;* File Name : startup_stm32f10x_ld_vl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Low Density Value Line Devices vector table ;* Description : STM32F10x Low Density Value Line Devices vector table
;* for MDK-ARM toolchain. ;* for MDK-ARM toolchain.
;* This module performs: ;* This module performs:
...@@ -301,4 +301,4 @@ __user_initial_stackheap ...@@ -301,4 +301,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_md.s ;* File Name : startup_stm32f10x_md.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Medium Density Devices vector table for MDK-ARM ;* Description : STM32F10x Medium Density Devices vector table for MDK-ARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
...@@ -304,4 +304,4 @@ __user_initial_stackheap ...@@ -304,4 +304,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_md_vl.s ;* File Name : startup_stm32f10x_md_vl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Medium Density Value Line Devices vector table ;* Description : STM32F10x Medium Density Value Line Devices vector table
;* for MDK-ARM toolchain. ;* for MDK-ARM toolchain.
;* This module performs: ;* This module performs:
...@@ -312,4 +312,4 @@ __user_initial_stackheap ...@@ -312,4 +312,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
;******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_xl.s ;* File Name : startup_stm32f10x_xl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x XL-Density Devices vector table for MDK-ARM ;* Description : STM32F10x XL-Density Devices vector table for MDK-ARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
...@@ -355,4 +355,4 @@ __user_initial_stackheap ...@@ -355,4 +355,4 @@ __user_initial_stackheap
END END
;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE***** ;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_cl.s * @file startup_stm32f10x_cl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Connectivity line Devices vector table for RIDE7 toolchain. * @brief STM32F10x Connectivity line Devices vector table for RIDE7 toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR * - Set the vector table entries with the exceptions ISR
* address. * address.
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -464,4 +465,4 @@ g_pfnVectors: ...@@ -464,4 +465,4 @@ g_pfnVectors:
.weak OTG_FS_IRQHandler .weak OTG_FS_IRQHandler
.thumb_set OTG_FS_IRQHandler ,Default_Handler .thumb_set OTG_FS_IRQHandler ,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_hd.s * @file startup_stm32f10x_hd.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x High Density Devices vector table for RIDE7 toolchain. * @brief STM32F10x High Density Devices vector table for RIDE7 toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system and the external SRAM mounted on * - Configure the clock system and the external SRAM mounted on
* STM3210E-EVAL board to be used as data memory (optional, * STM3210E-EVAL board to be used as data memory (optional,
* to be enabled by user) * to be enabled by user)
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -461,4 +462,4 @@ g_pfnVectors: ...@@ -461,4 +462,4 @@ g_pfnVectors:
.weak DMA2_Channel4_5_IRQHandler .weak DMA2_Channel4_5_IRQHandler
.thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_hd_vl.s * @file startup_stm32f10x_hd_vl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x High Density Value Line Devices vector table for RIDE7 * @brief STM32F10x High Density Value Line Devices vector table for RIDE7
* toolchain. * toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system and the external SRAM mounted on * - Configure the clock system and the external SRAM mounted on
* STM32100E-EVAL board to be used as data memory (optional, * STM32100E-EVAL board to be used as data memory (optional,
* to be enabled by user) * to be enabled by user)
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -187,7 +188,7 @@ g_pfnVectors: ...@@ -187,7 +188,7 @@ g_pfnVectors:
.word TIM14_IRQHandler .word TIM14_IRQHandler
.word 0 .word 0
.word 0 .word 0
.word FSMC_IRQHandler .word 0
.word 0 .word 0
.word TIM5_IRQHandler .word TIM5_IRQHandler
.word SPI3_IRQHandler .word SPI3_IRQHandler
...@@ -405,9 +406,6 @@ g_pfnVectors: ...@@ -405,9 +406,6 @@ g_pfnVectors:
.weak TIM14_IRQHandler .weak TIM14_IRQHandler
.thumb_set TIM14_IRQHandler,Default_Handler .thumb_set TIM14_IRQHandler,Default_Handler
.weak FSMC_IRQHandler
.thumb_set FSMC_IRQHandler,Default_Handler
.weak TIM5_IRQHandler .weak TIM5_IRQHandler
.thumb_set TIM5_IRQHandler,Default_Handler .thumb_set TIM5_IRQHandler,Default_Handler
...@@ -441,4 +439,4 @@ g_pfnVectors: ...@@ -441,4 +439,4 @@ g_pfnVectors:
.weak DMA2_Channel5_IRQHandler .weak DMA2_Channel5_IRQHandler
.thumb_set DMA2_Channel5_IRQHandler,Default_Handler .thumb_set DMA2_Channel5_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_ld.s * @file startup_stm32f10x_ld.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Low Density Devices vector table for RIDE7 toolchain. * @brief STM32F10x Low Density Devices vector table for RIDE7 toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -339,4 +340,4 @@ g_pfnVectors: ...@@ -339,4 +340,4 @@ g_pfnVectors:
.weak USBWakeUp_IRQHandler .weak USBWakeUp_IRQHandler
.thumb_set USBWakeUp_IRQHandler,Default_Handler .thumb_set USBWakeUp_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_ld_vl.s * @file startup_stm32f10x_ld_vl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Low Density Value Line Devices vector table for RIDE7 * @brief STM32F10x Low Density Value Line Devices vector table for RIDE7
* toolchain. * toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -379,4 +380,4 @@ g_pfnVectors: ...@@ -379,4 +380,4 @@ g_pfnVectors:
.weak TIM7_IRQHandler .weak TIM7_IRQHandler
.thumb_set TIM7_IRQHandler,Default_Handler .thumb_set TIM7_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_md.s * @file startup_stm32f10x_md.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Medium Density Devices vector table for RIDE7 toolchain. * @brief STM32F10x Medium Density Devices vector table for RIDE7 toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -354,4 +355,4 @@ g_pfnVectors: ...@@ -354,4 +355,4 @@ g_pfnVectors:
.weak USBWakeUp_IRQHandler .weak USBWakeUp_IRQHandler
.thumb_set USBWakeUp_IRQHandler,Default_Handler .thumb_set USBWakeUp_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_md_vl.s * @file startup_stm32f10x_md_vl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x Medium Density Value Line Devices vector table for RIDE7 * @brief STM32F10x Medium Density Value Line Devices vector table for RIDE7
* toolchain. * toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system * - Configure the clock system
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -395,4 +396,4 @@ g_pfnVectors: ...@@ -395,4 +396,4 @@ g_pfnVectors:
.weak TIM7_IRQHandler .weak TIM7_IRQHandler
.thumb_set TIM7_IRQHandler,Default_Handler .thumb_set TIM7_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
/** /**
****************************************************************************** ******************************************************************************
* @file startup_stm32f10x_xl.s * @file startup_stm32f10x_xl.s
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief STM32F10x XL-Density Devices vector table for RIDE7 toolchain. * @brief STM32F10x XL-Density Devices vector table for RIDE7 toolchain.
* This module performs: * This module performs:
* - Set the initial SP * - Set the initial SP
* - Set the initial PC == Reset_Handler, * - Set the initial PC == Reset_Handler,
* - Set the vector table entries with the exceptions ISR address * - Set the vector table entries with the exceptions ISR address
* - Configure the clock system and the external SRAM mounted on * - Configure the clock system and the external SRAM mounted on
* STM3210E-EVAL board to be used as data memory (optional, * STM3210E-EVAL board to be used as data memory (optional,
* to be enabled by user) * to be enabled by user)
* - Branches to main in the C library (which eventually * - Branches to main in the C library (which eventually
* calls main()). * calls main()).
* After Reset the Cortex-M3 processor is in Thread mode, * After Reset the Cortex-M3 processor is in Thread mode,
* priority is Privileged, and the Stack is set to Main. * priority is Privileged, and the Stack is set to Main.
******************************************************************************* ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
.syntax unified .syntax unified
.cpu cortex-m3 .cpu cortex-m3
...@@ -461,4 +462,4 @@ g_pfnVectors: ...@@ -461,4 +462,4 @@ g_pfnVectors:
.weak DMA2_Channel4_5_IRQHandler .weak DMA2_Channel4_5_IRQHandler
.thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics *******************
;* File Name : startup_stm32f10x_cl.s ;* File Name : startup_stm32f10x_cl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Connectivity line devices vector table for ;* Description : STM32F10x Connectivity line devices vector table for
;* EWARM5.x toolchain. ;* EWARM toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
;* - Configure the clock system ;* - Configure the clock system
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -504,4 +504,4 @@ OTG_FS_IRQHandler ...@@ -504,4 +504,4 @@ OTG_FS_IRQHandler
B OTG_FS_IRQHandler B OTG_FS_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_hd.s ;* File Name : startup_stm32f10x_hd.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x High Density Devices vector table for EWARM5.x ;* Description : STM32F10x High Density Devices vector table for EWARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -493,4 +493,4 @@ DMA2_Channel4_5_IRQHandler ...@@ -493,4 +493,4 @@ DMA2_Channel4_5_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_hd_vl.s ;* File Name : startup_stm32f10x_hd_vl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x High Density Value Line Devices vector table ;* Description : STM32F10x High Density Value Line Devices vector table
;* for EWARM5.x toolchain. ;* for EWARM toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
;* - Configure the clock system and the external SRAM ;* - Configure the clock system and the external SRAM
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -119,7 +119,7 @@ __vector_table ...@@ -119,7 +119,7 @@ __vector_table
DCD TIM14_IRQHandler ; TIM14 DCD TIM14_IRQHandler ; TIM14
DCD 0 ; Reserved DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD FSMC_IRQHandler ; FSMC DCD 0 ; Reserved
DCD 0 ; Reserved DCD 0 ; Reserved
DCD TIM5_IRQHandler ; TIM5 DCD TIM5_IRQHandler ; TIM5
DCD SPI3_IRQHandler ; SPI3 DCD SPI3_IRQHandler ; SPI3
...@@ -402,11 +402,6 @@ TIM13_IRQHandler ...@@ -402,11 +402,6 @@ TIM13_IRQHandler
TIM14_IRQHandler TIM14_IRQHandler
B TIM14_IRQHandler B TIM14_IRQHandler
PUBWEAK FSMC_IRQHandler
SECTION .text:CODE:REORDER(1)
FSMC_IRQHandler
B FSMC_IRQHandler
PUBWEAK TIM5_IRQHandler PUBWEAK TIM5_IRQHandler
SECTION .text:CODE:REORDER(1) SECTION .text:CODE:REORDER(1)
TIM5_IRQHandler TIM5_IRQHandler
...@@ -463,4 +458,4 @@ DMA2_Channel5_IRQHandler ...@@ -463,4 +458,4 @@ DMA2_Channel5_IRQHandler
B DMA2_Channel5_IRQHandler B DMA2_Channel5_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_ld.s ;* File Name : startup_stm32f10x_ld.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Low Density Devices vector table for EWARM5.x ;* Description : STM32F10x Low Density Devices vector table for EWARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -363,4 +363,4 @@ USBWakeUp_IRQHandler ...@@ -363,4 +363,4 @@ USBWakeUp_IRQHandler
B USBWakeUp_IRQHandler B USBWakeUp_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_ld_vl.s ;* File Name : startup_stm32f10x_ld_vl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Low Density Value Line Devices vector table ;* Description : STM32F10x Low Density Value Line Devices vector table
;* for EWARM5.x toolchain. ;* for EWARM toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
;* - Configure the clock system ;* - Configure the clock system
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -366,4 +366,4 @@ TIM7_IRQHandler ...@@ -366,4 +366,4 @@ TIM7_IRQHandler
B TIM7_IRQHandler B TIM7_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_md.s ;* File Name : startup_stm32f10x_md.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Medium Density Devices vector table for ;* Description : STM32F10x Medium Density Devices vector table for
;* EWARM5.x toolchain. ;* EWARM toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
;* - Configure the clock system ;* - Configure the clock system
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -388,4 +388,4 @@ USBWakeUp_IRQHandler ...@@ -388,4 +388,4 @@ USBWakeUp_IRQHandler
B USBWakeUp_IRQHandler B USBWakeUp_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_md_vl.s ;* File Name : startup_stm32f10x_md_vl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x Medium Density Value Line Devices vector table ;* Description : STM32F10x Medium Density Value Line Devices vector table
;* for EWARM5.x toolchain. ;* for EWARM toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
;* - Configure the clock system ;* - Configure the clock system
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -391,4 +391,4 @@ TIM7_IRQHandler ...@@ -391,4 +391,4 @@ TIM7_IRQHandler
B TIM7_IRQHandler B TIM7_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
;/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** ;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
;* File Name : startup_stm32f10x_xl.s ;* File Name : startup_stm32f10x_xl.s
;* Author : MCD Application Team ;* Author : MCD Application Team
;* Version : V3.4.0 ;* Version : V3.5.0
;* Date : 10/15/2010 ;* Date : 11-March-2011
;* Description : STM32F10x XL-Density Devices vector table for EWARM5.x ;* Description : STM32F10x XL-Density Devices vector table for EWARM
;* toolchain. ;* toolchain.
;* This module performs: ;* This module performs:
;* - Set the initial SP ;* - Set the initial SP
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
;*******************************************************************************/ ;*******************************************************************************
; ;
; ;
; The modules in this file are included in the libraries, and may be replaced ; The modules in this file are included in the libraries, and may be replaced
...@@ -493,4 +493,4 @@ DMA2_Channel4_5_IRQHandler ...@@ -493,4 +493,4 @@ DMA2_Channel4_5_IRQHandler
END END
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
****************************************************************************** ******************************************************************************
* @file system_stm32f10x.h * @file system_stm32f10x.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief CMSIS Cortex-M3 Device Peripheral Access Layer System Header File. * @brief CMSIS Cortex-M3 Device Peripheral Access Layer System Header File.
****************************************************************************** ******************************************************************************
* @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
****************************************************************************** ******************************************************************************
*/ */
...@@ -94,4 +95,4 @@ extern void SystemCoreClockUpdate(void); ...@@ -94,4 +95,4 @@ extern void SystemCoreClockUpdate(void);
/** /**
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,9 +2,13 @@ import rtconfig ...@@ -2,9 +2,13 @@ import rtconfig
Import('RTT_ROOT') Import('RTT_ROOT')
from building import * from building import *
# get current directory
cwd = GetCurrentDir()
# The set of source files associated with this SConscript file. # The set of source files associated with this SConscript file.
src = Split(""" src = Split("""
CMSIS/CM3/CoreSupport/core_cm3.c CMSIS/CM3/CoreSupport/core_cm3.c
CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
...@@ -30,11 +34,30 @@ STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c ...@@ -30,11 +34,30 @@ STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
STM32F10x_StdPeriph_Driver/src/misc.c STM32F10x_StdPeriph_Driver/src/misc.c
""") """)
path = [RTT_ROOT + '/bsp/stm3210/Libraries/STM32F10x_StdPeriph_Driver/inc', # starupt scripts for each STM32 kind
RTT_ROOT + '/bsp/stm3210/Libraries/CMSIS/CM3/CoreSupport', startup_scripts = {}
RTT_ROOT + '/bsp/stm3210/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x'] startup_scripts['STM32F10X_CL'] = 'startup_stm32f10x_cl.s'
startup_scripts['STM32F10X_HD'] = 'startup_stm32f10x_hd.s'
startup_scripts['STM32F10X_HD_VL'] = 'startup_stm32f10x_hd_vl.s'
startup_scripts['STM32F10X_LD'] = 'startup_stm32f10x_ld.s'
startup_scripts['STM32F10X_LD_VL'] = 'startup_stm32f10x_ld_vl.s'
startup_scripts['STM32F10X_MD'] = 'startup_stm32f10x_md.s'
startup_scripts['STM32F10X_MD_VL'] = 'startup_stm32f10x_md_vl.s'
startup_scripts['STM32F10X_XL'] = 'startup_stm32f10x_xl.s'
# add for startup script
if rtconfig.CROSS_TOOL == 'gcc':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/' + startup_scripts[rtconfig.STM32_TYPE]]
elif rtconfig.CROSS_TOOL == 'keil':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/' + startup_scripts[rtconfig.STM32_TYPE]]
elif rtconfig.CROSS_TOOL == 'iar':
src = src + ['CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/' + startup_scripts[rtconfig.STM32_TYPE]]
path = [cwd + '/STM32F10x_StdPeriph_Driver/inc',
cwd + '/CMSIS/CM3/CoreSupport',
cwd + '/CMSIS/CM3/DeviceSupport/ST/STM32F10x']
CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE] CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.STM32_TYPE]
group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path) group = DefineGroup('STM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
Return('group') Return('group')
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file misc.h * @file misc.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the miscellaneous * @brief This file contains all the functions prototypes for the miscellaneous
* firmware library functions (add-on to CMSIS functions). * firmware library functions (add-on to CMSIS functions).
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __MISC_H #ifndef __MISC_H
...@@ -216,4 +217,4 @@ void SysTick_CLKSourceConfig(uint32_t SysTick_CLKSource); ...@@ -216,4 +217,4 @@ void SysTick_CLKSourceConfig(uint32_t SysTick_CLKSource);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_adc.h * @file stm32f10x_adc.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the ADC firmware * @brief This file contains all the functions prototypes for the ADC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_ADC_H #ifndef __STM32F10x_ADC_H
...@@ -479,4 +480,4 @@ void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, uint16_t ADC_IT); ...@@ -479,4 +480,4 @@ void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, uint16_t ADC_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_bkp.h * @file stm32f10x_bkp.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the BKP firmware * @brief This file contains all the functions prototypes for the BKP firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_BKP_H #ifndef __STM32F10x_BKP_H
...@@ -191,4 +192,4 @@ void BKP_ClearITPendingBit(void); ...@@ -191,4 +192,4 @@ void BKP_ClearITPendingBit(void);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_cec.h * @file stm32f10x_cec.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the CEC firmware * @brief This file contains all the functions prototypes for the CEC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_CEC_H #ifndef __STM32F10x_CEC_H
...@@ -101,7 +102,7 @@ typedef struct ...@@ -101,7 +102,7 @@ typedef struct
*/ */
/** @defgroup CEC_Own_Addres /** @defgroup CEC_Own_Address
* @{ * @{
*/ */
#define IS_CEC_ADDRESS(ADDRESS) ((ADDRESS) < 0x10) #define IS_CEC_ADDRESS(ADDRESS) ((ADDRESS) < 0x10)
...@@ -206,4 +207,4 @@ void CEC_ClearITPendingBit(uint16_t CEC_IT); ...@@ -206,4 +207,4 @@ void CEC_ClearITPendingBit(uint16_t CEC_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_crc.h * @file stm32f10x_crc.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the CRC firmware * @brief This file contains all the functions prototypes for the CRC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_CRC_H #ifndef __STM32F10x_CRC_H
...@@ -90,4 +91,4 @@ uint8_t CRC_GetIDRegister(void); ...@@ -90,4 +91,4 @@ uint8_t CRC_GetIDRegister(void);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_dac.h * @file stm32f10x_dac.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the DAC firmware * @brief This file contains all the functions prototypes for the DAC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_DAC_H #ifndef __STM32F10x_DAC_H
...@@ -200,7 +201,7 @@ typedef struct ...@@ -200,7 +201,7 @@ typedef struct
* @} * @}
*/ */
/** @defgroup DAC_data_alignement /** @defgroup DAC_data_alignment
* @{ * @{
*/ */
...@@ -313,4 +314,4 @@ void DAC_ClearITPendingBit(uint32_t DAC_Channel, uint32_t DAC_IT); ...@@ -313,4 +314,4 @@ void DAC_ClearITPendingBit(uint32_t DAC_Channel, uint32_t DAC_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_dbgmcu.h * @file stm32f10x_dbgmcu.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the DBGMCU * @brief This file contains all the functions prototypes for the DBGMCU
* firmware library. * firmware library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_DBGMCU_H #ifndef __STM32F10x_DBGMCU_H
...@@ -115,4 +116,4 @@ void DBGMCU_Config(uint32_t DBGMCU_Periph, FunctionalState NewState); ...@@ -115,4 +116,4 @@ void DBGMCU_Config(uint32_t DBGMCU_Periph, FunctionalState NewState);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_dma.h * @file stm32f10x_dma.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the DMA firmware * @brief This file contains all the functions prototypes for the DMA firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_DMA_H #ifndef __STM32F10x_DMA_H
...@@ -413,10 +414,10 @@ void DMA_Cmd(DMA_Channel_TypeDef* DMAy_Channelx, FunctionalState NewState); ...@@ -413,10 +414,10 @@ void DMA_Cmd(DMA_Channel_TypeDef* DMAy_Channelx, FunctionalState NewState);
void DMA_ITConfig(DMA_Channel_TypeDef* DMAy_Channelx, uint32_t DMA_IT, FunctionalState NewState); void DMA_ITConfig(DMA_Channel_TypeDef* DMAy_Channelx, uint32_t DMA_IT, FunctionalState NewState);
void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNumber); void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNumber);
uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx); uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx);
FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG); FlagStatus DMA_GetFlagStatus(uint32_t DMAy_FLAG);
void DMA_ClearFlag(uint32_t DMA_FLAG); void DMA_ClearFlag(uint32_t DMAy_FLAG);
ITStatus DMA_GetITStatus(uint32_t DMA_IT); ITStatus DMA_GetITStatus(uint32_t DMAy_IT);
void DMA_ClearITPendingBit(uint32_t DMA_IT); void DMA_ClearITPendingBit(uint32_t DMAy_IT);
#ifdef __cplusplus #ifdef __cplusplus
} }
...@@ -435,4 +436,4 @@ void DMA_ClearITPendingBit(uint32_t DMA_IT); ...@@ -435,4 +436,4 @@ void DMA_ClearITPendingBit(uint32_t DMA_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_exti.h * @file stm32f10x_exti.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the EXTI firmware * @brief This file contains all the functions prototypes for the EXTI firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_EXTI_H #ifndef __STM32F10x_EXTI_H
...@@ -180,4 +181,4 @@ void EXTI_ClearITPendingBit(uint32_t EXTI_Line); ...@@ -180,4 +181,4 @@ void EXTI_ClearITPendingBit(uint32_t EXTI_Line);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_flash.h * @file stm32f10x_flash.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the FLASH * @brief This file contains all the functions prototypes for the FLASH
* firmware library. * firmware library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_FLASH_H #ifndef __STM32F10x_FLASH_H
...@@ -422,4 +423,4 @@ FLASH_Status FLASH_BootConfig(uint16_t FLASH_BOOT); ...@@ -422,4 +423,4 @@ FLASH_Status FLASH_BootConfig(uint16_t FLASH_BOOT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_fsmc.h * @file stm32f10x_fsmc.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the FSMC firmware * @brief This file contains all the functions prototypes for the FSMC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_FSMC_H #ifndef __STM32F10x_FSMC_H
...@@ -76,7 +77,7 @@ typedef struct ...@@ -76,7 +77,7 @@ typedef struct
to the memory before getting the first data. to the memory before getting the first data.
The value of this parameter depends on the memory type as shown below: The value of this parameter depends on the memory type as shown below:
- It must be set to 0 in case of a CRAM - It must be set to 0 in case of a CRAM
- It is dont care in asynchronous NOR, SRAM or ROM accesses - It is don't care in asynchronous NOR, SRAM or ROM accesses
- It may assume a value between 0 and 0xF in NOR Flash memories - It may assume a value between 0 and 0xF in NOR Flash memories
with synchronous burst mode enable */ with synchronous burst mode enable */
...@@ -729,4 +730,4 @@ void FSMC_ClearITPendingBit(uint32_t FSMC_Bank, uint32_t FSMC_IT); ...@@ -729,4 +730,4 @@ void FSMC_ClearITPendingBit(uint32_t FSMC_Bank, uint32_t FSMC_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_gpio.h * @file stm32f10x_gpio.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the GPIO * @brief This file contains all the functions prototypes for the GPIO
* firmware library. * firmware library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_GPIO_H #ifndef __STM32F10x_GPIO_H
...@@ -195,7 +196,7 @@ typedef enum ...@@ -195,7 +196,7 @@ typedef enum
#define GPIO_Remap_SWJ_NoJTRST ((uint32_t)0x00300100) /*!< Full SWJ Enabled (JTAG-DP + SW-DP) but without JTRST */ #define GPIO_Remap_SWJ_NoJTRST ((uint32_t)0x00300100) /*!< Full SWJ Enabled (JTAG-DP + SW-DP) but without JTRST */
#define GPIO_Remap_SWJ_JTAGDisable ((uint32_t)0x00300200) /*!< JTAG-DP Disabled and SW-DP Enabled */ #define GPIO_Remap_SWJ_JTAGDisable ((uint32_t)0x00300200) /*!< JTAG-DP Disabled and SW-DP Enabled */
#define GPIO_Remap_SWJ_Disable ((uint32_t)0x00300400) /*!< Full SWJ Disabled (JTAG-DP + SW-DP) */ #define GPIO_Remap_SWJ_Disable ((uint32_t)0x00300400) /*!< Full SWJ Disabled (JTAG-DP + SW-DP) */
#define GPIO_Remap_SPI3 ((uint32_t)0x00201000) /*!< SPI3/I2S3 Alternate Function mapping (only for Connectivity line devices) */ #define GPIO_Remap_SPI3 ((uint32_t)0x00201100) /*!< SPI3/I2S3 Alternate Function mapping (only for Connectivity line devices) */
#define GPIO_Remap_TIM2ITR1_PTP_SOF ((uint32_t)0x00202000) /*!< Ethernet PTP output or USB OTG SOF (Start of Frame) connected #define GPIO_Remap_TIM2ITR1_PTP_SOF ((uint32_t)0x00202000) /*!< Ethernet PTP output or USB OTG SOF (Start of Frame) connected
to TIM2 Internal Trigger 1 for calibration to TIM2 Internal Trigger 1 for calibration
(only for Connectivity line devices) */ (only for Connectivity line devices) */
...@@ -381,4 +382,4 @@ void GPIO_ETH_MediaInterfaceConfig(uint32_t GPIO_ETH_MediaInterface); ...@@ -381,4 +382,4 @@ void GPIO_ETH_MediaInterfaceConfig(uint32_t GPIO_ETH_MediaInterface);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_i2c.h * @file stm32f10x_i2c.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the I2C firmware * @brief This file contains all the functions prototypes for the I2C firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_I2C_H #ifndef __STM32F10x_I2C_H
...@@ -190,6 +191,18 @@ typedef struct ...@@ -190,6 +191,18 @@ typedef struct
* @} * @}
*/ */
/** @defgroup I2C_NCAK_position
* @{
*/
#define I2C_NACKPosition_Next ((uint16_t)0x0800)
#define I2C_NACKPosition_Current ((uint16_t)0xF7FF)
#define IS_I2C_NACK_POSITION(POSITION) (((POSITION) == I2C_NACKPosition_Next) || \
((POSITION) == I2C_NACKPosition_Current))
/**
* @}
*/
/** @defgroup I2C_interrupts_definition /** @defgroup I2C_interrupts_definition
* @{ * @{
*/ */
...@@ -433,7 +446,7 @@ typedef struct ...@@ -433,7 +446,7 @@ typedef struct
* the end of the byte transmission. The two events I2C_EVENT_SLAVE_BYTE_TRANSMITTED and * the end of the byte transmission. The two events I2C_EVENT_SLAVE_BYTE_TRANSMITTED and
* I2C_EVENT_SLAVE_BYTE_TRANSMITTING are similar. The second one can optionally be * I2C_EVENT_SLAVE_BYTE_TRANSMITTING are similar. The second one can optionally be
* used when the user software doesn't guarantee the EV3 is managed before the * used when the user software doesn't guarantee the EV3 is managed before the
* current byte end of tranfer. * current byte end of transfer.
* - EV3_2: When the master sends a NACK in order to tell slave that data transmission * - EV3_2: When the master sends a NACK in order to tell slave that data transmission
* shall end (before sending the STOP condition). In this case slave has to stop sending * shall end (before sending the STOP condition). In this case slave has to stop sending
* data bytes and expect a Stop condition on the bus. * data bytes and expect a Stop condition on the bus.
...@@ -536,6 +549,7 @@ uint8_t I2C_ReceiveData(I2C_TypeDef* I2Cx); ...@@ -536,6 +549,7 @@ uint8_t I2C_ReceiveData(I2C_TypeDef* I2Cx);
void I2C_Send7bitAddress(I2C_TypeDef* I2Cx, uint8_t Address, uint8_t I2C_Direction); void I2C_Send7bitAddress(I2C_TypeDef* I2Cx, uint8_t Address, uint8_t I2C_Direction);
uint16_t I2C_ReadRegister(I2C_TypeDef* I2Cx, uint8_t I2C_Register); uint16_t I2C_ReadRegister(I2C_TypeDef* I2Cx, uint8_t I2C_Register);
void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState); void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
void I2C_NACKPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_NACKPosition);
void I2C_SMBusAlertConfig(I2C_TypeDef* I2Cx, uint16_t I2C_SMBusAlert); void I2C_SMBusAlertConfig(I2C_TypeDef* I2Cx, uint16_t I2C_SMBusAlert);
void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState); void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState);
void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition); void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition);
...@@ -577,10 +591,10 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle); ...@@ -577,10 +591,10 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle);
* @note * @note
* For error management, it is advised to use the following functions: * For error management, it is advised to use the following functions:
* - I2C_ITConfig() to configure and enable the error interrupts (I2C_IT_ERR). * - I2C_ITConfig() to configure and enable the error interrupts (I2C_IT_ERR).
* - I2Cx_ER_IRQHandler() which is called when the error interurpt occurs. * - I2Cx_ER_IRQHandler() which is called when the error interrupt occurs.
* Where x is the peripheral instance (I2C1, I2C2 ...) * Where x is the peripheral instance (I2C1, I2C2 ...)
* - I2C_GetFlagStatus() or I2C_GetITStatus() to be called into I2Cx_ER_IRQHandler() * - I2C_GetFlagStatus() or I2C_GetITStatus() to be called into I2Cx_ER_IRQHandler()
* in order to determine which error occured. * in order to determine which error occurred.
* - I2C_ClearFlag() or I2C_ClearITPendingBit() and/or I2C_SoftwareResetCmd() * - I2C_ClearFlag() or I2C_ClearITPendingBit() and/or I2C_SoftwareResetCmd()
* and/or I2C_GenerateStop() in order to clear the error flag and source, * and/or I2C_GenerateStop() in order to clear the error flag and source,
* and return to correct communication status. * and return to correct communication status.
...@@ -667,4 +681,4 @@ void I2C_ClearITPendingBit(I2C_TypeDef* I2Cx, uint32_t I2C_IT); ...@@ -667,4 +681,4 @@ void I2C_ClearITPendingBit(I2C_TypeDef* I2Cx, uint32_t I2C_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_iwdg.h * @file stm32f10x_iwdg.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the IWDG * @brief This file contains all the functions prototypes for the IWDG
* firmware library. * firmware library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_IWDG_H #ifndef __STM32F10x_IWDG_H
...@@ -136,4 +137,4 @@ FlagStatus IWDG_GetFlagStatus(uint16_t IWDG_FLAG); ...@@ -136,4 +137,4 @@ FlagStatus IWDG_GetFlagStatus(uint16_t IWDG_FLAG);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_pwr.h * @file stm32f10x_pwr.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the PWR firmware * @brief This file contains all the functions prototypes for the PWR firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_PWR_H #ifndef __STM32F10x_PWR_H
...@@ -152,4 +153,4 @@ void PWR_ClearFlag(uint32_t PWR_FLAG); ...@@ -152,4 +153,4 @@ void PWR_ClearFlag(uint32_t PWR_FLAG);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_rcc.h * @file stm32f10x_rcc.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the RCC firmware * @brief This file contains all the functions prototypes for the RCC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_RCC_H #ifndef __STM32F10x_RCC_H
...@@ -723,4 +724,4 @@ void RCC_ClearITPendingBit(uint8_t RCC_IT); ...@@ -723,4 +724,4 @@ void RCC_ClearITPendingBit(uint8_t RCC_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_rtc.h * @file stm32f10x_rtc.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the RTC firmware * @brief This file contains all the functions prototypes for the RTC firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_RTC_H #ifndef __STM32F10x_RTC_H
...@@ -131,4 +132,4 @@ void RTC_ClearITPendingBit(uint16_t RTC_IT); ...@@ -131,4 +132,4 @@ void RTC_ClearITPendingBit(uint16_t RTC_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_sdio.h * @file stm32f10x_sdio.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the SDIO firmware * @brief This file contains all the functions prototypes for the SDIO firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_SDIO_H #ifndef __STM32F10x_SDIO_H
...@@ -189,7 +190,7 @@ typedef struct ...@@ -189,7 +190,7 @@ typedef struct
*/ */
/** @defgroup SDIO_Interrupt_soucres /** @defgroup SDIO_Interrupt_sources
* @{ * @{
*/ */
...@@ -527,4 +528,4 @@ void SDIO_ClearITPendingBit(uint32_t SDIO_IT); ...@@ -527,4 +528,4 @@ void SDIO_ClearITPendingBit(uint32_t SDIO_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_spi.h * @file stm32f10x_spi.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the SPI firmware * @brief This file contains all the functions prototypes for the SPI firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_SPI_H #ifndef __STM32F10x_SPI_H
...@@ -339,7 +340,7 @@ typedef struct ...@@ -339,7 +340,7 @@ typedef struct
* @} * @}
*/ */
/** @defgroup SPI_NSS_internal_software_mangement /** @defgroup SPI_NSS_internal_software_management
* @{ * @{
*/ */
...@@ -483,4 +484,4 @@ void SPI_I2S_ClearITPendingBit(SPI_TypeDef* SPIx, uint8_t SPI_I2S_IT); ...@@ -483,4 +484,4 @@ void SPI_I2S_ClearITPendingBit(SPI_TypeDef* SPIx, uint8_t SPI_I2S_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_tim.h * @file stm32f10x_tim.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the TIM firmware * @brief This file contains all the functions prototypes for the TIM firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_TIM_H #ifndef __STM32F10x_TIM_H
...@@ -44,7 +45,7 @@ ...@@ -44,7 +45,7 @@
/** /**
* @brief TIM Time Base Init structure definition * @brief TIM Time Base Init structure definition
* @note This sturcture is used with all TIMx except for TIM6 and TIM7. * @note This structure is used with all TIMx except for TIM6 and TIM7.
*/ */
typedef struct typedef struct
...@@ -132,7 +133,7 @@ typedef struct ...@@ -132,7 +133,7 @@ typedef struct
/** /**
* @brief BDTR structure definition * @brief BDTR structure definition
* @note This sturcture is used only with TIM1 and TIM8. * @note This structure is used only with TIM1 and TIM8.
*/ */
typedef struct typedef struct
...@@ -669,42 +670,42 @@ typedef struct ...@@ -669,42 +670,42 @@ typedef struct
* @{ * @{
*/ */
#define TIM_DMABurstLength_1Byte ((uint16_t)0x0000) #define TIM_DMABurstLength_1Transfer ((uint16_t)0x0000)
#define TIM_DMABurstLength_2Bytes ((uint16_t)0x0100) #define TIM_DMABurstLength_2Transfers ((uint16_t)0x0100)
#define TIM_DMABurstLength_3Bytes ((uint16_t)0x0200) #define TIM_DMABurstLength_3Transfers ((uint16_t)0x0200)
#define TIM_DMABurstLength_4Bytes ((uint16_t)0x0300) #define TIM_DMABurstLength_4Transfers ((uint16_t)0x0300)
#define TIM_DMABurstLength_5Bytes ((uint16_t)0x0400) #define TIM_DMABurstLength_5Transfers ((uint16_t)0x0400)
#define TIM_DMABurstLength_6Bytes ((uint16_t)0x0500) #define TIM_DMABurstLength_6Transfers ((uint16_t)0x0500)
#define TIM_DMABurstLength_7Bytes ((uint16_t)0x0600) #define TIM_DMABurstLength_7Transfers ((uint16_t)0x0600)
#define TIM_DMABurstLength_8Bytes ((uint16_t)0x0700) #define TIM_DMABurstLength_8Transfers ((uint16_t)0x0700)
#define TIM_DMABurstLength_9Bytes ((uint16_t)0x0800) #define TIM_DMABurstLength_9Transfers ((uint16_t)0x0800)
#define TIM_DMABurstLength_10Bytes ((uint16_t)0x0900) #define TIM_DMABurstLength_10Transfers ((uint16_t)0x0900)
#define TIM_DMABurstLength_11Bytes ((uint16_t)0x0A00) #define TIM_DMABurstLength_11Transfers ((uint16_t)0x0A00)
#define TIM_DMABurstLength_12Bytes ((uint16_t)0x0B00) #define TIM_DMABurstLength_12Transfers ((uint16_t)0x0B00)
#define TIM_DMABurstLength_13Bytes ((uint16_t)0x0C00) #define TIM_DMABurstLength_13Transfers ((uint16_t)0x0C00)
#define TIM_DMABurstLength_14Bytes ((uint16_t)0x0D00) #define TIM_DMABurstLength_14Transfers ((uint16_t)0x0D00)
#define TIM_DMABurstLength_15Bytes ((uint16_t)0x0E00) #define TIM_DMABurstLength_15Transfers ((uint16_t)0x0E00)
#define TIM_DMABurstLength_16Bytes ((uint16_t)0x0F00) #define TIM_DMABurstLength_16Transfers ((uint16_t)0x0F00)
#define TIM_DMABurstLength_17Bytes ((uint16_t)0x1000) #define TIM_DMABurstLength_17Transfers ((uint16_t)0x1000)
#define TIM_DMABurstLength_18Bytes ((uint16_t)0x1100) #define TIM_DMABurstLength_18Transfers ((uint16_t)0x1100)
#define IS_TIM_DMA_LENGTH(LENGTH) (((LENGTH) == TIM_DMABurstLength_1Byte) || \ #define IS_TIM_DMA_LENGTH(LENGTH) (((LENGTH) == TIM_DMABurstLength_1Transfer) || \
((LENGTH) == TIM_DMABurstLength_2Bytes) || \ ((LENGTH) == TIM_DMABurstLength_2Transfers) || \
((LENGTH) == TIM_DMABurstLength_3Bytes) || \ ((LENGTH) == TIM_DMABurstLength_3Transfers) || \
((LENGTH) == TIM_DMABurstLength_4Bytes) || \ ((LENGTH) == TIM_DMABurstLength_4Transfers) || \
((LENGTH) == TIM_DMABurstLength_5Bytes) || \ ((LENGTH) == TIM_DMABurstLength_5Transfers) || \
((LENGTH) == TIM_DMABurstLength_6Bytes) || \ ((LENGTH) == TIM_DMABurstLength_6Transfers) || \
((LENGTH) == TIM_DMABurstLength_7Bytes) || \ ((LENGTH) == TIM_DMABurstLength_7Transfers) || \
((LENGTH) == TIM_DMABurstLength_8Bytes) || \ ((LENGTH) == TIM_DMABurstLength_8Transfers) || \
((LENGTH) == TIM_DMABurstLength_9Bytes) || \ ((LENGTH) == TIM_DMABurstLength_9Transfers) || \
((LENGTH) == TIM_DMABurstLength_10Bytes) || \ ((LENGTH) == TIM_DMABurstLength_10Transfers) || \
((LENGTH) == TIM_DMABurstLength_11Bytes) || \ ((LENGTH) == TIM_DMABurstLength_11Transfers) || \
((LENGTH) == TIM_DMABurstLength_12Bytes) || \ ((LENGTH) == TIM_DMABurstLength_12Transfers) || \
((LENGTH) == TIM_DMABurstLength_13Bytes) || \ ((LENGTH) == TIM_DMABurstLength_13Transfers) || \
((LENGTH) == TIM_DMABurstLength_14Bytes) || \ ((LENGTH) == TIM_DMABurstLength_14Transfers) || \
((LENGTH) == TIM_DMABurstLength_15Bytes) || \ ((LENGTH) == TIM_DMABurstLength_15Transfers) || \
((LENGTH) == TIM_DMABurstLength_16Bytes) || \ ((LENGTH) == TIM_DMABurstLength_16Transfers) || \
((LENGTH) == TIM_DMABurstLength_17Bytes) || \ ((LENGTH) == TIM_DMABurstLength_17Transfers) || \
((LENGTH) == TIM_DMABurstLength_18Bytes)) ((LENGTH) == TIM_DMABurstLength_18Transfers))
/** /**
* @} * @}
*/ */
...@@ -866,7 +867,7 @@ typedef struct ...@@ -866,7 +867,7 @@ typedef struct
* @} * @}
*/ */
/** @defgroup TIM_Ouput_Compare_Preload_State /** @defgroup TIM_Output_Compare_Preload_State
* @{ * @{
*/ */
...@@ -878,7 +879,7 @@ typedef struct ...@@ -878,7 +879,7 @@ typedef struct
* @} * @}
*/ */
/** @defgroup TIM_Ouput_Compare_Fast_State /** @defgroup TIM_Output_Compare_Fast_State
* @{ * @{
*/ */
...@@ -891,7 +892,7 @@ typedef struct ...@@ -891,7 +892,7 @@ typedef struct
* @} * @}
*/ */
/** @defgroup TIM_Ouput_Compare_Clear_State /** @defgroup TIM_Output_Compare_Clear_State
* @{ * @{
*/ */
...@@ -1008,6 +1009,32 @@ typedef struct ...@@ -1008,6 +1009,32 @@ typedef struct
* @} * @}
*/ */
/** @defgroup TIM_Legacy
* @{
*/
#define TIM_DMABurstLength_1Byte TIM_DMABurstLength_1Transfer
#define TIM_DMABurstLength_2Bytes TIM_DMABurstLength_2Transfers
#define TIM_DMABurstLength_3Bytes TIM_DMABurstLength_3Transfers
#define TIM_DMABurstLength_4Bytes TIM_DMABurstLength_4Transfers
#define TIM_DMABurstLength_5Bytes TIM_DMABurstLength_5Transfers
#define TIM_DMABurstLength_6Bytes TIM_DMABurstLength_6Transfers
#define TIM_DMABurstLength_7Bytes TIM_DMABurstLength_7Transfers
#define TIM_DMABurstLength_8Bytes TIM_DMABurstLength_8Transfers
#define TIM_DMABurstLength_9Bytes TIM_DMABurstLength_9Transfers
#define TIM_DMABurstLength_10Bytes TIM_DMABurstLength_10Transfers
#define TIM_DMABurstLength_11Bytes TIM_DMABurstLength_11Transfers
#define TIM_DMABurstLength_12Bytes TIM_DMABurstLength_12Transfers
#define TIM_DMABurstLength_13Bytes TIM_DMABurstLength_13Transfers
#define TIM_DMABurstLength_14Bytes TIM_DMABurstLength_14Transfers
#define TIM_DMABurstLength_15Bytes TIM_DMABurstLength_15Transfers
#define TIM_DMABurstLength_16Bytes TIM_DMABurstLength_16Transfers
#define TIM_DMABurstLength_17Bytes TIM_DMABurstLength_17Transfers
#define TIM_DMABurstLength_18Bytes TIM_DMABurstLength_18Transfers
/**
* @}
*/
/** /**
* @} * @}
*/ */
...@@ -1134,4 +1161,4 @@ void TIM_ClearITPendingBit(TIM_TypeDef* TIMx, uint16_t TIM_IT); ...@@ -1134,4 +1161,4 @@ void TIM_ClearITPendingBit(TIM_TypeDef* TIMx, uint16_t TIM_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_usart.h * @file stm32f10x_usart.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the USART * @brief This file contains all the functions prototypes for the USART
* firmware library. * firmware library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_USART_H #ifndef __STM32F10x_USART_H
...@@ -408,4 +409,4 @@ void USART_ClearITPendingBit(USART_TypeDef* USARTx, uint16_t USART_IT); ...@@ -408,4 +409,4 @@ void USART_ClearITPendingBit(USART_TypeDef* USARTx, uint16_t USART_IT);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_wwdg.h * @file stm32f10x_wwdg.h
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file contains all the functions prototypes for the WWDG firmware * @brief This file contains all the functions prototypes for the WWDG firmware
* library. * library.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __STM32F10x_WWDG_H #ifndef __STM32F10x_WWDG_H
...@@ -111,4 +112,4 @@ void WWDG_ClearFlag(void); ...@@ -111,4 +112,4 @@ void WWDG_ClearFlag(void);
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
****************************************************************************** ******************************************************************************
* @file misc.c * @file misc.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the miscellaneous firmware functions (add-on * @brief This file provides all the miscellaneous firmware functions (add-on
* to CMSIS functions). * to CMSIS functions).
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -16,8 +16,9 @@ ...@@ -16,8 +16,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "misc.h" #include "misc.h"
...@@ -103,9 +104,9 @@ void NVIC_PriorityGroupConfig(uint32_t NVIC_PriorityGroup) ...@@ -103,9 +104,9 @@ void NVIC_PriorityGroupConfig(uint32_t NVIC_PriorityGroup)
/** /**
* @brief Initializes the NVIC peripheral according to the specified * @brief Initializes the NVIC peripheral according to the specified
* parameters in the NVIC_InitStruct. * parameters in the NVIC_InitStruct.
* @param NVIC_InitStruct: pointer to a NVIC_InitTypeDef structure that contains * @param NVIC_InitStruct: pointer to a NVIC_InitTypeDef structure that contains
* the configuration information for the specified NVIC peripheral. * the configuration information for the specified NVIC peripheral.
* @retval None * @retval None
*/ */
void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct) void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct)
...@@ -148,7 +149,8 @@ void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct) ...@@ -148,7 +149,8 @@ void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct)
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg NVIC_VectTab_RAM * @arg NVIC_VectTab_RAM
* @arg NVIC_VectTab_FLASH * @arg NVIC_VectTab_FLASH
* @param Offset: Vector Table base offset field. This value must be a multiple of 0x100. * @param Offset: Vector Table base offset field. This value must be a multiple
* of 0x200.
* @retval None * @retval None
*/ */
void NVIC_SetVectorTable(uint32_t NVIC_VectTab, uint32_t Offset) void NVIC_SetVectorTable(uint32_t NVIC_VectTab, uint32_t Offset)
...@@ -220,4 +222,4 @@ void SysTick_CLKSourceConfig(uint32_t SysTick_CLKSource) ...@@ -220,4 +222,4 @@ void SysTick_CLKSourceConfig(uint32_t SysTick_CLKSource)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_adc.c * @file stm32f10x_adc.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the ADC firmware functions. * @brief This file provides all the ADC firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_adc.h" #include "stm32f10x_adc.h"
...@@ -208,10 +209,10 @@ void ADC_DeInit(ADC_TypeDef* ADCx) ...@@ -208,10 +209,10 @@ void ADC_DeInit(ADC_TypeDef* ADCx)
/** /**
* @brief Initializes the ADCx peripheral according to the specified parameters * @brief Initializes the ADCx peripheral according to the specified parameters
* in the ADC_InitStruct. * in the ADC_InitStruct.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param ADC_InitStruct: pointer to an ADC_InitTypeDef structure that contains * @param ADC_InitStruct: pointer to an ADC_InitTypeDef structure that contains
* the configuration information for the specified ADC peripheral. * the configuration information for the specified ADC peripheral.
* @retval None * @retval None
*/ */
void ADC_Init(ADC_TypeDef* ADCx, ADC_InitTypeDef* ADC_InitStruct) void ADC_Init(ADC_TypeDef* ADCx, ADC_InitTypeDef* ADC_InitStruct)
...@@ -379,7 +380,7 @@ void ADC_ResetCalibration(ADC_TypeDef* ADCx) ...@@ -379,7 +380,7 @@ void ADC_ResetCalibration(ADC_TypeDef* ADCx)
{ {
/* Check the parameters */ /* Check the parameters */
assert_param(IS_ADC_ALL_PERIPH(ADCx)); assert_param(IS_ADC_ALL_PERIPH(ADCx));
/* Resets the selected ADC calibartion registers */ /* Resets the selected ADC calibration registers */
ADCx->CR2 |= CR2_RSTCAL_Set; ADCx->CR2 |= CR2_RSTCAL_Set;
} }
...@@ -499,10 +500,10 @@ FlagStatus ADC_GetSoftwareStartConvStatus(ADC_TypeDef* ADCx) ...@@ -499,10 +500,10 @@ FlagStatus ADC_GetSoftwareStartConvStatus(ADC_TypeDef* ADCx)
/** /**
* @brief Configures the discontinuous mode for the selected ADC regular * @brief Configures the discontinuous mode for the selected ADC regular
* group channel. * group channel.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param Number: specifies the discontinuous mode regular channel * @param Number: specifies the discontinuous mode regular channel
* count value. This number must be between 1 and 8. * count value. This number must be between 1 and 8.
* @retval None * @retval None
*/ */
void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number) void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number)
...@@ -525,11 +526,11 @@ void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number) ...@@ -525,11 +526,11 @@ void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number)
/** /**
* @brief Enables or disables the discontinuous mode on regular group * @brief Enables or disables the discontinuous mode on regular group
* channel for the specified ADC * channel for the specified ADC
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param NewState: new state of the selected ADC discontinuous mode * @param NewState: new state of the selected ADC discontinuous mode
* on regular group channel. * on regular group channel.
* This parameter can be: ENABLE or DISABLE. * This parameter can be: ENABLE or DISABLE.
* @retval None * @retval None
*/ */
void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState) void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
...@@ -551,7 +552,7 @@ void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState) ...@@ -551,7 +552,7 @@ void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
/** /**
* @brief Configures for the selected ADC regular channel its corresponding * @brief Configures for the selected ADC regular channel its corresponding
* rank in the sequencer and its sample time. * rank in the sequencer and its sample time.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param ADC_Channel: the ADC channel to configure. * @param ADC_Channel: the ADC channel to configure.
* This parameter can be one of the following values: * This parameter can be one of the following values:
...@@ -724,7 +725,7 @@ uint32_t ADC_GetDualModeConversionValue(void) ...@@ -724,7 +725,7 @@ uint32_t ADC_GetDualModeConversionValue(void)
/** /**
* @brief Enables or disables the selected ADC automatic injected group * @brief Enables or disables the selected ADC automatic injected group
* conversion after regular one. * conversion after regular one.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param NewState: new state of the selected ADC auto injected conversion * @param NewState: new state of the selected ADC auto injected conversion
* This parameter can be: ENABLE or DISABLE. * This parameter can be: ENABLE or DISABLE.
...@@ -749,10 +750,10 @@ void ADC_AutoInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState) ...@@ -749,10 +750,10 @@ void ADC_AutoInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
/** /**
* @brief Enables or disables the discontinuous mode for injected group * @brief Enables or disables the discontinuous mode for injected group
* channel for the specified ADC * channel for the specified ADC
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param NewState: new state of the selected ADC discontinuous mode * @param NewState: new state of the selected ADC discontinuous mode
* on injected group channel. * on injected group channel.
* This parameter can be: ENABLE or DISABLE. * This parameter can be: ENABLE or DISABLE.
* @retval None * @retval None
*/ */
...@@ -813,10 +814,10 @@ void ADC_ExternalTrigInjectedConvConfig(ADC_TypeDef* ADCx, uint32_t ADC_External ...@@ -813,10 +814,10 @@ void ADC_ExternalTrigInjectedConvConfig(ADC_TypeDef* ADCx, uint32_t ADC_External
/** /**
* @brief Enables or disables the ADCx injected channels conversion through * @brief Enables or disables the ADCx injected channels conversion through
* external trigger * external trigger
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param NewState: new state of the selected ADC external trigger start of * @param NewState: new state of the selected ADC external trigger start of
* injected conversion. * injected conversion.
* This parameter can be: ENABLE or DISABLE. * This parameter can be: ENABLE or DISABLE.
* @retval None * @retval None
*/ */
...@@ -839,7 +840,7 @@ void ADC_ExternalTrigInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState ...@@ -839,7 +840,7 @@ void ADC_ExternalTrigInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState
/** /**
* @brief Enables or disables the selected ADC start of the injected * @brief Enables or disables the selected ADC start of the injected
* channels conversion. * channels conversion.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param NewState: new state of the selected ADC software start injected conversion. * @param NewState: new state of the selected ADC software start injected conversion.
* This parameter can be: ENABLE or DISABLE. * This parameter can be: ENABLE or DISABLE.
...@@ -891,7 +892,7 @@ FlagStatus ADC_GetSoftwareStartInjectedConvCmdStatus(ADC_TypeDef* ADCx) ...@@ -891,7 +892,7 @@ FlagStatus ADC_GetSoftwareStartInjectedConvCmdStatus(ADC_TypeDef* ADCx)
/** /**
* @brief Configures for the selected ADC injected channel its corresponding * @brief Configures for the selected ADC injected channel its corresponding
* rank in the sequencer and its sample time. * rank in the sequencer and its sample time.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param ADC_Channel: the ADC channel to configure. * @param ADC_Channel: the ADC channel to configure.
* This parameter can be one of the following values: * This parameter can be one of the following values:
...@@ -1065,7 +1066,7 @@ uint16_t ADC_GetInjectedConversionValue(ADC_TypeDef* ADCx, uint8_t ADC_InjectedC ...@@ -1065,7 +1066,7 @@ uint16_t ADC_GetInjectedConversionValue(ADC_TypeDef* ADCx, uint8_t ADC_InjectedC
/** /**
* @brief Enables or disables the analog watchdog on single/all regular * @brief Enables or disables the analog watchdog on single/all regular
* or injected channels * or injected channels
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param ADC_AnalogWatchdog: the ADC analog watchdog configuration. * @param ADC_AnalogWatchdog: the ADC analog watchdog configuration.
* This parameter can be one of the following values: * This parameter can be one of the following values:
...@@ -1270,7 +1271,7 @@ ITStatus ADC_GetITStatus(ADC_TypeDef* ADCx, uint16_t ADC_IT) ...@@ -1270,7 +1271,7 @@ ITStatus ADC_GetITStatus(ADC_TypeDef* ADCx, uint16_t ADC_IT)
} }
/** /**
* @brief Clears the ADCxs interrupt pending bits. * @brief Clears the ADCx's interrupt pending bits.
* @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral. * @param ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
* @param ADC_IT: specifies the ADC interrupt pending bit to clear. * @param ADC_IT: specifies the ADC interrupt pending bit to clear.
* This parameter can be any combination of the following values: * This parameter can be any combination of the following values:
...@@ -1303,4 +1304,4 @@ void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, uint16_t ADC_IT) ...@@ -1303,4 +1304,4 @@ void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, uint16_t ADC_IT)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_bkp.c * @file stm32f10x_bkp.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the BKP firmware functions. * @brief This file provides all the BKP firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_bkp.h" #include "stm32f10x_bkp.h"
...@@ -304,4 +305,4 @@ void BKP_ClearITPendingBit(void) ...@@ -304,4 +305,4 @@ void BKP_ClearITPendingBit(void)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_cec.c * @file stm32f10x_cec.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the CEC firmware functions. * @brief This file provides all the CEC firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_cec.h" #include "stm32f10x_cec.h"
...@@ -277,7 +278,7 @@ void CEC_EndOfMessageCmd(FunctionalState NewState) ...@@ -277,7 +278,7 @@ void CEC_EndOfMessageCmd(FunctionalState NewState)
* @arg CEC_FLAG_SBE: Start Bit Error * @arg CEC_FLAG_SBE: Start Bit Error
* @arg CEC_FLAG_ACKE: Block Acknowledge Error * @arg CEC_FLAG_ACKE: Block Acknowledge Error
* @arg CEC_FLAG_LINE: Line Error * @arg CEC_FLAG_LINE: Line Error
* @arg CEC_FLAG_TBTFE: Tx Block Transfer Finsihed Error * @arg CEC_FLAG_TBTFE: Tx Block Transfer Finished Error
* @arg CEC_FLAG_TEOM: Tx End Of Message * @arg CEC_FLAG_TEOM: Tx End Of Message
* @arg CEC_FLAG_TERR: Tx Error * @arg CEC_FLAG_TERR: Tx Error
* @arg CEC_FLAG_TBTRF: Tx Byte Transfer Request or Block Transfer Finished * @arg CEC_FLAG_TBTRF: Tx Byte Transfer Request or Block Transfer Finished
...@@ -429,4 +430,4 @@ void CEC_ClearITPendingBit(uint16_t CEC_IT) ...@@ -429,4 +430,4 @@ void CEC_ClearITPendingBit(uint16_t CEC_IT)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_crc.c * @file stm32f10x_crc.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the CRC firmware functions. * @brief This file provides all the CRC firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_crc.h" #include "stm32f10x_crc.h"
...@@ -156,4 +157,4 @@ uint8_t CRC_GetIDRegister(void) ...@@ -156,4 +157,4 @@ uint8_t CRC_GetIDRegister(void)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_dac.c * @file stm32f10x_dac.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the DAC firmware functions. * @brief This file provides all the DAC firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_dac.h" #include "stm32f10x_dac.h"
...@@ -104,13 +105,13 @@ void DAC_DeInit(void) ...@@ -104,13 +105,13 @@ void DAC_DeInit(void)
/** /**
* @brief Initializes the DAC peripheral according to the specified * @brief Initializes the DAC peripheral according to the specified
* parameters in the DAC_InitStruct. * parameters in the DAC_InitStruct.
* @param DAC_Channel: the selected DAC channel. * @param DAC_Channel: the selected DAC channel.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DAC_Channel_1: DAC Channel1 selected * @arg DAC_Channel_1: DAC Channel1 selected
* @arg DAC_Channel_2: DAC Channel2 selected * @arg DAC_Channel_2: DAC Channel2 selected
* @param DAC_InitStruct: pointer to a DAC_InitTypeDef structure that * @param DAC_InitStruct: pointer to a DAC_InitTypeDef structure that
* contains the configuration information for the specified DAC channel. * contains the configuration information for the specified DAC channel.
* @retval None * @retval None
*/ */
void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct) void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)
...@@ -126,8 +127,8 @@ void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct) ...@@ -126,8 +127,8 @@ void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)
tmpreg1 = DAC->CR; tmpreg1 = DAC->CR;
/* Clear BOFFx, TENx, TSELx, WAVEx and MAMPx bits */ /* Clear BOFFx, TENx, TSELx, WAVEx and MAMPx bits */
tmpreg1 &= ~(CR_CLEAR_MASK << DAC_Channel); tmpreg1 &= ~(CR_CLEAR_MASK << DAC_Channel);
/* Configure for the selected DAC channel: buffer output, trigger, wave genration, /* Configure for the selected DAC channel: buffer output, trigger, wave generation,
mask/amplitude for wave genration */ mask/amplitude for wave generation */
/* Set TSELx and TENx bits according to DAC_Trigger value */ /* Set TSELx and TENx bits according to DAC_Trigger value */
/* Set WAVEx bits according to DAC_WaveGeneration value */ /* Set WAVEx bits according to DAC_WaveGeneration value */
/* Set MAMPx bits according to DAC_LFSRUnmask_TriangleAmplitude value */ /* Set MAMPx bits according to DAC_LFSRUnmask_TriangleAmplitude value */
...@@ -143,7 +144,7 @@ void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct) ...@@ -143,7 +144,7 @@ void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)
/** /**
* @brief Fills each DAC_InitStruct member with its default value. * @brief Fills each DAC_InitStruct member with its default value.
* @param DAC_InitStruct : pointer to a DAC_InitTypeDef structure which will * @param DAC_InitStruct : pointer to a DAC_InitTypeDef structure which will
* be initialized. * be initialized.
* @retval None * @retval None
*/ */
void DAC_StructInit(DAC_InitTypeDef* DAC_InitStruct) void DAC_StructInit(DAC_InitTypeDef* DAC_InitStruct)
...@@ -330,11 +331,11 @@ void DAC_WaveGenerationCmd(uint32_t DAC_Channel, uint32_t DAC_Wave, FunctionalSt ...@@ -330,11 +331,11 @@ void DAC_WaveGenerationCmd(uint32_t DAC_Channel, uint32_t DAC_Wave, FunctionalSt
/** /**
* @brief Set the specified data holding register value for DAC channel1. * @brief Set the specified data holding register value for DAC channel1.
* @param DAC_Align: Specifies the data alignement for DAC channel1. * @param DAC_Align: Specifies the data alignment for DAC channel1.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DAC_Align_8b_R: 8bit right data alignement selected * @arg DAC_Align_8b_R: 8bit right data alignment selected
* @arg DAC_Align_12b_L: 12bit left data alignement selected * @arg DAC_Align_12b_L: 12bit left data alignment selected
* @arg DAC_Align_12b_R: 12bit right data alignement selected * @arg DAC_Align_12b_R: 12bit right data alignment selected
* @param Data : Data to be loaded in the selected data holding register. * @param Data : Data to be loaded in the selected data holding register.
* @retval None * @retval None
*/ */
...@@ -355,11 +356,11 @@ void DAC_SetChannel1Data(uint32_t DAC_Align, uint16_t Data) ...@@ -355,11 +356,11 @@ void DAC_SetChannel1Data(uint32_t DAC_Align, uint16_t Data)
/** /**
* @brief Set the specified data holding register value for DAC channel2. * @brief Set the specified data holding register value for DAC channel2.
* @param DAC_Align: Specifies the data alignement for DAC channel2. * @param DAC_Align: Specifies the data alignment for DAC channel2.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DAC_Align_8b_R: 8bit right data alignement selected * @arg DAC_Align_8b_R: 8bit right data alignment selected
* @arg DAC_Align_12b_L: 12bit left data alignement selected * @arg DAC_Align_12b_L: 12bit left data alignment selected
* @arg DAC_Align_12b_R: 12bit right data alignement selected * @arg DAC_Align_12b_R: 12bit right data alignment selected
* @param Data : Data to be loaded in the selected data holding register. * @param Data : Data to be loaded in the selected data holding register.
* @retval None * @retval None
*/ */
...@@ -381,11 +382,11 @@ void DAC_SetChannel2Data(uint32_t DAC_Align, uint16_t Data) ...@@ -381,11 +382,11 @@ void DAC_SetChannel2Data(uint32_t DAC_Align, uint16_t Data)
/** /**
* @brief Set the specified data holding register value for dual channel * @brief Set the specified data holding register value for dual channel
* DAC. * DAC.
* @param DAC_Align: Specifies the data alignement for dual channel DAC. * @param DAC_Align: Specifies the data alignment for dual channel DAC.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DAC_Align_8b_R: 8bit right data alignement selected * @arg DAC_Align_8b_R: 8bit right data alignment selected
* @arg DAC_Align_12b_L: 12bit left data alignement selected * @arg DAC_Align_12b_L: 12bit left data alignment selected
* @arg DAC_Align_12b_R: 12bit right data alignement selected * @arg DAC_Align_12b_R: 12bit right data alignment selected
* @param Data2: Data for DAC Channel2 to be loaded in the selected data * @param Data2: Data for DAC Channel2 to be loaded in the selected data
* holding register. * holding register.
* @param Data1: Data for DAC Channel1 to be loaded in the selected data * @param Data1: Data for DAC Channel1 to be loaded in the selected data
...@@ -419,7 +420,7 @@ void DAC_SetDualChannelData(uint32_t DAC_Align, uint16_t Data2, uint16_t Data1) ...@@ -419,7 +420,7 @@ void DAC_SetDualChannelData(uint32_t DAC_Align, uint16_t Data2, uint16_t Data1)
} }
/** /**
* @brief Returns the last data output value of the selected DAC cahnnel. * @brief Returns the last data output value of the selected DAC channel.
* @param DAC_Channel: the selected DAC channel. * @param DAC_Channel: the selected DAC channel.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DAC_Channel_1: DAC Channel1 selected * @arg DAC_Channel_1: DAC Channel1 selected
...@@ -534,7 +535,7 @@ ITStatus DAC_GetITStatus(uint32_t DAC_Channel, uint32_t DAC_IT) ...@@ -534,7 +535,7 @@ ITStatus DAC_GetITStatus(uint32_t DAC_Channel, uint32_t DAC_IT)
} }
/** /**
* @brief Clears the DAC channelxs interrupt pending bits. * @brief Clears the DAC channelx's interrupt pending bits.
* @param DAC_Channel: the selected DAC channel. * @param DAC_Channel: the selected DAC channel.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DAC_Channel_1: DAC Channel1 selected * @arg DAC_Channel_1: DAC Channel1 selected
...@@ -567,4 +568,4 @@ void DAC_ClearITPendingBit(uint32_t DAC_Channel, uint32_t DAC_IT) ...@@ -567,4 +568,4 @@ void DAC_ClearITPendingBit(uint32_t DAC_Channel, uint32_t DAC_IT)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_dbgmcu.c * @file stm32f10x_dbgmcu.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the DBGMCU firmware functions. * @brief This file provides all the DBGMCU firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_dbgmcu.h" #include "stm32f10x_dbgmcu.h"
...@@ -158,4 +159,4 @@ void DBGMCU_Config(uint32_t DBGMCU_Periph, FunctionalState NewState) ...@@ -158,4 +159,4 @@ void DBGMCU_Config(uint32_t DBGMCU_Periph, FunctionalState NewState)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_dma.c * @file stm32f10x_dma.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the DMA firmware functions. * @brief This file provides all the DMA firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_dma.h" #include "stm32f10x_dma.h"
...@@ -99,7 +100,7 @@ ...@@ -99,7 +100,7 @@
/** /**
* @brief Deinitializes the DMAy Channelx registers to their default reset * @brief Deinitializes the DMAy Channelx registers to their default reset
* values. * values.
* @param DMAy_Channelx: where y can be 1 or 2 to select the DMA and * @param DMAy_Channelx: where y can be 1 or 2 to select the DMA and
* x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel. * x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.
* @retval None * @retval None
...@@ -191,11 +192,11 @@ void DMA_DeInit(DMA_Channel_TypeDef* DMAy_Channelx) ...@@ -191,11 +192,11 @@ void DMA_DeInit(DMA_Channel_TypeDef* DMAy_Channelx)
/** /**
* @brief Initializes the DMAy Channelx according to the specified * @brief Initializes the DMAy Channelx according to the specified
* parameters in the DMA_InitStruct. * parameters in the DMA_InitStruct.
* @param DMAy_Channelx: where y can be 1 or 2 to select the DMA and * @param DMAy_Channelx: where y can be 1 or 2 to select the DMA and
* x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel. * x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.
* @param DMA_InitStruct: pointer to a DMA_InitTypeDef structure that * @param DMA_InitStruct: pointer to a DMA_InitTypeDef structure that
* contains the configuration information for the specified DMA Channel. * contains the configuration information for the specified DMA Channel.
* @retval None * @retval None
*/ */
void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruct) void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruct)
...@@ -252,7 +253,7 @@ void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruc ...@@ -252,7 +253,7 @@ void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruc
/** /**
* @brief Fills each DMA_InitStruct member with its default value. * @brief Fills each DMA_InitStruct member with its default value.
* @param DMA_InitStruct : pointer to a DMA_InitTypeDef structure which will * @param DMA_InitStruct : pointer to a DMA_InitTypeDef structure which will
* be initialized. * be initialized.
* @retval None * @retval None
*/ */
void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct) void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct)
...@@ -361,11 +362,11 @@ void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNum ...@@ -361,11 +362,11 @@ void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNum
/** /**
* @brief Returns the number of remaining data units in the current * @brief Returns the number of remaining data units in the current
* DMAy Channelx transfer. * DMAy Channelx transfer.
* @param DMAy_Channelx: where y can be 1 or 2 to select the DMA and * @param DMAy_Channelx: where y can be 1 or 2 to select the DMA and
* x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel. * x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.
* @retval The number of remaining data units in the current DMAy Channelx * @retval The number of remaining data units in the current DMAy Channelx
* transfer. * transfer.
*/ */
uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx) uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)
{ {
...@@ -377,7 +378,7 @@ uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx) ...@@ -377,7 +378,7 @@ uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)
/** /**
* @brief Checks whether the specified DMAy Channelx flag is set or not. * @brief Checks whether the specified DMAy Channelx flag is set or not.
* @param DMA_FLAG: specifies the flag to check. * @param DMAy_FLAG: specifies the flag to check.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag. * @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag.
* @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag. * @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.
...@@ -427,17 +428,18 @@ uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx) ...@@ -427,17 +428,18 @@ uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)
* @arg DMA2_FLAG_TC5: DMA2 Channel5 transfer complete flag. * @arg DMA2_FLAG_TC5: DMA2 Channel5 transfer complete flag.
* @arg DMA2_FLAG_HT5: DMA2 Channel5 half transfer flag. * @arg DMA2_FLAG_HT5: DMA2 Channel5 half transfer flag.
* @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag. * @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.
* @retval The new state of DMA_FLAG (SET or RESET). * @retval The new state of DMAy_FLAG (SET or RESET).
*/ */
FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG) FlagStatus DMA_GetFlagStatus(uint32_t DMAy_FLAG)
{ {
FlagStatus bitstatus = RESET; FlagStatus bitstatus = RESET;
uint32_t tmpreg = 0; uint32_t tmpreg = 0;
/* Check the parameters */ /* Check the parameters */
assert_param(IS_DMA_GET_FLAG(DMA_FLAG)); assert_param(IS_DMA_GET_FLAG(DMAy_FLAG));
/* Calculate the used DMA */ /* Calculate the used DMAy */
if ((DMA_FLAG & FLAG_Mask) != (uint32_t)RESET) if ((DMAy_FLAG & FLAG_Mask) != (uint32_t)RESET)
{ {
/* Get DMA2 ISR register value */ /* Get DMA2 ISR register value */
tmpreg = DMA2->ISR ; tmpreg = DMA2->ISR ;
...@@ -448,25 +450,25 @@ FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG) ...@@ -448,25 +450,25 @@ FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG)
tmpreg = DMA1->ISR ; tmpreg = DMA1->ISR ;
} }
/* Check the status of the specified DMA flag */ /* Check the status of the specified DMAy flag */
if ((tmpreg & DMA_FLAG) != (uint32_t)RESET) if ((tmpreg & DMAy_FLAG) != (uint32_t)RESET)
{ {
/* DMA_FLAG is set */ /* DMAy_FLAG is set */
bitstatus = SET; bitstatus = SET;
} }
else else
{ {
/* DMA_FLAG is reset */ /* DMAy_FLAG is reset */
bitstatus = RESET; bitstatus = RESET;
} }
/* Return the DMA_FLAG status */ /* Return the DMAy_FLAG status */
return bitstatus; return bitstatus;
} }
/** /**
* @brief Clears the DMAy Channelx's pending flags. * @brief Clears the DMAy Channelx's pending flags.
* @param DMA_FLAG: specifies the flag to clear. * @param DMAy_FLAG: specifies the flag to clear.
* This parameter can be any combination (for the same DMA) of the following values: * This parameter can be any combination (for the same DMA) of the following values:
* @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag. * @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag.
* @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag. * @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.
...@@ -518,27 +520,27 @@ FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG) ...@@ -518,27 +520,27 @@ FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG)
* @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag. * @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.
* @retval None * @retval None
*/ */
void DMA_ClearFlag(uint32_t DMA_FLAG) void DMA_ClearFlag(uint32_t DMAy_FLAG)
{ {
/* Check the parameters */ /* Check the parameters */
assert_param(IS_DMA_CLEAR_FLAG(DMA_FLAG)); assert_param(IS_DMA_CLEAR_FLAG(DMAy_FLAG));
/* Calculate the used DMA */
if ((DMA_FLAG & FLAG_Mask) != (uint32_t)RESET) /* Calculate the used DMAy */
if ((DMAy_FLAG & FLAG_Mask) != (uint32_t)RESET)
{ {
/* Clear the selected DMA flags */ /* Clear the selected DMAy flags */
DMA2->IFCR = DMA_FLAG; DMA2->IFCR = DMAy_FLAG;
} }
else else
{ {
/* Clear the selected DMA flags */ /* Clear the selected DMAy flags */
DMA1->IFCR = DMA_FLAG; DMA1->IFCR = DMAy_FLAG;
} }
} }
/** /**
* @brief Checks whether the specified DMAy Channelx interrupt has occurred or not. * @brief Checks whether the specified DMAy Channelx interrupt has occurred or not.
* @param DMA_IT: specifies the DMA interrupt source to check. * @param DMAy_IT: specifies the DMAy interrupt source to check.
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt. * @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt.
* @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt. * @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.
...@@ -588,36 +590,37 @@ void DMA_ClearFlag(uint32_t DMA_FLAG) ...@@ -588,36 +590,37 @@ void DMA_ClearFlag(uint32_t DMA_FLAG)
* @arg DMA2_IT_TC5: DMA2 Channel5 transfer complete interrupt. * @arg DMA2_IT_TC5: DMA2 Channel5 transfer complete interrupt.
* @arg DMA2_IT_HT5: DMA2 Channel5 half transfer interrupt. * @arg DMA2_IT_HT5: DMA2 Channel5 half transfer interrupt.
* @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt. * @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.
* @retval The new state of DMA_IT (SET or RESET). * @retval The new state of DMAy_IT (SET or RESET).
*/ */
ITStatus DMA_GetITStatus(uint32_t DMA_IT) ITStatus DMA_GetITStatus(uint32_t DMAy_IT)
{ {
ITStatus bitstatus = RESET; ITStatus bitstatus = RESET;
uint32_t tmpreg = 0; uint32_t tmpreg = 0;
/* Check the parameters */ /* Check the parameters */
assert_param(IS_DMA_GET_IT(DMA_IT)); assert_param(IS_DMA_GET_IT(DMAy_IT));
/* Calculate the used DMA */ /* Calculate the used DMA */
if ((DMA_IT & FLAG_Mask) != (uint32_t)RESET) if ((DMAy_IT & FLAG_Mask) != (uint32_t)RESET)
{ {
/* Get DMA2 ISR register value */ /* Get DMA2 ISR register value */
tmpreg = DMA2->ISR ; tmpreg = DMA2->ISR;
} }
else else
{ {
/* Get DMA1 ISR register value */ /* Get DMA1 ISR register value */
tmpreg = DMA1->ISR ; tmpreg = DMA1->ISR;
} }
/* Check the status of the specified DMA interrupt */ /* Check the status of the specified DMAy interrupt */
if ((tmpreg & DMA_IT) != (uint32_t)RESET) if ((tmpreg & DMAy_IT) != (uint32_t)RESET)
{ {
/* DMA_IT is set */ /* DMAy_IT is set */
bitstatus = SET; bitstatus = SET;
} }
else else
{ {
/* DMA_IT is reset */ /* DMAy_IT is reset */
bitstatus = RESET; bitstatus = RESET;
} }
/* Return the DMA_IT status */ /* Return the DMA_IT status */
...@@ -625,8 +628,8 @@ ITStatus DMA_GetITStatus(uint32_t DMA_IT) ...@@ -625,8 +628,8 @@ ITStatus DMA_GetITStatus(uint32_t DMA_IT)
} }
/** /**
* @brief Clears the DMAy Channelxs interrupt pending bits. * @brief Clears the DMAy Channelx's interrupt pending bits.
* @param DMA_IT: specifies the DMA interrupt pending bit to clear. * @param DMAy_IT: specifies the DMAy interrupt pending bit to clear.
* This parameter can be any combination (for the same DMA) of the following values: * This parameter can be any combination (for the same DMA) of the following values:
* @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt. * @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt.
* @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt. * @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.
...@@ -678,21 +681,21 @@ ITStatus DMA_GetITStatus(uint32_t DMA_IT) ...@@ -678,21 +681,21 @@ ITStatus DMA_GetITStatus(uint32_t DMA_IT)
* @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt. * @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.
* @retval None * @retval None
*/ */
void DMA_ClearITPendingBit(uint32_t DMA_IT) void DMA_ClearITPendingBit(uint32_t DMAy_IT)
{ {
/* Check the parameters */ /* Check the parameters */
assert_param(IS_DMA_CLEAR_IT(DMA_IT)); assert_param(IS_DMA_CLEAR_IT(DMAy_IT));
/* Calculate the used DMA */ /* Calculate the used DMAy */
if ((DMA_IT & FLAG_Mask) != (uint32_t)RESET) if ((DMAy_IT & FLAG_Mask) != (uint32_t)RESET)
{ {
/* Clear the selected DMA interrupt pending bits */ /* Clear the selected DMAy interrupt pending bits */
DMA2->IFCR = DMA_IT; DMA2->IFCR = DMAy_IT;
} }
else else
{ {
/* Clear the selected DMA interrupt pending bits */ /* Clear the selected DMAy interrupt pending bits */
DMA1->IFCR = DMA_IT; DMA1->IFCR = DMAy_IT;
} }
} }
...@@ -708,4 +711,4 @@ void DMA_ClearITPendingBit(uint32_t DMA_IT) ...@@ -708,4 +711,4 @@ void DMA_ClearITPendingBit(uint32_t DMA_IT)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_exti.c * @file stm32f10x_exti.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the EXTI firmware functions. * @brief This file provides all the EXTI firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_exti.h" #include "stm32f10x_exti.h"
...@@ -92,9 +93,9 @@ void EXTI_DeInit(void) ...@@ -92,9 +93,9 @@ void EXTI_DeInit(void)
/** /**
* @brief Initializes the EXTI peripheral according to the specified * @brief Initializes the EXTI peripheral according to the specified
* parameters in the EXTI_InitStruct. * parameters in the EXTI_InitStruct.
* @param EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure * @param EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure
* that contains the configuration information for the EXTI peripheral. * that contains the configuration information for the EXTI peripheral.
* @retval None * @retval None
*/ */
void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct) void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct)
...@@ -150,7 +151,7 @@ void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct) ...@@ -150,7 +151,7 @@ void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct)
/** /**
* @brief Fills each EXTI_InitStruct member with its reset value. * @brief Fills each EXTI_InitStruct member with its reset value.
* @param EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure which will * @param EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure which will
* be initialized. * be initialized.
* @retval None * @retval None
*/ */
void EXTI_StructInit(EXTI_InitTypeDef* EXTI_InitStruct) void EXTI_StructInit(EXTI_InitTypeDef* EXTI_InitStruct)
...@@ -200,7 +201,7 @@ FlagStatus EXTI_GetFlagStatus(uint32_t EXTI_Line) ...@@ -200,7 +201,7 @@ FlagStatus EXTI_GetFlagStatus(uint32_t EXTI_Line)
} }
/** /**
* @brief Clears the EXTIs line pending flags. * @brief Clears the EXTI's line pending flags.
* @param EXTI_Line: specifies the EXTI lines flags to clear. * @param EXTI_Line: specifies the EXTI lines flags to clear.
* This parameter can be any combination of EXTI_Linex where x can be (0..19). * This parameter can be any combination of EXTI_Linex where x can be (0..19).
* @retval None * @retval None
...@@ -240,7 +241,7 @@ ITStatus EXTI_GetITStatus(uint32_t EXTI_Line) ...@@ -240,7 +241,7 @@ ITStatus EXTI_GetITStatus(uint32_t EXTI_Line)
} }
/** /**
* @brief Clears the EXTIs line pending bits. * @brief Clears the EXTI's line pending bits.
* @param EXTI_Line: specifies the EXTI lines to clear. * @param EXTI_Line: specifies the EXTI lines to clear.
* This parameter can be any combination of EXTI_Linex where x can be (0..19). * This parameter can be any combination of EXTI_Linex where x can be (0..19).
* @retval None * @retval None
...@@ -265,4 +266,4 @@ void EXTI_ClearITPendingBit(uint32_t EXTI_Line) ...@@ -265,4 +266,4 @@ void EXTI_ClearITPendingBit(uint32_t EXTI_Line)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_fsmc.c * @file stm32f10x_fsmc.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the FSMC firmware functions. * @brief This file provides all the FSMC firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_fsmc.h" #include "stm32f10x_fsmc.h"
...@@ -89,7 +90,7 @@ ...@@ -89,7 +90,7 @@
/** /**
* @brief Deinitializes the FSMC NOR/SRAM Banks registers to their default * @brief Deinitializes the FSMC NOR/SRAM Banks registers to their default
* reset values. * reset values.
* @param FSMC_Bank: specifies the FSMC Bank to be used * @param FSMC_Bank: specifies the FSMC Bank to be used
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg FSMC_Bank1_NORSRAM1: FSMC Bank1 NOR/SRAM1 * @arg FSMC_Bank1_NORSRAM1: FSMC Bank1 NOR/SRAM1
...@@ -166,10 +167,10 @@ void FSMC_PCCARDDeInit(void) ...@@ -166,10 +167,10 @@ void FSMC_PCCARDDeInit(void)
/** /**
* @brief Initializes the FSMC NOR/SRAM Banks according to the specified * @brief Initializes the FSMC NOR/SRAM Banks according to the specified
* parameters in the FSMC_NORSRAMInitStruct. * parameters in the FSMC_NORSRAMInitStruct.
* @param FSMC_NORSRAMInitStruct : pointer to a FSMC_NORSRAMInitTypeDef * @param FSMC_NORSRAMInitStruct : pointer to a FSMC_NORSRAMInitTypeDef
* structure that contains the configuration information for * structure that contains the configuration information for
* the FSMC NOR/SRAM specified Banks. * the FSMC NOR/SRAM specified Banks.
* @retval None * @retval None
*/ */
void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct) void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
...@@ -252,9 +253,10 @@ void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct) ...@@ -252,9 +253,10 @@ void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
/** /**
* @brief Initializes the FSMC NAND Banks according to the specified * @brief Initializes the FSMC NAND Banks according to the specified
* parameters in the FSMC_NANDInitStruct. * parameters in the FSMC_NANDInitStruct.
* @param FSMC_NANDInitStruct : pointer to a FSMC_NANDInitTypeDef * @param FSMC_NANDInitStruct : pointer to a FSMC_NANDInitTypeDef
* structure that contains the configuration information for the FSMC NAND specified Banks. * structure that contains the configuration information for the FSMC
* NAND specified Banks.
* @retval None * @retval None
*/ */
void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct) void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
...@@ -317,9 +319,10 @@ void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct) ...@@ -317,9 +319,10 @@ void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
/** /**
* @brief Initializes the FSMC PCCARD Bank according to the specified * @brief Initializes the FSMC PCCARD Bank according to the specified
* parameters in the FSMC_PCCARDInitStruct. * parameters in the FSMC_PCCARDInitStruct.
* @param FSMC_PCCARDInitStruct : pointer to a FSMC_PCCARDInitTypeDef * @param FSMC_PCCARDInitStruct : pointer to a FSMC_PCCARDInitTypeDef
* structure that contains the configuration information for the FSMC PCCARD Bank. * structure that contains the configuration information for the FSMC
* PCCARD Bank.
* @retval None * @retval None
*/ */
void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct) void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)
...@@ -371,7 +374,7 @@ void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct) ...@@ -371,7 +374,7 @@ void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)
/** /**
* @brief Fills each FSMC_NORSRAMInitStruct member with its default value. * @brief Fills each FSMC_NORSRAMInitStruct member with its default value.
* @param FSMC_NORSRAMInitStruct: pointer to a FSMC_NORSRAMInitTypeDef * @param FSMC_NORSRAMInitStruct: pointer to a FSMC_NORSRAMInitTypeDef
* structure which will be initialized. * structure which will be initialized.
* @retval None * @retval None
*/ */
void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct) void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
...@@ -409,7 +412,7 @@ void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct) ...@@ -409,7 +412,7 @@ void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
/** /**
* @brief Fills each FSMC_NANDInitStruct member with its default value. * @brief Fills each FSMC_NANDInitStruct member with its default value.
* @param FSMC_NANDInitStruct: pointer to a FSMC_NANDInitTypeDef * @param FSMC_NANDInitStruct: pointer to a FSMC_NANDInitTypeDef
* structure which will be initialized. * structure which will be initialized.
* @retval None * @retval None
*/ */
void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct) void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
...@@ -435,7 +438,7 @@ void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct) ...@@ -435,7 +438,7 @@ void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
/** /**
* @brief Fills each FSMC_PCCARDInitStruct member with its default value. * @brief Fills each FSMC_PCCARDInitStruct member with its default value.
* @param FSMC_PCCARDInitStruct: pointer to a FSMC_PCCARDInitTypeDef * @param FSMC_PCCARDInitStruct: pointer to a FSMC_PCCARDInitTypeDef
* structure which will be initialized. * structure which will be initialized.
* @retval None * @retval None
*/ */
void FSMC_PCCARDStructInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct) void FSMC_PCCARDStructInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)
...@@ -728,7 +731,7 @@ FlagStatus FSMC_GetFlagStatus(uint32_t FSMC_Bank, uint32_t FSMC_FLAG) ...@@ -728,7 +731,7 @@ FlagStatus FSMC_GetFlagStatus(uint32_t FSMC_Bank, uint32_t FSMC_FLAG)
} }
/** /**
* @brief Clears the FSMCs pending flags. * @brief Clears the FSMC's pending flags.
* @param FSMC_Bank: specifies the FSMC Bank to be used * @param FSMC_Bank: specifies the FSMC Bank to be used
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg FSMC_Bank2_NAND: FSMC Bank2 NAND * @arg FSMC_Bank2_NAND: FSMC Bank2 NAND
...@@ -814,7 +817,7 @@ ITStatus FSMC_GetITStatus(uint32_t FSMC_Bank, uint32_t FSMC_IT) ...@@ -814,7 +817,7 @@ ITStatus FSMC_GetITStatus(uint32_t FSMC_Bank, uint32_t FSMC_IT)
} }
/** /**
* @brief Clears the FSMCs interrupt pending bits. * @brief Clears the FSMC's interrupt pending bits.
* @param FSMC_Bank: specifies the FSMC Bank to be used * @param FSMC_Bank: specifies the FSMC Bank to be used
* This parameter can be one of the following values: * This parameter can be one of the following values:
* @arg FSMC_Bank2_NAND: FSMC Bank2 NAND * @arg FSMC_Bank2_NAND: FSMC Bank2 NAND
...@@ -860,4 +863,4 @@ void FSMC_ClearITPendingBit(uint32_t FSMC_Bank, uint32_t FSMC_IT) ...@@ -860,4 +863,4 @@ void FSMC_ClearITPendingBit(uint32_t FSMC_Bank, uint32_t FSMC_IT)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
****************************************************************************** ******************************************************************************
* @file stm32f10x_iwdg.c * @file stm32f10x_iwdg.c
* @author MCD Application Team * @author MCD Application Team
* @version V3.4.0 * @version V3.5.0
* @date 10/15/2010 * @date 11-March-2011
* @brief This file provides all the IWDG firmware functions. * @brief This file provides all the IWDG firmware functions.
****************************************************************************** ******************************************************************************
* @copy * @attention
* *
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
* *
* <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2> * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>
*/ ******************************************************************************
*/
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "stm32f10x_iwdg.h" #include "stm32f10x_iwdg.h"
...@@ -186,4 +187,4 @@ FlagStatus IWDG_GetFlagStatus(uint16_t IWDG_FLAG) ...@@ -186,4 +187,4 @@ FlagStatus IWDG_GetFlagStatus(uint16_t IWDG_FLAG)
* @} * @}
*/ */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册