stm3210 up to lib3.1.2

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@75 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
wuyangyong
2009-10-08 14:53:36 +00:00
parent cfbcf2e82f
commit 088b3a75ca
59 changed files with 1228 additions and 1227 deletions
@@ -1,8 +1,8 @@
;******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_cl.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x Connectivity line devices vector table for RVMDK
;* toolchain.
;* This module performs:
@@ -1,8 +1,8 @@
;******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_hd.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x High Density Devices vector table for RVMDK
;* toolchain.
;* This module performs:
@@ -1,8 +1,8 @@
;******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_ld.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x Low Density Devices vector table for RVMDK
;* toolchain.
;* This module performs:
@@ -1,8 +1,8 @@
;******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_md.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x Medium Density Devices vector table for RVMDK
;* toolchain.
;* This module performs:
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -1,8 +1,8 @@
;/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_cl.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x Connectivity line devices vector table for
;* EWARM5.x toolchain.
;* This module performs:
@@ -1,8 +1,8 @@
;/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_hd.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x High Density Devices vector table for EWARM5.x
;* toolchain.
;* This module performs:
@@ -1,8 +1,8 @@
;/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_ld.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x Low Density Devices vector table for EWARM5.x
;* toolchain.
;* This module performs:
@@ -1,8 +1,8 @@
;/******************** (C) COPYRIGHT 2009 STMicroelectronics ********************
;* File Name : startup_stm32f10x_md.s
;* Author : MCD Application Team
;* Version : V3.1.0
;* Date : 06/19/2009
;* Version : V3.1.2
;* Date : 09/28/2009
;* Description : STM32F10x Medium Density Devices vector table for
;* EWARM5.x toolchain.
;* This module performs:
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief CMSIS Cortex-M3 Device Peripheral Access Layer Header File.
* This file contains all the peripheral register's definitions, bits
* definitions and memory mapping for STM32F10x Connectivity line, High
@@ -100,7 +100,7 @@
*/
#define __STM32F10X_STDPERIPH_VERSION_MAIN (0x03) /*!< [31:16] STM32F10x Standard Peripheral Library main version */
#define __STM32F10X_STDPERIPH_VERSION_SUB1 (0x01) /*!< [15:8] STM32F10x Standard Peripheral Library sub1 version */
#define __STM32F10X_STDPERIPH_VERSION_SUB2 (0x00) /*!< [7:0] STM32F10x Standard Peripheral Library sub2 version */
#define __STM32F10X_STDPERIPH_VERSION_SUB2 (0x02) /*!< [7:0] STM32F10x Standard Peripheral Library sub2 version */
#define __STM32F10X_STDPERIPH_VERSION ((__STM32F10X_STDPERIPH_VERSION_MAIN << 16)\
| (__STM32F10X_STDPERIPH_VERSION_SUB1 << 8)\
| __STM32F10X_STDPERIPH_VERSION_SUB2)
@@ -2,8 +2,8 @@
******************************************************************************
* @file system_stm32f10x.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief CMSIS Cortex-M3 Device Peripheral Access Layer System Source File.
******************************************************************************
*
@@ -641,7 +641,7 @@ static void SetSysClockTo48(void)
/* PCLK2 = HCLK */
RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;
/* PCLK1 = HCLK */
/* PCLK1 = HCLK/2 */
RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV2;
#ifdef STM32F10X_CL
@@ -737,9 +737,9 @@ static void SetSysClockTo56(void)
/* Enable Prefetch Buffer */
FLASH->ACR |= FLASH_ACR_PRFTBE;
/* Flash 1 wait state */
/* Flash 2 wait state */
FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);
FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_1;
FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_2;
/* HCLK = SYSCLK */
RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;
@@ -747,7 +747,7 @@ static void SetSysClockTo56(void)
/* PCLK2 = HCLK */
RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;
/* PCLK1 = HCLK */
/* PCLK1 = HCLK/2 */
RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV2;
#ifdef STM32F10X_CL
@@ -855,7 +855,7 @@ static void SetSysClockTo72(void)
/* PCLK2 = HCLK */
RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;
/* PCLK1 = HCLK */
/* PCLK1 = HCLK/2 */
RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV2;
#ifdef STM32F10X_CL
@@ -2,8 +2,8 @@
******************************************************************************
* @file system_stm32f10x.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief CMSIS Cortex-M3 Device Peripheral Access Layer System Header File.
******************************************************************************
*
@@ -2,8 +2,8 @@
******************************************************************************
* @file misc.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the miscellaneous
* firmware library functions (add-on to CMSIS functions).
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_adc.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the ADC firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_bkp.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the BKP firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_can.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the CAN firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_crc.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the CRC firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_dac.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the DAC firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_dbgmcu.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the DBGMCU
* firmware library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_dma.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the DMA firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_exti.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the EXTI firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_flash.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the FLASH
* firmware library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_fsmc.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the FSMC firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_gpio.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the GPIO
* firmware library.
******************************************************************************
@@ -295,8 +295,8 @@ typedef enum
/** @defgroup Ethernet_Media_Interface
* @{
*/
#define GPIO_ETH_MediaInterface_MII ((u32)0x00000000)
#define GPIO_ETH_MediaInterface_RMII ((u32)0x00000001)
#define GPIO_ETH_MediaInterface_MII ((uint32_t)0x00000000)
#define GPIO_ETH_MediaInterface_RMII ((uint32_t)0x00000001)
#define IS_GPIO_ETH_MEDIA_INTERFACE(INTERFACE) (((INTERFACE) == GPIO_ETH_MediaInterface_MII) || \
((INTERFACE) == GPIO_ETH_MediaInterface_RMII))
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_i2c.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the I2C firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_iwdg.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the IWDG
* firmware library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_pwr.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the PWR firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_rcc.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the RCC firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_rtc.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the RTC firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_sdio.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the SDIO firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_spi.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the SPI firmware
* library.
******************************************************************************
@@ -98,7 +98,7 @@ typedef struct
uint16_t I2S_MCLKOutput; /*!< Specifies whether the I2S MCLK output is enabled or not.
This parameter can be any combination of @ref I2S_MCLK_Output */
uint16_t I2S_AudioFreq; /*!< Specifies the frequency selected for the I2S communication.
uint32_t I2S_AudioFreq; /*!< Specifies the frequency selected for the I2S communication.
This parameter can be any combination of @ref I2S_Audio_Frequency */
uint16_t I2S_CPOL; /*!< Specifies the idle state of the I2S clock.
@@ -298,15 +298,15 @@ typedef struct
* @{
*/
#define I2S_AudioFreq_96k ((uint16_t)96000)
#define I2S_AudioFreq_48k ((uint16_t)48000)
#define I2S_AudioFreq_44k ((uint16_t)44100)
#define I2S_AudioFreq_32k ((uint16_t)32000)
#define I2S_AudioFreq_22k ((uint16_t)22050)
#define I2S_AudioFreq_16k ((uint16_t)16000)
#define I2S_AudioFreq_11k ((uint16_t)11025)
#define I2S_AudioFreq_8k ((uint16_t)8000)
#define I2S_AudioFreq_Default ((uint16_t)2)
#define I2S_AudioFreq_96k ((uint32_t)96000)
#define I2S_AudioFreq_48k ((uint32_t)48000)
#define I2S_AudioFreq_44k ((uint32_t)44100)
#define I2S_AudioFreq_32k ((uint32_t)32000)
#define I2S_AudioFreq_22k ((uint32_t)22050)
#define I2S_AudioFreq_16k ((uint32_t)16000)
#define I2S_AudioFreq_11k ((uint32_t)11025)
#define I2S_AudioFreq_8k ((uint32_t)8000)
#define I2S_AudioFreq_Default ((uint32_t)2)
#define IS_I2S_AUDIO_FREQ(FREQ) (((FREQ) == I2S_AudioFreq_96k) || \
((FREQ) == I2S_AudioFreq_48k) || \
((FREQ) == I2S_AudioFreq_44k) || \
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_tim.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the TIM firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_usart.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the USART
* firmware library.
******************************************************************************
@@ -51,7 +51,7 @@ typedef struct
uint32_t USART_BaudRate; /*!< This member configures the USART communication baud rate.
The baud rate is computed using the following formula:
- IntegerDivider = ((PCLKx) / (16 * (USART_InitStruct->USART_BaudRate)))
- FractionalDivider = ((IntegerDivider - ((u32) IntegerDivider)) * 16) + 0.5 */
- FractionalDivider = ((IntegerDivider - ((uint32_t) IntegerDivider)) * 16) + 0.5 */
uint16_t USART_WordLength; /*!< Specifies the number of data bits transmitted or received in a frame.
This parameter can be a value of @ref USART_Word_Length */
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_wwdg.h
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file contains all the functions prototypes for the WWDG firmware
* library.
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file misc.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the miscellaneous firmware functions (add-on
* to CMSIS functions).
******************************************************************************
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_adc.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the ADC firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_bkp.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the BKP firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_can.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the CAN firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_crc.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the CRC firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_dac.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the DAC firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_dbgmcu.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the DBGMCU firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_dma.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the DMA firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_exti.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the EXTI firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_flash.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the FLASH firmware functions.
******************************************************************************
* @copy
@@ -264,6 +264,10 @@ FLASH_Status FLASH_EraseAllPages(void)
/**
* @brief Erases the FLASH option bytes.
* @note This functions erases all option bytes and then deactivates the Read
* protection. If the user needs to keep the Read protection activated,
* he has to enable it after this function call (using
* FLASH_ReadOutProtection function)
* @param None
* @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,
* FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.
@@ -293,7 +297,7 @@ FLASH_Status FLASH_EraseOptionBytes(void)
/* Enable the Option Bytes Programming operation */
FLASH->CR |= CR_OPTPG_Set;
/* Enable the readout access */
/* Disable the Read protection */
OB->RDP= RDP_Key;
/* Wait for last operation to be completed */
status = FLASH_WaitForLastOperation(ProgramTimeout);
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_fsmc.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the FSMC firmware functions.
******************************************************************************
* @copy
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_gpio.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the GPIO firmware functions.
******************************************************************************
* @copy
@@ -57,7 +57,7 @@
/* --- MAPR Register ---*/
/* Alias word address of MII_RMII_SEL bit */
#define MAPR_OFFSET (AFIO_OFFSET + 0x04)
#define MII_RMII_SEL_BitNumber ((u8)0x17)
#define MII_RMII_SEL_BitNumber ((uint8_t)0x17)
#define MAPR_MII_RMII_SEL_BB (PERIPH_BB_BASE + (MAPR_OFFSET * 32) + (MII_RMII_SEL_BitNumber * 4))
@@ -2,8 +2,8 @@
******************************************************************************
* @file stm32f10x_i2c.c
* @author MCD Application Team
* @version V3.1.0
* @date 06/19/2009
* @version V3.1.2
* @date 09/28/2009
* @brief This file provides all the I2C firmware functions.
******************************************************************************
* @copy

Some files were not shown because too many files have changed in this diff Show More