aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPerry Hung <iperry@alum.mit.edu>2010-03-30 22:59:55 -0400
committerPerry Hung <iperry@alum.mit.edu>2010-03-30 22:59:55 -0400
commit0ddd521fa7d59d0651a90e92b7174d042cd83d4a (patch)
tree81d37c07687005fd08a9f1fa3dd2c98f14b6ee58
parent1be7df0937bee5127103e7dc8800c83e47415f3d (diff)
downloadlibrambutan-0ddd521fa7d59d0651a90e92b7174d042cd83d4a.tar.gz
librambutan-0ddd521fa7d59d0651a90e92b7174d042cd83d4a.zip
Delete STM32 Standard Peripheral Library.
-rw-r--r--stm32lib/inc/cortexm3_macro.h176
-rw-r--r--stm32lib/inc/stm32f10x_adc.h300
-rw-r--r--stm32lib/inc/stm32f10x_bkp.h122
-rw-r--r--stm32lib/inc/stm32f10x_can.h263
-rw-r--r--stm32lib/inc/stm32f10x_crc.h37
-rw-r--r--stm32lib/inc/stm32f10x_dac.h167
-rw-r--r--stm32lib/inc/stm32f10x_dbgmcu.h55
-rw-r--r--stm32lib/inc/stm32f10x_dma.h297
-rw-r--r--stm32lib/inc/stm32f10x_exti.h113
-rw-r--r--stm32lib/inc/stm32f10x_flash.h215
-rw-r--r--stm32lib/inc/stm32f10x_fsmc.h355
-rw-r--r--stm32lib/inc/stm32f10x_gpio.h243
-rw-r--r--stm32lib/inc/stm32f10x_i2c.h281
-rw-r--r--stm32lib/inc/stm32f10x_iwdg.h69
-rw-r--r--stm32lib/inc/stm32f10x_lib.h124
-rw-r--r--stm32lib/inc/stm32f10x_map.h1187
-rw-r--r--stm32lib/inc/stm32f10x_nvic.h293
-rw-r--r--stm32lib/inc/stm32f10x_pwr.h77
-rw-r--r--stm32lib/inc/stm32f10x_rcc.h295
-rw-r--r--stm32lib/inc/stm32f10x_rtc.h70
-rw-r--r--stm32lib/inc/stm32f10x_sdio.h337
-rw-r--r--stm32lib/inc/stm32f10x_spi.h289
-rw-r--r--stm32lib/inc/stm32f10x_systick.h70
-rw-r--r--stm32lib/inc/stm32f10x_tim.h784
-rw-r--r--stm32lib/inc/stm32f10x_type.h80
-rw-r--r--stm32lib/inc/stm32f10x_usart.h259
-rw-r--r--stm32lib/inc/stm32f10x_wwdg.h54
-rw-r--r--stm32lib/src/stm32f10x_adc.c1402
-rw-r--r--stm32lib/src/stm32f10x_bkp.c272
-rw-r--r--stm32lib/src/stm32f10x_can.c907
-rw-r--r--stm32lib/src/stm32f10x_crc.c114
-rw-r--r--stm32lib/src/stm32f10x_dac.c389
-rw-r--r--stm32lib/src/stm32f10x_dbgmcu.c97
-rw-r--r--stm32lib/src/stm32f10x_dma.c678
-rw-r--r--stm32lib/src/stm32f10x_exti.c219
-rw-r--r--stm32lib/src/stm32f10x_flash.c916
-rw-r--r--stm32lib/src/stm32f10x_fsmc.c861
-rw-r--r--stm32lib/src/stm32f10x_gpio.c583
-rw-r--r--stm32lib/src/stm32f10x_i2c.c1216
-rw-r--r--stm32lib/src/stm32f10x_iwdg.c148
-rw-r--r--stm32lib/src/stm32f10x_lib.c303
-rw-r--r--stm32lib/src/stm32f10x_nvic.c751
-rw-r--r--stm32lib/src/stm32f10x_pwr.c280
-rw-r--r--stm32lib/src/stm32f10x_rcc.c1104
-rw-r--r--stm32lib/src/stm32f10x_rtc.c320
-rw-r--r--stm32lib/src/stm32f10x_sdio.c832
-rw-r--r--stm32lib/src/stm32f10x_spi.c863
-rw-r--r--stm32lib/src/stm32f10x_systick.c181
-rw-r--r--stm32lib/src/stm32f10x_tim.c3219
-rw-r--r--stm32lib/src/stm32f10x_usart.c1001
-rw-r--r--stm32lib/src/stm32f10x_wwdg.c185
51 files changed, 0 insertions, 23453 deletions
diff --git a/stm32lib/inc/cortexm3_macro.h b/stm32lib/inc/cortexm3_macro.h
deleted file mode 100644
index 26b04ef..0000000
--- a/stm32lib/inc/cortexm3_macro.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#if 0
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : cortexm3_macro.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : Header file for cortexm3_macro.s.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __CORTEXM3_MACRO_H
-#define __CORTEXM3_MACRO_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_type.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void __WFI(void);
-void __WFE(void);
-void __SEV(void);
-void __ISB(void);
-void __DSB(void);
-void __DMB(void);
-void __SVC(void);
-u32 __MRS_CONTROL(void);
-void __MSR_CONTROL(u32 Control);
-u32 __MRS_PSP(void);
-void __MSR_PSP(u32 TopOfProcessStack);
-u32 __MRS_MSP(void);
-void __MSR_MSP(u32 TopOfMainStack);
-void __RESETPRIMASK(void);
-void __SETPRIMASK(void);
-u32 __READ_PRIMASK(void);
-void __RESETFAULTMASK(void);
-void __SETFAULTMASK(void);
-u32 __READ_FAULTMASK(void);
-void __BASEPRICONFIG(u32 NewPriority);
-u32 __GetBASEPRI(void);
-u16 __REV_HalfWord(u16 Data);
-u32 __REV_Word(u32 Data);
-
-#endif /* __CORTEXM3_MACRO_H */
-#endif
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
-
-/******************** (C) COPYRIGHT 2008 Andreas Fritiofson ********************
-* File Name : cortexm3_macro.h
-* Author : Andreas Fritiofson
-* Version : V1.0
-* Date : 30/04/2008
-* Description : Instruction wrappers for special Cortex-M3 instructions.
-********************************************************************************
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __CORTEXM3_MACRO_H
-#define __CORTEXM3_MACRO_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_type.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-static inline void __WFI(void) {
- asm volatile ( "WFI \n" );
-}
-static inline void __WFE(void) {
- asm volatile ( "WFE \n" );
-}
-static inline void __SEV(void) {
- asm volatile ( "SEV \n" );
-}
-static inline void __ISB(void) {
- asm volatile ( "ISB \n" );
-}
-static inline void __DSB(void) {
- asm volatile ( "DSB \n" );
-}
-static inline void __DMB(void) {
- asm volatile ( "DMB \n" );
-}
-static inline void __SVC(void) {
- asm volatile ( "SVC 0x01 \n" );
-}
-static inline u32 __MRS_CONTROL(void) {
- u32 x;
- asm volatile ( "MRS %0, control \n" : "=r" (x));
- return x;
-}
-static inline void __MSR_CONTROL(u32 Control) {
- asm volatile (
- "MSR control, %0 \n"
- "ISB \n"
- : : "r" (Control));
-}
-static inline u32 __MRS_PSP(void) {
- u32 x;
- asm volatile ( "MRS %0, psp \n" : "=r" (x));
- return x;
-}
-static inline void __MSR_PSP(u32 TopOfProcessStack) {
- asm volatile ( "MSR psp, %0 \n" : : "r" (TopOfProcessStack));
-}
-static inline u32 __MRS_MSP(void) {
- u32 x;
- asm volatile ( "MRS %0, msp \n" : "=r" (x));
- return x;
-}
-static inline void __MSR_MSP(u32 TopOfMainStack) {
- asm volatile ( "MSR msp, %0 \n" : : "r" (TopOfMainStack));
-}
-static inline void __SETPRIMASK(void) {
- asm volatile ( "CPSID i \n" );
-}
-static inline void __RESETPRIMASK(void) {
- asm volatile ( "CPSIE i \n" );
-}
-static inline void __SETFAULTMASK(void) {
- asm volatile ( "CPSID f \n" );
-}
-static inline void __RESETFAULTMASK(void) {
- asm volatile ( "CPSIE f \n" );
-}
-static inline void __BASEPRICONFIG(u32 NewPriority) {
- asm volatile ( "MSR basepri, %0 \n" : : "r" (NewPriority));
-}
-static inline u32 __GetBASEPRI(void) {
- u32 x;
- asm volatile ( "MRS %0, basepri_max \n" : "=r" (x));
- return x;
-}
-static inline u16 __REV_HalfWord(u16 Data) {
- u16 x;
- asm volatile ( "REV16 %0, %1 \n" : "=r" (x) : "r" (Data));
- return x;
-}
-static inline u32 __REV_Word(u32 Data) {
- u32 x;
- asm volatile ( "REV %0, %1 \n" : "=r" (x) : "r" (Data));
- return x;
-}
-
-#endif /* __CORTEXM3_MACRO_H */
-
-/******************* (C) COPYRIGHT 2008 Andreas Fritiofson *****END OF FILE****/
-
diff --git a/stm32lib/inc/stm32f10x_adc.h b/stm32lib/inc/stm32f10x_adc.h
deleted file mode 100644
index 8fc9098..0000000
--- a/stm32lib/inc/stm32f10x_adc.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_adc.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* ADC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_ADC_H
-#define __STM32F10x_ADC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* ADC Init structure definition */
-typedef struct
-{
- u32 ADC_Mode;
- FunctionalState ADC_ScanConvMode;
- FunctionalState ADC_ContinuousConvMode;
- u32 ADC_ExternalTrigConv;
- u32 ADC_DataAlign;
- u8 ADC_NbrOfChannel;
-}ADC_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define IS_ADC_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == ADC1_BASE) || \
- ((*(u32*)&(PERIPH)) == ADC2_BASE) || \
- ((*(u32*)&(PERIPH)) == ADC3_BASE))
-
-#define IS_ADC_DMA_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == ADC1_BASE) || \
- ((*(u32*)&(PERIPH)) == ADC3_BASE))
-
-/* ADC dual mode -------------------------------------------------------------*/
-#define ADC_Mode_Independent ((u32)0x00000000)
-#define ADC_Mode_RegInjecSimult ((u32)0x00010000)
-#define ADC_Mode_RegSimult_AlterTrig ((u32)0x00020000)
-#define ADC_Mode_InjecSimult_FastInterl ((u32)0x00030000)
-#define ADC_Mode_InjecSimult_SlowInterl ((u32)0x00040000)
-#define ADC_Mode_InjecSimult ((u32)0x00050000)
-#define ADC_Mode_RegSimult ((u32)0x00060000)
-#define ADC_Mode_FastInterl ((u32)0x00070000)
-#define ADC_Mode_SlowInterl ((u32)0x00080000)
-#define ADC_Mode_AlterTrig ((u32)0x00090000)
-
-#define IS_ADC_MODE(MODE) (((MODE) == ADC_Mode_Independent) || \
- ((MODE) == ADC_Mode_RegInjecSimult) || \
- ((MODE) == ADC_Mode_RegSimult_AlterTrig) || \
- ((MODE) == ADC_Mode_InjecSimult_FastInterl) || \
- ((MODE) == ADC_Mode_InjecSimult_SlowInterl) || \
- ((MODE) == ADC_Mode_InjecSimult) || \
- ((MODE) == ADC_Mode_RegSimult) || \
- ((MODE) == ADC_Mode_FastInterl) || \
- ((MODE) == ADC_Mode_SlowInterl) || \
- ((MODE) == ADC_Mode_AlterTrig))
-
-/* ADC extrenal trigger sources for regular channels conversion --------------*/
-/* for ADC1 and ADC2 */
-#define ADC_ExternalTrigConv_T1_CC1 ((u32)0x00000000)
-#define ADC_ExternalTrigConv_T1_CC2 ((u32)0x00020000)
-#define ADC_ExternalTrigConv_T2_CC2 ((u32)0x00060000)
-#define ADC_ExternalTrigConv_T3_TRGO ((u32)0x00080000)
-#define ADC_ExternalTrigConv_T4_CC4 ((u32)0x000A0000)
-#define ADC_ExternalTrigConv_Ext_IT11_TIM8_TRGO ((u32)0x000C0000)
-/* for ADC1, ADC2 and ADC3 */
-#define ADC_ExternalTrigConv_T1_CC3 ((u32)0x00040000)
-#define ADC_ExternalTrigConv_None ((u32)0x000E0000)
-/* for ADC3 */
-#define ADC_ExternalTrigConv_T3_CC1 ((u32)0x00000000)
-#define ADC_ExternalTrigConv_T2_CC3 ((u32)0x00020000)
-#define ADC_ExternalTrigConv_T8_CC1 ((u32)0x00060000)
-#define ADC_ExternalTrigConv_T8_TRGO ((u32)0x00080000)
-#define ADC_ExternalTrigConv_T5_CC1 ((u32)0x000A0000)
-#define ADC_ExternalTrigConv_T5_CC3 ((u32)0x000C0000)
-
-#define IS_ADC_EXT_TRIG(REGTRIG) (((REGTRIG) == ADC_ExternalTrigConv_T1_CC1) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T1_CC2) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T1_CC3) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T2_CC2) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T3_TRGO) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T4_CC4) || \
- ((REGTRIG) == ADC_ExternalTrigConv_Ext_IT11_TIM8_TRGO) || \
- ((REGTRIG) == ADC_ExternalTrigConv_None) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T3_CC1) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T2_CC3) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T8_CC1) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T8_TRGO) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T5_CC1) || \
- ((REGTRIG) == ADC_ExternalTrigConv_T5_CC3))
-
-/* ADC data align ------------------------------------------------------------*/
-#define ADC_DataAlign_Right ((u32)0x00000000)
-#define ADC_DataAlign_Left ((u32)0x00000800)
-
-#define IS_ADC_DATA_ALIGN(ALIGN) (((ALIGN) == ADC_DataAlign_Right) || \
- ((ALIGN) == ADC_DataAlign_Left))
-
-/* ADC channels --------------------------------------------------------------*/
-#define ADC_Channel_0 ((u8)0x00)
-#define ADC_Channel_1 ((u8)0x01)
-#define ADC_Channel_2 ((u8)0x02)
-#define ADC_Channel_3 ((u8)0x03)
-#define ADC_Channel_4 ((u8)0x04)
-#define ADC_Channel_5 ((u8)0x05)
-#define ADC_Channel_6 ((u8)0x06)
-#define ADC_Channel_7 ((u8)0x07)
-#define ADC_Channel_8 ((u8)0x08)
-#define ADC_Channel_9 ((u8)0x09)
-#define ADC_Channel_10 ((u8)0x0A)
-#define ADC_Channel_11 ((u8)0x0B)
-#define ADC_Channel_12 ((u8)0x0C)
-#define ADC_Channel_13 ((u8)0x0D)
-#define ADC_Channel_14 ((u8)0x0E)
-#define ADC_Channel_15 ((u8)0x0F)
-#define ADC_Channel_16 ((u8)0x10)
-#define ADC_Channel_17 ((u8)0x11)
-
-#define IS_ADC_CHANNEL(CHANNEL) (((CHANNEL) == ADC_Channel_0) || ((CHANNEL) == ADC_Channel_1) || \
- ((CHANNEL) == ADC_Channel_2) || ((CHANNEL) == ADC_Channel_3) || \
- ((CHANNEL) == ADC_Channel_4) || ((CHANNEL) == ADC_Channel_5) || \
- ((CHANNEL) == ADC_Channel_6) || ((CHANNEL) == ADC_Channel_7) || \
- ((CHANNEL) == ADC_Channel_8) || ((CHANNEL) == ADC_Channel_9) || \
- ((CHANNEL) == ADC_Channel_10) || ((CHANNEL) == ADC_Channel_11) || \
- ((CHANNEL) == ADC_Channel_12) || ((CHANNEL) == ADC_Channel_13) || \
- ((CHANNEL) == ADC_Channel_14) || ((CHANNEL) == ADC_Channel_15) || \
- ((CHANNEL) == ADC_Channel_16) || ((CHANNEL) == ADC_Channel_17))
-
-/* ADC sampling times --------------------------------------------------------*/
-#define ADC_SampleTime_1Cycles5 ((u8)0x00)
-#define ADC_SampleTime_7Cycles5 ((u8)0x01)
-#define ADC_SampleTime_13Cycles5 ((u8)0x02)
-#define ADC_SampleTime_28Cycles5 ((u8)0x03)
-#define ADC_SampleTime_41Cycles5 ((u8)0x04)
-#define ADC_SampleTime_55Cycles5 ((u8)0x05)
-#define ADC_SampleTime_71Cycles5 ((u8)0x06)
-#define ADC_SampleTime_239Cycles5 ((u8)0x07)
-
-#define IS_ADC_SAMPLE_TIME(TIME) (((TIME) == ADC_SampleTime_1Cycles5) || \
- ((TIME) == ADC_SampleTime_7Cycles5) || \
- ((TIME) == ADC_SampleTime_13Cycles5) || \
- ((TIME) == ADC_SampleTime_28Cycles5) || \
- ((TIME) == ADC_SampleTime_41Cycles5) || \
- ((TIME) == ADC_SampleTime_55Cycles5) || \
- ((TIME) == ADC_SampleTime_71Cycles5) || \
- ((TIME) == ADC_SampleTime_239Cycles5))
-
-/* ADC extrenal trigger sources for injected channels conversion -------------*/
-/* For ADC1 and ADC2 */
-#define ADC_ExternalTrigInjecConv_T2_TRGO ((u32)0x00002000)
-#define ADC_ExternalTrigInjecConv_T2_CC1 ((u32)0x00003000)
-#define ADC_ExternalTrigInjecConv_T3_CC4 ((u32)0x00004000)
-#define ADC_ExternalTrigInjecConv_T4_TRGO ((u32)0x00005000)
-#define ADC_ExternalTrigInjecConv_Ext_IT15_TIM8_CC4 ((u32)0x00006000)
-/* For ADC1, ADC2 and ADC3 */
-#define ADC_ExternalTrigInjecConv_T1_TRGO ((u32)0x00000000)
-#define ADC_ExternalTrigInjecConv_T1_CC4 ((u32)0x00001000)
-#define ADC_ExternalTrigInjecConv_None ((u32)0x00007000)
-/* For ADC3 */
-#define ADC_ExternalTrigInjecConv_T4_CC3 ((u32)0x00002000)
-#define ADC_ExternalTrigInjecConv_T8_CC2 ((u32)0x00003000)
-#define ADC_ExternalTrigInjecConv_T8_CC4 ((u32)0x00004000)
-#define ADC_ExternalTrigInjecConv_T5_TRGO ((u32)0x00005000)
-#define ADC_ExternalTrigInjecConv_T5_CC4 ((u32)0x00006000)
-
-#define IS_ADC_EXT_INJEC_TRIG(INJTRIG) (((INJTRIG) == ADC_ExternalTrigInjecConv_T1_TRGO) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T1_CC4) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T2_TRGO) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T2_CC1) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T3_CC4) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T4_TRGO) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_Ext_IT15_TIM8_CC4) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_None) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T4_CC3) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T8_CC2) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T8_CC4) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T5_TRGO) || \
- ((INJTRIG) == ADC_ExternalTrigInjecConv_T5_CC4))
-
-/* ADC injected channel selection --------------------------------------------*/
-#define ADC_InjectedChannel_1 ((u8)0x14)
-#define ADC_InjectedChannel_2 ((u8)0x18)
-#define ADC_InjectedChannel_3 ((u8)0x1C)
-#define ADC_InjectedChannel_4 ((u8)0x20)
-
-#define IS_ADC_INJECTED_CHANNEL(CHANNEL) (((CHANNEL) == ADC_InjectedChannel_1) || \
- ((CHANNEL) == ADC_InjectedChannel_2) || \
- ((CHANNEL) == ADC_InjectedChannel_3) || \
- ((CHANNEL) == ADC_InjectedChannel_4))
-
-/* ADC analog watchdog selection ---------------------------------------------*/
-#define ADC_AnalogWatchdog_SingleRegEnable ((u32)0x00800200)
-#define ADC_AnalogWatchdog_SingleInjecEnable ((u32)0x00400200)
-#define ADC_AnalogWatchdog_SingleRegOrInjecEnable ((u32)0x00C00200)
-#define ADC_AnalogWatchdog_AllRegEnable ((u32)0x00800000)
-#define ADC_AnalogWatchdog_AllInjecEnable ((u32)0x00400000)
-#define ADC_AnalogWatchdog_AllRegAllInjecEnable ((u32)0x00C00000)
-#define ADC_AnalogWatchdog_None ((u32)0x00000000)
-
-#define IS_ADC_ANALOG_WATCHDOG(WATCHDOG) (((WATCHDOG) == ADC_AnalogWatchdog_SingleRegEnable) || \
- ((WATCHDOG) == ADC_AnalogWatchdog_SingleInjecEnable) || \
- ((WATCHDOG) == ADC_AnalogWatchdog_SingleRegOrInjecEnable) || \
- ((WATCHDOG) == ADC_AnalogWatchdog_AllRegEnable) || \
- ((WATCHDOG) == ADC_AnalogWatchdog_AllInjecEnable) || \
- ((WATCHDOG) == ADC_AnalogWatchdog_AllRegAllInjecEnable) || \
- ((WATCHDOG) == ADC_AnalogWatchdog_None))
-
-/* ADC interrupts definition -------------------------------------------------*/
-#define ADC_IT_EOC ((u16)0x0220)
-#define ADC_IT_AWD ((u16)0x0140)
-#define ADC_IT_JEOC ((u16)0x0480)
-
-#define IS_ADC_IT(IT) ((((IT) & (u16)0xF81F) == 0x00) && ((IT) != 0x00))
-#define IS_ADC_GET_IT(IT) (((IT) == ADC_IT_EOC) || ((IT) == ADC_IT_AWD) || \
- ((IT) == ADC_IT_JEOC))
-
-/* ADC flags definition ------------------------------------------------------*/
-#define ADC_FLAG_AWD ((u8)0x01)
-#define ADC_FLAG_EOC ((u8)0x02)
-#define ADC_FLAG_JEOC ((u8)0x04)
-#define ADC_FLAG_JSTRT ((u8)0x08)
-#define ADC_FLAG_STRT ((u8)0x10)
-
-#define IS_ADC_CLEAR_FLAG(FLAG) ((((FLAG) & (u8)0xE0) == 0x00) && ((FLAG) != 0x00))
-#define IS_ADC_GET_FLAG(FLAG) (((FLAG) == ADC_FLAG_AWD) || ((FLAG) == ADC_FLAG_EOC) || \
- ((FLAG) == ADC_FLAG_JEOC) || ((FLAG)== ADC_FLAG_JSTRT) || \
- ((FLAG) == ADC_FLAG_STRT))
-
-/* ADC thresholds ------------------------------------------------------------*/
-#define IS_ADC_THRESHOLD(THRESHOLD) ((THRESHOLD) <= 0xFFF)
-
-/* ADC injected offset -------------------------------------------------------*/
-#define IS_ADC_OFFSET(OFFSET) ((OFFSET) <= 0xFFF)
-
-/* ADC injected length -------------------------------------------------------*/
-#define IS_ADC_INJECTED_LENGTH(LENGTH) (((LENGTH) >= 0x1) && ((LENGTH) <= 0x4))
-
-/* ADC injected rank ---------------------------------------------------------*/
-#define IS_ADC_INJECTED_RANK(RANK) (((RANK) >= 0x1) && ((RANK) <= 0x4))
-
-/* ADC regular length --------------------------------------------------------*/
-#define IS_ADC_REGULAR_LENGTH(LENGTH) (((LENGTH) >= 0x1) && ((LENGTH) <= 0x10))
-
-/* ADC regular rank ----------------------------------------------------------*/
-#define IS_ADC_REGULAR_RANK(RANK) (((RANK) >= 0x1) && ((RANK) <= 0x10))
-
-/* ADC regular discontinuous mode number -------------------------------------*/
-#define IS_ADC_REGULAR_DISC_NUMBER(NUMBER) (((NUMBER) >= 0x1) && ((NUMBER) <= 0x8))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void ADC_DeInit(ADC_TypeDef* ADCx);
-void ADC_Init(ADC_TypeDef* ADCx, ADC_InitTypeDef* ADC_InitStruct);
-void ADC_StructInit(ADC_InitTypeDef* ADC_InitStruct);
-void ADC_Cmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-void ADC_DMACmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-void ADC_ITConfig(ADC_TypeDef* ADCx, u16 ADC_IT, FunctionalState NewState);
-void ADC_ResetCalibration(ADC_TypeDef* ADCx);
-FlagStatus ADC_GetResetCalibrationStatus(ADC_TypeDef* ADCx);
-void ADC_StartCalibration(ADC_TypeDef* ADCx);
-FlagStatus ADC_GetCalibrationStatus(ADC_TypeDef* ADCx);
-void ADC_SoftwareStartConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-FlagStatus ADC_GetSoftwareStartConvStatus(ADC_TypeDef* ADCx);
-void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, u8 Number);
-void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-void ADC_RegularChannelConfig(ADC_TypeDef* ADCx, u8 ADC_Channel, u8 Rank, u8 ADC_SampleTime);
-void ADC_ExternalTrigConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-u16 ADC_GetConversionValue(ADC_TypeDef* ADCx);
-u32 ADC_GetDualModeConversionValue(void);
-void ADC_AutoInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-void ADC_InjectedDiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-void ADC_ExternalTrigInjectedConvConfig(ADC_TypeDef* ADCx, u32 ADC_ExternalTrigInjecConv);
-void ADC_ExternalTrigInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-void ADC_SoftwareStartInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState);
-FlagStatus ADC_GetSoftwareStartInjectedConvCmdStatus(ADC_TypeDef* ADCx);
-void ADC_InjectedChannelConfig(ADC_TypeDef* ADCx, u8 ADC_Channel, u8 Rank, u8 ADC_SampleTime);
-void ADC_InjectedSequencerLengthConfig(ADC_TypeDef* ADCx, u8 Length);
-void ADC_SetInjectedOffset(ADC_TypeDef* ADCx, u8 ADC_InjectedChannel, u16 Offset);
-u16 ADC_GetInjectedConversionValue(ADC_TypeDef* ADCx, u8 ADC_InjectedChannel);
-void ADC_AnalogWatchdogCmd(ADC_TypeDef* ADCx, u32 ADC_AnalogWatchdog);
-void ADC_AnalogWatchdogThresholdsConfig(ADC_TypeDef* ADCx, u16 HighThreshold, u16 LowThreshold);
-void ADC_AnalogWatchdogSingleChannelConfig(ADC_TypeDef* ADCx, u8 ADC_Channel);
-void ADC_TempSensorVrefintCmd(FunctionalState NewState);
-FlagStatus ADC_GetFlagStatus(ADC_TypeDef* ADCx, u8 ADC_FLAG);
-void ADC_ClearFlag(ADC_TypeDef* ADCx, u8 ADC_FLAG);
-ITStatus ADC_GetITStatus(ADC_TypeDef* ADCx, u16 ADC_IT);
-void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, u16 ADC_IT);
-
-#endif /*__STM32F10x_ADC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_bkp.h b/stm32lib/inc/stm32f10x_bkp.h
deleted file mode 100644
index 39ea7ae..0000000
--- a/stm32lib/inc/stm32f10x_bkp.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_bkp.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* BKP firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_BKP_H
-#define __STM32F10x_BKP_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Tamper Pin active level */
-#define BKP_TamperPinLevel_High ((u16)0x0000)
-#define BKP_TamperPinLevel_Low ((u16)0x0001)
-
-#define IS_BKP_TAMPER_PIN_LEVEL(LEVEL) (((LEVEL) == BKP_TamperPinLevel_High) || \
- ((LEVEL) == BKP_TamperPinLevel_Low))
-
-/* RTC output source to output on the Tamper pin */
-#define BKP_RTCOutputSource_None ((u16)0x0000)
-#define BKP_RTCOutputSource_CalibClock ((u16)0x0080)
-#define BKP_RTCOutputSource_Alarm ((u16)0x0100)
-#define BKP_RTCOutputSource_Second ((u16)0x0300)
-
-#define IS_BKP_RTC_OUTPUT_SOURCE(SOURCE) (((SOURCE) == BKP_RTCOutputSource_None) || \
- ((SOURCE) == BKP_RTCOutputSource_CalibClock) || \
- ((SOURCE) == BKP_RTCOutputSource_Alarm) || \
- ((SOURCE) == BKP_RTCOutputSource_Second))
-
-/* Data Backup Register */
-#define BKP_DR1 ((u16)0x0004)
-#define BKP_DR2 ((u16)0x0008)
-#define BKP_DR3 ((u16)0x000C)
-#define BKP_DR4 ((u16)0x0010)
-#define BKP_DR5 ((u16)0x0014)
-#define BKP_DR6 ((u16)0x0018)
-#define BKP_DR7 ((u16)0x001C)
-#define BKP_DR8 ((u16)0x0020)
-#define BKP_DR9 ((u16)0x0024)
-#define BKP_DR10 ((u16)0x0028)
-#define BKP_DR11 ((u16)0x0040)
-#define BKP_DR12 ((u16)0x0044)
-#define BKP_DR13 ((u16)0x0048)
-#define BKP_DR14 ((u16)0x004C)
-#define BKP_DR15 ((u16)0x0050)
-#define BKP_DR16 ((u16)0x0054)
-#define BKP_DR17 ((u16)0x0058)
-#define BKP_DR18 ((u16)0x005C)
-#define BKP_DR19 ((u16)0x0060)
-#define BKP_DR20 ((u16)0x0064)
-#define BKP_DR21 ((u16)0x0068)
-#define BKP_DR22 ((u16)0x006C)
-#define BKP_DR23 ((u16)0x0070)
-#define BKP_DR24 ((u16)0x0074)
-#define BKP_DR25 ((u16)0x0078)
-#define BKP_DR26 ((u16)0x007C)
-#define BKP_DR27 ((u16)0x0080)
-#define BKP_DR28 ((u16)0x0084)
-#define BKP_DR29 ((u16)0x0088)
-#define BKP_DR30 ((u16)0x008C)
-#define BKP_DR31 ((u16)0x0090)
-#define BKP_DR32 ((u16)0x0094)
-#define BKP_DR33 ((u16)0x0098)
-#define BKP_DR34 ((u16)0x009C)
-#define BKP_DR35 ((u16)0x00A0)
-#define BKP_DR36 ((u16)0x00A4)
-#define BKP_DR37 ((u16)0x00A8)
-#define BKP_DR38 ((u16)0x00AC)
-#define BKP_DR39 ((u16)0x00B0)
-#define BKP_DR40 ((u16)0x00B4)
-#define BKP_DR41 ((u16)0x00B8)
-#define BKP_DR42 ((u16)0x00BC)
-
-#define IS_BKP_DR(DR) (((DR) == BKP_DR1) || ((DR) == BKP_DR2) || ((DR) == BKP_DR3) || \
- ((DR) == BKP_DR4) || ((DR) == BKP_DR5) || ((DR) == BKP_DR6) || \
- ((DR) == BKP_DR7) || ((DR) == BKP_DR8) || ((DR) == BKP_DR9) || \
- ((DR) == BKP_DR10) || ((DR) == BKP_DR11) || ((DR) == BKP_DR12) || \
- ((DR) == BKP_DR13) || ((DR) == BKP_DR14) || ((DR) == BKP_DR15) || \
- ((DR) == BKP_DR16) || ((DR) == BKP_DR17) || ((DR) == BKP_DR18) || \
- ((DR) == BKP_DR19) || ((DR) == BKP_DR20) || ((DR) == BKP_DR21) || \
- ((DR) == BKP_DR22) || ((DR) == BKP_DR23) || ((DR) == BKP_DR24) || \
- ((DR) == BKP_DR25) || ((DR) == BKP_DR26) || ((DR) == BKP_DR27) || \
- ((DR) == BKP_DR28) || ((DR) == BKP_DR29) || ((DR) == BKP_DR30) || \
- ((DR) == BKP_DR31) || ((DR) == BKP_DR32) || ((DR) == BKP_DR33) || \
- ((DR) == BKP_DR34) || ((DR) == BKP_DR35) || ((DR) == BKP_DR36) || \
- ((DR) == BKP_DR37) || ((DR) == BKP_DR38) || ((DR) == BKP_DR39) || \
- ((DR) == BKP_DR40) || ((DR) == BKP_DR41) || ((DR) == BKP_DR42))
-
-#define IS_BKP_CALIBRATION_VALUE(VALUE) ((VALUE) <= 0x7F)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void BKP_DeInit(void);
-void BKP_TamperPinLevelConfig(u16 BKP_TamperPinLevel);
-void BKP_TamperPinCmd(FunctionalState NewState);
-void BKP_ITConfig(FunctionalState NewState);
-void BKP_RTCOutputConfig(u16 BKP_RTCOutputSource);
-void BKP_SetRTCCalibrationValue(u8 CalibrationValue);
-void BKP_WriteBackupRegister(u16 BKP_DR, u16 Data);
-u16 BKP_ReadBackupRegister(u16 BKP_DR);
-FlagStatus BKP_GetFlagStatus(void);
-void BKP_ClearFlag(void);
-ITStatus BKP_GetITStatus(void);
-void BKP_ClearITPendingBit(void);
-
-#endif /* __STM32F10x_BKP_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_can.h b/stm32lib/inc/stm32f10x_can.h
deleted file mode 100644
index 85dd07b..0000000
--- a/stm32lib/inc/stm32f10x_can.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_can.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* CAN firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_CAN_H
-#define __STM32F10x_CAN_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* CAN init structure definition */
-typedef struct
-{
- FunctionalState CAN_TTCM;
- FunctionalState CAN_ABOM;
- FunctionalState CAN_AWUM;
- FunctionalState CAN_NART;
- FunctionalState CAN_RFLM;
- FunctionalState CAN_TXFP;
- u8 CAN_Mode;
- u8 CAN_SJW;
- u8 CAN_BS1;
- u8 CAN_BS2;
- u16 CAN_Prescaler;
-} CAN_InitTypeDef;
-
-/* CAN filter init structure definition */
-typedef struct
-{
- u8 CAN_FilterNumber;
- u8 CAN_FilterMode;
- u8 CAN_FilterScale;
- u16 CAN_FilterIdHigh;
- u16 CAN_FilterIdLow;
- u16 CAN_FilterMaskIdHigh;
- u16 CAN_FilterMaskIdLow;
- u16 CAN_FilterFIFOAssignment;
- FunctionalState CAN_FilterActivation;
-} CAN_FilterInitTypeDef;
-
-/* CAN Tx message structure definition */
-typedef struct
-{
- u32 StdId;
- u32 ExtId;
- u8 IDE;
- u8 RTR;
- u8 DLC;
- u8 Data[8];
-} CanTxMsg;
-
-/* CAN Rx message structure definition */
-typedef struct
-{
- u32 StdId;
- u32 ExtId;
- u8 IDE;
- u8 RTR;
- u8 DLC;
- u8 Data[8];
- u8 FMI;
-} CanRxMsg;
-
-/* Exported constants --------------------------------------------------------*/
-
-/* CAN sleep constants */
-#define CANINITFAILED ((u8)0x00) /* CAN initialization failed */
-#define CANINITOK ((u8)0x01) /* CAN initialization failed */
-
-/* CAN operating mode */
-#define CAN_Mode_Normal ((u8)0x00) /* normal mode */
-#define CAN_Mode_LoopBack ((u8)0x01) /* loopback mode */
-#define CAN_Mode_Silent ((u8)0x02) /* silent mode */
-#define CAN_Mode_Silent_LoopBack ((u8)0x03) /* loopback combined with silent mode */
-
-#define IS_CAN_MODE(MODE) (((MODE) == CAN_Mode_Normal) || ((MODE) == CAN_Mode_LoopBack)|| \
- ((MODE) == CAN_Mode_Silent) || ((MODE) == CAN_Mode_Silent_LoopBack))
-
-/* CAN synchronisation jump width */
-#define CAN_SJW_1tq ((u8)0x00) /* 1 time quantum */
-#define CAN_SJW_2tq ((u8)0x01) /* 2 time quantum */
-#define CAN_SJW_3tq ((u8)0x02) /* 3 time quantum */
-#define CAN_SJW_4tq ((u8)0x03) /* 4 time quantum */
-
-#define IS_CAN_SJW(SJW) (((SJW) == CAN_SJW_1tq) || ((SJW) == CAN_SJW_2tq)|| \
- ((SJW) == CAN_SJW_3tq) || ((SJW) == CAN_SJW_4tq))
-
-/* time quantum in bit segment 1 */
-#define CAN_BS1_1tq ((u8)0x00) /* 1 time quantum */
-#define CAN_BS1_2tq ((u8)0x01) /* 2 time quantum */
-#define CAN_BS1_3tq ((u8)0x02) /* 3 time quantum */
-#define CAN_BS1_4tq ((u8)0x03) /* 4 time quantum */
-#define CAN_BS1_5tq ((u8)0x04) /* 5 time quantum */
-#define CAN_BS1_6tq ((u8)0x05) /* 6 time quantum */
-#define CAN_BS1_7tq ((u8)0x06) /* 7 time quantum */
-#define CAN_BS1_8tq ((u8)0x07) /* 8 time quantum */
-#define CAN_BS1_9tq ((u8)0x08) /* 9 time quantum */
-#define CAN_BS1_10tq ((u8)0x09) /* 10 time quantum */
-#define CAN_BS1_11tq ((u8)0x0A) /* 11 time quantum */
-#define CAN_BS1_12tq ((u8)0x0B) /* 12 time quantum */
-#define CAN_BS1_13tq ((u8)0x0C) /* 13 time quantum */
-#define CAN_BS1_14tq ((u8)0x0D) /* 14 time quantum */
-#define CAN_BS1_15tq ((u8)0x0E) /* 15 time quantum */
-#define CAN_BS1_16tq ((u8)0x0F) /* 16 time quantum */
-
-#define IS_CAN_BS1(BS1) ((BS1) <= CAN_BS1_16tq)
-
-/* time quantum in bit segment 2 */
-#define CAN_BS2_1tq ((u8)0x00) /* 1 time quantum */
-#define CAN_BS2_2tq ((u8)0x01) /* 2 time quantum */
-#define CAN_BS2_3tq ((u8)0x02) /* 3 time quantum */
-#define CAN_BS2_4tq ((u8)0x03) /* 4 time quantum */
-#define CAN_BS2_5tq ((u8)0x04) /* 5 time quantum */
-#define CAN_BS2_6tq ((u8)0x05) /* 6 time quantum */
-#define CAN_BS2_7tq ((u8)0x06) /* 7 time quantum */
-#define CAN_BS2_8tq ((u8)0x07) /* 8 time quantum */
-
-#define IS_CAN_BS2(BS2) ((BS2) <= CAN_BS2_8tq)
-
-/* CAN clock prescaler */
-#define IS_CAN_PRESCALER(PRESCALER) (((PRESCALER) >= 1) && ((PRESCALER) <= 1024))
-
-/* CAN filter number */
-#define IS_CAN_FILTER_NUMBER(NUMBER) ((NUMBER) <= 13)
-
-/* CAN filter mode */
-#define CAN_FilterMode_IdMask ((u8)0x00) /* id/mask mode */
-#define CAN_FilterMode_IdList ((u8)0x01) /* identifier list mode */
-
-#define IS_CAN_FILTER_MODE(MODE) (((MODE) == CAN_FilterMode_IdMask) || \
- ((MODE) == CAN_FilterMode_IdList))
-
-/* CAN filter scale */
-#define CAN_FilterScale_16bit ((u8)0x00) /* 16-bit filter scale */
-#define CAN_FilterScale_32bit ((u8)0x01) /* 2-bit filter scale */
-
-#define IS_CAN_FILTER_SCALE(SCALE) (((SCALE) == CAN_FilterScale_16bit) || \
- ((SCALE) == CAN_FilterScale_32bit))
-
-/* CAN filter FIFO assignation */
-#define CAN_FilterFIFO0 ((u8)0x00) /* Filter FIFO 0 assignment for filter x */
-#define CAN_FilterFIFO1 ((u8)0x01) /* Filter FIFO 1 assignment for filter x */
-
-#define IS_CAN_FILTER_FIFO(FIFO) (((FIFO) == CAN_FilterFIFO0) || \
- ((FIFO) == CAN_FilterFIFO1))
-
-/* CAN Tx */
-#define IS_CAN_TRANSMITMAILBOX(TRANSMITMAILBOX) ((TRANSMITMAILBOX) <= ((u8)0x02))
-#define IS_CAN_STDID(STDID) ((STDID) <= ((u32)0x7FF))
-#define IS_CAN_EXTID(EXTID) ((EXTID) <= ((u32)0x1FFFFFFF))
-#define IS_CAN_DLC(DLC) ((DLC) <= ((u8)0x08))
-
-/* CAN identifier type */
-#define CAN_ID_STD ((u32)0x00000000) /* Standard Id */
-#define CAN_ID_EXT ((u32)0x00000004) /* Extended Id */
-
-#define IS_CAN_IDTYPE(IDTYPE) (((IDTYPE) == CAN_ID_STD) || ((IDTYPE) == CAN_ID_EXT))
-
-/* CAN remote transmission request */
-#define CAN_RTR_DATA ((u32)0x00000000) /* Data frame */
-#define CAN_RTR_REMOTE ((u32)0x00000002) /* Remote frame */
-
-#define IS_CAN_RTR(RTR) (((RTR) == CAN_RTR_DATA) || ((RTR) == CAN_RTR_REMOTE))
-
-/* CAN transmit constants */
-#define CANTXFAILED ((u8)0x00) /* CAN transmission failed */
-#define CANTXOK ((u8)0x01) /* CAN transmission succeeded */
-#define CANTXPENDING ((u8)0x02) /* CAN transmission pending */
-#define CAN_NO_MB ((u8)0x04) /* CAN cell did not provide an empty mailbox */
-
-/* CAN receive FIFO number constants */
-#define CAN_FIFO0 ((u8)0x00) /* CAN FIFO0 used to receive */
-#define CAN_FIFO1 ((u8)0x01) /* CAN FIFO1 used to receive */
-
-#define IS_CAN_FIFO(FIFO) (((FIFO) == CAN_FIFO0) || ((FIFO) == CAN_FIFO1))
-
-/* CAN sleep constants */
-#define CANSLEEPFAILED ((u8)0x00) /* CAN did not enter the sleep mode */
-#define CANSLEEPOK ((u8)0x01) /* CAN entered the sleep mode */
-
-/* CAN wake up constants */
-#define CANWAKEUPFAILED ((u8)0x00) /* CAN did not leave the sleep mode */
-#define CANWAKEUPOK ((u8)0x01) /* CAN leaved the sleep mode */
-
-/* CAN flags */
-#define CAN_FLAG_EWG ((u32)0x00000001) /* Error Warning Flag */
-#define CAN_FLAG_EPV ((u32)0x00000002) /* Error Passive Flag */
-#define CAN_FLAG_BOF ((u32)0x00000004) /* Bus-Off Flag */
-
-#define IS_CAN_FLAG(FLAG) (((FLAG) == CAN_FLAG_EWG) || ((FLAG) == CAN_FLAG_EPV) ||\
- ((FLAG) == CAN_FLAG_BOF))
-
-/* CAN interrupts */
-#define CAN_IT_RQCP0 ((u32)0x00000005) /* Request completed mailbox 0 */
-#define CAN_IT_RQCP1 ((u32)0x00000006) /* Request completed mailbox 1 */
-#define CAN_IT_RQCP2 ((u32)0x00000007) /* Request completed mailbox 2 */
-#define CAN_IT_TME ((u32)0x00000001) /* Transmit mailbox empty */
-#define CAN_IT_FMP0 ((u32)0x00000002) /* FIFO 0 message pending */
-#define CAN_IT_FF0 ((u32)0x00000004) /* FIFO 0 full */
-#define CAN_IT_FOV0 ((u32)0x00000008) /* FIFO 0 overrun */
-#define CAN_IT_FMP1 ((u32)0x00000010) /* FIFO 1 message pending */
-#define CAN_IT_FF1 ((u32)0x00000020) /* FIFO 1 full */
-#define CAN_IT_FOV1 ((u32)0x00000040) /* FIFO 1 overrun */
-#define CAN_IT_EWG ((u32)0x00000100) /* Error warning */
-#define CAN_IT_EPV ((u32)0x00000200) /* Error passive */
-#define CAN_IT_BOF ((u32)0x00000400) /* Bus-off */
-#define CAN_IT_LEC ((u32)0x00000800) /* Last error code */
-#define CAN_IT_ERR ((u32)0x00008000) /* Error */
-#define CAN_IT_WKU ((u32)0x00010000) /* Wake-up */
-#define CAN_IT_SLK ((u32)0x00020000) /* Sleep */
-
-#define IS_CAN_ITConfig(IT) (((IT) == CAN_IT_TME) || ((IT) == CAN_IT_FMP0) ||\
- ((IT) == CAN_IT_FF0) || ((IT) == CAN_IT_FOV0) ||\
- ((IT) == CAN_IT_FMP1) || ((IT) == CAN_IT_FF1) ||\
- ((IT) == CAN_IT_FOV1) || ((IT) == CAN_IT_EWG) ||\
- ((IT) == CAN_IT_EPV) || ((IT) == CAN_IT_BOF) ||\
- ((IT) == CAN_IT_LEC) || ((IT) == CAN_IT_ERR) ||\
- ((IT) == CAN_IT_WKU) || ((IT) == CAN_IT_SLK))
-
-#define IS_CAN_ITStatus(IT) (((IT) == CAN_IT_RQCP0) || ((IT) == CAN_IT_RQCP1) ||\
- ((IT) == CAN_IT_RQCP2) || ((IT) == CAN_IT_FF0) ||\
- ((IT) == CAN_IT_FOV0) || ((IT) == CAN_IT_FF1) ||\
- ((IT) == CAN_IT_FOV1) || ((IT) == CAN_IT_EWG) ||\
- ((IT) == CAN_IT_EPV) || ((IT) == CAN_IT_BOF) ||\
- ((IT) == CAN_IT_WKU) || ((IT) == CAN_IT_SLK))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported function protypes ----------------------------------------------- */
-void CAN_DeInit(void);
-u8 CAN_Init(CAN_InitTypeDef* CAN_InitStruct);
-void CAN_FilterInit(CAN_FilterInitTypeDef* CAN_FilterInitStruct);
-void CAN_StructInit(CAN_InitTypeDef* CAN_InitStruct);
-void CAN_ITConfig(u32 CAN_IT, FunctionalState NewState);
-u8 CAN_Transmit(CanTxMsg* TxMessage);
-u8 CAN_TransmitStatus(u8 TransmitMailbox);
-void CAN_CancelTransmit(u8 Mailbox);
-void CAN_FIFORelease(u8 FIFONumber);
-u8 CAN_MessagePending(u8 FIFONumber);
-void CAN_Receive(u8 FIFONumber, CanRxMsg* RxMessage);
-u8 CAN_Sleep(void);
-u8 CAN_WakeUp(void);
-FlagStatus CAN_GetFlagStatus(u32 CAN_FLAG);
-void CAN_ClearFlag(u32 CAN_FLAG);
-ITStatus CAN_GetITStatus(u32 CAN_IT);
-void CAN_ClearITPendingBit(u32 CAN_IT);
-
-#endif /* __STM32F10x_CAN_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_crc.h b/stm32lib/inc/stm32f10x_crc.h
deleted file mode 100644
index 0c3dab4..0000000
--- a/stm32lib/inc/stm32f10x_crc.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_crc.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* CRC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_CRC_H
-#define __STM32F10x_CRC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void CRC_ResetDR(void);
-u32 CRC_CalcCRC(u32 Data);
-u32 CRC_CalcBlockCRC(u32 pBuffer[], u32 BufferLength);
-u32 CRC_GetCRC(void);
-void CRC_SetIDRegister(u8 IDValue);
-u8 CRC_GetIDRegister(void);
-
-#endif /* __STM32F10x_CRC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_dac.h b/stm32lib/inc/stm32f10x_dac.h
deleted file mode 100644
index cd7b5ad..0000000
--- a/stm32lib/inc/stm32f10x_dac.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_dac.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* DAC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_DAC_H
-#define __STM32F10x_DAC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* DAC Init structure definition */
-typedef struct
-{
- u32 DAC_Trigger;
- u32 DAC_WaveGeneration;
- u32 DAC_LFSRUnmask_TriangleAmplitude;
- u32 DAC_OutputBuffer;
-}DAC_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/* DAC trigger selection */
-#define DAC_Trigger_None ((u32)0x00000000)
-#define DAC_Trigger_T6_TRGO ((u32)0x00000004)
-#define DAC_Trigger_T8_TRGO ((u32)0x0000000C)
-#define DAC_Trigger_T7_TRGO ((u32)0x00000014)
-#define DAC_Trigger_T5_TRGO ((u32)0x0000001C)
-#define DAC_Trigger_T2_TRGO ((u32)0x00000024)
-#define DAC_Trigger_T4_TRGO ((u32)0x0000002C)
-#define DAC_Trigger_Ext_IT9 ((u32)0x00000034)
-#define DAC_Trigger_Software ((u32)0x0000003C)
-
-#define IS_DAC_TRIGGER(TRIGGER) (((TRIGGER) == DAC_Trigger_None) || \
- ((TRIGGER) == DAC_Trigger_T6_TRGO) || \
- ((TRIGGER) == DAC_Trigger_T8_TRGO) || \
- ((TRIGGER) == DAC_Trigger_T7_TRGO) || \
- ((TRIGGER) == DAC_Trigger_T5_TRGO) || \
- ((TRIGGER) == DAC_Trigger_T2_TRGO) || \
- ((TRIGGER) == DAC_Trigger_T4_TRGO) || \
- ((TRIGGER) == DAC_Trigger_Ext_IT9) || \
- ((TRIGGER) == DAC_Trigger_Software))
-
-/* DAC wave generation */
-#define DAC_WaveGeneration_None ((u32)0x00000000)
-#define DAC_WaveGeneration_Noise ((u32)0x00000040)
-#define DAC_WaveGeneration_Triangle ((u32)0x00000080)
-
-#define IS_DAC_GENERATE_WAVE(WAVE) (((WAVE) == DAC_WaveGeneration_None) || \
- ((WAVE) == DAC_WaveGeneration_Noise) || \
- ((WAVE) == DAC_WaveGeneration_Triangle))
-
-/* DAC noise wave generation mask / triangle wave generation max amplitude */
-#define DAC_LFSRUnmask_Bit0 ((u32)0x00000000)
-#define DAC_LFSRUnmask_Bits1_0 ((u32)0x00000100)
-#define DAC_LFSRUnmask_Bits2_0 ((u32)0x00000200)
-#define DAC_LFSRUnmask_Bits3_0 ((u32)0x00000300)
-#define DAC_LFSRUnmask_Bits4_0 ((u32)0x00000400)
-#define DAC_LFSRUnmask_Bits5_0 ((u32)0x00000500)
-#define DAC_LFSRUnmask_Bits6_0 ((u32)0x00000600)
-#define DAC_LFSRUnmask_Bits7_0 ((u32)0x00000700)
-#define DAC_LFSRUnmask_Bits8_0 ((u32)0x00000800)
-#define DAC_LFSRUnmask_Bits9_0 ((u32)0x00000900)
-#define DAC_LFSRUnmask_Bits10_0 ((u32)0x00000A00)
-#define DAC_LFSRUnmask_Bits11_0 ((u32)0x00000B00)
-
-#define DAC_TriangleAmplitude_1 ((u32)0x00000000)
-#define DAC_TriangleAmplitude_3 ((u32)0x00000100)
-#define DAC_TriangleAmplitude_7 ((u32)0x00000200)
-#define DAC_TriangleAmplitude_15 ((u32)0x00000300)
-#define DAC_TriangleAmplitude_31 ((u32)0x00000400)
-#define DAC_TriangleAmplitude_63 ((u32)0x00000500)
-#define DAC_TriangleAmplitude_127 ((u32)0x00000600)
-#define DAC_TriangleAmplitude_255 ((u32)0x00000700)
-#define DAC_TriangleAmplitude_511 ((u32)0x00000800)
-#define DAC_TriangleAmplitude_1023 ((u32)0x00000900)
-#define DAC_TriangleAmplitude_2047 ((u32)0x00000A00)
-#define DAC_TriangleAmplitude_4095 ((u32)0x00000B00)
-
-#define IS_DAC_LFSR_UNMASK_TRIANGLE_AMPLITUDE(VALUE) (((VALUE) == DAC_LFSRUnmask_Bit0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits1_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits2_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits3_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits4_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits5_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits6_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits7_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits8_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits9_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits10_0) || \
- ((VALUE) == DAC_LFSRUnmask_Bits11_0) || \
- ((VALUE) == DAC_TriangleAmplitude_1) || \
- ((VALUE) == DAC_TriangleAmplitude_3) || \
- ((VALUE) == DAC_TriangleAmplitude_7) || \
- ((VALUE) == DAC_TriangleAmplitude_15) || \
- ((VALUE) == DAC_TriangleAmplitude_31) || \
- ((VALUE) == DAC_TriangleAmplitude_63) || \
- ((VALUE) == DAC_TriangleAmplitude_127) || \
- ((VALUE) == DAC_TriangleAmplitude_255) || \
- ((VALUE) == DAC_TriangleAmplitude_511) || \
- ((VALUE) == DAC_TriangleAmplitude_1023) || \
- ((VALUE) == DAC_TriangleAmplitude_2047) || \
- ((VALUE) == DAC_TriangleAmplitude_4095))
-
-/* DAC output buffer */
-#define DAC_OutputBuffer_Enable ((u32)0x00000000)
-#define DAC_OutputBuffer_Disable ((u32)0x00000002)
-
-#define IS_DAC_OUTPUT_BUFFER_STATE(STATE) (((STATE) == DAC_OutputBuffer_Enable) || \
- ((STATE) == DAC_OutputBuffer_Disable))
-
-/* DAC Channel selection */
-#define DAC_Channel_1 ((u32)0x00000000)
-#define DAC_Channel_2 ((u32)0x00000010)
-
-#define IS_DAC_CHANNEL(CHANNEL) (((CHANNEL) == DAC_Channel_1) || \
- ((CHANNEL) == DAC_Channel_2))
-
-/* DAC data alignement */
-#define DAC_Align_12b_R ((u32)0x00000000)
-#define DAC_Align_12b_L ((u32)0x00000004)
-#define DAC_Align_8b_R ((u32)0x00000008)
-
-#define IS_DAC_ALIGN(ALIGN) (((ALIGN) == DAC_Align_12b_R) || \
- ((ALIGN) == DAC_Align_12b_L) || \
- ((ALIGN) == DAC_Align_8b_R))
-
-/* DAC wave generation */
-#define DAC_Wave_Noise ((u32)0x00000040)
-#define DAC_Wave_Triangle ((u32)0x00000080)
-
-#define IS_DAC_WAVE(WAVE) (((WAVE) == DAC_Wave_Noise) || \
- ((WAVE) == DAC_Wave_Triangle))
-
-/* DAC data ------------------------------------------------------------------*/
-#define IS_DAC_DATA(DATA) ((DATA) <= 0xFFF0)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions --------------------------------------------------------*/
-void DAC_DeInit(void);
-void DAC_Init(u32 DAC_Channel, DAC_InitTypeDef* DAC_InitStruct);
-void DAC_StructInit(DAC_InitTypeDef* DAC_InitStruct);
-void DAC_Cmd(u32 DAC_Channel, FunctionalState NewState);
-void DAC_DMACmd(u32 DAC_Channel, FunctionalState NewState);
-void DAC_SoftwareTriggerCmd(u32 DAC_Channel, FunctionalState NewState);
-void DAC_DualSoftwareTriggerCmd(FunctionalState NewState);
-void DAC_WaveGenerationCmd(u32 DAC_Channel, u32 DAC_Wave, FunctionalState NewState);
-void DAC_SetChannel1Data(u32 DAC_Align, u16 Data);
-void DAC_SetChannel2Data(u32 DAC_Align, u16 Data);
-void DAC_SetDualChannelData(u32 DAC_Align, u16 Data2, u16 Data1);
-u16 DAC_GetDataOutputValue(u32 DAC_Channel);
-
-#endif /*__STM32F10x_DAC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_dbgmcu.h b/stm32lib/inc/stm32f10x_dbgmcu.h
deleted file mode 100644
index 212f646..0000000
--- a/stm32lib/inc/stm32f10x_dbgmcu.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_dbgmcu.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* DBGMCU firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_DBGMCU_H
-#define __STM32F10x_DBGMCU_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-#define DBGMCU_SLEEP ((u32)0x00000001)
-#define DBGMCU_STOP ((u32)0x00000002)
-#define DBGMCU_STANDBY ((u32)0x00000004)
-#define DBGMCU_IWDG_STOP ((u32)0x00000100)
-#define DBGMCU_WWDG_STOP ((u32)0x00000200)
-#define DBGMCU_TIM1_STOP ((u32)0x00000400)
-#define DBGMCU_TIM2_STOP ((u32)0x00000800)
-#define DBGMCU_TIM3_STOP ((u32)0x00001000)
-#define DBGMCU_TIM4_STOP ((u32)0x00002000)
-#define DBGMCU_CAN_STOP ((u32)0x00004000)
-#define DBGMCU_I2C1_SMBUS_TIMEOUT ((u32)0x00008000)
-#define DBGMCU_I2C2_SMBUS_TIMEOUT ((u32)0x00010000)
-#define DBGMCU_TIM5_STOP ((u32)0x00020000)
-#define DBGMCU_TIM6_STOP ((u32)0x00040000)
-#define DBGMCU_TIM7_STOP ((u32)0x00080000)
-#define DBGMCU_TIM8_STOP ((u32)0x00100000)
-
-#define IS_DBGMCU_PERIPH(PERIPH) ((((PERIPH) & 0xFFE000F8) == 0x00) && ((PERIPH) != 0x00))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-u32 DBGMCU_GetREVID(void);
-u32 DBGMCU_GetDEVID(void);
-void DBGMCU_Config(u32 DBGMCU_Periph, FunctionalState NewState);
-
-#endif /* __STM32F10x_DBGMCU_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
-
-
diff --git a/stm32lib/inc/stm32f10x_dma.h b/stm32lib/inc/stm32f10x_dma.h
deleted file mode 100644
index 4803a69..0000000
--- a/stm32lib/inc/stm32f10x_dma.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_dma.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* DMA firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_DMA_H
-#define __STM32F10x_DMA_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* DMA Init structure definition */
-typedef struct
-{
- u32 DMA_PeripheralBaseAddr;
- u32 DMA_MemoryBaseAddr;
- u32 DMA_DIR;
- u32 DMA_BufferSize;
- u32 DMA_PeripheralInc;
- u32 DMA_MemoryInc;
- u32 DMA_PeripheralDataSize;
- u32 DMA_MemoryDataSize;
- u32 DMA_Mode;
- u32 DMA_Priority;
- u32 DMA_M2M;
-}DMA_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define IS_DMA_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == DMA1_Channel1_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA1_Channel2_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA1_Channel3_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA1_Channel4_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA1_Channel5_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA1_Channel6_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA1_Channel7_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA2_Channel1_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA2_Channel2_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA2_Channel3_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA2_Channel4_BASE) || \
- ((*(u32*)&(PERIPH)) == DMA2_Channel5_BASE))
-
-/* DMA data transfer direction -----------------------------------------------*/
-#define DMA_DIR_PeripheralDST ((u32)0x00000010)
-#define DMA_DIR_PeripheralSRC ((u32)0x00000000)
-
-#define IS_DMA_DIR(DIR) (((DIR) == DMA_DIR_PeripheralDST) || \
- ((DIR) == DMA_DIR_PeripheralSRC))
-
-/* DMA peripheral incremented mode -------------------------------------------*/
-#define DMA_PeripheralInc_Enable ((u32)0x00000040)
-#define DMA_PeripheralInc_Disable ((u32)0x00000000)
-
-#define IS_DMA_PERIPHERAL_INC_STATE(STATE) (((STATE) == DMA_PeripheralInc_Enable) || \
- ((STATE) == DMA_PeripheralInc_Disable))
-
-/* DMA memory incremented mode -----------------------------------------------*/
-#define DMA_MemoryInc_Enable ((u32)0x00000080)
-#define DMA_MemoryInc_Disable ((u32)0x00000000)
-
-#define IS_DMA_MEMORY_INC_STATE(STATE) (((STATE) == DMA_MemoryInc_Enable) || \
- ((STATE) == DMA_MemoryInc_Disable))
-
-/* DMA peripheral data size --------------------------------------------------*/
-#define DMA_PeripheralDataSize_Byte ((u32)0x00000000)
-#define DMA_PeripheralDataSize_HalfWord ((u32)0x00000100)
-#define DMA_PeripheralDataSize_Word ((u32)0x00000200)
-
-#define IS_DMA_PERIPHERAL_DATA_SIZE(SIZE) (((SIZE) == DMA_PeripheralDataSize_Byte) || \
- ((SIZE) == DMA_PeripheralDataSize_HalfWord) || \
- ((SIZE) == DMA_PeripheralDataSize_Word))
-
-/* DMA memory data size ------------------------------------------------------*/
-#define DMA_MemoryDataSize_Byte ((u32)0x00000000)
-#define DMA_MemoryDataSize_HalfWord ((u32)0x00000400)
-#define DMA_MemoryDataSize_Word ((u32)0x00000800)
-
-#define IS_DMA_MEMORY_DATA_SIZE(SIZE) (((SIZE) == DMA_MemoryDataSize_Byte) || \
- ((SIZE) == DMA_MemoryDataSize_HalfWord) || \
- ((SIZE) == DMA_MemoryDataSize_Word))
-
-/* DMA circular/normal mode --------------------------------------------------*/
-#define DMA_Mode_Circular ((u32)0x00000020)
-#define DMA_Mode_Normal ((u32)0x00000000)
-
-#define IS_DMA_MODE(MODE) (((MODE) == DMA_Mode_Circular) || ((MODE) == DMA_Mode_Normal))
-
-/* DMA priority level --------------------------------------------------------*/
-#define DMA_Priority_VeryHigh ((u32)0x00003000)
-#define DMA_Priority_High ((u32)0x00002000)
-#define DMA_Priority_Medium ((u32)0x00001000)
-#define DMA_Priority_Low ((u32)0x00000000)
-
-#define IS_DMA_PRIORITY(PRIORITY) (((PRIORITY) == DMA_Priority_VeryHigh) || \
- ((PRIORITY) == DMA_Priority_High) || \
- ((PRIORITY) == DMA_Priority_Medium) || \
- ((PRIORITY) == DMA_Priority_Low))
-
-/* DMA memory to memory ------------------------------------------------------*/
-#define DMA_M2M_Enable ((u32)0x00004000)
-#define DMA_M2M_Disable ((u32)0x00000000)
-
-#define IS_DMA_M2M_STATE(STATE) (((STATE) == DMA_M2M_Enable) || ((STATE) == DMA_M2M_Disable))
-
-/* DMA interrupts definition -------------------------------------------------*/
-#define DMA_IT_TC ((u32)0x00000002)
-#define DMA_IT_HT ((u32)0x00000004)
-#define DMA_IT_TE ((u32)0x00000008)
-
-#define IS_DMA_CONFIG_IT(IT) ((((IT) & 0xFFFFFFF1) == 0x00) && ((IT) != 0x00))
-
-/* For DMA1 */
-#define DMA1_IT_GL1 ((u32)0x00000001)
-#define DMA1_IT_TC1 ((u32)0x00000002)
-#define DMA1_IT_HT1 ((u32)0x00000004)
-#define DMA1_IT_TE1 ((u32)0x00000008)
-#define DMA1_IT_GL2 ((u32)0x00000010)
-#define DMA1_IT_TC2 ((u32)0x00000020)
-#define DMA1_IT_HT2 ((u32)0x00000040)
-#define DMA1_IT_TE2 ((u32)0x00000080)
-#define DMA1_IT_GL3 ((u32)0x00000100)
-#define DMA1_IT_TC3 ((u32)0x00000200)
-#define DMA1_IT_HT3 ((u32)0x00000400)
-#define DMA1_IT_TE3 ((u32)0x00000800)
-#define DMA1_IT_GL4 ((u32)0x00001000)
-#define DMA1_IT_TC4 ((u32)0x00002000)
-#define DMA1_IT_HT4 ((u32)0x00004000)
-#define DMA1_IT_TE4 ((u32)0x00008000)
-#define DMA1_IT_GL5 ((u32)0x00010000)
-#define DMA1_IT_TC5 ((u32)0x00020000)
-#define DMA1_IT_HT5 ((u32)0x00040000)
-#define DMA1_IT_TE5 ((u32)0x00080000)
-#define DMA1_IT_GL6 ((u32)0x00100000)
-#define DMA1_IT_TC6 ((u32)0x00200000)
-#define DMA1_IT_HT6 ((u32)0x00400000)
-#define DMA1_IT_TE6 ((u32)0x00800000)
-#define DMA1_IT_GL7 ((u32)0x01000000)
-#define DMA1_IT_TC7 ((u32)0x02000000)
-#define DMA1_IT_HT7 ((u32)0x04000000)
-#define DMA1_IT_TE7 ((u32)0x08000000)
-/* For DMA2 */
-#define DMA2_IT_GL1 ((u32)0x10000001)
-#define DMA2_IT_TC1 ((u32)0x10000002)
-#define DMA2_IT_HT1 ((u32)0x10000004)
-#define DMA2_IT_TE1 ((u32)0x10000008)
-#define DMA2_IT_GL2 ((u32)0x10000010)
-#define DMA2_IT_TC2 ((u32)0x10000020)
-#define DMA2_IT_HT2 ((u32)0x10000040)
-#define DMA2_IT_TE2 ((u32)0x10000080)
-#define DMA2_IT_GL3 ((u32)0x10000100)
-#define DMA2_IT_TC3 ((u32)0x10000200)
-#define DMA2_IT_HT3 ((u32)0x10000400)
-#define DMA2_IT_TE3 ((u32)0x10000800)
-#define DMA2_IT_GL4 ((u32)0x10001000)
-#define DMA2_IT_TC4 ((u32)0x10002000)
-#define DMA2_IT_HT4 ((u32)0x10004000)
-#define DMA2_IT_TE4 ((u32)0x10008000)
-#define DMA2_IT_GL5 ((u32)0x10010000)
-#define DMA2_IT_TC5 ((u32)0x10020000)
-#define DMA2_IT_HT5 ((u32)0x10040000)
-#define DMA2_IT_TE5 ((u32)0x10080000)
-
-#define IS_DMA_CLEAR_IT(IT) (((((IT) & 0xF0000000) == 0x00) || (((IT) & 0xEFF00000) == 0x00)) && ((IT) != 0x00))
-#define IS_DMA_GET_IT(IT) (((IT) == DMA1_IT_GL1) || ((IT) == DMA1_IT_TC1) || \
- ((IT) == DMA1_IT_HT1) || ((IT) == DMA1_IT_TE1) || \
- ((IT) == DMA1_IT_GL2) || ((IT) == DMA1_IT_TC2) || \
- ((IT) == DMA1_IT_HT2) || ((IT) == DMA1_IT_TE2) || \
- ((IT) == DMA1_IT_GL3) || ((IT) == DMA1_IT_TC3) || \
- ((IT) == DMA1_IT_HT3) || ((IT) == DMA1_IT_TE3) || \
- ((IT) == DMA1_IT_GL4) || ((IT) == DMA1_IT_TC4) || \
- ((IT) == DMA1_IT_HT4) || ((IT) == DMA1_IT_TE4) || \
- ((IT) == DMA1_IT_GL5) || ((IT) == DMA1_IT_TC5) || \
- ((IT) == DMA1_IT_HT5) || ((IT) == DMA1_IT_TE5) || \
- ((IT) == DMA1_IT_GL6) || ((IT) == DMA1_IT_TC6) || \
- ((IT) == DMA1_IT_HT6) || ((IT) == DMA1_IT_TE6) || \
- ((IT) == DMA1_IT_GL7) || ((IT) == DMA1_IT_TC7) || \
- ((IT) == DMA1_IT_HT7) || ((IT) == DMA1_IT_TE7) || \
- ((IT) == DMA2_IT_GL1) || ((IT) == DMA2_IT_TC1) || \
- ((IT) == DMA2_IT_HT1) || ((IT) == DMA2_IT_TE1) || \
- ((IT) == DMA2_IT_GL2) || ((IT) == DMA2_IT_TC2) || \
- ((IT) == DMA2_IT_HT2) || ((IT) == DMA2_IT_TE2) || \
- ((IT) == DMA2_IT_GL3) || ((IT) == DMA2_IT_TC3) || \
- ((IT) == DMA2_IT_HT3) || ((IT) == DMA2_IT_TE3) || \
- ((IT) == DMA2_IT_GL4) || ((IT) == DMA2_IT_TC4) || \
- ((IT) == DMA2_IT_HT4) || ((IT) == DMA2_IT_TE4) || \
- ((IT) == DMA2_IT_GL5) || ((IT) == DMA2_IT_TC5) || \
- ((IT) == DMA2_IT_HT5) || ((IT) == DMA2_IT_TE5))
-
-/* DMA flags definition ------------------------------------------------------*/
-/* For DMA1 */
-#define DMA1_FLAG_GL1 ((u32)0x00000001)
-#define DMA1_FLAG_TC1 ((u32)0x00000002)
-#define DMA1_FLAG_HT1 ((u32)0x00000004)
-#define DMA1_FLAG_TE1 ((u32)0x00000008)
-#define DMA1_FLAG_GL2 ((u32)0x00000010)
-#define DMA1_FLAG_TC2 ((u32)0x00000020)
-#define DMA1_FLAG_HT2 ((u32)0x00000040)
-#define DMA1_FLAG_TE2 ((u32)0x00000080)
-#define DMA1_FLAG_GL3 ((u32)0x00000100)
-#define DMA1_FLAG_TC3 ((u32)0x00000200)
-#define DMA1_FLAG_HT3 ((u32)0x00000400)
-#define DMA1_FLAG_TE3 ((u32)0x00000800)
-#define DMA1_FLAG_GL4 ((u32)0x00001000)
-#define DMA1_FLAG_TC4 ((u32)0x00002000)
-#define DMA1_FLAG_HT4 ((u32)0x00004000)
-#define DMA1_FLAG_TE4 ((u32)0x00008000)
-#define DMA1_FLAG_GL5 ((u32)0x00010000)
-#define DMA1_FLAG_TC5 ((u32)0x00020000)
-#define DMA1_FLAG_HT5 ((u32)0x00040000)
-#define DMA1_FLAG_TE5 ((u32)0x00080000)
-#define DMA1_FLAG_GL6 ((u32)0x00100000)
-#define DMA1_FLAG_TC6 ((u32)0x00200000)
-#define DMA1_FLAG_HT6 ((u32)0x00400000)
-#define DMA1_FLAG_TE6 ((u32)0x00800000)
-#define DMA1_FLAG_GL7 ((u32)0x01000000)
-#define DMA1_FLAG_TC7 ((u32)0x02000000)
-#define DMA1_FLAG_HT7 ((u32)0x04000000)
-#define DMA1_FLAG_TE7 ((u32)0x08000000)
-/* For DMA2 */
-#define DMA2_FLAG_GL1 ((u32)0x10000001)
-#define DMA2_FLAG_TC1 ((u32)0x10000002)
-#define DMA2_FLAG_HT1 ((u32)0x10000004)
-#define DMA2_FLAG_TE1 ((u32)0x10000008)
-#define DMA2_FLAG_GL2 ((u32)0x10000010)
-#define DMA2_FLAG_TC2 ((u32)0x10000020)
-#define DMA2_FLAG_HT2 ((u32)0x10000040)
-#define DMA2_FLAG_TE2 ((u32)0x10000080)
-#define DMA2_FLAG_GL3 ((u32)0x10000100)
-#define DMA2_FLAG_TC3 ((u32)0x10000200)
-#define DMA2_FLAG_HT3 ((u32)0x10000400)
-#define DMA2_FLAG_TE3 ((u32)0x10000800)
-#define DMA2_FLAG_GL4 ((u32)0x10001000)
-#define DMA2_FLAG_TC4 ((u32)0x10002000)
-#define DMA2_FLAG_HT4 ((u32)0x10004000)
-#define DMA2_FLAG_TE4 ((u32)0x10008000)
-#define DMA2_FLAG_GL5 ((u32)0x10010000)
-#define DMA2_FLAG_TC5 ((u32)0x10020000)
-#define DMA2_FLAG_HT5 ((u32)0x10040000)
-#define DMA2_FLAG_TE5 ((u32)0x10080000)
-
-#define IS_DMA_CLEAR_FLAG(FLAG) (((((FLAG) & 0xF0000000) == 0x00) || (((FLAG) & 0xEFF00000) == 0x00)) && ((FLAG) != 0x00))
-#define IS_DMA_GET_FLAG(FLAG) (((FLAG) == DMA1_FLAG_GL1) || ((FLAG) == DMA1_FLAG_TC1) || \
- ((FLAG) == DMA1_FLAG_HT1) || ((FLAG) == DMA1_FLAG_TE1) || \
- ((FLAG) == DMA1_FLAG_GL2) || ((FLAG) == DMA1_FLAG_TC2) || \
- ((FLAG) == DMA1_FLAG_HT2) || ((FLAG) == DMA1_FLAG_TE2) || \
- ((FLAG) == DMA1_FLAG_GL3) || ((FLAG) == DMA1_FLAG_TC3) || \
- ((FLAG) == DMA1_FLAG_HT3) || ((FLAG) == DMA1_FLAG_TE3) || \
- ((FLAG) == DMA1_FLAG_GL4) || ((FLAG) == DMA1_FLAG_TC4) || \
- ((FLAG) == DMA1_FLAG_HT4) || ((FLAG) == DMA1_FLAG_TE4) || \
- ((FLAG) == DMA1_FLAG_GL5) || ((FLAG) == DMA1_FLAG_TC5) || \
- ((FLAG) == DMA1_FLAG_HT5) || ((FLAG) == DMA1_FLAG_TE5) || \
- ((FLAG) == DMA1_FLAG_GL6) || ((FLAG) == DMA1_FLAG_TC6) || \
- ((FLAG) == DMA1_FLAG_HT6) || ((FLAG) == DMA1_FLAG_TE6) || \
- ((FLAG) == DMA1_FLAG_GL7) || ((FLAG) == DMA1_FLAG_TC7) || \
- ((FLAG) == DMA1_FLAG_HT7) || ((FLAG) == DMA1_FLAG_TE7) || \
- ((FLAG) == DMA2_FLAG_GL1) || ((FLAG) == DMA2_FLAG_TC1) || \
- ((FLAG) == DMA2_FLAG_HT1) || ((FLAG) == DMA2_FLAG_TE1) || \
- ((FLAG) == DMA2_FLAG_GL2) || ((FLAG) == DMA2_FLAG_TC2) || \
- ((FLAG) == DMA2_FLAG_HT2) || ((FLAG) == DMA2_FLAG_TE2) || \
- ((FLAG) == DMA2_FLAG_GL3) || ((FLAG) == DMA2_FLAG_TC3) || \
- ((FLAG) == DMA2_FLAG_HT3) || ((FLAG) == DMA2_FLAG_TE3) || \
- ((FLAG) == DMA2_FLAG_GL4) || ((FLAG) == DMA2_FLAG_TC4) || \
- ((FLAG) == DMA2_FLAG_HT4) || ((FLAG) == DMA2_FLAG_TE4) || \
- ((FLAG) == DMA2_FLAG_GL5) || ((FLAG) == DMA2_FLAG_TC5) || \
- ((FLAG) == DMA2_FLAG_HT5) || ((FLAG) == DMA2_FLAG_TE5))
-
-/* DMA Buffer Size -----------------------------------------------------------*/
-#define IS_DMA_BUFFER_SIZE(SIZE) (((SIZE) >= 0x1) && ((SIZE) < 0x10000))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void DMA_DeInit(DMA_Channel_TypeDef* DMAy_Channelx);
-void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruct);
-void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct);
-void DMA_Cmd(DMA_Channel_TypeDef* DMAy_Channelx, FunctionalState NewState);
-void DMA_ITConfig(DMA_Channel_TypeDef* DMAy_Channelx, u32 DMA_IT, FunctionalState NewState);
-u16 DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx);
-FlagStatus DMA_GetFlagStatus(u32 DMA_FLAG);
-void DMA_ClearFlag(u32 DMA_FLAG);
-ITStatus DMA_GetITStatus(u32 DMA_IT);
-void DMA_ClearITPendingBit(u32 DMA_IT);
-
-#endif /*__STM32F10x_DMA_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_exti.h b/stm32lib/inc/stm32f10x_exti.h
deleted file mode 100644
index 46ac68d..0000000
--- a/stm32lib/inc/stm32f10x_exti.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_exti.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* EXTI firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_EXTI_H
-#define __STM32F10x_EXTI_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* EXTI mode enumeration -----------------------------------------------------*/
-typedef enum
-{
- EXTI_Mode_Interrupt = 0x00,
- EXTI_Mode_Event = 0x04
-}EXTIMode_TypeDef;
-
-#define IS_EXTI_MODE(MODE) (((MODE) == EXTI_Mode_Interrupt) || ((MODE) == EXTI_Mode_Event))
-
-/* EXTI Trigger enumeration --------------------------------------------------*/
-typedef enum
-{
- EXTI_Trigger_Rising = 0x08,
- EXTI_Trigger_Falling = 0x0C,
- EXTI_Trigger_Rising_Falling = 0x10
-}EXTITrigger_TypeDef;
-
-#define IS_EXTI_TRIGGER(TRIGGER) (((TRIGGER) == EXTI_Trigger_Rising) || \
- ((TRIGGER) == EXTI_Trigger_Falling) || \
- ((TRIGGER) == EXTI_Trigger_Rising_Falling))
-
-/* EXTI Init Structure definition --------------------------------------------*/
-typedef struct
-{
- u32 EXTI_Line;
- EXTIMode_TypeDef EXTI_Mode;
- EXTITrigger_TypeDef EXTI_Trigger;
- FunctionalState EXTI_LineCmd;
-}EXTI_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/* EXTI Lines ----------------------------------------------------------------*/
-#define EXTI_Line0 ((u32)0x00001) /* External interrupt line 0 */
-#define EXTI_Line1 ((u32)0x00002) /* External interrupt line 1 */
-#define EXTI_Line2 ((u32)0x00004) /* External interrupt line 2 */
-#define EXTI_Line3 ((u32)0x00008) /* External interrupt line 3 */
-#define EXTI_Line4 ((u32)0x00010) /* External interrupt line 4 */
-#define EXTI_Line5 ((u32)0x00020) /* External interrupt line 5 */
-#define EXTI_Line6 ((u32)0x00040) /* External interrupt line 6 */
-#define EXTI_Line7 ((u32)0x00080) /* External interrupt line 7 */
-#define EXTI_Line8 ((u32)0x00100) /* External interrupt line 8 */
-#define EXTI_Line9 ((u32)0x00200) /* External interrupt line 9 */
-#define EXTI_Line10 ((u32)0x00400) /* External interrupt line 10 */
-#define EXTI_Line11 ((u32)0x00800) /* External interrupt line 11 */
-#define EXTI_Line12 ((u32)0x01000) /* External interrupt line 12 */
-#define EXTI_Line13 ((u32)0x02000) /* External interrupt line 13 */
-#define EXTI_Line14 ((u32)0x04000) /* External interrupt line 14 */
-#define EXTI_Line15 ((u32)0x08000) /* External interrupt line 15 */
-#define EXTI_Line16 ((u32)0x10000) /* External interrupt line 16
- Connected to the PVD Output */
-#define EXTI_Line17 ((u32)0x20000) /* External interrupt line 17
- Connected to the RTC Alarm event */
-#define EXTI_Line18 ((u32)0x40000) /* External interrupt line 18
- Connected to the USB Wakeup from
- suspend event */
-
-#define IS_EXTI_LINE(LINE) ((((LINE) & (u32)0xFFF80000) == 0x00) && ((LINE) != (u16)0x00))
-
-#define IS_GET_EXTI_LINE(LINE) (((LINE) == EXTI_Line0) || ((LINE) == EXTI_Line1) || \
- ((LINE) == EXTI_Line2) || ((LINE) == EXTI_Line3) || \
- ((LINE) == EXTI_Line4) || ((LINE) == EXTI_Line5) || \
- ((LINE) == EXTI_Line6) || ((LINE) == EXTI_Line7) || \
- ((LINE) == EXTI_Line8) || ((LINE) == EXTI_Line9) || \
- ((LINE) == EXTI_Line10) || ((LINE) == EXTI_Line11) || \
- ((LINE) == EXTI_Line12) || ((LINE) == EXTI_Line13) || \
- ((LINE) == EXTI_Line14) || ((LINE) == EXTI_Line15) || \
- ((LINE) == EXTI_Line16) || ((LINE) == EXTI_Line17) || \
- ((LINE) == EXTI_Line18))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void EXTI_DeInit(void);
-void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct);
-void EXTI_StructInit(EXTI_InitTypeDef* EXTI_InitStruct);
-void EXTI_GenerateSWInterrupt(u32 EXTI_Line);
-FlagStatus EXTI_GetFlagStatus(u32 EXTI_Line);
-void EXTI_ClearFlag(u32 EXTI_Line);
-ITStatus EXTI_GetITStatus(u32 EXTI_Line);
-void EXTI_ClearITPendingBit(u32 EXTI_Line);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F10x_EXTI_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_flash.h b/stm32lib/inc/stm32f10x_flash.h
deleted file mode 100644
index 459a044..0000000
--- a/stm32lib/inc/stm32f10x_flash.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_flash.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* FLASH firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_FLASH_H
-#define __STM32F10x_FLASH_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-
-/* Exported types ------------------------------------------------------------*/
-#ifdef _FLASH_PROG
-/* FLASH Status */
-typedef enum
-{
- FLASH_BUSY = 1,
- FLASH_ERROR_PG,
- FLASH_ERROR_WRP,
- FLASH_COMPLETE,
- FLASH_TIMEOUT
-}FLASH_Status;
-#endif
-
-/* Flash Latency -------------------------------------------------------------*/
-#define FLASH_Latency_0 ((u32)0x00000000) /* FLASH Zero Latency cycle */
-#define FLASH_Latency_1 ((u32)0x00000001) /* FLASH One Latency cycle */
-#define FLASH_Latency_2 ((u32)0x00000002) /* FLASH Two Latency cycles */
-
-#define IS_FLASH_LATENCY(LATENCY) (((LATENCY) == FLASH_Latency_0) || \
- ((LATENCY) == FLASH_Latency_1) || \
- ((LATENCY) == FLASH_Latency_2))
-
-/* Half Cycle Enable/Disable -------------------------------------------------*/
-#define FLASH_HalfCycleAccess_Enable ((u32)0x00000008) /* FLASH Half Cycle Enable */
-#define FLASH_HalfCycleAccess_Disable ((u32)0x00000000) /* FLASH Half Cycle Disable */
-
-#define IS_FLASH_HALFCYCLEACCESS_STATE(STATE) (((STATE) == FLASH_HalfCycleAccess_Enable) || \
- ((STATE) == FLASH_HalfCycleAccess_Disable))
-
-
-/* Prefetch Buffer Enable/Disable --------------------------------------------*/
-#define FLASH_PrefetchBuffer_Enable ((u32)0x00000010) /* FLASH Prefetch Buffer Enable */
-#define FLASH_PrefetchBuffer_Disable ((u32)0x00000000) /* FLASH Prefetch Buffer Disable */
-
-#define IS_FLASH_PREFETCHBUFFER_STATE(STATE) (((STATE) == FLASH_PrefetchBuffer_Enable) || \
- ((STATE) == FLASH_PrefetchBuffer_Disable))
-
-#ifdef _FLASH_PROG
-/* Option Bytes Write Protection ---------------------------------------------*/
-/* Values to be used with STM32F10Xxx Medium-density devices: FLASH memory density
- ranges between 32 and 128 Kbytes with page size equal to 1 Kbytes */
-#define FLASH_WRProt_Pages0to3 ((u32)0x00000001) /* Write protection of page 0 to 3 */
-#define FLASH_WRProt_Pages4to7 ((u32)0x00000002) /* Write protection of page 4 to 7 */
-#define FLASH_WRProt_Pages8to11 ((u32)0x00000004) /* Write protection of page 8 to 11 */
-#define FLASH_WRProt_Pages12to15 ((u32)0x00000008) /* Write protection of page 12 to 15 */
-#define FLASH_WRProt_Pages16to19 ((u32)0x00000010) /* Write protection of page 16 to 19 */
-#define FLASH_WRProt_Pages20to23 ((u32)0x00000020) /* Write protection of page 20 to 23 */
-#define FLASH_WRProt_Pages24to27 ((u32)0x00000040) /* Write protection of page 24 to 27 */
-#define FLASH_WRProt_Pages28to31 ((u32)0x00000080) /* Write protection of page 28 to 31 */
-#define FLASH_WRProt_Pages32to35 ((u32)0x00000100) /* Write protection of page 32 to 35 */
-#define FLASH_WRProt_Pages36to39 ((u32)0x00000200) /* Write protection of page 36 to 39 */
-#define FLASH_WRProt_Pages40to43 ((u32)0x00000400) /* Write protection of page 40 to 43 */
-#define FLASH_WRProt_Pages44to47 ((u32)0x00000800) /* Write protection of page 44 to 47 */
-#define FLASH_WRProt_Pages48to51 ((u32)0x00001000) /* Write protection of page 48 to 51 */
-#define FLASH_WRProt_Pages52to55 ((u32)0x00002000) /* Write protection of page 52 to 55 */
-#define FLASH_WRProt_Pages56to59 ((u32)0x00004000) /* Write protection of page 56 to 59 */
-#define FLASH_WRProt_Pages60to63 ((u32)0x00008000) /* Write protection of page 60 to 63 */
-#define FLASH_WRProt_Pages64to67 ((u32)0x00010000) /* Write protection of page 64 to 67 */
-#define FLASH_WRProt_Pages68to71 ((u32)0x00020000) /* Write protection of page 68 to 71 */
-#define FLASH_WRProt_Pages72to75 ((u32)0x00040000) /* Write protection of page 72 to 75 */
-#define FLASH_WRProt_Pages76to79 ((u32)0x00080000) /* Write protection of page 76 to 79 */
-#define FLASH_WRProt_Pages80to83 ((u32)0x00100000) /* Write protection of page 80 to 83 */
-#define FLASH_WRProt_Pages84to87 ((u32)0x00200000) /* Write protection of page 84 to 87 */
-#define FLASH_WRProt_Pages88to91 ((u32)0x00400000) /* Write protection of page 88 to 91 */
-#define FLASH_WRProt_Pages92to95 ((u32)0x00800000) /* Write protection of page 92 to 95 */
-#define FLASH_WRProt_Pages96to99 ((u32)0x01000000) /* Write protection of page 96 to 99 */
-#define FLASH_WRProt_Pages100to103 ((u32)0x02000000) /* Write protection of page 100 to 103 */
-#define FLASH_WRProt_Pages104to107 ((u32)0x04000000) /* Write protection of page 104 to 107 */
-#define FLASH_WRProt_Pages108to111 ((u32)0x08000000) /* Write protection of page 108 to 111 */
-#define FLASH_WRProt_Pages112to115 ((u32)0x10000000) /* Write protection of page 112 to 115 */
-#define FLASH_WRProt_Pages116to119 ((u32)0x20000000) /* Write protection of page 115 to 119 */
-#define FLASH_WRProt_Pages120to123 ((u32)0x40000000) /* Write protection of page 120 to 123 */
-#define FLASH_WRProt_Pages124to127 ((u32)0x80000000) /* Write protection of page 124 to 127 */
-/* Values to be used with STM32F10Xxx High-density devices: FLASH memory density
- ranges between 256 and 512 Kbytes with page size equal to 2 Kbytes */
-#define FLASH_WRProt_Pages0to1 ((u32)0x00000001) /* Write protection of page 0 to 1 */
-#define FLASH_WRProt_Pages2to3 ((u32)0x00000002) /* Write protection of page 2 to 3 */
-#define FLASH_WRProt_Pages4to5 ((u32)0x00000004) /* Write protection of page 4 to 5 */
-#define FLASH_WRProt_Pages6to7 ((u32)0x00000008) /* Write protection of page 6 to 7 */
-#define FLASH_WRProt_Pages8to9 ((u32)0x00000010) /* Write protection of page 8 to 9 */
-#define FLASH_WRProt_Pages10to11 ((u32)0x00000020) /* Write protection of page 10 to 11 */
-#define FLASH_WRProt_Pages12to13 ((u32)0x00000040) /* Write protection of page 12 to 13 */
-#define FLASH_WRProt_Pages14to15 ((u32)0x00000080) /* Write protection of page 14 to 15 */
-#define FLASH_WRProt_Pages16to17 ((u32)0x00000100) /* Write protection of page 16 to 17 */
-#define FLASH_WRProt_Pages18to19 ((u32)0x00000200) /* Write protection of page 18 to 19 */
-#define FLASH_WRProt_Pages20to21 ((u32)0x00000400) /* Write protection of page 20 to 21 */
-#define FLASH_WRProt_Pages22to23 ((u32)0x00000800) /* Write protection of page 22 to 23 */
-#define FLASH_WRProt_Pages24to25 ((u32)0x00001000) /* Write protection of page 24 to 25 */
-#define FLASH_WRProt_Pages26to27 ((u32)0x00002000) /* Write protection of page 26 to 27 */
-#define FLASH_WRProt_Pages28to29 ((u32)0x00004000) /* Write protection of page 28 to 29 */
-#define FLASH_WRProt_Pages30to31 ((u32)0x00008000) /* Write protection of page 30 to 31 */
-#define FLASH_WRProt_Pages32to33 ((u32)0x00010000) /* Write protection of page 32 to 33 */
-#define FLASH_WRProt_Pages34to35 ((u32)0x00020000) /* Write protection of page 34 to 35 */
-#define FLASH_WRProt_Pages36to37 ((u32)0x00040000) /* Write protection of page 36 to 37 */
-#define FLASH_WRProt_Pages38to39 ((u32)0x00080000) /* Write protection of page 38 to 39 */
-#define FLASH_WRProt_Pages40to41 ((u32)0x00100000) /* Write protection of page 40 to 41 */
-#define FLASH_WRProt_Pages42to43 ((u32)0x00200000) /* Write protection of page 42 to 43 */
-#define FLASH_WRProt_Pages44to45 ((u32)0x00400000) /* Write protection of page 44 to 45 */
-#define FLASH_WRProt_Pages46to47 ((u32)0x00800000) /* Write protection of page 46 to 47 */
-#define FLASH_WRProt_Pages48to49 ((u32)0x01000000) /* Write protection of page 48 to 49 */
-#define FLASH_WRProt_Pages50to51 ((u32)0x02000000) /* Write protection of page 50 to 51 */
-#define FLASH_WRProt_Pages52to53 ((u32)0x04000000) /* Write protection of page 52 to 53 */
-#define FLASH_WRProt_Pages54to55 ((u32)0x08000000) /* Write protection of page 54 to 55 */
-#define FLASH_WRProt_Pages56to57 ((u32)0x10000000) /* Write protection of page 56 to 57 */
-#define FLASH_WRProt_Pages58to59 ((u32)0x20000000) /* Write protection of page 58 to 59 */
-#define FLASH_WRProt_Pages60to61 ((u32)0x40000000) /* Write protection of page 60 to 61 */
-#define FLASH_WRProt_Pages62to255 ((u32)0x80000000) /* Write protection of page 62 to 255 */
-#define FLASH_WRProt_AllPages ((u32)0xFFFFFFFF) /* Write protection of all Pages */
-
-#define IS_FLASH_WRPROT_PAGE(PAGE) (((PAGE) != 0x00000000))
-
-#define IS_FLASH_ADDRESS(ADDRESS) (((ADDRESS) >= 0x08000000) && ((ADDRESS) < 0x0807FFFF))
-#define IS_OB_DATA_ADDRESS(ADDRESS) (((ADDRESS) == 0x1FFFF804) || ((ADDRESS) == 0x1FFFF806))
-
-/* Option Bytes IWatchdog ----------------------------------------------------*/
-#define OB_IWDG_SW ((u16)0x0001) /* Software IWDG selected */
-#define OB_IWDG_HW ((u16)0x0000) /* Hardware IWDG selected */
-
-#define IS_OB_IWDG_SOURCE(SOURCE) (((SOURCE) == OB_IWDG_SW) || ((SOURCE) == OB_IWDG_HW))
-
-/* Option Bytes nRST_STOP ----------------------------------------------------*/
-#define OB_STOP_NoRST ((u16)0x0002) /* No reset generated when entering in STOP */
-#define OB_STOP_RST ((u16)0x0000) /* Reset generated when entering in STOP */
-
-#define IS_OB_STOP_SOURCE(SOURCE) (((SOURCE) == OB_STOP_NoRST) || ((SOURCE) == OB_STOP_RST))
-
-/* Option Bytes nRST_STDBY ---------------------------------------------------*/
-#define OB_STDBY_NoRST ((u16)0x0004) /* No reset generated when entering in STANDBY */
-#define OB_STDBY_RST ((u16)0x0000) /* Reset generated when entering in STANDBY */
-
-#define IS_OB_STDBY_SOURCE(SOURCE) (((SOURCE) == OB_STDBY_NoRST) || ((SOURCE) == OB_STDBY_RST))
-
-/* FLASH Interrupts ----------------------------------------------------------*/
-#define FLASH_IT_ERROR ((u32)0x00000400) /* FPEC error interrupt source */
-#define FLASH_IT_EOP ((u32)0x00001000) /* End of FLASH Operation Interrupt source */
-
-#define IS_FLASH_IT(IT) ((((IT) & (u32)0xFFFFEBFF) == 0x00000000) && (((IT) != 0x00000000)))
-
-/* FLASH Flags ---------------------------------------------------------------*/
-#define FLASH_FLAG_BSY ((u32)0x00000001) /* FLASH Busy flag */
-#define FLASH_FLAG_EOP ((u32)0x00000020) /* FLASH End of Operation flag */
-#define FLASH_FLAG_PGERR ((u32)0x00000004) /* FLASH Program error flag */
-#define FLASH_FLAG_WRPRTERR ((u32)0x00000010) /* FLASH Write protected error flag */
-#define FLASH_FLAG_OPTERR ((u32)0x00000001) /* FLASH Option Byte error flag */
-
-#define IS_FLASH_CLEAR_FLAG(FLAG) ((((FLAG) & (u32)0xFFFFFFCA) == 0x00000000) && ((FLAG) != 0x00000000))
-
-#define IS_FLASH_GET_FLAG(FLAG) (((FLAG) == FLASH_FLAG_BSY) || ((FLAG) == FLASH_FLAG_EOP) || \
- ((FLAG) == FLASH_FLAG_PGERR) || ((FLAG) == FLASH_FLAG_WRPRTERR) || \
- ((FLAG) == FLASH_FLAG_OPTERR))
-#endif
-
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void FLASH_SetLatency(u32 FLASH_Latency);
-void FLASH_HalfCycleAccessCmd(u32 FLASH_HalfCycleAccess);
-void FLASH_PrefetchBufferCmd(u32 FLASH_PrefetchBuffer);
-#ifdef __cplusplus
-};
-#endif
-
-#ifdef _FLASH_PROG
-void FLASH_Unlock(void);
-void FLASH_Lock(void);
-FLASH_Status FLASH_ErasePage(u32 Page_Address);
-FLASH_Status FLASH_EraseAllPages(void);
-FLASH_Status FLASH_EraseOptionBytes(void);
-FLASH_Status FLASH_ProgramWord(u32 Address, u32 Data);
-FLASH_Status FLASH_ProgramHalfWord(u32 Address, u16 Data);
-FLASH_Status FLASH_ProgramOptionByteData(u32 Address, u8 Data);
-FLASH_Status FLASH_EnableWriteProtection(u32 FLASH_Pages);
-FLASH_Status FLASH_ReadOutProtection(FunctionalState NewState);
-FLASH_Status FLASH_UserOptionByteConfig(u16 OB_IWDG, u16 OB_STOP, u16 OB_STDBY);
-u32 FLASH_GetUserOptionByte(void);
-u32 FLASH_GetWriteProtectionOptionByte(void);
-FlagStatus FLASH_GetReadOutProtectionStatus(void);
-FlagStatus FLASH_GetPrefetchBufferStatus(void);
-void FLASH_ITConfig(u16 FLASH_IT, FunctionalState NewState);
-FlagStatus FLASH_GetFlagStatus(u16 FLASH_FLAG);
-void FLASH_ClearFlag(u16 FLASH_FLAG);
-FLASH_Status FLASH_GetStatus(void);
-FLASH_Status FLASH_WaitForLastOperation(u32 Timeout);
-#endif
-
-#endif /* __STM32F10x_FLASH_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_fsmc.h b/stm32lib/inc/stm32f10x_fsmc.h
deleted file mode 100644
index d508299..0000000
--- a/stm32lib/inc/stm32f10x_fsmc.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_fsmc.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* FSMC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_FSMC_H
-#define __STM32F10x_FSMC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Timing parameters For NOR/SRAM Banks */
-typedef struct
-{
- u32 FSMC_AddressSetupTime;
- u32 FSMC_AddressHoldTime;
- u32 FSMC_DataSetupTime;
- u32 FSMC_BusTurnAroundDuration;
- u32 FSMC_CLKDivision;
- u32 FSMC_DataLatency;
- u32 FSMC_AccessMode;
-}FSMC_NORSRAMTimingInitTypeDef;
-
-/* FSMC NOR/SRAM Init structure definition */
-typedef struct
-{
- u32 FSMC_Bank;
- u32 FSMC_DataAddressMux;
- u32 FSMC_MemoryType;
- u32 FSMC_MemoryDataWidth;
- u32 FSMC_BurstAccessMode;
- u32 FSMC_WaitSignalPolarity;
- u32 FSMC_WrapMode;
- u32 FSMC_WaitSignalActive;
- u32 FSMC_WriteOperation;
- u32 FSMC_WaitSignal;
- u32 FSMC_ExtendedMode;
- u32 FSMC_AsyncWait;
- u32 FSMC_WriteBurst;
- /* Timing Parameters for write and read access if the ExtendedMode is not used*/
- FSMC_NORSRAMTimingInitTypeDef* FSMC_ReadWriteTimingStruct;
- /* Timing Parameters for write access if the ExtendedMode is used*/
- FSMC_NORSRAMTimingInitTypeDef* FSMC_WriteTimingStruct;
-}FSMC_NORSRAMInitTypeDef;
-
-/* Timing parameters For FSMC NAND and PCCARD Banks */
-typedef struct
-{
- u32 FSMC_SetupTime;
- u32 FSMC_WaitSetupTime;
- u32 FSMC_HoldSetupTime;
- u32 FSMC_HiZSetupTime;
-}FSMC_NAND_PCCARDTimingInitTypeDef;
-
-/* FSMC NAND Init structure definition */
-typedef struct
-{
- u32 FSMC_Bank;
- u32 FSMC_Waitfeature;
- u32 FSMC_MemoryDataWidth;
- u32 FSMC_ECC;
- u32 FSMC_ECCPageSize;
- u32 FSMC_AddressLowMapping;
- u32 FSMC_TCLRSetupTime;
- u32 FSMC_TARSetupTime;
- /* FSMC Common Space Timing */
- FSMC_NAND_PCCARDTimingInitTypeDef* FSMC_CommonSpaceTimingStruct;
- /* FSMC Attribute Space Timing */
- FSMC_NAND_PCCARDTimingInitTypeDef* FSMC_AttributeSpaceTimingStruct;
-}FSMC_NANDInitTypeDef;
-
-/* FSMC PCCARD Init structure definition */
-typedef struct
-{
- u32 FSMC_Waitfeature;
- u32 FSMC_AddressLowMapping;
- u32 FSMC_TCLRSetupTime;
- u32 FSMC_TARSetupTime;
- /* FSMC Common Space Timing */
- FSMC_NAND_PCCARDTimingInitTypeDef* FSMC_CommonSpaceTimingStruct;
- /* FSMC Attribute Space Timing */
- FSMC_NAND_PCCARDTimingInitTypeDef* FSMC_AttributeSpaceTimingStruct;
- /* FSMC IO Space Timing */
- FSMC_NAND_PCCARDTimingInitTypeDef* FSMC_IOSpaceTimingStruct;
-}FSMC_PCCARDInitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/*-------------------------------FSMC Banks definitions ----------------------*/
-#define FSMC_Bank1_NORSRAM1 ((u32)0x00000000)
-#define FSMC_Bank1_NORSRAM2 ((u32)0x00000002)
-#define FSMC_Bank1_NORSRAM3 ((u32)0x00000004)
-#define FSMC_Bank1_NORSRAM4 ((u32)0x00000006)
-#define FSMC_Bank2_NAND ((u32)0x00000010)
-#define FSMC_Bank3_NAND ((u32)0x00000100)
-#define FSMC_Bank4_PCCARD ((u32)0x00001000)
-
-#define IS_FSMC_NORSRAM_BANK(BANK) (((BANK) == FSMC_Bank1_NORSRAM1) || \
- ((BANK) == FSMC_Bank1_NORSRAM2) || \
- ((BANK) == FSMC_Bank1_NORSRAM3) || \
- ((BANK) == FSMC_Bank1_NORSRAM4))
-
-
-#define IS_FSMC_NAND_BANK(BANK) (((BANK) == FSMC_Bank2_NAND) || \
- ((BANK) == FSMC_Bank3_NAND))
-
-#define IS_FSMC_GETFLAG_BANK(BANK) (((BANK) == FSMC_Bank2_NAND) || \
- ((BANK) == FSMC_Bank3_NAND) || \
- ((BANK) == FSMC_Bank4_PCCARD))
-
-#define IS_FSMC_IT_BANK(BANK) (((BANK) == FSMC_Bank2_NAND) || \
- ((BANK) == FSMC_Bank3_NAND) || \
- ((BANK) == FSMC_Bank4_PCCARD))
-
-
-/*------------------------------- NOR/SRAM Banks -----------------------------*/
-/* FSMC Data/Address Bus Multiplexing ----------------------------------------*/
-#define FSMC_DataAddressMux_Disable ((u32)0x00000000)
-#define FSMC_DataAddressMux_Enable ((u32)0x00000002)
-
-#define IS_FSMC_MUX(MUX) (((MUX) == FSMC_DataAddressMux_Disable) || \
- ((MUX) == FSMC_DataAddressMux_Enable))
-
-/* FSMC Memory Type ----------------------------------------------------------*/
-#define FSMC_MemoryType_SRAM ((u32)0x00000000)
-#define FSMC_MemoryType_CRAM ((u32)0x00000004)
-#define FSMC_MemoryType_NOR ((u32)0x00000008)
-#define FSMC_MemoryType_COSMORAM ((u32)0x0000000C)
-
-#define IS_FSMC_MEMORY(MEMORY) (((MEMORY) == FSMC_MemoryType_SRAM) || \
- ((MEMORY) == FSMC_MemoryType_CRAM)|| \
- ((MEMORY) == FSMC_MemoryType_NOR)|| \
- ((MEMORY) == FSMC_MemoryType_COSMORAM))
-
-/* FSMC Data Width ----------------------------------------------------------*/
-#define FSMC_MemoryDataWidth_8b ((u32)0x00000000)
-#define FSMC_MemoryDataWidth_16b ((u32)0x00000010)
-
-#define IS_FSMC_MEMORY_WIDTH(WIDTH) (((WIDTH) == FSMC_MemoryDataWidth_8b) || \
- ((WIDTH) == FSMC_MemoryDataWidth_16b))
-
-
-/* FSMC Burst Access Mode ----------------------------------------------------*/
-#define FSMC_BurstAccessMode_Disable ((u32)0x00000000)
-#define FSMC_BurstAccessMode_Enable ((u32)0x00000100)
-
-#define IS_FSMC_BURSTMODE(STATE) (((STATE) == FSMC_BurstAccessMode_Disable) || \
- ((STATE) == FSMC_BurstAccessMode_Enable))
-
-/* FSMC Wait Signal Polarity -------------------------------------------------*/
-#define FSMC_WaitSignalPolarity_Low ((u32)0x00000000)
-#define FSMC_WaitSignalPolarity_High ((u32)0x00000200)
-
-#define IS_FSMC_WAIT_POLARITY(POLARITY) (((POLARITY) == FSMC_WaitSignalPolarity_Low) || \
- ((POLARITY) == FSMC_WaitSignalPolarity_High))
-
-/* FSMC Wrap Mode ------------------------------------------------------------*/
-#define FSMC_WrapMode_Disable ((u32)0x00000000)
-#define FSMC_WrapMode_Enable ((u32)0x00000400)
-
-#define IS_FSMC_WRAP_MODE(MODE) (((MODE) == FSMC_WrapMode_Disable) || \
- ((MODE) == FSMC_WrapMode_Enable))
-
-/* FSMC Wait Timing ----------------------------------------------------------*/
-#define FSMC_WaitSignalActive_BeforeWaitState ((u32)0x00000000)
-#define FSMC_WaitSignalActive_DuringWaitState ((u32)0x00000800)
-
-#define IS_FSMC_WAIT_SIGNAL_ACTIVE(ACTIVE) (((ACTIVE) == FSMC_WaitSignalActive_BeforeWaitState) || \
- ((ACTIVE) == FSMC_WaitSignalActive_DuringWaitState))
-
-/* FSMC Write Operation ------------------------------------------------------*/
-#define FSMC_WriteOperation_Disable ((u32)0x00000000)
-#define FSMC_WriteOperation_Enable ((u32)0x00001000)
-
-#define IS_FSMC_WRITE_OPERATION(OPERATION) (((OPERATION) == FSMC_WriteOperation_Disable) || \
- ((OPERATION) == FSMC_WriteOperation_Enable))
-
-/* FSMC Wait Signal ----------------------------------------------------------*/
-#define FSMC_WaitSignal_Disable ((u32)0x00000000)
-#define FSMC_WaitSignal_Enable ((u32)0x00002000)
-
-#define IS_FSMC_WAITE_SIGNAL(SIGNAL) (((SIGNAL) == FSMC_WaitSignal_Disable) || \
- ((SIGNAL) == FSMC_WaitSignal_Enable))
-
-/* FSMC Extended Mode --------------------------------------------------------*/
-#define FSMC_ExtendedMode_Disable ((u32)0x00000000)
-#define FSMC_ExtendedMode_Enable ((u32)0x00004000)
-
-#define IS_FSMC_EXTENDED_MODE(MODE) (((MODE) == FSMC_ExtendedMode_Disable) || \
- ((MODE) == FSMC_ExtendedMode_Enable))
-
-/* FSMC Asynchronous Wait ----------------------------------------------------*/
-#define FSMC_AsyncWait_Disable ((u32)0x00000000)
-#define FSMC_AsyncWait_Enable ((u32)0x00008000)
-
-#define IS_FSMC_ASYNC_WAIT(WAIT) (((WAIT) == FSMC_AsyncWait_Disable) || \
- ((WAIT) == FSMC_AsyncWait_Enable))
-
-/* FSMC Write Burst ----------------------------------------------------------*/
-#define FSMC_WriteBurst_Disable ((u32)0x00000000)
-#define FSMC_WriteBurst_Enable ((u32)0x00080000)
-
-#define IS_FSMC_WRITE_BURST(BURST) (((BURST) == FSMC_WriteBurst_Disable) || \
- ((BURST) == FSMC_WriteBurst_Enable))
-
-/* FSMC Address Setup Time ---------------------------------------------------*/
-#define IS_FSMC_ADDRESS_SETUP_TIME(TIME) ((TIME) <= 0xF)
-
-/* FSMC Address Hold Time ----------------------------------------------------*/
-#define IS_FSMC_ADDRESS_HOLD_TIME(TIME) ((TIME) <= 0xF)
-
-/* FSMC Data Setup Time ------------------------------------------------------*/
-#define IS_FSMC_DATASETUP_TIME(TIME) (((TIME) > 0) && ((TIME) <= 0xFF))
-
-/* FSMC Bus Turn around Duration ---------------------------------------------*/
-#define IS_FSMC_TURNAROUND_TIME(TIME) ((TIME) <= 0xF)
-
-/* FSMC CLK Division ---------------------------------------------------------*/
-#define IS_FSMC_CLK_DIV(DIV) ((DIV) <= 0xF)
-
-/* FSMC Data Latency ---------------------------------------------------------*/
-#define IS_FSMC_DATA_LATENCY(LATENCY) ((LATENCY) <= 0xF)
-
-/* FSMC Access Mode ----------------------------------------------------------*/
-#define FSMC_AccessMode_A ((u32)0x00000000)
-#define FSMC_AccessMode_B ((u32)0x10000000)
-#define FSMC_AccessMode_C ((u32)0x20000000)
-#define FSMC_AccessMode_D ((u32)0x30000000)
-
-#define IS_FSMC_ACCESS_MODE(MODE) (((MODE) == FSMC_AccessMode_A) || \
- ((MODE) == FSMC_AccessMode_B) || \
- ((MODE) == FSMC_AccessMode_C) || \
- ((MODE) == FSMC_AccessMode_D))
-
-/*----------------------------- NAND and PCCARD Banks ------------------------*/
-/* FSMC Wait feature ---------------------------------------------------------*/
-#define FSMC_Waitfeature_Disable ((u32)0x00000000)
-#define FSMC_Waitfeature_Enable ((u32)0x00000002)
-
-#define IS_FSMC_WAIT_FEATURE(FEATURE) (((FEATURE) == FSMC_Waitfeature_Disable) || \
- ((FEATURE) == FSMC_Waitfeature_Enable))
-
-/* FSMC Memory Data Width ----------------------------------------------------*/
-#define FSMC_MemoryDataWidth_8b ((u32)0x00000000)
-#define FSMC_MemoryDataWidth_16b ((u32)0x00000010)
-
-#define IS_FSMC_DATA_WIDTH(WIDTH) (((WIDTH) == FSMC_MemoryDataWidth_8b) || \
- ((WIDTH) == FSMC_MemoryDataWidth_16b))
-
-/* FSMC ECC ------------------------------------------------------------------*/
-#define FSMC_ECC_Disable ((u32)0x00000000)
-#define FSMC_ECC_Enable ((u32)0x00000040)
-
-#define IS_FSMC_ECC_STATE(STATE) (((STATE) == FSMC_ECC_Disable) || \
- ((STATE) == FSMC_ECC_Enable))
-
-/* FSMC ECC Page Size --------------------------------------------------------*/
-#define FSMC_ECCPageSize_256Bytes ((u32)0x00000000)
-#define FSMC_ECCPageSize_512Bytes ((u32)0x00020000)
-#define FSMC_ECCPageSize_1024Bytes ((u32)0x00040000)
-#define FSMC_ECCPageSize_2048Bytes ((u32)0x00060000)
-#define FSMC_ECCPageSize_4096Bytes ((u32)0x00080000)
-#define FSMC_ECCPageSize_8192Bytes ((u32)0x000A0000)
-
-#define IS_FSMC_ECCPAGE_SIZE(SIZE) (((SIZE) == FSMC_ECCPageSize_256Bytes) || \
- ((SIZE) == FSMC_ECCPageSize_512Bytes) || \
- ((SIZE) == FSMC_ECCPageSize_1024Bytes) || \
- ((SIZE) == FSMC_ECCPageSize_2048Bytes) || \
- ((SIZE) == FSMC_ECCPageSize_4096Bytes) || \
- ((SIZE) == FSMC_ECCPageSize_8192Bytes))
-
-/* FSMC Address Low Mapping --------------------------------------------------*/
-#define FSMC_AddressLowMapping_Direct ((u32)0x00000000)
-#define FSMC_AddressLowMapping_InDirect ((u32)0x00000100)
-
-#define IS_FSMC_ADDRESS_LOW_MAPPING(MAPPING) (((MAPPING) == FSMC_AddressLowMapping_Direct) || \
- ((MAPPING) == FSMC_AddressLowMapping_InDirect))
-/* FSMC TCLR Setup Time ------------------------------------------------------*/
-#define IS_FSMC_TCLR_TIME(TIME) ((TIME) <= 0xFF)
-
-/* FSMC TAR Setup Time -------------------------------------------------------*/
-#define IS_FSMC_TAR_TIME(TIME) ((TIME) <= 0xFF)
-
-/* FSMC Setup Time ----------------------------------------------------*/
-#define IS_FSMC_SETUP_TIME(TIME) ((TIME) <= 0xFF)
-
-/* FSMC Wait Setup Time -----------------------------------------------*/
-#define IS_FSMC_WAIT_TIME(TIME) ((TIME) <= 0xFF)
-
-/* FSMC Hold Setup Time -----------------------------------------------*/
-#define IS_FSMC_HOLD_TIME(TIME) ((TIME) <= 0xFF)
-
-/* FSMC HiZ Setup Time ------------------------------------------------*/
-#define IS_FSMC_HIZ_TIME(TIME) ((TIME) <= 0xFF)
-
-/* FSMC Interrupt sources ----------------------------------------------------*/
-#define FSMC_IT_RisingEdge ((u32)0x00000008)
-#define FSMC_IT_Level ((u32)0x00000010)
-#define FSMC_IT_FallingEdge ((u32)0x00000020)
-
-#define IS_FSMC_IT(IT) ((((IT) & (u32)0xFFFFFFC7) == 0x00000000) && ((IT) != 0x00000000))
-
-#define IS_FSMC_GET_IT(IT) (((IT) == FSMC_IT_RisingEdge) || \
- ((IT) == FSMC_IT_Level) || \
- ((IT) == FSMC_IT_FallingEdge))
-
-/* FSMC Flags ----------------------------------------------------------------*/
-#define FSMC_FLAG_RisingEdge ((u32)0x00000001)
-#define FSMC_FLAG_Level ((u32)0x00000002)
-#define FSMC_FLAG_FallingEdge ((u32)0x00000004)
-#define FSMC_FLAG_FEMPT ((u32)0x00000040)
-
-#define IS_FSMC_GET_FLAG(FLAG) (((FLAG) == FSMC_FLAG_RisingEdge) || \
- ((FLAG) == FSMC_FLAG_Level) || \
- ((FLAG) == FSMC_FLAG_FallingEdge) || \
- ((FLAG) == FSMC_FLAG_FEMPT))
-
-#define IS_FSMC_CLEAR_FLAG(FLAG) ((((FLAG) & (u32)0xFFFFFFF8) == 0x00000000) && ((FLAG) != 0x00000000))
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void FSMC_NORSRAMDeInit(u32 FSMC_Bank);
-void FSMC_NANDDeInit(u32 FSMC_Bank);
-void FSMC_PCCARDDeInit(void);
-void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct);
-void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct);
-void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct);
-void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct);
-void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct);
-void FSMC_PCCARDStructInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct);
-void FSMC_NORSRAMCmd(u32 FSMC_Bank, FunctionalState NewState);
-void FSMC_NANDCmd(u32 FSMC_Bank, FunctionalState NewState);
-void FSMC_PCCARDCmd(FunctionalState NewState);
-void FSMC_NANDECCCmd(u32 FSMC_Bank, FunctionalState NewState);
-u32 FSMC_GetECC(u32 FSMC_Bank);
-void FSMC_ITConfig(u32 FSMC_Bank, u32 FSMC_IT, FunctionalState NewState);
-FlagStatus FSMC_GetFlagStatus(u32 FSMC_Bank, u32 FSMC_FLAG);
-void FSMC_ClearFlag(u32 FSMC_Bank, u32 FSMC_FLAG);
-ITStatus FSMC_GetITStatus(u32 FSMC_Bank, u32 FSMC_IT);
-void FSMC_ClearITPendingBit(u32 FSMC_Bank, u32 FSMC_IT);
-
-#endif /*__STM32F10x_FSMC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_gpio.h b/stm32lib/inc/stm32f10x_gpio.h
deleted file mode 100644
index ae7f0c2..0000000
--- a/stm32lib/inc/stm32f10x_gpio.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_gpio.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* GPIO firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_GPIO_H
-#define __STM32F10x_GPIO_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-#define IS_GPIO_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == GPIOA_BASE) || \
- ((*(u32*)&(PERIPH)) == GPIOB_BASE) || \
- ((*(u32*)&(PERIPH)) == GPIOC_BASE) || \
- ((*(u32*)&(PERIPH)) == GPIOD_BASE) || \
- ((*(u32*)&(PERIPH)) == GPIOE_BASE) || \
- ((*(u32*)&(PERIPH)) == GPIOF_BASE) || \
- ((*(u32*)&(PERIPH)) == GPIOG_BASE))
-
-/* Output Maximum frequency selection ----------------------------------------*/
-typedef enum
-{
- GPIO_Speed_10MHz = 1,
- GPIO_Speed_2MHz,
- GPIO_Speed_50MHz
-}GPIOSpeed_TypeDef;
-
-#define IS_GPIO_SPEED(SPEED) (((SPEED) == GPIO_Speed_10MHz) || ((SPEED) == GPIO_Speed_2MHz) || \
- ((SPEED) == GPIO_Speed_50MHz))
-
-/* Configuration Mode enumeration --------------------------------------------*/
-typedef enum
-{ GPIO_Mode_AIN = 0x0,
- GPIO_Mode_IN_FLOATING = 0x04,
- GPIO_Mode_IPD = 0x28,
- GPIO_Mode_IPU = 0x48,
- GPIO_Mode_Out_OD = 0x14,
- GPIO_Mode_Out_PP = 0x10,
- GPIO_Mode_AF_OD = 0x1C,
- GPIO_Mode_AF_PP = 0x18
-}GPIOMode_TypeDef;
-
-#define IS_GPIO_MODE(MODE) (((MODE) == GPIO_Mode_AIN) || ((MODE) == GPIO_Mode_IN_FLOATING) || \
- ((MODE) == GPIO_Mode_IPD) || ((MODE) == GPIO_Mode_IPU) || \
- ((MODE) == GPIO_Mode_Out_OD) || ((MODE) == GPIO_Mode_Out_PP) || \
- ((MODE) == GPIO_Mode_AF_OD) || ((MODE) == GPIO_Mode_AF_PP))
-
-/* GPIO Init structure definition */
-typedef struct
-{
- u16 GPIO_Pin;
- GPIOSpeed_TypeDef GPIO_Speed;
- GPIOMode_TypeDef GPIO_Mode;
-}GPIO_InitTypeDef;
-
-/* Bit_SET and Bit_RESET enumeration -----------------------------------------*/
-typedef enum
-{ Bit_RESET = 0,
- Bit_SET
-}BitAction;
-#define IS_GPIO_BIT_ACTION(ACTION) (((ACTION) == Bit_RESET) || ((ACTION) == Bit_SET))
-
-/* Exported constants --------------------------------------------------------*/
-/* GPIO pins define ----------------------------------------------------------*/
-#define GPIO_Pin_0 ((u16)0x0001) /* Pin 0 selected */
-#define GPIO_Pin_1 ((u16)0x0002) /* Pin 1 selected */
-#define GPIO_Pin_2 ((u16)0x0004) /* Pin 2 selected */
-#define GPIO_Pin_3 ((u16)0x0008) /* Pin 3 selected */
-#define GPIO_Pin_4 ((u16)0x0010) /* Pin 4 selected */
-#define GPIO_Pin_5 ((u16)0x0020) /* Pin 5 selected */
-#define GPIO_Pin_6 ((u16)0x0040) /* Pin 6 selected */
-#define GPIO_Pin_7 ((u16)0x0080) /* Pin 7 selected */
-#define GPIO_Pin_8 ((u16)0x0100) /* Pin 8 selected */
-#define GPIO_Pin_9 ((u16)0x0200) /* Pin 9 selected */
-#define GPIO_Pin_10 ((u16)0x0400) /* Pin 10 selected */
-#define GPIO_Pin_11 ((u16)0x0800) /* Pin 11 selected */
-#define GPIO_Pin_12 ((u16)0x1000) /* Pin 12 selected */
-#define GPIO_Pin_13 ((u16)0x2000) /* Pin 13 selected */
-#define GPIO_Pin_14 ((u16)0x4000) /* Pin 14 selected */
-#define GPIO_Pin_15 ((u16)0x8000) /* Pin 15 selected */
-#define GPIO_Pin_All ((u16)0xFFFF) /* All pins selected */
-
-#define IS_GPIO_PIN(PIN) ((((PIN) & (u16)0x00) == 0x00) && ((PIN) != (u16)0x00))
-
-#define IS_GET_GPIO_PIN(PIN) (((PIN) == GPIO_Pin_0) || \
- ((PIN) == GPIO_Pin_1) || \
- ((PIN) == GPIO_Pin_2) || \
- ((PIN) == GPIO_Pin_3) || \
- ((PIN) == GPIO_Pin_4) || \
- ((PIN) == GPIO_Pin_5) || \
- ((PIN) == GPIO_Pin_6) || \
- ((PIN) == GPIO_Pin_7) || \
- ((PIN) == GPIO_Pin_8) || \
- ((PIN) == GPIO_Pin_9) || \
- ((PIN) == GPIO_Pin_10) || \
- ((PIN) == GPIO_Pin_11) || \
- ((PIN) == GPIO_Pin_12) || \
- ((PIN) == GPIO_Pin_13) || \
- ((PIN) == GPIO_Pin_14) || \
- ((PIN) == GPIO_Pin_15))
-
-/* GPIO Remap define ---------------------------------------------------------*/
-#define GPIO_Remap_SPI1 ((u32)0x00000001) /* SPI1 Alternate Function mapping */
-#define GPIO_Remap_I2C1 ((u32)0x00000002) /* I2C1 Alternate Function mapping */
-#define GPIO_Remap_USART1 ((u32)0x00000004) /* USART1 Alternate Function mapping */
-#define GPIO_Remap_USART2 ((u32)0x00000008) /* USART2 Alternate Function mapping */
-#define GPIO_PartialRemap_USART3 ((u32)0x00140010) /* USART3 Partial Alternate Function mapping */
-#define GPIO_FullRemap_USART3 ((u32)0x00140030) /* USART3 Full Alternate Function mapping */
-#define GPIO_PartialRemap_TIM1 ((u32)0x00160040) /* TIM1 Partial Alternate Function mapping */
-#define GPIO_FullRemap_TIM1 ((u32)0x001600C0) /* TIM1 Full Alternate Function mapping */
-#define GPIO_PartialRemap1_TIM2 ((u32)0x00180100) /* TIM2 Partial1 Alternate Function mapping */
-#define GPIO_PartialRemap2_TIM2 ((u32)0x00180200) /* TIM2 Partial2 Alternate Function mapping */
-#define GPIO_FullRemap_TIM2 ((u32)0x00180300) /* TIM2 Full Alternate Function mapping */
-#define GPIO_PartialRemap_TIM3 ((u32)0x001A0800) /* TIM3 Partial Alternate Function mapping */
-#define GPIO_FullRemap_TIM3 ((u32)0x001A0C00) /* TIM3 Full Alternate Function mapping */
-#define GPIO_Remap_TIM4 ((u32)0x00001000) /* TIM4 Alternate Function mapping */
-#define GPIO_Remap1_CAN ((u32)0x001D4000) /* CAN Alternate Function mapping */
-#define GPIO_Remap2_CAN ((u32)0x001D6000) /* CAN Alternate Function mapping */
-#define GPIO_Remap_PD01 ((u32)0x00008000) /* PD01 Alternate Function mapping */
-#define GPIO_Remap_TIM5CH4_LSI ((u32)0x00200001) /* LSI connected to TIM5 Channel4 input capture for calibration */
-#define GPIO_Remap_ADC1_ETRGINJ ((u32)0x00200002) /* ADC1 External Trigger Injected Conversion remapping */
-#define GPIO_Remap_ADC1_ETRGREG ((u32)0x00200004) /* ADC1 External Trigger Regular Conversion remapping */
-#define GPIO_Remap_ADC2_ETRGINJ ((u32)0x00200008) /* ADC2 External Trigger Injected Conversion remapping */
-#define GPIO_Remap_ADC2_ETRGREG ((u32)0x00200010) /* ADC2 External Trigger Regular Conversion remapping */
-#define GPIO_Remap_SWJ_NoJTRST ((u32)0x00300100) /* Full SWJ Enabled (JTAG-DP + SW-DP) but without JTRST */
-#define GPIO_Remap_SWJ_JTAGDisable ((u32)0x00300200) /* JTAG-DP Disabled and SW-DP Enabled */
-#define GPIO_Remap_SWJ_Disable ((u32)0x00300400) /* Full SWJ Disabled (JTAG-DP + SW-DP) */
-
-
-#define IS_GPIO_REMAP(REMAP) (((REMAP) == GPIO_Remap_SPI1) || ((REMAP) == GPIO_Remap_I2C1) || \
- ((REMAP) == GPIO_Remap_USART1) || ((REMAP) == GPIO_Remap_USART2) || \
- ((REMAP) == GPIO_PartialRemap_USART3) || ((REMAP) == GPIO_FullRemap_USART3) || \
- ((REMAP) == GPIO_PartialRemap_TIM1) || ((REMAP) == GPIO_FullRemap_TIM1) || \
- ((REMAP) == GPIO_PartialRemap1_TIM2) || ((REMAP) == GPIO_PartialRemap2_TIM2) || \
- ((REMAP) == GPIO_FullRemap_TIM2) || ((REMAP) == GPIO_PartialRemap_TIM3) || \
- ((REMAP) == GPIO_FullRemap_TIM3) || ((REMAP) == GPIO_Remap_TIM4) || \
- ((REMAP) == GPIO_Remap1_CAN) || ((REMAP) == GPIO_Remap2_CAN) || \
- ((REMAP) == GPIO_Remap_PD01) || ((REMAP) == GPIO_Remap_TIM5CH4_LSI) || \
- ((REMAP) == GPIO_Remap_ADC1_ETRGINJ) ||((REMAP) == GPIO_Remap_ADC1_ETRGREG) || \
- ((REMAP) == GPIO_Remap_ADC2_ETRGINJ) ||((REMAP) == GPIO_Remap_ADC2_ETRGREG) || \
- ((REMAP) == GPIO_Remap_SWJ_NoJTRST) || ((REMAP) == GPIO_Remap_SWJ_JTAGDisable)|| \
- ((REMAP) == GPIO_Remap_SWJ_Disable))
-
-/* GPIO Port Sources ---------------------------------------------------------*/
-#define GPIO_PortSourceGPIOA ((u8)0x00)
-#define GPIO_PortSourceGPIOB ((u8)0x01)
-#define GPIO_PortSourceGPIOC ((u8)0x02)
-#define GPIO_PortSourceGPIOD ((u8)0x03)
-#define GPIO_PortSourceGPIOE ((u8)0x04)
-#define GPIO_PortSourceGPIOF ((u8)0x05)
-#define GPIO_PortSourceGPIOG ((u8)0x06)
-
-#define IS_GPIO_EVENTOUT_PORT_SOURCE(PORTSOURCE) (((PORTSOURCE) == GPIO_PortSourceGPIOA) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOB) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOC) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOD) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOE))
-
-#define IS_GPIO_EXTI_PORT_SOURCE(PORTSOURCE) (((PORTSOURCE) == GPIO_PortSourceGPIOA) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOB) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOC) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOD) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOE) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOF) || \
- ((PORTSOURCE) == GPIO_PortSourceGPIOG))
-
-/* GPIO Pin sources ----------------------------------------------------------*/
-#define GPIO_PinSource0 ((u8)0x00)
-#define GPIO_PinSource1 ((u8)0x01)
-#define GPIO_PinSource2 ((u8)0x02)
-#define GPIO_PinSource3 ((u8)0x03)
-#define GPIO_PinSource4 ((u8)0x04)
-#define GPIO_PinSource5 ((u8)0x05)
-#define GPIO_PinSource6 ((u8)0x06)
-#define GPIO_PinSource7 ((u8)0x07)
-#define GPIO_PinSource8 ((u8)0x08)
-#define GPIO_PinSource9 ((u8)0x09)
-#define GPIO_PinSource10 ((u8)0x0A)
-#define GPIO_PinSource11 ((u8)0x0B)
-#define GPIO_PinSource12 ((u8)0x0C)
-#define GPIO_PinSource13 ((u8)0x0D)
-#define GPIO_PinSource14 ((u8)0x0E)
-#define GPIO_PinSource15 ((u8)0x0F)
-
-#define IS_GPIO_PIN_SOURCE(PINSOURCE) (((PINSOURCE) == GPIO_PinSource0) || \
- ((PINSOURCE) == GPIO_PinSource1) || \
- ((PINSOURCE) == GPIO_PinSource2) || \
- ((PINSOURCE) == GPIO_PinSource3) || \
- ((PINSOURCE) == GPIO_PinSource4) || \
- ((PINSOURCE) == GPIO_PinSource5) || \
- ((PINSOURCE) == GPIO_PinSource6) || \
- ((PINSOURCE) == GPIO_PinSource7) || \
- ((PINSOURCE) == GPIO_PinSource8) || \
- ((PINSOURCE) == GPIO_PinSource9) || \
- ((PINSOURCE) == GPIO_PinSource10) || \
- ((PINSOURCE) == GPIO_PinSource11) || \
- ((PINSOURCE) == GPIO_PinSource12) || \
- ((PINSOURCE) == GPIO_PinSource13) || \
- ((PINSOURCE) == GPIO_PinSource14) || \
- ((PINSOURCE) == GPIO_PinSource15))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void GPIO_DeInit(GPIO_TypeDef* GPIOx);
-void GPIO_AFIODeInit(void);
-void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct);
-void GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct);
-u8 GPIO_ReadInputDataBit(GPIO_TypeDef* GPIOx, u16 GPIO_Pin);
-u16 GPIO_ReadInputData(GPIO_TypeDef* GPIOx);
-u8 GPIO_ReadOutputDataBit(GPIO_TypeDef* GPIOx, u16 GPIO_Pin);
-u16 GPIO_ReadOutputData(GPIO_TypeDef* GPIOx);
-void GPIO_SetBits(GPIO_TypeDef* GPIOx, u16 GPIO_Pin);
-void GPIO_ResetBits(GPIO_TypeDef* GPIOx, u16 GPIO_Pin);
-void GPIO_WriteBit(GPIO_TypeDef* GPIOx, u16 GPIO_Pin, BitAction BitVal);
-void GPIO_Write(GPIO_TypeDef* GPIOx, u16 PortVal);
-void GPIO_PinLockConfig(GPIO_TypeDef* GPIOx, u16 GPIO_Pin);
-void GPIO_EventOutputConfig(u8 GPIO_PortSource, u8 GPIO_PinSource);
-void GPIO_EventOutputCmd(FunctionalState NewState);
-void GPIO_PinRemapConfig(u32 GPIO_Remap, FunctionalState NewState);
-void GPIO_EXTILineConfig(u8 GPIO_PortSource, u8 GPIO_PinSource);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __STM32F10x_GPIO_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_i2c.h b/stm32lib/inc/stm32f10x_i2c.h
deleted file mode 100644
index 7dd6d7d..0000000
--- a/stm32lib/inc/stm32f10x_i2c.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_i2c.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* I2C firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_I2C_H
-#define __STM32F10x_I2C_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* I2C Init structure definition */
-typedef struct
-{
- u16 I2C_Mode;
- u16 I2C_DutyCycle;
- u16 I2C_OwnAddress1;
- u16 I2C_Ack;
- u16 I2C_AcknowledgedAddress;
- u32 I2C_ClockSpeed;
-}I2C_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define IS_I2C_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == I2C1_BASE) || \
- ((*(u32*)&(PERIPH)) == I2C2_BASE))
-
-/* I2C modes */
-#define I2C_Mode_I2C ((u16)0x0000)
-#define I2C_Mode_SMBusDevice ((u16)0x0002)
-#define I2C_Mode_SMBusHost ((u16)0x000A)
-
-#define IS_I2C_MODE(MODE) (((MODE) == I2C_Mode_I2C) || \
- ((MODE) == I2C_Mode_SMBusDevice) || \
- ((MODE) == I2C_Mode_SMBusHost))
-/* I2C duty cycle in fast mode */
-#define I2C_DutyCycle_16_9 ((u16)0x4000)
-#define I2C_DutyCycle_2 ((u16)0xBFFF)
-
-#define IS_I2C_DUTY_CYCLE(CYCLE) (((CYCLE) == I2C_DutyCycle_16_9) || \
- ((CYCLE) == I2C_DutyCycle_2))
-
-/* I2C cknowledgementy */
-#define I2C_Ack_Enable ((u16)0x0400)
-#define I2C_Ack_Disable ((u16)0x0000)
-
-#define IS_I2C_ACK_STATE(STATE) (((STATE) == I2C_Ack_Enable) || \
- ((STATE) == I2C_Ack_Disable))
-
-/* I2C transfer direction */
-#define I2C_Direction_Transmitter ((u8)0x00)
-#define I2C_Direction_Receiver ((u8)0x01)
-
-#define IS_I2C_DIRECTION(DIRECTION) (((DIRECTION) == I2C_Direction_Transmitter) || \
- ((DIRECTION) == I2C_Direction_Receiver))
-
-/* I2C acknowledged address defines */
-#define I2C_AcknowledgedAddress_7bit ((u16)0x4000)
-#define I2C_AcknowledgedAddress_10bit ((u16)0xC000)
-
-#define IS_I2C_ACKNOWLEDGE_ADDRESS(ADDRESS) (((ADDRESS) == I2C_AcknowledgedAddress_7bit) || \
- ((ADDRESS) == I2C_AcknowledgedAddress_10bit))
-
-/* I2C registers */
-#define I2C_Register_CR1 ((u8)0x00)
-#define I2C_Register_CR2 ((u8)0x04)
-#define I2C_Register_OAR1 ((u8)0x08)
-#define I2C_Register_OAR2 ((u8)0x0C)
-#define I2C_Register_DR ((u8)0x10)
-#define I2C_Register_SR1 ((u8)0x14)
-#define I2C_Register_SR2 ((u8)0x18)
-#define I2C_Register_CCR ((u8)0x1C)
-#define I2C_Register_TRISE ((u8)0x20)
-
-#define IS_I2C_REGISTER(REGISTER) (((REGISTER) == I2C_Register_CR1) || \
- ((REGISTER) == I2C_Register_CR2) || \
- ((REGISTER) == I2C_Register_OAR1) || \
- ((REGISTER) == I2C_Register_OAR2) || \
- ((REGISTER) == I2C_Register_DR) || \
- ((REGISTER) == I2C_Register_SR1) || \
- ((REGISTER) == I2C_Register_SR2) || \
- ((REGISTER) == I2C_Register_CCR) || \
- ((REGISTER) == I2C_Register_TRISE))
-
-/* I2C SMBus alert pin level */
-#define I2C_SMBusAlert_Low ((u16)0x2000)
-#define I2C_SMBusAlert_High ((u16)0xDFFF)
-
-#define IS_I2C_SMBUS_ALERT(ALERT) (((ALERT) == I2C_SMBusAlert_Low) || \
- ((ALERT) == I2C_SMBusAlert_High))
-
-/* I2C PEC position */
-#define I2C_PECPosition_Next ((u16)0x0800)
-#define I2C_PECPosition_Current ((u16)0xF7FF)
-
-#define IS_I2C_PEC_POSITION(POSITION) (((POSITION) == I2C_PECPosition_Next) || \
- ((POSITION) == I2C_PECPosition_Current))
-
-/* I2C interrupts definition */
-#define I2C_IT_BUF ((u16)0x0400)
-#define I2C_IT_EVT ((u16)0x0200)
-#define I2C_IT_ERR ((u16)0x0100)
-
-#define IS_I2C_CONFIG_IT(IT) ((((IT) & (u16)0xF8FF) == 0x00) && ((IT) != 0x00))
-
-/* I2C interrupts definition */
-#define I2C_IT_SMBALERT ((u32)0x01008000)
-#define I2C_IT_TIMEOUT ((u32)0x01004000)
-#define I2C_IT_PECERR ((u32)0x01001000)
-#define I2C_IT_OVR ((u32)0x01000800)
-#define I2C_IT_AF ((u32)0x01000400)
-#define I2C_IT_ARLO ((u32)0x01000200)
-#define I2C_IT_BERR ((u32)0x01000100)
-#define I2C_IT_TXE ((u32)0x06000080)
-#define I2C_IT_RXNE ((u32)0x06000040)
-#define I2C_IT_STOPF ((u32)0x02000010)
-#define I2C_IT_ADD10 ((u32)0x02000008)
-#define I2C_IT_BTF ((u32)0x02000004)
-#define I2C_IT_ADDR ((u32)0x02000002)
-#define I2C_IT_SB ((u32)0x02000001)
-
-#define IS_I2C_CLEAR_IT(IT) ((((IT) & (u16)0x20FF) == 0x00) && ((IT) != (u16)0x00))
-
-#define IS_I2C_GET_IT(IT) (((IT) == I2C_IT_SMBALERT) || ((IT) == I2C_IT_TIMEOUT) || \
- ((IT) == I2C_IT_PECERR) || ((IT) == I2C_IT_OVR) || \
- ((IT) == I2C_IT_AF) || ((IT) == I2C_IT_ARLO) || \
- ((IT) == I2C_IT_BERR) || ((IT) == I2C_IT_TXE) || \
- ((IT) == I2C_IT_RXNE) || ((IT) == I2C_IT_STOPF) || \
- ((IT) == I2C_IT_ADD10) || ((IT) == I2C_IT_BTF) || \
- ((IT) == I2C_IT_ADDR) || ((IT) == I2C_IT_SB))
-
-/* I2C flags definition */
-/* SR2 register flags */
-#define I2C_FLAG_DUALF ((u32)0x00800000)
-#define I2C_FLAG_SMBHOST ((u32)0x00400000)
-#define I2C_FLAG_SMBDEFAULT ((u32)0x00200000)
-#define I2C_FLAG_GENCALL ((u32)0x00100000)
-#define I2C_FLAG_TRA ((u32)0x00040000)
-#define I2C_FLAG_BUSY ((u32)0x00020000)
-#define I2C_FLAG_MSL ((u32)0x00010000)
-/* SR1 register flags */
-#define I2C_FLAG_SMBALERT ((u32)0x10008000)
-#define I2C_FLAG_TIMEOUT ((u32)0x10004000)
-#define I2C_FLAG_PECERR ((u32)0x10001000)
-#define I2C_FLAG_OVR ((u32)0x10000800)
-#define I2C_FLAG_AF ((u32)0x10000400)
-#define I2C_FLAG_ARLO ((u32)0x10000200)
-#define I2C_FLAG_BERR ((u32)0x10000100)
-#define I2C_FLAG_TXE ((u32)0x10000080)
-#define I2C_FLAG_RXNE ((u32)0x10000040)
-#define I2C_FLAG_STOPF ((u32)0x10000010)
-#define I2C_FLAG_ADD10 ((u32)0x10000008)
-#define I2C_FLAG_BTF ((u32)0x10000004)
-#define I2C_FLAG_ADDR ((u32)0x10000002)
-#define I2C_FLAG_SB ((u32)0x10000001)
-
-#define IS_I2C_CLEAR_FLAG(FLAG) ((((FLAG) & (u16)0x20FF) == 0x00) && ((FLAG) != (u16)0x00))
-
-#define IS_I2C_GET_FLAG(FLAG) (((FLAG) == I2C_FLAG_DUALF) || ((FLAG) == I2C_FLAG_SMBHOST) || \
- ((FLAG) == I2C_FLAG_SMBDEFAULT) || ((FLAG) == I2C_FLAG_GENCALL) || \
- ((FLAG) == I2C_FLAG_TRA) || ((FLAG) == I2C_FLAG_BUSY) || \
- ((FLAG) == I2C_FLAG_MSL) || ((FLAG) == I2C_FLAG_SMBALERT) || \
- ((FLAG) == I2C_FLAG_TIMEOUT) || ((FLAG) == I2C_FLAG_PECERR) || \
- ((FLAG) == I2C_FLAG_OVR) || ((FLAG) == I2C_FLAG_AF) || \
- ((FLAG) == I2C_FLAG_ARLO) || ((FLAG) == I2C_FLAG_BERR) || \
- ((FLAG) == I2C_FLAG_TXE) || ((FLAG) == I2C_FLAG_RXNE) || \
- ((FLAG) == I2C_FLAG_STOPF) || ((FLAG) == I2C_FLAG_ADD10) || \
- ((FLAG) == I2C_FLAG_BTF) || ((FLAG) == I2C_FLAG_ADDR) || \
- ((FLAG) == I2C_FLAG_SB))
-
-/* I2C Events */
-/* EV1 */
-#define I2C_EVENT_SLAVE_TRANSMITTER_ADDRESS_MATCHED ((u32)0x00060082) /* TRA, BUSY, TXE and ADDR flags */
-#define I2C_EVENT_SLAVE_RECEIVER_ADDRESS_MATCHED ((u32)0x00020002) /* BUSY and ADDR flags */
-#define I2C_EVENT_SLAVE_TRANSMITTER_SECONDADDRESS_MATCHED ((u32)0x00860080) /* DUALF, TRA, BUSY and TXE flags */
-#define I2C_EVENT_SLAVE_RECEIVER_SECONDADDRESS_MATCHED ((u32)0x00820000) /* DUALF and BUSY flags */
-#define I2C_EVENT_SLAVE_GENERALCALLADDRESS_MATCHED ((u32)0x00120000) /* GENCALL and BUSY flags */
-
-/* EV2 */
-#define I2C_EVENT_SLAVE_BYTE_RECEIVED ((u32)0x00020040) /* BUSY and RXNE flags */
-
-/* EV3 */
-#define I2C_EVENT_SLAVE_BYTE_TRANSMITTED ((u32)0x00060084) /* TRA, BUSY, TXE and BTF flags */
-
-/* EV4 */
-#define I2C_EVENT_SLAVE_STOP_DETECTED ((u32)0x00000010) /* STOPF flag */
-
-/* EV5 */
-#define I2C_EVENT_MASTER_MODE_SELECT ((u32)0x00030001) /* BUSY, MSL and SB flag */
-
-/* EV6 */
-#define I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED ((u32)0x00070082) /* BUSY, MSL, ADDR, TXE and TRA flags */
-#define I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED ((u32)0x00030002) /* BUSY, MSL and ADDR flags */
-
-/* EV7 */
-#define I2C_EVENT_MASTER_BYTE_RECEIVED ((u32)0x00030040) /* BUSY, MSL and RXNE flags */
-
-/* EV8 */
-#define I2C_EVENT_MASTER_BYTE_TRANSMITTED ((u32)0x00070084) /* TRA, BUSY, MSL, TXE and BTF flags */
-
-/* EV9 */
-#define I2C_EVENT_MASTER_MODE_ADDRESS10 ((u32)0x00030008) /* BUSY, MSL and ADD10 flags */
-
-/* EV3_2 */
-#define I2C_EVENT_SLAVE_ACK_FAILURE ((u32)0x00000400) /* AF flag */
-
-#define IS_I2C_EVENT(EVENT) (((EVENT) == I2C_EVENT_SLAVE_TRANSMITTER_ADDRESS_MATCHED) || \
- ((EVENT) == I2C_EVENT_SLAVE_RECEIVER_ADDRESS_MATCHED) || \
- ((EVENT) == I2C_EVENT_SLAVE_TRANSMITTER_SECONDADDRESS_MATCHED) || \
- ((EVENT) == I2C_EVENT_SLAVE_RECEIVER_SECONDADDRESS_MATCHED) || \
- ((EVENT) == I2C_EVENT_SLAVE_GENERALCALLADDRESS_MATCHED) || \
- ((EVENT) == I2C_EVENT_SLAVE_BYTE_RECEIVED) || \
- ((EVENT) == (I2C_EVENT_SLAVE_BYTE_RECEIVED | I2C_FLAG_DUALF)) || \
- ((EVENT) == (I2C_EVENT_SLAVE_BYTE_RECEIVED | I2C_FLAG_GENCALL)) || \
- ((EVENT) == I2C_EVENT_SLAVE_BYTE_TRANSMITTED) || \
- ((EVENT) == (I2C_EVENT_SLAVE_BYTE_TRANSMITTED | I2C_FLAG_DUALF)) || \
- ((EVENT) == (I2C_EVENT_SLAVE_BYTE_TRANSMITTED | I2C_FLAG_GENCALL)) || \
- ((EVENT) == I2C_EVENT_SLAVE_STOP_DETECTED) || \
- ((EVENT) == I2C_EVENT_MASTER_MODE_SELECT) || \
- ((EVENT) == I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED) || \
- ((EVENT) == I2C_EVENT_MASTER_RECEIVER_MODE_SELECTED) || \
- ((EVENT) == I2C_EVENT_MASTER_BYTE_RECEIVED) || \
- ((EVENT) == I2C_EVENT_MASTER_BYTE_TRANSMITTED) || \
- ((EVENT) == I2C_EVENT_MASTER_MODE_ADDRESS10) || \
- ((EVENT) == I2C_EVENT_SLAVE_ACK_FAILURE))
-
-/* I2C own address1 -----------------------------------------------------------*/
-#define IS_I2C_OWN_ADDRESS1(ADDRESS1) ((ADDRESS1) <= 0x3FF)
-/* I2C clock speed ------------------------------------------------------------*/
-#define IS_I2C_CLOCK_SPEED(SPEED) (((SPEED) >= 0x1) && ((SPEED) <= 400000))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void I2C_DeInit(I2C_TypeDef* I2Cx);
-void I2C_Init(I2C_TypeDef* I2Cx, I2C_InitTypeDef* I2C_InitStruct);
-void I2C_StructInit(I2C_InitTypeDef* I2C_InitStruct);
-void I2C_Cmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_DMACmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_DMALastTransferCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_GenerateSTART(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_GenerateSTOP(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_AcknowledgeConfig(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_OwnAddress2Config(I2C_TypeDef* I2Cx, u8 Address);
-void I2C_DualAddressCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_GeneralCallCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_ITConfig(I2C_TypeDef* I2Cx, u16 I2C_IT, FunctionalState NewState);
-void I2C_SendData(I2C_TypeDef* I2Cx, u8 Data);
-u8 I2C_ReceiveData(I2C_TypeDef* I2Cx);
-void I2C_Send7bitAddress(I2C_TypeDef* I2Cx, u8 Address, u8 I2C_Direction);
-u16 I2C_ReadRegister(I2C_TypeDef* I2Cx, u8 I2C_Register);
-void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_SMBusAlertConfig(I2C_TypeDef* I2Cx, u16 I2C_SMBusAlert);
-void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, u16 I2C_PECPosition);
-void I2C_CalculatePEC(I2C_TypeDef* I2Cx, FunctionalState NewState);
-u8 I2C_GetPEC(I2C_TypeDef* I2Cx);
-void I2C_ARPCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_StretchClockCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);
-void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, u16 I2C_DutyCycle);
-u32 I2C_GetLastEvent(I2C_TypeDef* I2Cx);
-ErrorStatus I2C_CheckEvent(I2C_TypeDef* I2Cx, u32 I2C_EVENT);
-FlagStatus I2C_GetFlagStatus(I2C_TypeDef* I2Cx, u32 I2C_FLAG);
-void I2C_ClearFlag(I2C_TypeDef* I2Cx, u32 I2C_FLAG);
-ITStatus I2C_GetITStatus(I2C_TypeDef* I2Cx, u32 I2C_IT);
-void I2C_ClearITPendingBit(I2C_TypeDef* I2Cx, u32 I2C_IT);
-
-#endif /*__STM32F10x_I2C_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_iwdg.h b/stm32lib/inc/stm32f10x_iwdg.h
deleted file mode 100644
index 287950f..0000000
--- a/stm32lib/inc/stm32f10x_iwdg.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_iwdg.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* IWDG firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_IWDG_H
-#define __STM32F10x_IWDG_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Write access to IWDG_PR and IWDG_RLR registers */
-#define IWDG_WriteAccess_Enable ((u16)0x5555)
-#define IWDG_WriteAccess_Disable ((u16)0x0000)
-
-#define IS_IWDG_WRITE_ACCESS(ACCESS) (((ACCESS) == IWDG_WriteAccess_Enable) || \
- ((ACCESS) == IWDG_WriteAccess_Disable))
-
-/* IWDG prescaler */
-#define IWDG_Prescaler_4 ((u8)0x00)
-#define IWDG_Prescaler_8 ((u8)0x01)
-#define IWDG_Prescaler_16 ((u8)0x02)
-#define IWDG_Prescaler_32 ((u8)0x03)
-#define IWDG_Prescaler_64 ((u8)0x04)
-#define IWDG_Prescaler_128 ((u8)0x05)
-#define IWDG_Prescaler_256 ((u8)0x06)
-
-#define IS_IWDG_PRESCALER(PRESCALER) (((PRESCALER) == IWDG_Prescaler_4) || \
- ((PRESCALER) == IWDG_Prescaler_8) || \
- ((PRESCALER) == IWDG_Prescaler_16) || \
- ((PRESCALER) == IWDG_Prescaler_32) || \
- ((PRESCALER) == IWDG_Prescaler_64) || \
- ((PRESCALER) == IWDG_Prescaler_128)|| \
- ((PRESCALER) == IWDG_Prescaler_256))
-
-/* IWDG Flag */
-#define IWDG_FLAG_PVU ((u16)0x0001)
-#define IWDG_FLAG_RVU ((u16)0x0002)
-
-#define IS_IWDG_FLAG(FLAG) (((FLAG) == IWDG_FLAG_PVU) || ((FLAG) == IWDG_FLAG_RVU))
-
-#define IS_IWDG_RELOAD(RELOAD) ((RELOAD) <= 0xFFF)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void IWDG_WriteAccessCmd(u16 IWDG_WriteAccess);
-void IWDG_SetPrescaler(u8 IWDG_Prescaler);
-void IWDG_SetReload(u16 Reload);
-void IWDG_ReloadCounter(void);
-void IWDG_Enable(void);
-FlagStatus IWDG_GetFlagStatus(u16 IWDG_FLAG);
-
-#endif /* __STM32F10x_IWDG_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_lib.h b/stm32lib/inc/stm32f10x_lib.h
deleted file mode 100644
index beff887..0000000
--- a/stm32lib/inc/stm32f10x_lib.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_lib.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file includes the peripherals header files in the
-* user application.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_LIB_H
-#define __STM32F10x_LIB_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-#ifdef _ADC
- #include "stm32f10x_adc.h"
-#endif /*_ADC */
-
-#ifdef _BKP
- #include "stm32f10x_bkp.h"
-#endif /*_BKP */
-
-#ifdef _CAN
- #include "stm32f10x_can.h"
-#endif /*_CAN */
-
-#ifdef _CRC
- #include "stm32f10x_crc.h"
-#endif /*_CRC */
-
-#ifdef _DAC
- #include "stm32f10x_dac.h"
-#endif /*_DAC */
-
-#ifdef _DBGMCU
- #include "stm32f10x_dbgmcu.h"
-#endif /*_DBGMCU */
-
-#ifdef _DMA
- #include "stm32f10x_dma.h"
-#endif /*_DMA */
-
-#ifdef _EXTI
- #include "stm32f10x_exti.h"
-#endif /*_EXTI */
-
-#ifdef _FLASH
- #include "stm32f10x_flash.h"
-#endif /*_FLASH */
-
-#ifdef _FSMC
- #include "stm32f10x_fsmc.h"
-#endif /*_FSMC */
-
-#ifdef _GPIO
- #include "stm32f10x_gpio.h"
-#endif /*_GPIO */
-
-#ifdef _I2C
- #include "stm32f10x_i2c.h"
-#endif /*_I2C */
-
-#ifdef _IWDG
- #include "stm32f10x_iwdg.h"
-#endif /*_IWDG */
-
-#ifdef _NVIC
- #include "stm32f10x_nvic.h"
-#endif /*_NVIC */
-
-#ifdef _PWR
- #include "stm32f10x_pwr.h"
-#endif /*_PWR */
-
-#ifdef _RCC
- #include "stm32f10x_rcc.h"
-#endif /*_RCC */
-
-#ifdef _RTC
- #include "stm32f10x_rtc.h"
-#endif /*_RTC */
-
-#ifdef _SDIO
- #include "stm32f10x_sdio.h"
-#endif /*_SDIO */
-
-#ifdef _SPI
- #include "stm32f10x_spi.h"
-#endif /*_SPI */
-
-#ifdef _SysTick
- #include "stm32f10x_systick.h"
-#endif /*_SysTick */
-
-#ifdef _TIM
- #include "stm32f10x_tim.h"
-#endif /*_TIM */
-
-#ifdef _USART
- #include "stm32f10x_usart.h"
-#endif /*_USART */
-
-#ifdef _WWDG
- #include "stm32f10x_wwdg.h"
-#endif /*_WWDG */
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void debug(void);
-
-#endif /* __STM32F10x_LIB_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_map.h b/stm32lib/inc/stm32f10x_map.h
deleted file mode 100644
index 16dc479..0000000
--- a/stm32lib/inc/stm32f10x_map.h
+++ /dev/null
@@ -1,1187 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_map.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the peripheral register's definitions
-* and memory mapping.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_MAP_H
-#define __STM32F10x_MAP_H
-
-#ifndef EXT
- #define EXT extern
-#endif /* EXT */
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_conf.h"
-#include "stm32f10x_type.h"
-#include "cortexm3_macro.h"
-
-/* Exported types ------------------------------------------------------------*/
-/******************************************************************************/
-/* Peripheral registers structures */
-/******************************************************************************/
-
-/*------------------------ Analog to Digital Converter -----------------------*/
-typedef struct
-{
- vu32 SR;
- vu32 CR1;
- vu32 CR2;
- vu32 SMPR1;
- vu32 SMPR2;
- vu32 JOFR1;
- vu32 JOFR2;
- vu32 JOFR3;
- vu32 JOFR4;
- vu32 HTR;
- vu32 LTR;
- vu32 SQR1;
- vu32 SQR2;
- vu32 SQR3;
- vu32 JSQR;
- vu32 JDR1;
- vu32 JDR2;
- vu32 JDR3;
- vu32 JDR4;
- vu32 DR;
-} ADC_TypeDef;
-
-/*------------------------ Backup Registers ----------------------------------*/
-typedef struct
-{
- u32 RESERVED0;
- vu16 DR1;
- u16 RESERVED1;
- vu16 DR2;
- u16 RESERVED2;
- vu16 DR3;
- u16 RESERVED3;
- vu16 DR4;
- u16 RESERVED4;
- vu16 DR5;
- u16 RESERVED5;
- vu16 DR6;
- u16 RESERVED6;
- vu16 DR7;
- u16 RESERVED7;
- vu16 DR8;
- u16 RESERVED8;
- vu16 DR9;
- u16 RESERVED9;
- vu16 DR10;
- u16 RESERVED10;
- vu16 RTCCR;
- u16 RESERVED11;
- vu16 CR;
- u16 RESERVED12;
- vu16 CSR;
- u16 RESERVED13[5];
- vu16 DR11;
- u16 RESERVED14;
- vu16 DR12;
- u16 RESERVED15;
- vu16 DR13;
- u16 RESERVED16;
- vu16 DR14;
- u16 RESERVED17;
- vu16 DR15;
- u16 RESERVED18;
- vu16 DR16;
- u16 RESERVED19;
- vu16 DR17;
- u16 RESERVED20;
- vu16 DR18;
- u16 RESERVED21;
- vu16 DR19;
- u16 RESERVED22;
- vu16 DR20;
- u16 RESERVED23;
- vu16 DR21;
- u16 RESERVED24;
- vu16 DR22;
- u16 RESERVED25;
- vu16 DR23;
- u16 RESERVED26;
- vu16 DR24;
- u16 RESERVED27;
- vu16 DR25;
- u16 RESERVED28;
- vu16 DR26;
- u16 RESERVED29;
- vu16 DR27;
- u16 RESERVED30;
- vu16 DR28;
- u16 RESERVED31;
- vu16 DR29;
- u16 RESERVED32;
- vu16 DR30;
- u16 RESERVED33;
- vu16 DR31;
- u16 RESERVED34;
- vu16 DR32;
- u16 RESERVED35;
- vu16 DR33;
- u16 RESERVED36;
- vu16 DR34;
- u16 RESERVED37;
- vu16 DR35;
- u16 RESERVED38;
- vu16 DR36;
- u16 RESERVED39;
- vu16 DR37;
- u16 RESERVED40;
- vu16 DR38;
- u16 RESERVED41;
- vu16 DR39;
- u16 RESERVED42;
- vu16 DR40;
- u16 RESERVED43;
- vu16 DR41;
- u16 RESERVED44;
- vu16 DR42;
- u16 RESERVED45;
-} BKP_TypeDef;
-
-/*------------------------ Controller Area Network ---------------------------*/
-typedef struct
-{
- vu32 TIR;
- vu32 TDTR;
- vu32 TDLR;
- vu32 TDHR;
-} CAN_TxMailBox_TypeDef;
-
-typedef struct
-{
- vu32 RIR;
- vu32 RDTR;
- vu32 RDLR;
- vu32 RDHR;
-} CAN_FIFOMailBox_TypeDef;
-
-typedef struct
-{
- vu32 FR1;
- vu32 FR2;
-} CAN_FilterRegister_TypeDef;
-
-typedef struct
-{
- vu32 MCR;
- vu32 MSR;
- vu32 TSR;
- vu32 RF0R;
- vu32 RF1R;
- vu32 IER;
- vu32 ESR;
- vu32 BTR;
- u32 RESERVED0[88];
- CAN_TxMailBox_TypeDef sTxMailBox[3];
- CAN_FIFOMailBox_TypeDef sFIFOMailBox[2];
- u32 RESERVED1[12];
- vu32 FMR;
- vu32 FM1R;
- u32 RESERVED2;
- vu32 FS1R;
- u32 RESERVED3;
- vu32 FFA1R;
- u32 RESERVED4;
- vu32 FA1R;
- u32 RESERVED5[8];
- CAN_FilterRegister_TypeDef sFilterRegister[14];
-} CAN_TypeDef;
-
-/*------------------------ CRC calculation unit ------------------------------*/
-typedef struct
-{
- vu32 DR;
- vu8 IDR;
- u8 RESERVED0;
- u16 RESERVED1;
- vu32 CR;
-} CRC_TypeDef;
-
-
-/*------------------------ Digital to Analog Converter -----------------------*/
-typedef struct
-{
- vu32 CR;
- vu32 SWTRIGR;
- vu32 DHR12R1;
- vu32 DHR12L1;
- vu32 DHR8R1;
- vu32 DHR12R2;
- vu32 DHR12L2;
- vu32 DHR8R2;
- vu32 DHR12RD;
- vu32 DHR12LD;
- vu32 DHR8RD;
- vu32 DOR1;
- vu32 DOR2;
-} DAC_TypeDef;
-
-/*------------------------ Debug MCU -----------------------------------------*/
-typedef struct
-{
- vu32 IDCODE;
- vu32 CR;
-}DBGMCU_TypeDef;
-
-/*------------------------ DMA Controller ------------------------------------*/
-typedef struct
-{
- vu32 CCR;
- vu32 CNDTR;
- vu32 CPAR;
- vu32 CMAR;
-} DMA_Channel_TypeDef;
-
-typedef struct
-{
- vu32 ISR;
- vu32 IFCR;
-} DMA_TypeDef;
-
-/*------------------------ External Interrupt/Event Controller ---------------*/
-typedef struct
-{
- vu32 IMR;
- vu32 EMR;
- vu32 RTSR;
- vu32 FTSR;
- vu32 SWIER;
- vu32 PR;
-} EXTI_TypeDef;
-
-/*------------------------ FLASH and Option Bytes Registers ------------------*/
-typedef struct
-{
- vu32 ACR;
- vu32 KEYR;
- vu32 OPTKEYR;
- vu32 SR;
- vu32 CR;
- vu32 AR;
- vu32 RESERVED;
- vu32 OBR;
- vu32 WRPR;
-} FLASH_TypeDef;
-
-typedef struct
-{
- vu16 RDP;
- vu16 USER;
- vu16 Data0;
- vu16 Data1;
- vu16 WRP0;
- vu16 WRP1;
- vu16 WRP2;
- vu16 WRP3;
-} OB_TypeDef;
-
-/*------------------------ Flexible Static Memory Controller -----------------*/
-typedef struct
-{
- vu32 BTCR[8];
-} FSMC_Bank1_TypeDef;
-
-typedef struct
-{
- vu32 BWTR[7];
-} FSMC_Bank1E_TypeDef;
-
-typedef struct
-{
- vu32 PCR2;
- vu32 SR2;
- vu32 PMEM2;
- vu32 PATT2;
- u32 RESERVED0;
- vu32 ECCR2;
-} FSMC_Bank2_TypeDef;
-
-typedef struct
-{
- vu32 PCR3;
- vu32 SR3;
- vu32 PMEM3;
- vu32 PATT3;
- u32 RESERVED0;
- vu32 ECCR3;
-} FSMC_Bank3_TypeDef;
-
-typedef struct
-{
- vu32 PCR4;
- vu32 SR4;
- vu32 PMEM4;
- vu32 PATT4;
- vu32 PIO4;
-} FSMC_Bank4_TypeDef;
-
-/*------------------------ General Purpose and Alternate Function IO ---------*/
-typedef struct
-{
- vu32 CRL;
- vu32 CRH;
- vu32 IDR;
- vu32 ODR;
- vu32 BSRR;
- vu32 BRR;
- vu32 LCKR;
-} GPIO_TypeDef;
-
-typedef struct
-{
- vu32 EVCR;
- vu32 MAPR;
- vu32 EXTICR[4];
-} AFIO_TypeDef;
-
-/*------------------------ Inter-integrated Circuit Interface ----------------*/
-typedef struct
-{
- vu16 CR1;
- u16 RESERVED0;
- vu16 CR2;
- u16 RESERVED1;
- vu16 OAR1;
- u16 RESERVED2;
- vu16 OAR2;
- u16 RESERVED3;
- vu16 DR;
- u16 RESERVED4;
- vu16 SR1;
- u16 RESERVED5;
- vu16 SR2;
- u16 RESERVED6;
- vu16 CCR;
- u16 RESERVED7;
- vu16 TRISE;
- u16 RESERVED8;
-} I2C_TypeDef;
-
-/*------------------------ Independent WATCHDOG ------------------------------*/
-typedef struct
-{
- vu32 KR;
- vu32 PR;
- vu32 RLR;
- vu32 SR;
-} IWDG_TypeDef;
-
-/*------------------------ Nested Vectored Interrupt Controller --------------*/
-typedef struct
-{
- vu32 ISER[2];
- u32 RESERVED0[30];
- vu32 ICER[2];
- u32 RSERVED1[30];
- vu32 ISPR[2];
- u32 RESERVED2[30];
- vu32 ICPR[2];
- u32 RESERVED3[30];
- vu32 IABR[2];
- u32 RESERVED4[62];
- vu32 IPR[15];
-} NVIC_TypeDef;
-
-typedef struct
-{
- vuc32 CPUID;
- vu32 ICSR;
- vu32 VTOR;
- vu32 AIRCR;
- vu32 SCR;
- vu32 CCR;
- vu32 SHPR[3];
- vu32 SHCSR;
- vu32 CFSR;
- vu32 HFSR;
- vu32 DFSR;
- vu32 MMFAR;
- vu32 BFAR;
- vu32 AFSR;
-} SCB_TypeDef;
-
-/*------------------------ Power Control -------------------------------------*/
-typedef struct
-{
- vu32 CR;
- vu32 CSR;
-} PWR_TypeDef;
-
-/*------------------------ Reset and Clock Control ---------------------------*/
-typedef struct
-{
- vu32 CR;
- vu32 CFGR;
- vu32 CIR;
- vu32 APB2RSTR;
- vu32 APB1RSTR;
- vu32 AHBENR;
- vu32 APB2ENR;
- vu32 APB1ENR;
- vu32 BDCR;
- vu32 CSR;
-} RCC_TypeDef;
-
-/*------------------------ Real-Time Clock -----------------------------------*/
-typedef struct
-{
- vu16 CRH;
- u16 RESERVED0;
- vu16 CRL;
- u16 RESERVED1;
- vu16 PRLH;
- u16 RESERVED2;
- vu16 PRLL;
- u16 RESERVED3;
- vu16 DIVH;
- u16 RESERVED4;
- vu16 DIVL;
- u16 RESERVED5;
- vu16 CNTH;
- u16 RESERVED6;
- vu16 CNTL;
- u16 RESERVED7;
- vu16 ALRH;
- u16 RESERVED8;
- vu16 ALRL;
- u16 RESERVED9;
-} RTC_TypeDef;
-
-/*------------------------ SD host Interface ---------------------------------*/
-typedef struct
-{
- vu32 POWER;
- vu32 CLKCR;
- vu32 ARG;
- vu32 CMD;
- vuc32 RESPCMD;
- vuc32 RESP1;
- vuc32 RESP2;
- vuc32 RESP3;
- vuc32 RESP4;
- vu32 DTIMER;
- vu32 DLEN;
- vu32 DCTRL;
- vuc32 DCOUNT;
- vuc32 STA;
- vu32 ICR;
- vu32 MASK;
- u32 RESERVED0[2];
- vuc32 FIFOCNT;
- u32 RESERVED1[13];
- vu32 FIFO;
-} SDIO_TypeDef;
-
-/*------------------------ Serial Peripheral Interface -----------------------*/
-typedef struct
-{
- vu16 CR1;
- u16 RESERVED0;
- vu16 CR2;
- u16 RESERVED1;
- vu16 SR;
- u16 RESERVED2;
- vu16 DR;
- u16 RESERVED3;
- vu16 CRCPR;
- u16 RESERVED4;
- vu16 RXCRCR;
- u16 RESERVED5;
- vu16 TXCRCR;
- u16 RESERVED6;
- vu16 I2SCFGR;
- u16 RESERVED7;
- vu16 I2SPR;
- u16 RESERVED8;
-} SPI_TypeDef;
-
-/*------------------------ SystemTick ----------------------------------------*/
-typedef struct
-{
- vu32 CTRL;
- vu32 LOAD;
- vu32 VAL;
- vuc32 CALIB;
-} SysTick_TypeDef;
-
-/*------------------------ TIM -----------------------------------------------*/
-typedef struct
-{
- vu16 CR1;
- u16 RESERVED0;
- vu16 CR2;
- u16 RESERVED1;
- vu16 SMCR;
- u16 RESERVED2;
- vu16 DIER;
- u16 RESERVED3;
- vu16 SR;
- u16 RESERVED4;
- vu16 EGR;
- u16 RESERVED5;
- vu16 CCMR1;
- u16 RESERVED6;
- vu16 CCMR2;
- u16 RESERVED7;
- vu16 CCER;
- u16 RESERVED8;
- vu16 CNT;
- u16 RESERVED9;
- vu16 PSC;
- u16 RESERVED10;
- vu16 ARR;
- u16 RESERVED11;
- vu16 RCR;
- u16 RESERVED12;
- vu16 CCR1;
- u16 RESERVED13;
- vu16 CCR2;
- u16 RESERVED14;
- vu16 CCR3;
- u16 RESERVED15;
- vu16 CCR4;
- u16 RESERVED16;
- vu16 BDTR;
- u16 RESERVED17;
- vu16 DCR;
- u16 RESERVED18;
- vu16 DMAR;
- u16 RESERVED19;
-} TIM_TypeDef;
-
-/*----------------- Universal Synchronous Asynchronous Receiver Transmitter --*/
-typedef struct
-{
- vu16 SR;
- u16 RESERVED0;
- vu16 DR;
- u16 RESERVED1;
- vu16 BRR;
- u16 RESERVED2;
- vu16 CR1;
- u16 RESERVED3;
- vu16 CR2;
- u16 RESERVED4;
- vu16 CR3;
- u16 RESERVED5;
- vu16 GTPR;
- u16 RESERVED6;
-} USART_TypeDef;
-
-/*------------------------ Window WATCHDOG -----------------------------------*/
-typedef struct
-{
- vu32 CR;
- vu32 CFR;
- vu32 SR;
-} WWDG_TypeDef;
-
-/******************************************************************************/
-/* Peripheral memory map */
-/******************************************************************************/
-/* Peripheral and SRAM base address in the alias region */
-#define PERIPH_BB_BASE ((u32)0x42000000)
-#define SRAM_BB_BASE ((u32)0x22000000)
-
-/* Peripheral and SRAM base address in the bit-band region */
-#define SRAM_BASE ((u32)0x20000000)
-#define PERIPH_BASE ((u32)0x40000000)
-
-/* FSMC registers base address */
-#define FSMC_R_BASE ((u32)0xA0000000)
-
-/* Peripheral memory map */
-#define APB1PERIPH_BASE PERIPH_BASE
-#define APB2PERIPH_BASE (PERIPH_BASE + 0x10000)
-#define AHBPERIPH_BASE (PERIPH_BASE + 0x20000)
-
-#define TIM2_BASE (APB1PERIPH_BASE + 0x0000)
-#define TIM3_BASE (APB1PERIPH_BASE + 0x0400)
-#define TIM4_BASE (APB1PERIPH_BASE + 0x0800)
-#define TIM5_BASE (APB1PERIPH_BASE + 0x0C00)
-#define TIM6_BASE (APB1PERIPH_BASE + 0x1000)
-#define TIM7_BASE (APB1PERIPH_BASE + 0x1400)
-#define RTC_BASE (APB1PERIPH_BASE + 0x2800)
-#define WWDG_BASE (APB1PERIPH_BASE + 0x2C00)
-#define IWDG_BASE (APB1PERIPH_BASE + 0x3000)
-#define SPI2_BASE (APB1PERIPH_BASE + 0x3800)
-#define SPI3_BASE (APB1PERIPH_BASE + 0x3C00)
-//#define USART2_BASE (APB1PERIPH_BASE + 0x4400)
-//#define USART3_BASE (APB1PERIPH_BASE + 0x4800)
-#define UART4_BASE (APB1PERIPH_BASE + 0x4C00)
-#define UART5_BASE (APB1PERIPH_BASE + 0x5000)
-#define I2C1_BASE (APB1PERIPH_BASE + 0x5400)
-#define I2C2_BASE (APB1PERIPH_BASE + 0x5800)
-#define CAN_BASE (APB1PERIPH_BASE + 0x6400)
-#define BKP_BASE (APB1PERIPH_BASE + 0x6C00)
-#define PWR_BASE (APB1PERIPH_BASE + 0x7000)
-#define DAC_BASE (APB1PERIPH_BASE + 0x7400)
-
-#define AFIO_BASE (APB2PERIPH_BASE + 0x0000)
-#define EXTI_BASE (APB2PERIPH_BASE + 0x0400)
-//#define GPIOA_BASE (APB2PERIPH_BASE + 0x0800)
-//#define GPIOB_BASE (APB2PERIPH_BASE + 0x0C00)
-//#define GPIOC_BASE (APB2PERIPH_BASE + 0x1000)
-//#define GPIOD_BASE (APB2PERIPH_BASE + 0x1400)
-//#define GPIOE_BASE (APB2PERIPH_BASE + 0x1800)
-//#define GPIOF_BASE (APB2PERIPH_BASE + 0x1C00)
-//#define GPIOG_BASE (APB2PERIPH_BASE + 0x2000)
-#define ADC1_BASE (APB2PERIPH_BASE + 0x2400)
-#define ADC2_BASE (APB2PERIPH_BASE + 0x2800)
-#define TIM1_BASE (APB2PERIPH_BASE + 0x2C00)
-#define SPI1_BASE (APB2PERIPH_BASE + 0x3000)
-#define TIM8_BASE (APB2PERIPH_BASE + 0x3400)
-//#define USART1_BASE (APB2PERIPH_BASE + 0x3800)
-#define ADC3_BASE (APB2PERIPH_BASE + 0x3C00)
-
-#define SDIO_BASE (PERIPH_BASE + 0x18000)
-
-#define DMA1_BASE (AHBPERIPH_BASE + 0x0000)
-#define DMA1_Channel1_BASE (AHBPERIPH_BASE + 0x0008)
-#define DMA1_Channel2_BASE (AHBPERIPH_BASE + 0x001C)
-#define DMA1_Channel3_BASE (AHBPERIPH_BASE + 0x0030)
-#define DMA1_Channel4_BASE (AHBPERIPH_BASE + 0x0044)
-#define DMA1_Channel5_BASE (AHBPERIPH_BASE + 0x0058)
-#define DMA1_Channel6_BASE (AHBPERIPH_BASE + 0x006C)
-#define DMA1_Channel7_BASE (AHBPERIPH_BASE + 0x0080)
-#define DMA2_BASE (AHBPERIPH_BASE + 0x0400)
-#define DMA2_Channel1_BASE (AHBPERIPH_BASE + 0x0408)
-#define DMA2_Channel2_BASE (AHBPERIPH_BASE + 0x041C)
-#define DMA2_Channel3_BASE (AHBPERIPH_BASE + 0x0430)
-#define DMA2_Channel4_BASE (AHBPERIPH_BASE + 0x0444)
-#define DMA2_Channel5_BASE (AHBPERIPH_BASE + 0x0458)
-//#define RCC_BASE (AHBPERIPH_BASE + 0x1000)
-#define CRC_BASE (AHBPERIPH_BASE + 0x3000)
-
-/* Flash registers base address */
-#define FLASH_R_BASE (AHBPERIPH_BASE + 0x2000)
-/* Flash Option Bytes base address */
-#define OB_BASE ((u32)0x1FFFF800)
-
-/* FSMC Bankx registers base address */
-#define FSMC_Bank1_R_BASE (FSMC_R_BASE + 0x0000)
-#define FSMC_Bank1E_R_BASE (FSMC_R_BASE + 0x0104)
-#define FSMC_Bank2_R_BASE (FSMC_R_BASE + 0x0060)
-#define FSMC_Bank3_R_BASE (FSMC_R_BASE + 0x0080)
-#define FSMC_Bank4_R_BASE (FSMC_R_BASE + 0x00A0)
-
-/* Debug MCU registers base address */
-#define DBGMCU_BASE ((u32)0xE0042000)
-
-/* System Control Space memory map */
-#define SCS_BASE ((u32)0xE000E000)
-
-#define SysTick_BASE (SCS_BASE + 0x0010)
-#define NVIC_BASE (SCS_BASE + 0x0100)
-#define SCB_BASE (SCS_BASE + 0x0D00)
-
-/******************************************************************************/
-/* Peripheral declaration */
-/******************************************************************************/
-
-/*------------------------ Non Debug Mode ------------------------------------*/
-#ifndef DEBUG
-#ifdef _TIM2
- #define TIM2 ((TIM_TypeDef *) TIM2_BASE)
-#endif /*_TIM2 */
-
-#ifdef _TIM3
- #define TIM3 ((TIM_TypeDef *) TIM3_BASE)
-#endif /*_TIM3 */
-
-#ifdef _TIM4
- #define TIM4 ((TIM_TypeDef *) TIM4_BASE)
-#endif /*_TIM4 */
-
-#ifdef _TIM5
- #define TIM5 ((TIM_TypeDef *) TIM5_BASE)
-#endif /*_TIM5 */
-
-#ifdef _TIM6
- #define TIM6 ((TIM_TypeDef *) TIM6_BASE)
-#endif /*_TIM6 */
-
-#ifdef _TIM7
- #define TIM7 ((TIM_TypeDef *) TIM7_BASE)
-#endif /*_TIM7 */
-
-#ifdef _RTC
- #define RTC ((RTC_TypeDef *) RTC_BASE)
-#endif /*_RTC */
-
-#ifdef _WWDG
- #define WWDG ((WWDG_TypeDef *) WWDG_BASE)
-#endif /*_WWDG */
-
-#ifdef _IWDG
- #define IWDG ((IWDG_TypeDef *) IWDG_BASE)
-#endif /*_IWDG */
-
-#ifdef _SPI2
- #define SPI2 ((SPI_TypeDef *) SPI2_BASE)
-#endif /*_SPI2 */
-
-#ifdef _SPI3
- #define SPI3 ((SPI_TypeDef *) SPI3_BASE)
-#endif /*_SPI3 */
-
-#ifdef _USART2
- #define USART2 ((USART_TypeDef *) USART2_BASE)
-#endif /*_USART2 */
-
-#ifdef _USART3
- #define USART3 ((USART_TypeDef *) USART3_BASE)
-#endif /*_USART3 */
-
-#ifdef _UART4
- #define UART4 ((USART_TypeDef *) UART4_BASE)
-#endif /*_UART4 */
-
-#ifdef _UART5
- #define UART5 ((USART_TypeDef *) UART5_BASE)
-#endif /*_USART5 */
-
-#ifdef _I2C1
- #define I2C1 ((I2C_TypeDef *) I2C1_BASE)
-#endif /*_I2C1 */
-
-#ifdef _I2C2
- #define I2C2 ((I2C_TypeDef *) I2C2_BASE)
-#endif /*_I2C2 */
-
-#ifdef _CAN
- #define CAN ((CAN_TypeDef *) CAN_BASE)
-#endif /*_CAN */
-
-#ifdef _BKP
- #define BKP ((BKP_TypeDef *) BKP_BASE)
-#endif /*_BKP */
-
-#ifdef _PWR
- #define PWR ((PWR_TypeDef *) PWR_BASE)
-#endif /*_PWR */
-
-#ifdef _DAC
- #define DAC ((DAC_TypeDef *) DAC_BASE)
-#endif /*_DAC */
-
-#ifdef _AFIO
- #define AFIO ((AFIO_TypeDef *) AFIO_BASE)
-#endif /*_AFIO */
-
-#ifdef _EXTI
- #define EXTI ((EXTI_TypeDef *) EXTI_BASE)
-#endif /*_EXTI */
-
-#ifdef _GPIOA
- #define GPIOA ((GPIO_TypeDef *) GPIOA_BASE)
-#endif /*_GPIOA */
-
-#ifdef _GPIOB
- #define GPIOB ((GPIO_TypeDef *) GPIOB_BASE)
-#endif /*_GPIOB */
-
-#ifdef _GPIOC
- #define GPIOC ((GPIO_TypeDef *) GPIOC_BASE)
-#endif /*_GPIOC */
-
-#ifdef _GPIOD
- #define GPIOD ((GPIO_TypeDef *) GPIOD_BASE)
-#endif /*_GPIOD */
-
-#ifdef _GPIOE
- #define GPIOE ((GPIO_TypeDef *) GPIOE_BASE)
-#endif /*_GPIOE */
-
-#ifdef _GPIOF
- #define GPIOF ((GPIO_TypeDef *) GPIOF_BASE)
-#endif /*_GPIOF */
-
-#ifdef _GPIOG
- #define GPIOG ((GPIO_TypeDef *) GPIOG_BASE)
-#endif /*_GPIOG */
-
-#ifdef _ADC1
- #define ADC1 ((ADC_TypeDef *) ADC1_BASE)
-#endif /*_ADC1 */
-
-#ifdef _ADC2
- #define ADC2 ((ADC_TypeDef *) ADC2_BASE)
-#endif /*_ADC2 */
-
-#ifdef _TIM1
- #define TIM1 ((TIM_TypeDef *) TIM1_BASE)
-#endif /*_TIM1 */
-
-#ifdef _SPI1
- #define SPI1 ((SPI_TypeDef *) SPI1_BASE)
-#endif /*_SPI1 */
-
-#ifdef _TIM8
- #define TIM8 ((TIM_TypeDef *) TIM8_BASE)
-#endif /*_TIM8 */
-
-#ifdef _USART1
- #define USART1 ((USART_TypeDef *) USART1_BASE)
-#endif /*_USART1 */
-
-#ifdef _ADC3
- #define ADC3 ((ADC_TypeDef *) ADC3_BASE)
-#endif /*_ADC3 */
-
-#ifdef _SDIO
- #define SDIO ((SDIO_TypeDef *) SDIO_BASE)
-#endif /*_SDIO */
-
-#ifdef _DMA
- #define DMA1 ((DMA_TypeDef *) DMA1_BASE)
- #define DMA2 ((DMA_TypeDef *) DMA2_BASE)
-#endif /*_DMA */
-
-#ifdef _DMA1_Channel1
- #define DMA1_Channel1 ((DMA_Channel_TypeDef *) DMA1_Channel1_BASE)
-#endif /*_DMA1_Channel1 */
-
-#ifdef _DMA1_Channel2
- #define DMA1_Channel2 ((DMA_Channel_TypeDef *) DMA1_Channel2_BASE)
-#endif /*_DMA1_Channel2 */
-
-#ifdef _DMA1_Channel3
- #define DMA1_Channel3 ((DMA_Channel_TypeDef *) DMA1_Channel3_BASE)
-#endif /*_DMA1_Channel3 */
-
-#ifdef _DMA1_Channel4
- #define DMA1_Channel4 ((DMA_Channel_TypeDef *) DMA1_Channel4_BASE)
-#endif /*_DMA1_Channel4 */
-
-#ifdef _DMA1_Channel5
- #define DMA1_Channel5 ((DMA_Channel_TypeDef *) DMA1_Channel5_BASE)
-#endif /*_DMA1_Channel5 */
-
-#ifdef _DMA1_Channel6
- #define DMA1_Channel6 ((DMA_Channel_TypeDef *) DMA1_Channel6_BASE)
-#endif /*_DMA1_Channel6 */
-
-#ifdef _DMA1_Channel7
- #define DMA1_Channel7 ((DMA_Channel_TypeDef *) DMA1_Channel7_BASE)
-#endif /*_DMA1_Channel7 */
-
-#ifdef _DMA2_Channel1
- #define DMA2_Channel1 ((DMA_Channel_TypeDef *) DMA2_Channel1_BASE)
-#endif /*_DMA2_Channel1 */
-
-#ifdef _DMA2_Channel2
- #define DMA2_Channel2 ((DMA_Channel_TypeDef *) DMA2_Channel2_BASE)
-#endif /*_DMA2_Channel2 */
-
-#ifdef _DMA2_Channel3
- #define DMA2_Channel3 ((DMA_Channel_TypeDef *) DMA2_Channel3_BASE)
-#endif /*_DMA2_Channel3 */
-
-#ifdef _DMA2_Channel4
- #define DMA2_Channel4 ((DMA_Channel_TypeDef *) DMA2_Channel4_BASE)
-#endif /*_DMA2_Channel4 */
-
-#ifdef _DMA2_Channel5
- #define DMA2_Channel5 ((DMA_Channel_TypeDef *) DMA2_Channel5_BASE)
-#endif /*_DMA2_Channel5 */
-
-#ifdef _RCC
- #define RCC ((RCC_TypeDef *) RCC_BASE)
-#endif /*_RCC */
-
-#ifdef _CRC
- #define CRC ((CRC_TypeDef *) CRC_BASE)
-#endif /*_CRC */
-
-#ifdef _FLASH
- #define FLASH ((FLASH_TypeDef *) FLASH_R_BASE)
- #define OB ((OB_TypeDef *) OB_BASE)
-#endif /*_FLASH */
-
-#ifdef _FSMC
- #define FSMC_Bank1 ((FSMC_Bank1_TypeDef *) FSMC_Bank1_R_BASE)
- #define FSMC_Bank1E ((FSMC_Bank1E_TypeDef *) FSMC_Bank1E_R_BASE)
- #define FSMC_Bank2 ((FSMC_Bank2_TypeDef *) FSMC_Bank2_R_BASE)
- #define FSMC_Bank3 ((FSMC_Bank3_TypeDef *) FSMC_Bank3_R_BASE)
- #define FSMC_Bank4 ((FSMC_Bank4_TypeDef *) FSMC_Bank4_R_BASE)
-#endif /*_FSMC */
-
-#ifdef _DBGMCU
- #define DBGMCU ((DBGMCU_TypeDef *) DBGMCU_BASE)
-#endif /*_DBGMCU */
-
-#ifdef _SysTick
- #define SysTick ((SysTick_TypeDef *) SysTick_BASE)
-#endif /*_SysTick */
-
-#ifdef _NVIC
- #define NVIC ((NVIC_TypeDef *) NVIC_BASE)
- #define SCB ((SCB_TypeDef *) SCB_BASE)
-#endif /*_NVIC */
-
-/*------------------------ Debug Mode ----------------------------------------*/
-#else /* DEBUG */
-#ifdef _TIM2
- EXT TIM_TypeDef *TIM2;
-#endif /*_TIM2 */
-
-#ifdef _TIM3
- EXT TIM_TypeDef *TIM3;
-#endif /*_TIM3 */
-
-#ifdef _TIM4
- EXT TIM_TypeDef *TIM4;
-#endif /*_TIM4 */
-
-#ifdef _TIM5
- EXT TIM_TypeDef *TIM5;
-#endif /*_TIM5 */
-
-#ifdef _TIM6
- EXT TIM_TypeDef *TIM6;
-#endif /*_TIM6 */
-
-#ifdef _TIM7
- EXT TIM_TypeDef *TIM7;
-#endif /*_TIM7 */
-
-#ifdef _RTC
- EXT RTC_TypeDef *RTC;
-#endif /*_RTC */
-
-#ifdef _WWDG
- EXT WWDG_TypeDef *WWDG;
-#endif /*_WWDG */
-
-#ifdef _IWDG
- EXT IWDG_TypeDef *IWDG;
-#endif /*_IWDG */
-
-#ifdef _SPI2
- EXT SPI_TypeDef *SPI2;
-#endif /*_SPI2 */
-
-#ifdef _SPI3
- EXT SPI_TypeDef *SPI3;
-#endif /*_SPI3 */
-
-#ifdef _USART2
- EXT USART_TypeDef *USART2;
-#endif /*_USART2 */
-
-#ifdef _USART3
- EXT USART_TypeDef *USART3;
-#endif /*_USART3 */
-
-#ifdef _UART4
- EXT USART_TypeDef *UART4;
-#endif /*_UART4 */
-
-#ifdef _UART5
- EXT USART_TypeDef *UART5;
-#endif /*_UART5 */
-
-#ifdef _I2C1
- EXT I2C_TypeDef *I2C1;
-#endif /*_I2C1 */
-
-#ifdef _I2C2
- EXT I2C_TypeDef *I2C2;
-#endif /*_I2C2 */
-
-#ifdef _CAN
- EXT CAN_TypeDef *CAN;
-#endif /*_CAN */
-
-#ifdef _BKP
- EXT BKP_TypeDef *BKP;
-#endif /*_BKP */
-
-#ifdef _PWR
- EXT PWR_TypeDef *PWR;
-#endif /*_PWR */
-
-#ifdef _DAC
- EXT DAC_TypeDef *DAC;
-#endif /*_DAC */
-
-#ifdef _AFIO
- EXT AFIO_TypeDef *AFIO;
-#endif /*_AFIO */
-
-#ifdef _EXTI
- EXT EXTI_TypeDef *EXTI;
-#endif /*_EXTI */
-
-#ifdef _GPIOA
- EXT GPIO_TypeDef *GPIOA;
-#endif /*_GPIOA */
-
-#ifdef _GPIOB
- EXT GPIO_TypeDef *GPIOB;
-#endif /*_GPIOB */
-
-#ifdef _GPIOC
- EXT GPIO_TypeDef *GPIOC;
-#endif /*_GPIOC */
-
-#ifdef _GPIOD
- EXT GPIO_TypeDef *GPIOD;
-#endif /*_GPIOD */
-
-#ifdef _GPIOE
- EXT GPIO_TypeDef *GPIOE;
-#endif /*_GPIOE */
-
-#ifdef _GPIOF
- EXT GPIO_TypeDef *GPIOF;
-#endif /*_GPIOF */
-
-#ifdef _GPIOG
- EXT GPIO_TypeDef *GPIOG;
-#endif /*_GPIOG */
-
-#ifdef _ADC1
- EXT ADC_TypeDef *ADC1;
-#endif /*_ADC1 */
-
-#ifdef _ADC2
- EXT ADC_TypeDef *ADC2;
-#endif /*_ADC2 */
-
-#ifdef _TIM1
- EXT TIM_TypeDef *TIM1;
-#endif /*_TIM1 */
-
-#ifdef _SPI1
- EXT SPI_TypeDef *SPI1;
-#endif /*_SPI1 */
-
-#ifdef _TIM8
- EXT TIM_TypeDef *TIM8;
-#endif /*_TIM8 */
-
-#ifdef _USART1
- EXT USART_TypeDef *USART1;
-#endif /*_USART1 */
-
-#ifdef _ADC3
- EXT ADC_TypeDef *ADC3;
-#endif /*_ADC3 */
-
-#ifdef _SDIO
- EXT SDIO_TypeDef *SDIO;
-#endif /*_SDIO */
-
-#ifdef _DMA
- EXT DMA_TypeDef *DMA1;
- EXT DMA_TypeDef *DMA2;
-#endif /*_DMA */
-
-#ifdef _DMA1_Channel1
- EXT DMA_Channel_TypeDef *DMA1_Channel1;
-#endif /*_DMA1_Channel1 */
-
-#ifdef _DMA1_Channel2
- EXT DMA_Channel_TypeDef *DMA1_Channel2;
-#endif /*_DMA1_Channel2 */
-
-#ifdef _DMA1_Channel3
- EXT DMA_Channel_TypeDef *DMA1_Channel3;
-#endif /*_DMA1_Channel3 */
-
-#ifdef _DMA1_Channel4
- EXT DMA_Channel_TypeDef *DMA1_Channel4;
-#endif /*_DMA1_Channel4 */
-
-#ifdef _DMA1_Channel5
- EXT DMA_Channel_TypeDef *DMA1_Channel5;
-#endif /*_DMA1_Channel5 */
-
-#ifdef _DMA1_Channel6
- EXT DMA_Channel_TypeDef *DMA1_Channel6;
-#endif /*_DMA1_Channel6 */
-
-#ifdef _DMA1_Channel7
- EXT DMA_Channel_TypeDef *DMA1_Channel7;
-#endif /*_DMA1_Channel7 */
-
-#ifdef _DMA2_Channel1
- EXT DMA_Channel_TypeDef *DMA2_Channel1;
-#endif /*_DMA2_Channel1 */
-
-#ifdef _DMA2_Channel2
- EXT DMA_Channel_TypeDef *DMA2_Channel2;
-#endif /*_DMA2_Channel2 */
-
-#ifdef _DMA2_Channel3
- EXT DMA_Channel_TypeDef *DMA2_Channel3;
-#endif /*_DMA2_Channel3 */
-
-#ifdef _DMA2_Channel4
- EXT DMA_Channel_TypeDef *DMA2_Channel4;
-#endif /*_DMA2_Channel4 */
-
-#ifdef _DMA2_Channel5
- EXT DMA_Channel_TypeDef *DMA2_Channel5;
-#endif /*_DMA2_Channel5 */
-
-#ifdef _RCC
- EXT RCC_TypeDef *RCC;
-#endif /*_RCC */
-
-#ifdef _CRC
- EXT CRC_TypeDef *CRC;
-#endif /*_CRC */
-
-#ifdef _FLASH
- EXT FLASH_TypeDef *FLASH;
- EXT OB_TypeDef *OB;
-#endif /*_FLASH */
-
-#ifdef _FSMC
- EXT FSMC_Bank1_TypeDef *FSMC_Bank1;
- EXT FSMC_Bank1E_TypeDef *FSMC_Bank1E;
- EXT FSMC_Bank2_TypeDef *FSMC_Bank2;
- EXT FSMC_Bank3_TypeDef *FSMC_Bank3;
- EXT FSMC_Bank4_TypeDef *FSMC_Bank4;
-#endif /*_FSMC */
-
-#ifdef _DBGMCU
- EXT DBGMCU_TypeDef *DBGMCU;
-#endif /*_DBGMCU */
-
-#ifdef _SysTick
- EXT SysTick_TypeDef *SysTick;
-#endif /*_SysTick */
-
-#ifdef _NVIC
- EXT NVIC_TypeDef *NVIC;
- EXT SCB_TypeDef *SCB;
-#endif /*_NVIC */
-
-#endif /* DEBUG */
-
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#endif /* __STM32F10x_MAP_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_nvic.h b/stm32lib/inc/stm32f10x_nvic.h
deleted file mode 100644
index 6a9815b..0000000
--- a/stm32lib/inc/stm32f10x_nvic.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_nvic.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* NVIC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_NVIC_H
-#define __STM32F10x_NVIC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* NVIC Init Structure definition */
-typedef struct
-{
- u8 NVIC_IRQChannel;
- u8 NVIC_IRQChannelPreemptionPriority;
- u8 NVIC_IRQChannelSubPriority;
- FunctionalState NVIC_IRQChannelCmd;
-} NVIC_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/* IRQ Channels --------------------------------------------------------------*/
-#define WWDG_IRQChannel ((u8)0x00) /* Window WatchDog Interrupt */
-#define PVD_IRQChannel ((u8)0x01) /* PVD through EXTI Line detection Interrupt */
-#define TAMPER_IRQChannel ((u8)0x02) /* Tamper Interrupt */
-#define RTC_IRQChannel ((u8)0x03) /* RTC global Interrupt */
-#define FLASH_IRQChannel ((u8)0x04) /* FLASH global Interrupt */
-#define RCC_IRQChannel ((u8)0x05) /* RCC global Interrupt */
-#define EXTI0_IRQChannel ((u8)0x06) /* EXTI Line0 Interrupt */
-#define EXTI1_IRQChannel ((u8)0x07) /* EXTI Line1 Interrupt */
-#define EXTI2_IRQChannel ((u8)0x08) /* EXTI Line2 Interrupt */
-#define EXTI3_IRQChannel ((u8)0x09) /* EXTI Line3 Interrupt */
-#define EXTI4_IRQChannel ((u8)0x0A) /* EXTI Line4 Interrupt */
-#define DMA1_Channel1_IRQChannel ((u8)0x0B) /* DMA1 Channel 1 global Interrupt */
-#define DMA1_Channel2_IRQChannel ((u8)0x0C) /* DMA1 Channel 2 global Interrupt */
-#define DMA1_Channel3_IRQChannel ((u8)0x0D) /* DMA1 Channel 3 global Interrupt */
-#define DMA1_Channel4_IRQChannel ((u8)0x0E) /* DMA1 Channel 4 global Interrupt */
-#define DMA1_Channel5_IRQChannel ((u8)0x0F) /* DMA1 Channel 5 global Interrupt */
-#define DMA1_Channel6_IRQChannel ((u8)0x10) /* DMA1 Channel 6 global Interrupt */
-#define DMA1_Channel7_IRQChannel ((u8)0x11) /* DMA1 Channel 7 global Interrupt */
-#define ADC1_2_IRQChannel ((u8)0x12) /* ADC1 et ADC2 global Interrupt */
-#define USB_HP_CAN_TX_IRQChannel ((u8)0x13) /* USB High Priority or CAN TX Interrupts */
-#define USB_LP_CAN_RX0_IRQChannel ((u8)0x14) /* USB Low Priority or CAN RX0 Interrupts */
-#define CAN_RX1_IRQChannel ((u8)0x15) /* CAN RX1 Interrupt */
-#define CAN_SCE_IRQChannel ((u8)0x16) /* CAN SCE Interrupt */
-#define EXTI9_5_IRQChannel ((u8)0x17) /* External Line[9:5] Interrupts */
-#define TIM1_BRK_IRQChannel ((u8)0x18) /* TIM1 Break Interrupt */
-#define TIM1_UP_IRQChannel ((u8)0x19) /* TIM1 Update Interrupt */
-#define TIM1_TRG_COM_IRQChannel ((u8)0x1A) /* TIM1 Trigger and Commutation Interrupt */
-#define TIM1_CC_IRQChannel ((u8)0x1B) /* TIM1 Capture Compare Interrupt */
-#define TIM2_IRQChannel ((u8)0x1C) /* TIM2 global Interrupt */
-#define TIM3_IRQChannel ((u8)0x1D) /* TIM3 global Interrupt */
-#define TIM4_IRQChannel ((u8)0x1E) /* TIM4 global Interrupt */
-#define I2C1_EV_IRQChannel ((u8)0x1F) /* I2C1 Event Interrupt */
-#define I2C1_ER_IRQChannel ((u8)0x20) /* I2C1 Error Interrupt */
-#define I2C2_EV_IRQChannel ((u8)0x21) /* I2C2 Event Interrupt */
-#define I2C2_ER_IRQChannel ((u8)0x22) /* I2C2 Error Interrupt */
-#define SPI1_IRQChannel ((u8)0x23) /* SPI1 global Interrupt */
-#define SPI2_IRQChannel ((u8)0x24) /* SPI2 global Interrupt */
-#define USART1_IRQChannel ((u8)0x25) /* USART1 global Interrupt */
-#define USART2_IRQChannel ((u8)0x26) /* USART2 global Interrupt */
-#define USART3_IRQChannel ((u8)0x27) /* USART3 global Interrupt */
-#define EXTI15_10_IRQChannel ((u8)0x28) /* External Line[15:10] Interrupts */
-#define RTCAlarm_IRQChannel ((u8)0x29) /* RTC Alarm through EXTI Line Interrupt */
-#define USBWakeUp_IRQChannel ((u8)0x2A) /* USB WakeUp from suspend through EXTI Line Interrupt */
-#define TIM8_BRK_IRQChannel ((u8)0x2B) /* TIM8 Break Interrupt */
-#define TIM8_UP_IRQChannel ((u8)0x2C) /* TIM8 Update Interrupt */
-#define TIM8_TRG_COM_IRQChannel ((u8)0x2D) /* TIM8 Trigger and Commutation Interrupt */
-#define TIM8_CC_IRQChannel ((u8)0x2E) /* TIM8 Capture Compare Interrupt */
-#define ADC3_IRQChannel ((u8)0x2F) /* ADC3 global Interrupt */
-#define FSMC_IRQChannel ((u8)0x30) /* FSMC global Interrupt */
-#define SDIO_IRQChannel ((u8)0x31) /* SDIO global Interrupt */
-#define TIM5_IRQChannel ((u8)0x32) /* TIM5 global Interrupt */
-#define SPI3_IRQChannel ((u8)0x33) /* SPI3 global Interrupt */
-#define UART4_IRQChannel ((u8)0x34) /* UART4 global Interrupt */
-#define UART5_IRQChannel ((u8)0x35) /* UART5 global Interrupt */
-#define TIM6_IRQChannel ((u8)0x36) /* TIM6 global Interrupt */
-#define TIM7_IRQChannel ((u8)0x37) /* TIM7 global Interrupt */
-#define DMA2_Channel1_IRQChannel ((u8)0x38) /* DMA2 Channel 1 global Interrupt */
-#define DMA2_Channel2_IRQChannel ((u8)0x39) /* DMA2 Channel 2 global Interrupt */
-#define DMA2_Channel3_IRQChannel ((u8)0x3A) /* DMA2 Channel 3 global Interrupt */
-#define DMA2_Channel4_5_IRQChannel ((u8)0x3B) /* DMA2 Channel 4 and DMA2 Channel 5 global Interrupt */
-
-
-#define IS_NVIC_IRQ_CHANNEL(CHANNEL) (((CHANNEL) == WWDG_IRQChannel) || \
- ((CHANNEL) == PVD_IRQChannel) || \
- ((CHANNEL) == TAMPER_IRQChannel) || \
- ((CHANNEL) == RTC_IRQChannel) || \
- ((CHANNEL) == FLASH_IRQChannel) || \
- ((CHANNEL) == RCC_IRQChannel) || \
- ((CHANNEL) == EXTI0_IRQChannel) || \
- ((CHANNEL) == EXTI1_IRQChannel) || \
- ((CHANNEL) == EXTI2_IRQChannel) || \
- ((CHANNEL) == EXTI3_IRQChannel) || \
- ((CHANNEL) == EXTI4_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel1_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel2_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel3_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel4_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel5_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel6_IRQChannel) || \
- ((CHANNEL) == DMA1_Channel7_IRQChannel) || \
- ((CHANNEL) == ADC1_2_IRQChannel) || \
- ((CHANNEL) == USB_HP_CAN_TX_IRQChannel) || \
- ((CHANNEL) == USB_LP_CAN_RX0_IRQChannel) || \
- ((CHANNEL) == CAN_RX1_IRQChannel) || \
- ((CHANNEL) == CAN_SCE_IRQChannel) || \
- ((CHANNEL) == EXTI9_5_IRQChannel) || \
- ((CHANNEL) == TIM1_BRK_IRQChannel) || \
- ((CHANNEL) == TIM1_UP_IRQChannel) || \
- ((CHANNEL) == TIM1_TRG_COM_IRQChannel) || \
- ((CHANNEL) == TIM1_CC_IRQChannel) || \
- ((CHANNEL) == TIM2_IRQChannel) || \
- ((CHANNEL) == TIM3_IRQChannel) || \
- ((CHANNEL) == TIM4_IRQChannel) || \
- ((CHANNEL) == I2C1_EV_IRQChannel) || \
- ((CHANNEL) == I2C1_ER_IRQChannel) || \
- ((CHANNEL) == I2C2_EV_IRQChannel) || \
- ((CHANNEL) == I2C2_ER_IRQChannel) || \
- ((CHANNEL) == SPI1_IRQChannel) || \
- ((CHANNEL) == SPI2_IRQChannel) || \
- ((CHANNEL) == USART1_IRQChannel) || \
- ((CHANNEL) == USART2_IRQChannel) || \
- ((CHANNEL) == USART3_IRQChannel) || \
- ((CHANNEL) == EXTI15_10_IRQChannel) || \
- ((CHANNEL) == RTCAlarm_IRQChannel) || \
- ((CHANNEL) == USBWakeUp_IRQChannel) || \
- ((CHANNEL) == TIM8_BRK_IRQChannel) || \
- ((CHANNEL) == TIM8_UP_IRQChannel) || \
- ((CHANNEL) == TIM8_TRG_COM_IRQChannel) || \
- ((CHANNEL) == TIM8_CC_IRQChannel) || \
- ((CHANNEL) == ADC3_IRQChannel) || \
- ((CHANNEL) == FSMC_IRQChannel) || \
- ((CHANNEL) == SDIO_IRQChannel) || \
- ((CHANNEL) == TIM5_IRQChannel) || \
- ((CHANNEL) == SPI3_IRQChannel) || \
- ((CHANNEL) == UART4_IRQChannel) || \
- ((CHANNEL) == UART5_IRQChannel) || \
- ((CHANNEL) == TIM6_IRQChannel) || \
- ((CHANNEL) == TIM7_IRQChannel) || \
- ((CHANNEL) == DMA2_Channel1_IRQChannel) || \
- ((CHANNEL) == DMA2_Channel2_IRQChannel) || \
- ((CHANNEL) == DMA2_Channel3_IRQChannel) || \
- ((CHANNEL) == DMA2_Channel4_5_IRQChannel))
-
-
-/* System Handlers -----------------------------------------------------------*/
-#define SystemHandler_NMI ((u32)0x00001F) /* NMI Handler */
-#define SystemHandler_HardFault ((u32)0x000000) /* Hard Fault Handler */
-#define SystemHandler_MemoryManage ((u32)0x043430) /* Memory Manage Handler */
-#define SystemHandler_BusFault ((u32)0x547931) /* Bus Fault Handler */
-#define SystemHandler_UsageFault ((u32)0x24C232) /* Usage Fault Handler */
-#define SystemHandler_SVCall ((u32)0x01FF40) /* SVCall Handler */
-#define SystemHandler_DebugMonitor ((u32)0x0A0080) /* Debug Monitor Handler */
-#define SystemHandler_PSV ((u32)0x02829C) /* PSV Handler */
-#define SystemHandler_SysTick ((u32)0x02C39A) /* SysTick Handler */
-
-#define IS_CONFIG_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_MemoryManage) || \
- ((HANDLER) == SystemHandler_BusFault) || \
- ((HANDLER) == SystemHandler_UsageFault))
-
-#define IS_PRIORITY_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_MemoryManage) || \
- ((HANDLER) == SystemHandler_BusFault) || \
- ((HANDLER) == SystemHandler_UsageFault) || \
- ((HANDLER) == SystemHandler_SVCall) || \
- ((HANDLER) == SystemHandler_DebugMonitor) || \
- ((HANDLER) == SystemHandler_PSV) || \
- ((HANDLER) == SystemHandler_SysTick))
-
-#define IS_GET_PENDING_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_MemoryManage) || \
- ((HANDLER) == SystemHandler_BusFault) || \
- ((HANDLER) == SystemHandler_SVCall))
-
-#define IS_SET_PENDING_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_NMI) || \
- ((HANDLER) == SystemHandler_PSV) || \
- ((HANDLER) == SystemHandler_SysTick))
-
-#define IS_CLEAR_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_PSV) || \
- ((HANDLER) == SystemHandler_SysTick))
-
-#define IS_GET_ACTIVE_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_MemoryManage) || \
- ((HANDLER) == SystemHandler_BusFault) || \
- ((HANDLER) == SystemHandler_UsageFault) || \
- ((HANDLER) == SystemHandler_SVCall) || \
- ((HANDLER) == SystemHandler_DebugMonitor) || \
- ((HANDLER) == SystemHandler_PSV) || \
- ((HANDLER) == SystemHandler_SysTick))
-
-#define IS_FAULT_SOURCE_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_HardFault) || \
- ((HANDLER) == SystemHandler_MemoryManage) || \
- ((HANDLER) == SystemHandler_BusFault) || \
- ((HANDLER) == SystemHandler_UsageFault) || \
- ((HANDLER) == SystemHandler_DebugMonitor))
-
-#define IS_FAULT_ADDRESS_SYSTEM_HANDLER(HANDLER) (((HANDLER) == SystemHandler_MemoryManage) || \
- ((HANDLER) == SystemHandler_BusFault))
-
-
-/* Vector Table Base ---------------------------------------------------------*/
-#define NVIC_VectTab_RAM ((u32)0x20000000)
-#define NVIC_VectTab_FLASH ((u32)0x08000000)
-
-#define IS_NVIC_VECTTAB(VECTTAB) (((VECTTAB) == NVIC_VectTab_RAM) || \
- ((VECTTAB) == NVIC_VectTab_FLASH))
-
-/* System Low Power ----------------------------------------------------------*/
-#define NVIC_LP_SEVONPEND ((u8)0x10)
-#define NVIC_LP_SLEEPDEEP ((u8)0x04)
-#define NVIC_LP_SLEEPONEXIT ((u8)0x02)
-
-#define IS_NVIC_LP(LP) (((LP) == NVIC_LP_SEVONPEND) || \
- ((LP) == NVIC_LP_SLEEPDEEP) || \
- ((LP) == NVIC_LP_SLEEPONEXIT))
-
-/* Preemption Priority Group -------------------------------------------------*/
-#define NVIC_PriorityGroup_0 ((u32)0x700) /* 0 bits for pre-emption priority
- 4 bits for subpriority */
-#define NVIC_PriorityGroup_1 ((u32)0x600) /* 1 bits for pre-emption priority
- 3 bits for subpriority */
-#define NVIC_PriorityGroup_2 ((u32)0x500) /* 2 bits for pre-emption priority
- 2 bits for subpriority */
-#define NVIC_PriorityGroup_3 ((u32)0x400) /* 3 bits for pre-emption priority
- 1 bits for subpriority */
-#define NVIC_PriorityGroup_4 ((u32)0x300) /* 4 bits for pre-emption priority
- 0 bits for subpriority */
-
-#define IS_NVIC_PRIORITY_GROUP(GROUP) (((GROUP) == NVIC_PriorityGroup_0) || \
- ((GROUP) == NVIC_PriorityGroup_1) || \
- ((GROUP) == NVIC_PriorityGroup_2) || \
- ((GROUP) == NVIC_PriorityGroup_3) || \
- ((GROUP) == NVIC_PriorityGroup_4))
-
-#define IS_NVIC_PREEMPTION_PRIORITY(PRIORITY) ((PRIORITY) < 0x10)
-#define IS_NVIC_SUB_PRIORITY(PRIORITY) ((PRIORITY) < 0x10)
-#define IS_NVIC_OFFSET(OFFSET) ((OFFSET) < 0x0007FFFF)
-#define IS_NVIC_BASE_PRI(PRI) ((PRI) < 0x10)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void NVIC_DeInit(void);
-void NVIC_SCBDeInit(void);
-void NVIC_PriorityGroupConfig(u32 NVIC_PriorityGroup);
-void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct);
-void NVIC_StructInit(NVIC_InitTypeDef* NVIC_InitStruct);
-void NVIC_SETPRIMASK(void);
-void NVIC_RESETPRIMASK(void);
-void NVIC_SETFAULTMASK(void);
-void NVIC_RESETFAULTMASK(void);
-void NVIC_BASEPRICONFIG(u32 NewPriority);
-u32 NVIC_GetBASEPRI(void);
-u16 NVIC_GetCurrentPendingIRQChannel(void);
-ITStatus NVIC_GetIRQChannelPendingBitStatus(u8 NVIC_IRQChannel);
-void NVIC_SetIRQChannelPendingBit(u8 NVIC_IRQChannel);
-void NVIC_ClearIRQChannelPendingBit(u8 NVIC_IRQChannel);
-u16 NVIC_GetCurrentActiveHandler(void);
-ITStatus NVIC_GetIRQChannelActiveBitStatus(u8 NVIC_IRQChannel);
-u32 NVIC_GetCPUID(void);
-void NVIC_SetVectorTable(u32 NVIC_VectTab, u32 Offset);
-void NVIC_GenerateSystemReset(void);
-void NVIC_GenerateCoreReset(void);
-void NVIC_SystemLPConfig(u8 LowPowerMode, FunctionalState NewState);
-void NVIC_SystemHandlerConfig(u32 SystemHandler, FunctionalState NewState);
-void NVIC_SystemHandlerPriorityConfig(u32 SystemHandler, u8 SystemHandlerPreemptionPriority,
- u8 SystemHandlerSubPriority);
-ITStatus NVIC_GetSystemHandlerPendingBitStatus(u32 SystemHandler);
-void NVIC_SetSystemHandlerPendingBit(u32 SystemHandler);
-void NVIC_ClearSystemHandlerPendingBit(u32 SystemHandler);
-ITStatus NVIC_GetSystemHandlerActiveBitStatus(u32 SystemHandler);
-u32 NVIC_GetFaultHandlerSources(u32 SystemHandler);
-u32 NVIC_GetFaultAddress(u32 SystemHandler);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F10x_NVIC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_pwr.h b/stm32lib/inc/stm32f10x_pwr.h
deleted file mode 100644
index ffcc438..0000000
--- a/stm32lib/inc/stm32f10x_pwr.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_pwr.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* PWR firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_PWR_H
-#define __STM32F10x_PWR_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* PVD detection level */
-#define PWR_PVDLevel_2V2 ((u32)0x00000000)
-#define PWR_PVDLevel_2V3 ((u32)0x00000020)
-#define PWR_PVDLevel_2V4 ((u32)0x00000040)
-#define PWR_PVDLevel_2V5 ((u32)0x00000060)
-#define PWR_PVDLevel_2V6 ((u32)0x00000080)
-#define PWR_PVDLevel_2V7 ((u32)0x000000A0)
-#define PWR_PVDLevel_2V8 ((u32)0x000000C0)
-#define PWR_PVDLevel_2V9 ((u32)0x000000E0)
-
-#define IS_PWR_PVD_LEVEL(LEVEL) (((LEVEL) == PWR_PVDLevel_2V2) || ((LEVEL) == PWR_PVDLevel_2V3)|| \
- ((LEVEL) == PWR_PVDLevel_2V4) || ((LEVEL) == PWR_PVDLevel_2V5)|| \
- ((LEVEL) == PWR_PVDLevel_2V6) || ((LEVEL) == PWR_PVDLevel_2V7)|| \
- ((LEVEL) == PWR_PVDLevel_2V8) || ((LEVEL) == PWR_PVDLevel_2V9))
-
-/* Regulator state is STOP mode */
-#define PWR_Regulator_ON ((u32)0x00000000)
-#define PWR_Regulator_LowPower ((u32)0x00000001)
-
-#define IS_PWR_REGULATOR(REGULATOR) (((REGULATOR) == PWR_Regulator_ON) || \
- ((REGULATOR) == PWR_Regulator_LowPower))
-
-/* STOP mode entry */
-#define PWR_STOPEntry_WFI ((u8)0x01)
-#define PWR_STOPEntry_WFE ((u8)0x02)
-
-#define IS_PWR_STOP_ENTRY(ENTRY) (((ENTRY) == PWR_STOPEntry_WFI) || ((ENTRY) == PWR_STOPEntry_WFE))
-
-/* PWR Flag */
-#define PWR_FLAG_WU ((u32)0x00000001)
-#define PWR_FLAG_SB ((u32)0x00000002)
-#define PWR_FLAG_PVDO ((u32)0x00000004)
-
-#define IS_PWR_GET_FLAG(FLAG) (((FLAG) == PWR_FLAG_WU) || ((FLAG) == PWR_FLAG_SB) || \
- ((FLAG) == PWR_FLAG_PVDO))
-#define IS_PWR_CLEAR_FLAG(FLAG) (((FLAG) == PWR_FLAG_WU) || ((FLAG) == PWR_FLAG_SB))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void PWR_DeInit(void);
-void PWR_BackupAccessCmd(FunctionalState NewState);
-void PWR_PVDCmd(FunctionalState NewState);
-void PWR_PVDLevelConfig(u32 PWR_PVDLevel);
-void PWR_WakeUpPinCmd(FunctionalState NewState);
-void PWR_EnterSTOPMode(u32 PWR_Regulator, u8 PWR_STOPEntry);
-void PWR_EnterSTANDBYMode(void);
-FlagStatus PWR_GetFlagStatus(u32 PWR_FLAG);
-void PWR_ClearFlag(u32 PWR_FLAG);
-
-#endif /* __STM32F10x_PWR_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_rcc.h b/stm32lib/inc/stm32f10x_rcc.h
deleted file mode 100644
index f0c39d7..0000000
--- a/stm32lib/inc/stm32f10x_rcc.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_rcc.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* RCC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_RCC_H
-#define __STM32F10x_RCC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-typedef struct
-{
- u32 SYSCLK_Frequency;
- u32 HCLK_Frequency;
- u32 PCLK1_Frequency;
- u32 PCLK2_Frequency;
- u32 ADCCLK_Frequency;
-}RCC_ClocksTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/* HSE configuration */
-#define RCC_HSE_OFF ((u32)0x00000000)
-#define RCC_HSE_ON ((u32)0x00010000)
-#define RCC_HSE_Bypass ((u32)0x00040000)
-
-#define IS_RCC_HSE(HSE) (((HSE) == RCC_HSE_OFF) || ((HSE) == RCC_HSE_ON) || \
- ((HSE) == RCC_HSE_Bypass))
-
-/* PLL entry clock source */
-#define RCC_PLLSource_HSI_Div2 ((u32)0x00000000)
-#define RCC_PLLSource_HSE_Div1 ((u32)0x00010000)
-#define RCC_PLLSource_HSE_Div2 ((u32)0x00030000)
-
-#define IS_RCC_PLL_SOURCE(SOURCE) (((SOURCE) == RCC_PLLSource_HSI_Div2) || \
- ((SOURCE) == RCC_PLLSource_HSE_Div1) || \
- ((SOURCE) == RCC_PLLSource_HSE_Div2))
-
-/* PLL multiplication factor */
-#define RCC_PLLMul_2 ((u32)0x00000000)
-#define RCC_PLLMul_3 ((u32)0x00040000)
-#define RCC_PLLMul_4 ((u32)0x00080000)
-#define RCC_PLLMul_5 ((u32)0x000C0000)
-#define RCC_PLLMul_6 ((u32)0x00100000)
-#define RCC_PLLMul_7 ((u32)0x00140000)
-#define RCC_PLLMul_8 ((u32)0x00180000)
-#define RCC_PLLMul_9 ((u32)0x001C0000)
-#define RCC_PLLMul_10 ((u32)0x00200000)
-#define RCC_PLLMul_11 ((u32)0x00240000)
-#define RCC_PLLMul_12 ((u32)0x00280000)
-#define RCC_PLLMul_13 ((u32)0x002C0000)
-#define RCC_PLLMul_14 ((u32)0x00300000)
-#define RCC_PLLMul_15 ((u32)0x00340000)
-#define RCC_PLLMul_16 ((u32)0x00380000)
-
-#define IS_RCC_PLL_MUL(MUL) (((MUL) == RCC_PLLMul_2) || ((MUL) == RCC_PLLMul_3) || \
- ((MUL) == RCC_PLLMul_4) || ((MUL) == RCC_PLLMul_5) || \
- ((MUL) == RCC_PLLMul_6) || ((MUL) == RCC_PLLMul_7) || \
- ((MUL) == RCC_PLLMul_8) || ((MUL) == RCC_PLLMul_9) || \
- ((MUL) == RCC_PLLMul_10) || ((MUL) == RCC_PLLMul_11) || \
- ((MUL) == RCC_PLLMul_12) || ((MUL) == RCC_PLLMul_13) || \
- ((MUL) == RCC_PLLMul_14) || ((MUL) == RCC_PLLMul_15) || \
- ((MUL) == RCC_PLLMul_16))
-
-/* System clock source */
-#define RCC_SYSCLKSource_HSI ((u32)0x00000000)
-#define RCC_SYSCLKSource_HSE ((u32)0x00000001)
-#define RCC_SYSCLKSource_PLLCLK ((u32)0x00000002)
-
-#define IS_RCC_SYSCLK_SOURCE(SOURCE) (((SOURCE) == RCC_SYSCLKSource_HSI) || \
- ((SOURCE) == RCC_SYSCLKSource_HSE) || \
- ((SOURCE) == RCC_SYSCLKSource_PLLCLK))
-
-/* AHB clock source */
-#define RCC_SYSCLK_Div1 ((u32)0x00000000)
-#define RCC_SYSCLK_Div2 ((u32)0x00000080)
-#define RCC_SYSCLK_Div4 ((u32)0x00000090)
-#define RCC_SYSCLK_Div8 ((u32)0x000000A0)
-#define RCC_SYSCLK_Div16 ((u32)0x000000B0)
-#define RCC_SYSCLK_Div64 ((u32)0x000000C0)
-#define RCC_SYSCLK_Div128 ((u32)0x000000D0)
-#define RCC_SYSCLK_Div256 ((u32)0x000000E0)
-#define RCC_SYSCLK_Div512 ((u32)0x000000F0)
-
-#define IS_RCC_HCLK(HCLK) (((HCLK) == RCC_SYSCLK_Div1) || ((HCLK) == RCC_SYSCLK_Div2) || \
- ((HCLK) == RCC_SYSCLK_Div4) || ((HCLK) == RCC_SYSCLK_Div8) || \
- ((HCLK) == RCC_SYSCLK_Div16) || ((HCLK) == RCC_SYSCLK_Div64) || \
- ((HCLK) == RCC_SYSCLK_Div128) || ((HCLK) == RCC_SYSCLK_Div256) || \
- ((HCLK) == RCC_SYSCLK_Div512))
-
-/* APB1/APB2 clock source */
-#define RCC_HCLK_Div1 ((u32)0x00000000)
-#define RCC_HCLK_Div2 ((u32)0x00000400)
-#define RCC_HCLK_Div4 ((u32)0x00000500)
-#define RCC_HCLK_Div8 ((u32)0x00000600)
-#define RCC_HCLK_Div16 ((u32)0x00000700)
-
-#define IS_RCC_PCLK(PCLK) (((PCLK) == RCC_HCLK_Div1) || ((PCLK) == RCC_HCLK_Div2) || \
- ((PCLK) == RCC_HCLK_Div4) || ((PCLK) == RCC_HCLK_Div8) || \
- ((PCLK) == RCC_HCLK_Div16))
-
-/* RCC Interrupt source */
-#define RCC_IT_LSIRDY ((u8)0x01)
-#define RCC_IT_LSERDY ((u8)0x02)
-#define RCC_IT_HSIRDY ((u8)0x04)
-#define RCC_IT_HSERDY ((u8)0x08)
-#define RCC_IT_PLLRDY ((u8)0x10)
-#define RCC_IT_CSS ((u8)0x80)
-
-#define IS_RCC_IT(IT) ((((IT) & (u8)0xE0) == 0x00) && ((IT) != 0x00))
-#define IS_RCC_GET_IT(IT) (((IT) == RCC_IT_LSIRDY) || ((IT) == RCC_IT_LSERDY) || \
- ((IT) == RCC_IT_HSIRDY) || ((IT) == RCC_IT_HSERDY) || \
- ((IT) == RCC_IT_PLLRDY) || ((IT) == RCC_IT_CSS))
-#define IS_RCC_CLEAR_IT(IT) ((((IT) & (u8)0x60) == 0x00) && ((IT) != 0x00))
-
-/* USB clock source */
-#define RCC_USBCLKSource_PLLCLK_1Div5 ((u8)0x00)
-#define RCC_USBCLKSource_PLLCLK_Div1 ((u8)0x01)
-
-#define IS_RCC_USBCLK_SOURCE(SOURCE) (((SOURCE) == RCC_USBCLKSource_PLLCLK_1Div5) || \
- ((SOURCE) == RCC_USBCLKSource_PLLCLK_Div1))
-
-/* ADC clock source */
-#define RCC_PCLK2_Div2 ((u32)0x00000000)
-#define RCC_PCLK2_Div4 ((u32)0x00004000)
-#define RCC_PCLK2_Div6 ((u32)0x00008000)
-#define RCC_PCLK2_Div8 ((u32)0x0000C000)
-
-#define IS_RCC_ADCCLK(ADCCLK) (((ADCCLK) == RCC_PCLK2_Div2) || ((ADCCLK) == RCC_PCLK2_Div4) || \
- ((ADCCLK) == RCC_PCLK2_Div6) || ((ADCCLK) == RCC_PCLK2_Div8))
-
-/* LSE configuration */
-#define RCC_LSE_OFF ((u8)0x00)
-#define RCC_LSE_ON ((u8)0x01)
-#define RCC_LSE_Bypass ((u8)0x04)
-
-#define IS_RCC_LSE(LSE) (((LSE) == RCC_LSE_OFF) || ((LSE) == RCC_LSE_ON) || \
- ((LSE) == RCC_LSE_Bypass))
-
-/* RTC clock source */
-#define RCC_RTCCLKSource_LSE ((u32)0x00000100)
-#define RCC_RTCCLKSource_LSI ((u32)0x00000200)
-#define RCC_RTCCLKSource_HSE_Div128 ((u32)0x00000300)
-
-#define IS_RCC_RTCCLK_SOURCE(SOURCE) (((SOURCE) == RCC_RTCCLKSource_LSE) || \
- ((SOURCE) == RCC_RTCCLKSource_LSI) || \
- ((SOURCE) == RCC_RTCCLKSource_HSE_Div128))
-
-/* AHB peripheral */
-#define RCC_AHBPeriph_DMA1 ((u32)0x00000001)
-#define RCC_AHBPeriph_DMA2 ((u32)0x00000002)
-#define RCC_AHBPeriph_SRAM ((u32)0x00000004)
-#define RCC_AHBPeriph_FLITF ((u32)0x00000010)
-#define RCC_AHBPeriph_CRC ((u32)0x00000040)
-#define RCC_AHBPeriph_FSMC ((u32)0x00000100)
-#define RCC_AHBPeriph_SDIO ((u32)0x00000400)
-
-#define IS_RCC_AHB_PERIPH(PERIPH) ((((PERIPH) & 0xFFFFFAA8) == 0x00) && ((PERIPH) != 0x00))
-
-/* APB2 peripheral */
-#define RCC_APB2Periph_AFIO ((u32)0x00000001)
-#define RCC_APB2Periph_GPIOA ((u32)0x00000004)
-#define RCC_APB2Periph_GPIOB ((u32)0x00000008)
-#define RCC_APB2Periph_GPIOC ((u32)0x00000010)
-#define RCC_APB2Periph_GPIOD ((u32)0x00000020)
-#define RCC_APB2Periph_GPIOE ((u32)0x00000040)
-#define RCC_APB2Periph_GPIOF ((u32)0x00000080)
-#define RCC_APB2Periph_GPIOG ((u32)0x00000100)
-#define RCC_APB2Periph_ADC1 ((u32)0x00000200)
-#define RCC_APB2Periph_ADC2 ((u32)0x00000400)
-#define RCC_APB2Periph_TIM1 ((u32)0x00000800)
-#define RCC_APB2Periph_SPI1 ((u32)0x00001000)
-#define RCC_APB2Periph_TIM8 ((u32)0x00002000)
-#define RCC_APB2Periph_USART1 ((u32)0x00004000)
-#define RCC_APB2Periph_ADC3 ((u32)0x00008000)
-#define RCC_APB2Periph_ALL ((u32)0x0000FFFD)
-
-#define IS_RCC_APB2_PERIPH(PERIPH) ((((PERIPH) & 0xFFFF0002) == 0x00) && ((PERIPH) != 0x00))
-
-/* APB1 peripheral */
-#define RCC_APB1Periph_TIM2 ((u32)0x00000001)
-#define RCC_APB1Periph_TIM3 ((u32)0x00000002)
-#define RCC_APB1Periph_TIM4 ((u32)0x00000004)
-#define RCC_APB1Periph_TIM5 ((u32)0x00000008)
-#define RCC_APB1Periph_TIM6 ((u32)0x00000010)
-#define RCC_APB1Periph_TIM7 ((u32)0x00000020)
-#define RCC_APB1Periph_WWDG ((u32)0x00000800)
-#define RCC_APB1Periph_SPI2 ((u32)0x00004000)
-#define RCC_APB1Periph_SPI3 ((u32)0x00008000)
-#define RCC_APB1Periph_USART2 ((u32)0x00020000)
-#define RCC_APB1Periph_USART3 ((u32)0x00040000)
-#define RCC_APB1Periph_UART4 ((u32)0x00080000)
-#define RCC_APB1Periph_UART5 ((u32)0x00100000)
-#define RCC_APB1Periph_I2C1 ((u32)0x00200000)
-#define RCC_APB1Periph_I2C2 ((u32)0x00400000)
-#define RCC_APB1Periph_USB ((u32)0x00800000)
-#define RCC_APB1Periph_CAN ((u32)0x02000000)
-#define RCC_APB1Periph_BKP ((u32)0x08000000)
-#define RCC_APB1Periph_PWR ((u32)0x10000000)
-#define RCC_APB1Periph_DAC ((u32)0x20000000)
-#define RCC_APB1Periph_ALL ((u32)0x3AFEC83F)
-
-#define IS_RCC_APB1_PERIPH(PERIPH) ((((PERIPH) & 0xC50137C0) == 0x00) && ((PERIPH) != 0x00))
-
-/* Clock source to output on MCO pin */
-#define RCC_MCO_NoClock ((u8)0x00)
-#define RCC_MCO_SYSCLK ((u8)0x04)
-#define RCC_MCO_HSI ((u8)0x05)
-#define RCC_MCO_HSE ((u8)0x06)
-#define RCC_MCO_PLLCLK_Div2 ((u8)0x07)
-
-#define IS_RCC_MCO(MCO) (((MCO) == RCC_MCO_NoClock) || ((MCO) == RCC_MCO_HSI) || \
- ((MCO) == RCC_MCO_SYSCLK) || ((MCO) == RCC_MCO_HSE) || \
- ((MCO) == RCC_MCO_PLLCLK_Div2))
-
-/* RCC Flag */
-#define RCC_FLAG_HSIRDY ((u8)0x20)
-#define RCC_FLAG_HSERDY ((u8)0x31)
-#define RCC_FLAG_PLLRDY ((u8)0x39)
-#define RCC_FLAG_LSERDY ((u8)0x41)
-#define RCC_FLAG_LSIRDY ((u8)0x61)
-#define RCC_FLAG_PINRST ((u8)0x7A)
-#define RCC_FLAG_PORRST ((u8)0x7B)
-#define RCC_FLAG_SFTRST ((u8)0x7C)
-#define RCC_FLAG_IWDGRST ((u8)0x7D)
-#define RCC_FLAG_WWDGRST ((u8)0x7E)
-#define RCC_FLAG_LPWRRST ((u8)0x7F)
-
-#define IS_RCC_FLAG(FLAG) (((FLAG) == RCC_FLAG_HSIRDY) || ((FLAG) == RCC_FLAG_HSERDY) || \
- ((FLAG) == RCC_FLAG_PLLRDY) || ((FLAG) == RCC_FLAG_LSERDY) || \
- ((FLAG) == RCC_FLAG_LSIRDY) || ((FLAG) == RCC_FLAG_PINRST) || \
- ((FLAG) == RCC_FLAG_PORRST) || ((FLAG) == RCC_FLAG_SFTRST) || \
- ((FLAG) == RCC_FLAG_IWDGRST)|| ((FLAG) == RCC_FLAG_WWDGRST)|| \
- ((FLAG) == RCC_FLAG_LPWRRST))
-
-#define IS_RCC_CALIBRATION_VALUE(VALUE) ((VALUE) <= 0x1F)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void RCC_DeInit(void);
-void RCC_HSEConfig(u32 RCC_HSE);
-ErrorStatus RCC_WaitForHSEStartUp(void);
-void RCC_AdjustHSICalibrationValue(u8 HSICalibrationValue);
-void RCC_HSICmd(FunctionalState NewState);
-void RCC_PLLConfig(u32 RCC_PLLSource, u32 RCC_PLLMul);
-void RCC_PLLCmd(FunctionalState NewState);
-void RCC_SYSCLKConfig(u32 RCC_SYSCLKSource);
-u8 RCC_GetSYSCLKSource(void);
-void RCC_HCLKConfig(u32 RCC_SYSCLK);
-void RCC_PCLK1Config(u32 RCC_HCLK);
-void RCC_PCLK2Config(u32 RCC_HCLK);
-void RCC_ITConfig(u8 RCC_IT, FunctionalState NewState);
-void RCC_USBCLKConfig(u32 RCC_USBCLKSource);
-void RCC_ADCCLKConfig(u32 RCC_PCLK2);
-void RCC_LSEConfig(u8 RCC_LSE);
-void RCC_LSICmd(FunctionalState NewState);
-void RCC_RTCCLKConfig(u32 RCC_RTCCLKSource);
-void RCC_RTCCLKCmd(FunctionalState NewState);
-void RCC_GetClocksFreq(RCC_ClocksTypeDef* RCC_Clocks);
-void RCC_AHBPeriphClockCmd(u32 RCC_AHBPeriph, FunctionalState NewState);
-void RCC_APB2PeriphClockCmd(u32 RCC_APB2Periph, FunctionalState NewState);
-void RCC_APB1PeriphClockCmd(u32 RCC_APB1Periph, FunctionalState NewState);
-void RCC_APB2PeriphResetCmd(u32 RCC_APB2Periph, FunctionalState NewState);
-void RCC_APB1PeriphResetCmd(u32 RCC_APB1Periph, FunctionalState NewState);
-void RCC_BackupResetCmd(FunctionalState NewState);
-void RCC_ClockSecuritySystemCmd(FunctionalState NewState);
-void RCC_MCOConfig(u8 RCC_MCO);
-FlagStatus RCC_GetFlagStatus(u8 RCC_FLAG);
-void RCC_ClearFlag(void);
-ITStatus RCC_GetITStatus(u8 RCC_IT);
-void RCC_ClearITPendingBit(u8 RCC_IT);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F10x_RCC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_rtc.h b/stm32lib/inc/stm32f10x_rtc.h
deleted file mode 100644
index 6ea7b78..0000000
--- a/stm32lib/inc/stm32f10x_rtc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_rtc.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* RTC firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_RTC_H
-#define __STM32F10x_RTC_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* RTC interrupts define -----------------------------------------------------*/
-#define RTC_IT_OW ((u16)0x0004) /* Overflow interrupt */
-#define RTC_IT_ALR ((u16)0x0002) /* Alarm interrupt */
-#define RTC_IT_SEC ((u16)0x0001) /* Second interrupt */
-
-#define IS_RTC_IT(IT) ((((IT) & (u16)0xFFF8) == 0x00) && ((IT) != 0x00))
-
-#define IS_RTC_GET_IT(IT) (((IT) == RTC_IT_OW) || ((IT) == RTC_IT_ALR) || \
- ((IT) == RTC_IT_SEC))
-
-/* RTC interrupts flags ------------------------------------------------------*/
-#define RTC_FLAG_RTOFF ((u16)0x0020) /* RTC Operation OFF flag */
-#define RTC_FLAG_RSF ((u16)0x0008) /* Registers Synchronized flag */
-#define RTC_FLAG_OW ((u16)0x0004) /* Overflow flag */
-#define RTC_FLAG_ALR ((u16)0x0002) /* Alarm flag */
-#define RTC_FLAG_SEC ((u16)0x0001) /* Second flag */
-
-#define IS_RTC_CLEAR_FLAG(FLAG) ((((FLAG) & (u16)0xFFF0) == 0x00) && ((FLAG) != 0x00))
-
-#define IS_RTC_GET_FLAG(FLAG) (((FLAG) == RTC_FLAG_RTOFF) || ((FLAG) == RTC_FLAG_RSF) || \
- ((FLAG) == RTC_FLAG_OW) || ((FLAG) == RTC_FLAG_ALR) || \
- ((FLAG) == RTC_FLAG_SEC))
-
-#define IS_RTC_PRESCALER(PRESCALER) ((PRESCALER) <= 0xFFFFF)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void RTC_ITConfig(u16 RTC_IT, FunctionalState NewState);
-void RTC_EnterConfigMode(void);
-void RTC_ExitConfigMode(void);
-u32 RTC_GetCounter(void);
-void RTC_SetCounter(u32 CounterValue);
-void RTC_SetPrescaler(u32 PrescalerValue);
-void RTC_SetAlarm(u32 AlarmValue);
-u32 RTC_GetDivider(void);
-void RTC_WaitForLastTask(void);
-void RTC_WaitForSynchro(void);
-FlagStatus RTC_GetFlagStatus(u16 RTC_FLAG);
-void RTC_ClearFlag(u16 RTC_FLAG);
-ITStatus RTC_GetITStatus(u16 RTC_IT);
-void RTC_ClearITPendingBit(u16 RTC_IT);
-
-#endif /* __STM32F10x_RTC_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_sdio.h b/stm32lib/inc/stm32f10x_sdio.h
deleted file mode 100644
index 27f74f7..0000000
--- a/stm32lib/inc/stm32f10x_sdio.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_sdio.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* SDIO firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_SDIO_H
-#define __STM32F10x_SDIO_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-typedef struct
-{
- u8 SDIO_ClockDiv;
- u32 SDIO_ClockEdge;
- u32 SDIO_ClockBypass;
- u32 SDIO_ClockPowerSave;
- u32 SDIO_BusWide;
- u32 SDIO_HardwareFlowControl;
-} SDIO_InitTypeDef;
-
-typedef struct
-{
- u32 SDIO_Argument;
- u32 SDIO_CmdIndex;
- u32 SDIO_Response;
- u32 SDIO_Wait;
- u32 SDIO_CPSM;
-} SDIO_CmdInitTypeDef;
-
-typedef struct
-{
- u32 SDIO_DataTimeOut;
- u32 SDIO_DataLength;
- u32 SDIO_DataBlockSize;
- u32 SDIO_TransferDir;
- u32 SDIO_TransferMode;
- u32 SDIO_DPSM;
-} SDIO_DataInitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/* SDIO Clock Edge -----------------------------------------------------------*/
-#define SDIO_ClockEdge_Rising ((u32)0x00000000)
-#define SDIO_ClockEdge_Falling ((u32)0x00002000)
-
-#define IS_SDIO_CLOCK_EDGE(EDGE) (((EDGE) == SDIO_ClockEdge_Rising) || \
- ((EDGE) == SDIO_ClockEdge_Falling))
-/* SDIO Clock Bypass ----------------------------------------------------------*/
-#define SDIO_ClockBypass_Disable ((u32)0x00000000)
-#define SDIO_ClockBypass_Enable ((u32)0x00000400)
-
-#define IS_SDIO_CLOCK_BYPASS(BYPASS) (((BYPASS) == SDIO_ClockBypass_Disable) || \
- ((BYPASS) == SDIO_ClockBypass_Enable))
-
-/* SDIO Clock Power Save ----------------------------------------------------*/
-#define SDIO_ClockPowerSave_Disable ((u32)0x00000000)
-#define SDIO_ClockPowerSave_Enable ((u32)0x00000200)
-
-#define IS_SDIO_CLOCK_POWER_SAVE(SAVE) (((SAVE) == SDIO_ClockPowerSave_Disable) || \
- ((SAVE) == SDIO_ClockPowerSave_Enable))
-
-/* SDIO Bus Wide -------------------------------------------------------------*/
-#define SDIO_BusWide_1b ((u32)0x00000000)
-#define SDIO_BusWide_4b ((u32)0x00000800)
-#define SDIO_BusWide_8b ((u32)0x00001000)
-
-#define IS_SDIO_BUS_WIDE(WIDE) (((WIDE) == SDIO_BusWide_1b) || ((WIDE) == SDIO_BusWide_4b) || \
- ((WIDE) == SDIO_BusWide_8b))
-
-/* SDIO Hardware Flow Control -----------------------------------------------*/
-#define SDIO_HardwareFlowControl_Disable ((u32)0x00000000)
-#define SDIO_HardwareFlowControl_Enable ((u32)0x00004000)
-
-#define IS_SDIO_HARDWARE_FLOW_CONTROL(CONTROL) (((CONTROL) == SDIO_HardwareFlowControl_Disable) || \
- ((CONTROL) == SDIO_HardwareFlowControl_Enable))
-
-/* SDIO Power State ----------------------------------------------------------*/
-#define SDIO_PowerState_OFF ((u32)0x00000000)
-#define SDIO_PowerState_ON ((u32)0x00000003)
-
-#define IS_SDIO_POWER_STATE(STATE) (((STATE) == SDIO_PowerState_OFF) || ((STATE) == SDIO_PowerState_ON))
-
-/* SDIO Interrupt soucres ----------------------------------------------------*/
-#define SDIO_IT_CCRCFAIL ((u32)0x00000001)
-#define SDIO_IT_DCRCFAIL ((u32)0x00000002)
-#define SDIO_IT_CTIMEOUT ((u32)0x00000004)
-#define SDIO_IT_DTIMEOUT ((u32)0x00000008)
-#define SDIO_IT_TXUNDERR ((u32)0x00000010)
-#define SDIO_IT_RXOVERR ((u32)0x00000020)
-#define SDIO_IT_CMDREND ((u32)0x00000040)
-#define SDIO_IT_CMDSENT ((u32)0x00000080)
-#define SDIO_IT_DATAEND ((u32)0x00000100)
-#define SDIO_IT_STBITERR ((u32)0x00000200)
-#define SDIO_IT_DBCKEND ((u32)0x00000400)
-#define SDIO_IT_CMDACT ((u32)0x00000800)
-#define SDIO_IT_TXACT ((u32)0x00001000)
-#define SDIO_IT_RXACT ((u32)0x00002000)
-#define SDIO_IT_TXFIFOHE ((u32)0x00004000)
-#define SDIO_IT_RXFIFOHF ((u32)0x00008000)
-#define SDIO_IT_TXFIFOF ((u32)0x00010000)
-#define SDIO_IT_RXFIFOF ((u32)0x00020000)
-#define SDIO_IT_TXFIFOE ((u32)0x00040000)
-#define SDIO_IT_RXFIFOE ((u32)0x00080000)
-#define SDIO_IT_TXDAVL ((u32)0x00100000)
-#define SDIO_IT_RXDAVL ((u32)0x00200000)
-#define SDIO_IT_SDIOIT ((u32)0x00400000)
-#define SDIO_IT_CEATAEND ((u32)0x00800000)
-
-#define IS_SDIO_IT(IT) ((((IT) & (u32)0xFF000000) == 0x00) && ((IT) != (u32)0x00))
-
-/* SDIO Command Index -------------------------------------------------------*/
-#define IS_SDIO_CMD_INDEX(INDEX) ((INDEX) < 0x40)
-
-/* SDIO Response Type --------------------------------------------------------*/
-#define SDIO_Response_No ((u32)0x00000000)
-#define SDIO_Response_Short ((u32)0x00000040)
-#define SDIO_Response_Long ((u32)0x000000C0)
-
-#define IS_SDIO_RESPONSE(RESPONSE) (((RESPONSE) == SDIO_Response_No) || \
- ((RESPONSE) == SDIO_Response_Short) || \
- ((RESPONSE) == SDIO_Response_Long))
-
-/* SDIO Wait Interrupt State -------------------------------------------------*/
-#define SDIO_Wait_No ((u32)0x00000000) /* SDIO No Wait, TimeOut is enabled */
-#define SDIO_Wait_IT ((u32)0x00000100) /* SDIO Wait Interrupt Request */
-#define SDIO_Wait_Pend ((u32)0x00000200) /* SDIO Wait End of transfer */
-
-#define IS_SDIO_WAIT(WAIT) (((WAIT) == SDIO_Wait_No) || ((WAIT) == SDIO_Wait_IT) || \
- ((WAIT) == SDIO_Wait_Pend))
-
-/* SDIO CPSM State -----------------------------------------------------------*/
-#define SDIO_CPSM_Disable ((u32)0x00000000)
-#define SDIO_CPSM_Enable ((u32)0x00000400)
-
-#define IS_SDIO_CPSM(CPSM) (((CPSM) == SDIO_CPSM_Enable) || ((CPSM) == SDIO_CPSM_Disable))
-
-/* SDIO Response Registers ---------------------------------------------------*/
-#define SDIO_RESP1 ((u32)0x00000000)
-#define SDIO_RESP2 ((u32)0x00000004)
-#define SDIO_RESP3 ((u32)0x00000008)
-#define SDIO_RESP4 ((u32)0x0000000C)
-
-#define IS_SDIO_RESP(RESP) (((RESP) == SDIO_RESP1) || ((RESP) == SDIO_RESP2) || \
- ((RESP) == SDIO_RESP3) || ((RESP) == SDIO_RESP4))
-
-/* SDIO Data Length ----------------------------------------------------------*/
-#define IS_SDIO_DATA_LENGTH(LENGTH) ((LENGTH) <= 0x01FFFFFF)
-
-/* SDIO Data Block Size ------------------------------------------------------*/
-#define SDIO_DataBlockSize_1b ((u32)0x00000000)
-#define SDIO_DataBlockSize_2b ((u32)0x00000010)
-#define SDIO_DataBlockSize_4b ((u32)0x00000020)
-#define SDIO_DataBlockSize_8b ((u32)0x00000030)
-#define SDIO_DataBlockSize_16b ((u32)0x00000040)
-#define SDIO_DataBlockSize_32b ((u32)0x00000050)
-#define SDIO_DataBlockSize_64b ((u32)0x00000060)
-#define SDIO_DataBlockSize_128b ((u32)0x00000070)
-#define SDIO_DataBlockSize_256b ((u32)0x00000080)
-#define SDIO_DataBlockSize_512b ((u32)0x00000090)
-#define SDIO_DataBlockSize_1024b ((u32)0x000000A0)
-#define SDIO_DataBlockSize_2048b ((u32)0x000000B0)
-#define SDIO_DataBlockSize_4096b ((u32)0x000000C0)
-#define SDIO_DataBlockSize_8192b ((u32)0x000000D0)
-#define SDIO_DataBlockSize_16384b ((u32)0x000000E0)
-
-#define IS_SDIO_BLOCK_SIZE(SIZE) (((SIZE) == SDIO_DataBlockSize_1b) || \
- ((SIZE) == SDIO_DataBlockSize_2b) || \
- ((SIZE) == SDIO_DataBlockSize_4b) || \
- ((SIZE) == SDIO_DataBlockSize_8b) || \
- ((SIZE) == SDIO_DataBlockSize_16b) || \
- ((SIZE) == SDIO_DataBlockSize_32b) || \
- ((SIZE) == SDIO_DataBlockSize_64b) || \
- ((SIZE) == SDIO_DataBlockSize_128b) || \
- ((SIZE) == SDIO_DataBlockSize_256b) || \
- ((SIZE) == SDIO_DataBlockSize_512b) || \
- ((SIZE) == SDIO_DataBlockSize_1024b) || \
- ((SIZE) == SDIO_DataBlockSize_2048b) || \
- ((SIZE) == SDIO_DataBlockSize_4096b) || \
- ((SIZE) == SDIO_DataBlockSize_8192b) || \
- ((SIZE) == SDIO_DataBlockSize_16384b))
-
-/* SDIO Transfer Direction ---------------------------------------------------*/
-#define SDIO_TransferDir_ToCard ((u32)0x00000000)
-#define SDIO_TransferDir_ToSDIO ((u32)0x00000002)
-
-#define IS_SDIO_TRANSFER_DIR(DIR) (((DIR) == SDIO_TransferDir_ToCard) || \
- ((DIR) == SDIO_TransferDir_ToSDIO))
-
-/* SDIO Transfer Type --------------------------------------------------------*/
-#define SDIO_TransferMode_Block ((u32)0x00000000)
-#define SDIO_TransferMode_Stream ((u32)0x00000004)
-
-#define IS_SDIO_TRANSFER_MODE(MODE) (((MODE) == SDIO_TransferMode_Stream) || \
- ((MODE) == SDIO_TransferMode_Block))
-
-/* SDIO DPSM State -----------------------------------------------------------*/
-#define SDIO_DPSM_Disable ((u32)0x00000000)
-#define SDIO_DPSM_Enable ((u32)0x00000001)
-
-#define IS_SDIO_DPSM(DPSM) (((DPSM) == SDIO_DPSM_Enable) || ((DPSM) == SDIO_DPSM_Disable))
-
-/* SDIO Flags ----------------------------------------------------------------*/
-#define SDIO_FLAG_CCRCFAIL ((u32)0x00000001)
-#define SDIO_FLAG_DCRCFAIL ((u32)0x00000002)
-#define SDIO_FLAG_CTIMEOUT ((u32)0x00000004)
-#define SDIO_FLAG_DTIMEOUT ((u32)0x00000008)
-#define SDIO_FLAG_TXUNDERR ((u32)0x00000010)
-#define SDIO_FLAG_RXOVERR ((u32)0x00000020)
-#define SDIO_FLAG_CMDREND ((u32)0x00000040)
-#define SDIO_FLAG_CMDSENT ((u32)0x00000080)
-#define SDIO_FLAG_DATAEND ((u32)0x00000100)
-#define SDIO_FLAG_STBITERR ((u32)0x00000200)
-#define SDIO_FLAG_DBCKEND ((u32)0x00000400)
-#define SDIO_FLAG_CMDACT ((u32)0x00000800)
-#define SDIO_FLAG_TXACT ((u32)0x00001000)
-#define SDIO_FLAG_RXACT ((u32)0x00002000)
-#define SDIO_FLAG_TXFIFOHE ((u32)0x00004000)
-#define SDIO_FLAG_RXFIFOHF ((u32)0x00008000)
-#define SDIO_FLAG_TXFIFOF ((u32)0x00010000)
-#define SDIO_FLAG_RXFIFOF ((u32)0x00020000)
-#define SDIO_FLAG_TXFIFOE ((u32)0x00040000)
-#define SDIO_FLAG_RXFIFOE ((u32)0x00080000)
-#define SDIO_FLAG_TXDAVL ((u32)0x00100000)
-#define SDIO_FLAG_RXDAVL ((u32)0x00200000)
-#define SDIO_FLAG_SDIOIT ((u32)0x00400000)
-#define SDIO_FLAG_CEATAEND ((u32)0x00800000)
-
-#define IS_SDIO_FLAG(FLAG) (((FLAG) == SDIO_FLAG_CCRCFAIL) || \
- ((FLAG) == SDIO_FLAG_DCRCFAIL) || \
- ((FLAG) == SDIO_FLAG_CTIMEOUT) || \
- ((FLAG) == SDIO_FLAG_DTIMEOUT) || \
- ((FLAG) == SDIO_FLAG_TXUNDERR) || \
- ((FLAG) == SDIO_FLAG_RXOVERR) || \
- ((FLAG) == SDIO_FLAG_CMDREND) || \
- ((FLAG) == SDIO_FLAG_CMDSENT) || \
- ((FLAG) == SDIO_FLAG_DATAEND) || \
- ((FLAG) == SDIO_FLAG_STBITERR) || \
- ((FLAG) == SDIO_FLAG_DBCKEND) || \
- ((FLAG) == SDIO_FLAG_CMDACT) || \
- ((FLAG) == SDIO_FLAG_TXACT) || \
- ((FLAG) == SDIO_FLAG_RXACT) || \
- ((FLAG) == SDIO_FLAG_TXFIFOHE) || \
- ((FLAG) == SDIO_FLAG_RXFIFOHF) || \
- ((FLAG) == SDIO_FLAG_TXFIFOF) || \
- ((FLAG) == SDIO_FLAG_RXFIFOF) || \
- ((FLAG) == SDIO_FLAG_TXFIFOE) || \
- ((FLAG) == SDIO_FLAG_RXFIFOE) || \
- ((FLAG) == SDIO_FLAG_TXDAVL) || \
- ((FLAG) == SDIO_FLAG_RXDAVL) || \
- ((FLAG) == SDIO_FLAG_SDIOIT) || \
- ((FLAG) == SDIO_FLAG_CEATAEND))
-
-#define IS_SDIO_CLEAR_FLAG(FLAG) ((((FLAG) & (u32)0xFF3FF800) == 0x00) && ((FLAG) != (u32)0x00))
-
-#define IS_SDIO_GET_IT(IT) (((IT) == SDIO_IT_CCRCFAIL) || \
- ((IT) == SDIO_IT_DCRCFAIL) || \
- ((IT) == SDIO_IT_CTIMEOUT) || \
- ((IT) == SDIO_IT_DTIMEOUT) || \
- ((IT) == SDIO_IT_TXUNDERR) || \
- ((IT) == SDIO_IT_RXOVERR) || \
- ((IT) == SDIO_IT_CMDREND) || \
- ((IT) == SDIO_IT_CMDSENT) || \
- ((IT) == SDIO_IT_DATAEND) || \
- ((IT) == SDIO_IT_STBITERR) || \
- ((IT) == SDIO_IT_DBCKEND) || \
- ((IT) == SDIO_IT_CMDACT) || \
- ((IT) == SDIO_IT_TXACT) || \
- ((IT) == SDIO_IT_RXACT) || \
- ((IT) == SDIO_IT_TXFIFOHE) || \
- ((IT) == SDIO_IT_RXFIFOHF) || \
- ((IT) == SDIO_IT_TXFIFOF) || \
- ((IT) == SDIO_IT_RXFIFOF) || \
- ((IT) == SDIO_IT_TXFIFOE) || \
- ((IT) == SDIO_IT_RXFIFOE) || \
- ((IT) == SDIO_IT_TXDAVL) || \
- ((IT) == SDIO_IT_RXDAVL) || \
- ((IT) == SDIO_IT_SDIOIT) || \
- ((IT) == SDIO_IT_CEATAEND))
-
-#define IS_SDIO_CLEAR_IT(IT) ((((IT) & (u32)0xFF3FF800) == 0x00) && ((IT) != (u32)0x00))
-
-/* SDIO Read Wait Mode -------------------------------------------------------*/
-#define SDIO_ReadWaitMode_CLK ((u32)0x00000000)
-#define SDIO_ReadWaitMode_DATA2 ((u32)0x00000001)
-
-#define IS_SDIO_READWAIT_MODE(MODE) (((MODE) == SDIO_ReadWaitMode_CLK) || \
- ((MODE) == SDIO_ReadWaitMode_DATA2))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void SDIO_DeInit(void);
-void SDIO_Init(SDIO_InitTypeDef* SDIO_InitStruct);
-void SDIO_StructInit(SDIO_InitTypeDef* SDIO_InitStruct);
-void SDIO_ClockCmd(FunctionalState NewState);
-void SDIO_SetPowerState(u32 SDIO_PowerState);
-u32 SDIO_GetPowerState(void);
-void SDIO_ITConfig(u32 SDIO_IT, FunctionalState NewState);
-void SDIO_DMACmd(FunctionalState NewState);
-void SDIO_SendCommand(SDIO_CmdInitTypeDef *SDIO_CmdInitStruct);
-void SDIO_CmdStructInit(SDIO_CmdInitTypeDef* SDIO_CmdInitStruct);
-u8 SDIO_GetCommandResponse(void);
-u32 SDIO_GetResponse(u32 SDIO_RESP);
-void SDIO_DataConfig(SDIO_DataInitTypeDef* SDIO_DataInitStruct);
-void SDIO_DataStructInit(SDIO_DataInitTypeDef* SDIO_DataInitStruct);
-u32 SDIO_GetDataCounter(void);
-u32 SDIO_ReadData(void);
-void SDIO_WriteData(u32 Data);
-u32 SDIO_GetFIFOCount(void);
-void SDIO_StartSDIOReadWait(FunctionalState NewState);
-void SDIO_StopSDIOReadWait(FunctionalState NewState);
-void SDIO_SetSDIOReadWaitMode(u32 SDIO_ReadWaitMode);
-void SDIO_SetSDIOOperation(FunctionalState NewState);
-void SDIO_SendSDIOSuspendCmd(FunctionalState NewState);
-void SDIO_CommandCompletionCmd(FunctionalState NewState);
-void SDIO_CEATAITCmd(FunctionalState NewState);
-void SDIO_SendCEATACmd(FunctionalState NewState);
-FlagStatus SDIO_GetFlagStatus(u32 SDIO_FLAG);
-void SDIO_ClearFlag(u32 SDIO_FLAG);
-ITStatus SDIO_GetITStatus(u32 SDIO_IT);
-void SDIO_ClearITPendingBit(u32 SDIO_IT);
-
-#endif /* __STM32F10x_SDIO_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_spi.h b/stm32lib/inc/stm32f10x_spi.h
deleted file mode 100644
index b39817c..0000000
--- a/stm32lib/inc/stm32f10x_spi.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_spi.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* SPI firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_SPI_H
-#define __STM32F10x_SPI_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* SPI Init structure definition */
-typedef struct
-{
- u16 SPI_Direction;
- u16 SPI_Mode;
- u16 SPI_DataSize;
- u16 SPI_CPOL;
- u16 SPI_CPHA;
- u16 SPI_NSS;
- u16 SPI_BaudRatePrescaler;
- u16 SPI_FirstBit;
- u16 SPI_CRCPolynomial;
-}SPI_InitTypeDef;
-
-/* I2S Init structure definition */
-typedef struct
-{
- u16 I2S_Mode;
- u16 I2S_Standard;
- u16 I2S_DataFormat;
- u16 I2S_MCLKOutput;
- u16 I2S_AudioFreq;
- u16 I2S_CPOL;
-}I2S_InitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-
-#define IS_SPI_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == SPI1_BASE) || \
- ((*(u32*)&(PERIPH)) == SPI2_BASE) || \
- ((*(u32*)&(PERIPH)) == SPI3_BASE))
-
-#define IS_SPI_23_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == SPI2_BASE) || \
- ((*(u32*)&(PERIPH)) == SPI3_BASE))
-
-/* SPI data direction mode */
-#define SPI_Direction_2Lines_FullDuplex ((u16)0x0000)
-#define SPI_Direction_2Lines_RxOnly ((u16)0x0400)
-#define SPI_Direction_1Line_Rx ((u16)0x8000)
-#define SPI_Direction_1Line_Tx ((u16)0xC000)
-
-#define IS_SPI_DIRECTION_MODE(MODE) (((MODE) == SPI_Direction_2Lines_FullDuplex) || \
- ((MODE) == SPI_Direction_2Lines_RxOnly) || \
- ((MODE) == SPI_Direction_1Line_Rx) || \
- ((MODE) == SPI_Direction_1Line_Tx))
-
-/* SPI master/slave mode */
-#define SPI_Mode_Master ((u16)0x0104)
-#define SPI_Mode_Slave ((u16)0x0000)
-
-#define IS_SPI_MODE(MODE) (((MODE) == SPI_Mode_Master) || \
- ((MODE) == SPI_Mode_Slave))
-
-/* SPI data size */
-#define SPI_DataSize_16b ((u16)0x0800)
-#define SPI_DataSize_8b ((u16)0x0000)
-
-#define IS_SPI_DATASIZE(DATASIZE) (((DATASIZE) == SPI_DataSize_16b) || \
- ((DATASIZE) == SPI_DataSize_8b))
-
-/* SPI Clock Polarity */
-#define SPI_CPOL_Low ((u16)0x0000)
-#define SPI_CPOL_High ((u16)0x0002)
-
-#define IS_SPI_CPOL(CPOL) (((CPOL) == SPI_CPOL_Low) || \
- ((CPOL) == SPI_CPOL_High))
-
-/* SPI Clock Phase */
-#define SPI_CPHA_1Edge ((u16)0x0000)
-#define SPI_CPHA_2Edge ((u16)0x0001)
-
-#define IS_SPI_CPHA(CPHA) (((CPHA) == SPI_CPHA_1Edge) || \
- ((CPHA) == SPI_CPHA_2Edge))
-
-/* SPI Slave Select management */
-#define SPI_NSS_Soft ((u16)0x0200)
-#define SPI_NSS_Hard ((u16)0x0000)
-
-#define IS_SPI_NSS(NSS) (((NSS) == SPI_NSS_Soft) || \
- ((NSS) == SPI_NSS_Hard))
-
-/* SPI BaudRate Prescaler */
-#define SPI_BaudRatePrescaler_2 ((u16)0x0000)
-#define SPI_BaudRatePrescaler_4 ((u16)0x0008)
-#define SPI_BaudRatePrescaler_8 ((u16)0x0010)
-#define SPI_BaudRatePrescaler_16 ((u16)0x0018)
-#define SPI_BaudRatePrescaler_32 ((u16)0x0020)
-#define SPI_BaudRatePrescaler_64 ((u16)0x0028)
-#define SPI_BaudRatePrescaler_128 ((u16)0x0030)
-#define SPI_BaudRatePrescaler_256 ((u16)0x0038)
-
-#define IS_SPI_BAUDRATE_PRESCALER(PRESCALER) (((PRESCALER) == SPI_BaudRatePrescaler_2) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_4) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_8) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_16) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_32) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_64) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_128) || \
- ((PRESCALER) == SPI_BaudRatePrescaler_256))
-
-/* SPI MSB/LSB transmission */
-#define SPI_FirstBit_MSB ((u16)0x0000)
-#define SPI_FirstBit_LSB ((u16)0x0080)
-
-#define IS_SPI_FIRST_BIT(BIT) (((BIT) == SPI_FirstBit_MSB) || \
- ((BIT) == SPI_FirstBit_LSB))
-
-/* I2S Mode */
-#define I2S_Mode_SlaveTx ((u16)0x0000)
-#define I2S_Mode_SlaveRx ((u16)0x0100)
-#define I2S_Mode_MasterTx ((u16)0x0200)
-#define I2S_Mode_MasterRx ((u16)0x0300)
-
-#define IS_I2S_MODE(MODE) (((MODE) == I2S_Mode_SlaveTx) || \
- ((MODE) == I2S_Mode_SlaveRx) || \
- ((MODE) == I2S_Mode_MasterTx) || \
- ((MODE) == I2S_Mode_MasterRx) )
-
-/* I2S Standard */
-#define I2S_Standard_Phillips ((u16)0x0000)
-#define I2S_Standard_MSB ((u16)0x0010)
-#define I2S_Standard_LSB ((u16)0x0020)
-#define I2S_Standard_PCMShort ((u16)0x0030)
-#define I2S_Standard_PCMLong ((u16)0x00B0)
-
-#define IS_I2S_STANDARD(STANDARD) (((STANDARD) == I2S_Standard_Phillips) || \
- ((STANDARD) == I2S_Standard_MSB) || \
- ((STANDARD) == I2S_Standard_LSB) || \
- ((STANDARD) == I2S_Standard_PCMShort) || \
- ((STANDARD) == I2S_Standard_PCMLong))
-
-/* I2S Data Format */
-#define I2S_DataFormat_16b ((u16)0x0000)
-#define I2S_DataFormat_16bextended ((u16)0x0001)
-#define I2S_DataFormat_24b ((u16)0x0003)
-#define I2S_DataFormat_32b ((u16)0x0005)
-
-#define IS_I2S_DATA_FORMAT(FORMAT) (((FORMAT) == I2S_DataFormat_16b) || \
- ((FORMAT) == I2S_DataFormat_16bextended) || \
- ((FORMAT) == I2S_DataFormat_24b) || \
- ((FORMAT) == I2S_DataFormat_32b))
-
-/* I2S MCLK Output */
-#define I2S_MCLKOutput_Enable ((u16)0x0200)
-#define I2S_MCLKOutput_Disable ((u16)0x0000)
-
-#define IS_I2S_MCLK_OUTPUT(OUTPUT) (((OUTPUT) == I2S_MCLKOutput_Enable) || \
- ((OUTPUT) == I2S_MCLKOutput_Disable))
-
-/* I2S Audio Frequency */
-#define I2S_AudioFreq_48k ((u16)48000)
-#define I2S_AudioFreq_44k ((u16)44100)
-#define I2S_AudioFreq_22k ((u16)22050)
-#define I2S_AudioFreq_16k ((u16)16000)
-#define I2S_AudioFreq_8k ((u16)8000)
-#define I2S_AudioFreq_Default ((u16)2)
-
-#define IS_I2S_AUDIO_FREQ(FREQ) (((FREQ) == I2S_AudioFreq_48k) || \
- ((FREQ) == I2S_AudioFreq_44k) || \
- ((FREQ) == I2S_AudioFreq_22k) || \
- ((FREQ) == I2S_AudioFreq_16k) || \
- ((FREQ) == I2S_AudioFreq_8k) || \
- ((FREQ) == I2S_AudioFreq_Default))
-
-/* I2S Clock Polarity */
-#define I2S_CPOL_Low ((u16)0x0000)
-#define I2S_CPOL_High ((u16)0x0008)
-
-#define IS_I2S_CPOL(CPOL) (((CPOL) == I2S_CPOL_Low) || \
- ((CPOL) == I2S_CPOL_High))
-
-/* SPI_I2S DMA transfer requests */
-#define SPI_I2S_DMAReq_Tx ((u16)0x0002)
-#define SPI_I2S_DMAReq_Rx ((u16)0x0001)
-
-#define IS_SPI_I2S_DMAREQ(DMAREQ) ((((DMAREQ) & (u16)0xFFFC) == 0x00) && ((DMAREQ) != 0x00))
-
-/* SPI NSS internal software mangement */
-#define SPI_NSSInternalSoft_Set ((u16)0x0100)
-#define SPI_NSSInternalSoft_Reset ((u16)0xFEFF)
-
-#define IS_SPI_NSS_INTERNAL(INTERNAL) (((INTERNAL) == SPI_NSSInternalSoft_Set) || \
- ((INTERNAL) == SPI_NSSInternalSoft_Reset))
-
-/* SPI CRC Transmit/Receive */
-#define SPI_CRC_Tx ((u8)0x00)
-#define SPI_CRC_Rx ((u8)0x01)
-
-#define IS_SPI_CRC(CRC) (((CRC) == SPI_CRC_Tx) || ((CRC) == SPI_CRC_Rx))
-
-/* SPI direction transmit/receive */
-#define SPI_Direction_Rx ((u16)0xBFFF)
-#define SPI_Direction_Tx ((u16)0x4000)
-
-#define IS_SPI_DIRECTION(DIRECTION) (((DIRECTION) == SPI_Direction_Rx) || \
- ((DIRECTION) == SPI_Direction_Tx))
-
-/* SPI_I2S interrupts definition */
-#define SPI_I2S_IT_TXE ((u8)0x71)
-#define SPI_I2S_IT_RXNE ((u8)0x60)
-#define SPI_I2S_IT_ERR ((u8)0x50)
-
-#define IS_SPI_I2S_CONFIG_IT(IT) (((IT) == SPI_I2S_IT_TXE) || \
- ((IT) == SPI_I2S_IT_RXNE) || \
- ((IT) == SPI_I2S_IT_ERR))
-
-#define SPI_I2S_IT_OVR ((u8)0x56)
-#define SPI_IT_MODF ((u8)0x55)
-#define SPI_IT_CRCERR ((u8)0x54)
-#define I2S_IT_UDR ((u8)0x53)
-
-#define IS_SPI_I2S_CLEAR_IT(IT) (((IT) == SPI_IT_CRCERR))
-
-#define IS_SPI_I2S_GET_IT(IT) (((IT) == SPI_I2S_IT_RXNE) || ((IT) == SPI_I2S_IT_TXE) || \
- ((IT) == I2S_IT_UDR) || ((IT) == SPI_IT_CRCERR) || \
- ((IT) == SPI_IT_MODF) || ((IT) == SPI_I2S_IT_OVR))
-
-/* SPI_I2S flags definition */
-#define SPI_I2S_FLAG_RXNE ((u16)0x0001)
-#define SPI_I2S_FLAG_TXE ((u16)0x0002)
-#define I2S_FLAG_CHSIDE ((u16)0x0004)
-#define I2S_FLAG_UDR ((u16)0x0008)
-#define SPI_FLAG_CRCERR ((u16)0x0010)
-#define SPI_FLAG_MODF ((u16)0x0020)
-#define SPI_I2S_FLAG_OVR ((u16)0x0040)
-#define SPI_I2S_FLAG_BSY ((u16)0x0080)
-
-#define IS_SPI_I2S_CLEAR_FLAG(FLAG) (((FLAG) == SPI_FLAG_CRCERR))
-
-#define IS_SPI_I2S_GET_FLAG(FLAG) (((FLAG) == SPI_I2S_FLAG_BSY) || ((FLAG) == SPI_I2S_FLAG_OVR) || \
- ((FLAG) == SPI_FLAG_MODF) || ((FLAG) == SPI_FLAG_CRCERR) || \
- ((FLAG) == I2S_FLAG_UDR) || ((FLAG) == I2S_FLAG_CHSIDE) || \
- ((FLAG) == SPI_I2S_FLAG_TXE) || ((FLAG) == SPI_I2S_FLAG_RXNE))
-
-/* SPI CRC polynomial --------------------------------------------------------*/
-#define IS_SPI_CRC_POLYNOMIAL(POLYNOMIAL) ((POLYNOMIAL) >= 0x1)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void SPI_I2S_DeInit(SPI_TypeDef* SPIx);
-void SPI_Init(SPI_TypeDef* SPIx, SPI_InitTypeDef* SPI_InitStruct);
-void I2S_Init(SPI_TypeDef* SPIx, I2S_InitTypeDef* I2S_InitStruct);
-void SPI_StructInit(SPI_InitTypeDef* SPI_InitStruct);
-void I2S_StructInit(I2S_InitTypeDef* I2S_InitStruct);
-void SPI_Cmd(SPI_TypeDef* SPIx, FunctionalState NewState);
-void I2S_Cmd(SPI_TypeDef* SPIx, FunctionalState NewState);
-void SPI_I2S_ITConfig(SPI_TypeDef* SPIx, u8 SPI_I2S_IT, FunctionalState NewState);
-void SPI_I2S_DMACmd(SPI_TypeDef* SPIx, u16 SPI_I2S_DMAReq, FunctionalState NewState);
-void SPI_I2S_SendData(SPI_TypeDef* SPIx, u16 Data);
-u16 SPI_I2S_ReceiveData(SPI_TypeDef* SPIx);
-void SPI_NSSInternalSoftwareConfig(SPI_TypeDef* SPIx, u16 SPI_NSSInternalSoft);
-void SPI_SSOutputCmd(SPI_TypeDef* SPIx, FunctionalState NewState);
-void SPI_DataSizeConfig(SPI_TypeDef* SPIx, u16 SPI_DataSize);
-void SPI_TransmitCRC(SPI_TypeDef* SPIx);
-void SPI_CalculateCRC(SPI_TypeDef* SPIx, FunctionalState NewState);
-u16 SPI_GetCRC(SPI_TypeDef* SPIx, u8 SPI_CRC);
-u16 SPI_GetCRCPolynomial(SPI_TypeDef* SPIx);
-void SPI_BiDirectionalLineConfig(SPI_TypeDef* SPIx, u16 SPI_Direction);
-FlagStatus SPI_I2S_GetFlagStatus(SPI_TypeDef* SPIx, u16 SPI_I2S_FLAG);
-void SPI_I2S_ClearFlag(SPI_TypeDef* SPIx, u16 SPI_I2S_FLAG);
-ITStatus SPI_I2S_GetITStatus(SPI_TypeDef* SPIx, u8 SPI_I2S_IT);
-void SPI_I2S_ClearITPendingBit(SPI_TypeDef* SPIx, u8 SPI_I2S_IT);
-
-#endif /*__STM32F10x_SPI_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_systick.h b/stm32lib/inc/stm32f10x_systick.h
deleted file mode 100644
index 3dfb036..0000000
--- a/stm32lib/inc/stm32f10x_systick.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_systick.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* SysTick firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_SYSTICK_H
-#define __STM32F10x_SYSTICK_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* SysTick clock source */
-#define SysTick_CLKSource_HCLK_Div8 ((u32)0xFFFFFFFB)
-#define SysTick_CLKSource_HCLK ((u32)0x00000004)
-
-#define IS_SYSTICK_CLK_SOURCE(SOURCE) (((SOURCE) == SysTick_CLKSource_HCLK) || \
- ((SOURCE) == SysTick_CLKSource_HCLK_Div8))
-
-/* SysTick counter state */
-#define SysTick_Counter_Disable ((u32)0xFFFFFFFE)
-#define SysTick_Counter_Enable ((u32)0x00000001)
-#define SysTick_Counter_Clear ((u32)0x00000000)
-
-#define IS_SYSTICK_COUNTER(COUNTER) (((COUNTER) == SysTick_Counter_Disable) || \
- ((COUNTER) == SysTick_Counter_Enable) || \
- ((COUNTER) == SysTick_Counter_Clear))
-
-/* SysTick Flag */
-#define SysTick_FLAG_COUNT ((u32)0x00000010)
-#define SysTick_FLAG_SKEW ((u32)0x0000001E)
-#define SysTick_FLAG_NOREF ((u32)0x0000001F)
-
-#define IS_SYSTICK_FLAG(FLAG) (((FLAG) == SysTick_FLAG_COUNT) || \
- ((FLAG) == SysTick_FLAG_SKEW) || \
- ((FLAG) == SysTick_FLAG_NOREF))
-
-#define IS_SYSTICK_RELOAD(RELOAD) (((RELOAD) > 0) && ((RELOAD) <= 0xFFFFFF))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void SysTick_CLKSourceConfig(u32 SysTick_CLKSource);
-void SysTick_SetReload(u32 Reload);
-void SysTick_CounterCmd(u32 SysTick_Counter);
-void SysTick_ITConfig(FunctionalState NewState);
-u32 SysTick_GetCounter(void);
-FlagStatus SysTick_GetFlagStatus(u8 SysTick_FLAG);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F10x_SYSTICK_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_tim.h b/stm32lib/inc/stm32f10x_tim.h
deleted file mode 100644
index 423516c..0000000
--- a/stm32lib/inc/stm32f10x_tim.h
+++ /dev/null
@@ -1,784 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_tim.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* TIM firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_TIM_H
-#define __STM32F10x_TIM_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-
-/* TIM Time Base Init structure definition */
-typedef struct
-{
- u16 TIM_Prescaler;
- u16 TIM_CounterMode;
- u16 TIM_Period;
- u16 TIM_ClockDivision;
- u8 TIM_RepetitionCounter;
-} TIM_TimeBaseInitTypeDef;
-
-/* TIM Output Compare Init structure definition */
-typedef struct
-{
- u16 TIM_OCMode;
- u16 TIM_OutputState;
- u16 TIM_OutputNState;
- u16 TIM_Pulse;
- u16 TIM_OCPolarity;
- u16 TIM_OCNPolarity;
- u16 TIM_OCIdleState;
- u16 TIM_OCNIdleState;
-} TIM_OCInitTypeDef;
-
-/* TIM Input Capture Init structure definition */
-typedef struct
-{
- u16 TIM_Channel;
- u16 TIM_ICPolarity;
- u16 TIM_ICSelection;
- u16 TIM_ICPrescaler;
- u16 TIM_ICFilter;
-} TIM_ICInitTypeDef;
-
-/* BDTR structure definition */
-typedef struct
-{
- u16 TIM_OSSRState;
- u16 TIM_OSSIState;
- u16 TIM_LOCKLevel;
- u16 TIM_DeadTime;
- u16 TIM_Break;
- u16 TIM_BreakPolarity;
- u16 TIM_AutomaticOutput;
-} TIM_BDTRInitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-
-#define IS_TIM_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == TIM1_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM2_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM3_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM4_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM5_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM6_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM7_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM8_BASE))
-
-#define IS_TIM_18_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == TIM1_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM8_BASE))
-
-#define IS_TIM_123458_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == TIM1_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM2_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM3_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM4_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM5_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM8_BASE))
-
-/* TIM Output Compare and PWM modes -----------------------------------------*/
-#define TIM_OCMode_Timing ((u16)0x0000)
-#define TIM_OCMode_Active ((u16)0x0010)
-#define TIM_OCMode_Inactive ((u16)0x0020)
-#define TIM_OCMode_Toggle ((u16)0x0030)
-#define TIM_OCMode_PWM1 ((u16)0x0060)
-#define TIM_OCMode_PWM2 ((u16)0x0070)
-
-#define IS_TIM_OC_MODE(MODE) (((MODE) == TIM_OCMode_Timing) || \
- ((MODE) == TIM_OCMode_Active) || \
- ((MODE) == TIM_OCMode_Inactive) || \
- ((MODE) == TIM_OCMode_Toggle)|| \
- ((MODE) == TIM_OCMode_PWM1) || \
- ((MODE) == TIM_OCMode_PWM2))
-
-#define IS_TIM_OCM(MODE) (((MODE) == TIM_OCMode_Timing) || \
- ((MODE) == TIM_OCMode_Active) || \
- ((MODE) == TIM_OCMode_Inactive) || \
- ((MODE) == TIM_OCMode_Toggle)|| \
- ((MODE) == TIM_OCMode_PWM1) || \
- ((MODE) == TIM_OCMode_PWM2) || \
- ((MODE) == TIM_ForcedAction_Active) || \
- ((MODE) == TIM_ForcedAction_InActive))
-/* TIM One Pulse Mode -------------------------------------------------------*/
-#define TIM_OPMode_Single ((u16)0x0008)
-#define TIM_OPMode_Repetitive ((u16)0x0000)
-
-#define IS_TIM_OPM_MODE(MODE) (((MODE) == TIM_OPMode_Single) || \
- ((MODE) == TIM_OPMode_Repetitive))
-
-/* TIM Channel -------------------------------------------------------------*/
-#define TIM_Channel_1 ((u16)0x0000)
-#define TIM_Channel_2 ((u16)0x0004)
-#define TIM_Channel_3 ((u16)0x0008)
-#define TIM_Channel_4 ((u16)0x000C)
-
-#define IS_TIM_CHANNEL(CHANNEL) (((CHANNEL) == TIM_Channel_1) || \
- ((CHANNEL) == TIM_Channel_2) || \
- ((CHANNEL) == TIM_Channel_3) || \
- ((CHANNEL) == TIM_Channel_4))
-
-#define IS_TIM_PWMI_CHANNEL(CHANNEL) (((CHANNEL) == TIM_Channel_1) || \
- ((CHANNEL) == TIM_Channel_2))
-
-#define IS_TIM_COMPLEMENTARY_CHANNEL(CHANNEL) (((CHANNEL) == TIM_Channel_1) || \
- ((CHANNEL) == TIM_Channel_2) || \
- ((CHANNEL) == TIM_Channel_3))
-/* TIM Clock Division CKD --------------------------------------------------*/
-#define TIM_CKD_DIV1 ((u16)0x0000)
-#define TIM_CKD_DIV2 ((u16)0x0100)
-#define TIM_CKD_DIV4 ((u16)0x0200)
-
-#define IS_TIM_CKD_DIV(DIV) (((DIV) == TIM_CKD_DIV1) || \
- ((DIV) == TIM_CKD_DIV2) || \
- ((DIV) == TIM_CKD_DIV4))
-
-/* TIM Counter Mode --------------------------------------------------------*/
-#define TIM_CounterMode_Up ((u16)0x0000)
-#define TIM_CounterMode_Down ((u16)0x0010)
-#define TIM_CounterMode_CenterAligned1 ((u16)0x0020)
-#define TIM_CounterMode_CenterAligned2 ((u16)0x0040)
-#define TIM_CounterMode_CenterAligned3 ((u16)0x0060)
-
-#define IS_TIM_COUNTER_MODE(MODE) (((MODE) == TIM_CounterMode_Up) || \
- ((MODE) == TIM_CounterMode_Down) || \
- ((MODE) == TIM_CounterMode_CenterAligned1) || \
- ((MODE) == TIM_CounterMode_CenterAligned2) || \
- ((MODE) == TIM_CounterMode_CenterAligned3))
-
-/* TIM Output Compare Polarity ---------------------------------------------*/
-#define TIM_OCPolarity_High ((u16)0x0000)
-#define TIM_OCPolarity_Low ((u16)0x0002)
-
-#define IS_TIM_OC_POLARITY(POLARITY) (((POLARITY) == TIM_OCPolarity_High) || \
- ((POLARITY) == TIM_OCPolarity_Low))
-
-/* TIM Output Compare N Polarity -------------------------------------------*/
-#define TIM_OCNPolarity_High ((u16)0x0000)
-#define TIM_OCNPolarity_Low ((u16)0x0008)
-
-#define IS_TIM_OCN_POLARITY(POLARITY) (((POLARITY) == TIM_OCNPolarity_High) || \
- ((POLARITY) == TIM_OCNPolarity_Low))
-
-/* TIM Output Compare states -----------------------------------------------*/
-#define TIM_OutputState_Disable ((u16)0x0000)
-#define TIM_OutputState_Enable ((u16)0x0001)
-
-#define IS_TIM_OUTPUT_STATE(STATE) (((STATE) == TIM_OutputState_Disable) || \
- ((STATE) == TIM_OutputState_Enable))
-
-/* TIM Output Compare N States ---------------------------------------------*/
-#define TIM_OutputNState_Disable ((u16)0x0000)
-#define TIM_OutputNState_Enable ((u16)0x0004)
-
-#define IS_TIM_OUTPUTN_STATE(STATE) (((STATE) == TIM_OutputNState_Disable) || \
- ((STATE) == TIM_OutputNState_Enable))
-
-/* TIM Capture Compare States -----------------------------------------------*/
-#define TIM_CCx_Enable ((u16)0x0001)
-#define TIM_CCx_Disable ((u16)0x0000)
-
-#define IS_TIM_CCX(CCX) (((CCX) == TIM_CCx_Enable) || \
- ((CCX) == TIM_CCx_Disable))
-
-/* TIM Capture Compare N States --------------------------------------------*/
-#define TIM_CCxN_Enable ((u16)0x0004)
-#define TIM_CCxN_Disable ((u16)0x0000)
-
-#define IS_TIM_CCXN(CCXN) (((CCXN) == TIM_CCxN_Enable) || \
- ((CCXN) == TIM_CCxN_Disable))
-
-/* Break Input enable/disable -----------------------------------------------*/
-#define TIM_Break_Enable ((u16)0x1000)
-#define TIM_Break_Disable ((u16)0x0000)
-
-#define IS_TIM_BREAK_STATE(STATE) (((STATE) == TIM_Break_Enable) || \
- ((STATE) == TIM_Break_Disable))
-
-/* Break Polarity -----------------------------------------------------------*/
-#define TIM_BreakPolarity_Low ((u16)0x0000)
-#define TIM_BreakPolarity_High ((u16)0x2000)
-
-#define IS_TIM_BREAK_POLARITY(POLARITY) (((POLARITY) == TIM_BreakPolarity_Low) || \
- ((POLARITY) == TIM_BreakPolarity_High))
-
-/* TIM AOE Bit Set/Reset ---------------------------------------------------*/
-#define TIM_AutomaticOutput_Enable ((u16)0x4000)
-#define TIM_AutomaticOutput_Disable ((u16)0x0000)
-
-#define IS_TIM_AUTOMATIC_OUTPUT_STATE(STATE) (((STATE) == TIM_AutomaticOutput_Enable) || \
- ((STATE) == TIM_AutomaticOutput_Disable))
-/* Lock levels --------------------------------------------------------------*/
-#define TIM_LOCKLevel_OFF ((u16)0x0000)
-#define TIM_LOCKLevel_1 ((u16)0x0100)
-#define TIM_LOCKLevel_2 ((u16)0x0200)
-#define TIM_LOCKLevel_3 ((u16)0x0300)
-
-#define IS_TIM_LOCK_LEVEL(LEVEL) (((LEVEL) == TIM_LOCKLevel_OFF) || \
- ((LEVEL) == TIM_LOCKLevel_1) || \
- ((LEVEL) == TIM_LOCKLevel_2) || \
- ((LEVEL) == TIM_LOCKLevel_3))
-
-/* OSSI: Off-State Selection for Idle mode states ---------------------------*/
-#define TIM_OSSIState_Enable ((u16)0x0400)
-#define TIM_OSSIState_Disable ((u16)0x0000)
-
-#define IS_TIM_OSSI_STATE(STATE) (((STATE) == TIM_OSSIState_Enable) || \
- ((STATE) == TIM_OSSIState_Disable))
-
-/* OSSR: Off-State Selection for Run mode states ----------------------------*/
-#define TIM_OSSRState_Enable ((u16)0x0800)
-#define TIM_OSSRState_Disable ((u16)0x0000)
-
-#define IS_TIM_OSSR_STATE(STATE) (((STATE) == TIM_OSSRState_Enable) || \
- ((STATE) == TIM_OSSRState_Disable))
-
-/* TIM Output Compare Idle State -------------------------------------------*/
-#define TIM_OCIdleState_Set ((u16)0x0100)
-#define TIM_OCIdleState_Reset ((u16)0x0000)
-
-#define IS_TIM_OCIDLE_STATE(STATE) (((STATE) == TIM_OCIdleState_Set) || \
- ((STATE) == TIM_OCIdleState_Reset))
-
-/* TIM Output Compare N Idle State -----------------------------------------*/
-#define TIM_OCNIdleState_Set ((u16)0x0200)
-#define TIM_OCNIdleState_Reset ((u16)0x0000)
-
-#define IS_TIM_OCNIDLE_STATE(STATE) (((STATE) == TIM_OCNIdleState_Set) || \
- ((STATE) == TIM_OCNIdleState_Reset))
-
-/* TIM Input Capture Polarity ----------------------------------------------*/
-#define TIM_ICPolarity_Rising ((u16)0x0000)
-#define TIM_ICPolarity_Falling ((u16)0x0002)
-
-#define IS_TIM_IC_POLARITY(POLARITY) (((POLARITY) == TIM_ICPolarity_Rising) || \
- ((POLARITY) == TIM_ICPolarity_Falling))
-
-/* TIM Input Capture Selection ---------------------------------------------*/
-#define TIM_ICSelection_DirectTI ((u16)0x0001)
-#define TIM_ICSelection_IndirectTI ((u16)0x0002)
-#define TIM_ICSelection_TRC ((u16)0x0003)
-
-#define IS_TIM_IC_SELECTION(SELECTION) (((SELECTION) == TIM_ICSelection_DirectTI) || \
- ((SELECTION) == TIM_ICSelection_IndirectTI) || \
- ((SELECTION) == TIM_ICSelection_TRC))
-
-/* TIM Input Capture Prescaler ---------------------------------------------*/
-#define TIM_ICPSC_DIV1 ((u16)0x0000)
-#define TIM_ICPSC_DIV2 ((u16)0x0004)
-#define TIM_ICPSC_DIV4 ((u16)0x0008)
-#define TIM_ICPSC_DIV8 ((u16)0x000C)
-
-#define IS_TIM_IC_PRESCALER(PRESCALER) (((PRESCALER) == TIM_ICPSC_DIV1) || \
- ((PRESCALER) == TIM_ICPSC_DIV2) || \
- ((PRESCALER) == TIM_ICPSC_DIV4) || \
- ((PRESCALER) == TIM_ICPSC_DIV8))
-
-/* TIM interrupt sources ---------------------------------------------------*/
-#define TIM_IT_Update ((u16)0x0001)
-#define TIM_IT_CC1 ((u16)0x0002)
-#define TIM_IT_CC2 ((u16)0x0004)
-#define TIM_IT_CC3 ((u16)0x0008)
-#define TIM_IT_CC4 ((u16)0x0010)
-#define TIM_IT_COM ((u16)0x0020)
-#define TIM_IT_Trigger ((u16)0x0040)
-#define TIM_IT_Break ((u16)0x0080)
-
-#define IS_TIM_IT(IT) ((((IT) & (u16)0xFF00) == 0x0000) && ((IT) != 0x0000))
-
-#define IS_TIM_PERIPH_IT(PERIPH, TIM_IT) ((((((*(u32*)&(PERIPH)) == TIM2_BASE) || (((*(u32*)&(PERIPH)) == TIM3_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM4_BASE)) || (((*(u32*)&(PERIPH)) == TIM5_BASE))))&& \
- (((TIM_IT) & (u16)0xFFA0) == 0x0000) && ((TIM_IT) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM1_BASE) || (((*(u32*)&(PERIPH)) == TIM8_BASE))))&& \
- (((TIM_IT) & (u16)0xFF00) == 0x0000) && ((TIM_IT) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM6_BASE) || (((*(u32*)&(PERIPH)) == TIM7_BASE))))&& \
- (((TIM_IT) & (u16)0xFFFE) == 0x0000) && ((TIM_IT) != 0x0000)))
-
-#define IS_TIM_GET_IT(IT) (((IT) == TIM_IT_Update) || \
- ((IT) == TIM_IT_CC1) || \
- ((IT) == TIM_IT_CC2) || \
- ((IT) == TIM_IT_CC3) || \
- ((IT) == TIM_IT_CC4) || \
- ((IT) == TIM_IT_COM) || \
- ((IT) == TIM_IT_Trigger) || \
- ((IT) == TIM_IT_Break))
-
-/* TIM DMA Base address ----------------------------------------------------*/
-#define TIM_DMABase_CR1 ((u16)0x0000)
-#define TIM_DMABase_CR2 ((u16)0x0001)
-#define TIM_DMABase_SMCR ((u16)0x0002)
-#define TIM_DMABase_DIER ((u16)0x0003)
-#define TIM_DMABase_SR ((u16)0x0004)
-#define TIM_DMABase_EGR ((u16)0x0005)
-#define TIM_DMABase_CCMR1 ((u16)0x0006)
-#define TIM_DMABase_CCMR2 ((u16)0x0007)
-#define TIM_DMABase_CCER ((u16)0x0008)
-#define TIM_DMABase_CNT ((u16)0x0009)
-#define TIM_DMABase_PSC ((u16)0x000A)
-#define TIM_DMABase_ARR ((u16)0x000B)
-#define TIM_DMABase_RCR ((u16)0x000C)
-#define TIM_DMABase_CCR1 ((u16)0x000D)
-#define TIM_DMABase_CCR2 ((u16)0x000E)
-#define TIM_DMABase_CCR3 ((u16)0x000F)
-#define TIM_DMABase_CCR4 ((u16)0x0010)
-#define TIM_DMABase_BDTR ((u16)0x0011)
-#define TIM_DMABase_DCR ((u16)0x0012)
-
-#define IS_TIM_DMA_BASE(BASE) (((BASE) == TIM_DMABase_CR1) || \
- ((BASE) == TIM_DMABase_CR2) || \
- ((BASE) == TIM_DMABase_SMCR) || \
- ((BASE) == TIM_DMABase_DIER) || \
- ((BASE) == TIM_DMABase_SR) || \
- ((BASE) == TIM_DMABase_EGR) || \
- ((BASE) == TIM_DMABase_CCMR1) || \
- ((BASE) == TIM_DMABase_CCMR2) || \
- ((BASE) == TIM_DMABase_CCER) || \
- ((BASE) == TIM_DMABase_CNT) || \
- ((BASE) == TIM_DMABase_PSC) || \
- ((BASE) == TIM_DMABase_ARR) || \
- ((BASE) == TIM_DMABase_RCR) || \
- ((BASE) == TIM_DMABase_CCR1) || \
- ((BASE) == TIM_DMABase_CCR2) || \
- ((BASE) == TIM_DMABase_CCR3) || \
- ((BASE) == TIM_DMABase_CCR4) || \
- ((BASE) == TIM_DMABase_BDTR) || \
- ((BASE) == TIM_DMABase_DCR))
-
-/* TIM DMA Burst Length ----------------------------------------------------*/
-#define TIM_DMABurstLength_1Byte ((u16)0x0000)
-#define TIM_DMABurstLength_2Bytes ((u16)0x0100)
-#define TIM_DMABurstLength_3Bytes ((u16)0x0200)
-#define TIM_DMABurstLength_4Bytes ((u16)0x0300)
-#define TIM_DMABurstLength_5Bytes ((u16)0x0400)
-#define TIM_DMABurstLength_6Bytes ((u16)0x0500)
-#define TIM_DMABurstLength_7Bytes ((u16)0x0600)
-#define TIM_DMABurstLength_8Bytes ((u16)0x0700)
-#define TIM_DMABurstLength_9Bytes ((u16)0x0800)
-#define TIM_DMABurstLength_10Bytes ((u16)0x0900)
-#define TIM_DMABurstLength_11Bytes ((u16)0x0A00)
-#define TIM_DMABurstLength_12Bytes ((u16)0x0B00)
-#define TIM_DMABurstLength_13Bytes ((u16)0x0C00)
-#define TIM_DMABurstLength_14Bytes ((u16)0x0D00)
-#define TIM_DMABurstLength_15Bytes ((u16)0x0E00)
-#define TIM_DMABurstLength_16Bytes ((u16)0x0F00)
-#define TIM_DMABurstLength_17Bytes ((u16)0x1000)
-#define TIM_DMABurstLength_18Bytes ((u16)0x1100)
-
-#define IS_TIM_DMA_LENGTH(LENGTH) (((LENGTH) == TIM_DMABurstLength_1Byte) || \
- ((LENGTH) == TIM_DMABurstLength_2Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_3Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_4Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_5Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_6Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_7Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_8Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_9Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_10Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_11Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_12Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_13Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_14Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_15Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_16Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_17Bytes) || \
- ((LENGTH) == TIM_DMABurstLength_18Bytes))
-
-/* TIM DMA sources ---------------------------------------------------------*/
-#define TIM_DMA_Update ((u16)0x0100)
-#define TIM_DMA_CC1 ((u16)0x0200)
-#define TIM_DMA_CC2 ((u16)0x0400)
-#define TIM_DMA_CC3 ((u16)0x0800)
-#define TIM_DMA_CC4 ((u16)0x1000)
-#define TIM_DMA_COM ((u16)0x2000)
-#define TIM_DMA_Trigger ((u16)0x4000)
-
-#define IS_TIM_DMA_SOURCE(SOURCE) ((((SOURCE) & (u16)0x80FF) == 0x0000) && ((SOURCE) != 0x0000))
-
-#define IS_TIM_PERIPH_DMA(PERIPH, SOURCE) ((((((*(u32*)&(PERIPH)) == TIM2_BASE) || (((*(u32*)&(PERIPH)) == TIM3_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM4_BASE)) || (((*(u32*)&(PERIPH)) == TIM5_BASE))))&& \
- (((SOURCE) & (u16)0xA0FF) == 0x0000) && ((SOURCE) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM1_BASE) || (((*(u32*)&(PERIPH)) == TIM8_BASE))))&& \
- (((SOURCE) & (u16)0x80FF) == 0x0000) && ((SOURCE) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM6_BASE) || (((*(u32*)&(PERIPH)) == TIM7_BASE))))&& \
- (((SOURCE) & (u16)0xFEFF) == 0x0000) && ((SOURCE) != 0x0000)))
-
-/* TIM External Trigger Prescaler ------------------------------------------*/
-#define TIM_ExtTRGPSC_OFF ((u16)0x0000)
-#define TIM_ExtTRGPSC_DIV2 ((u16)0x1000)
-#define TIM_ExtTRGPSC_DIV4 ((u16)0x2000)
-#define TIM_ExtTRGPSC_DIV8 ((u16)0x3000)
-
-#define IS_TIM_EXT_PRESCALER(PRESCALER) (((PRESCALER) == TIM_ExtTRGPSC_OFF) || \
- ((PRESCALER) == TIM_ExtTRGPSC_DIV2) || \
- ((PRESCALER) == TIM_ExtTRGPSC_DIV4) || \
- ((PRESCALER) == TIM_ExtTRGPSC_DIV8))
-
-/* TIM Internal Trigger Selection ------------------------------------------*/
-#define TIM_TS_ITR0 ((u16)0x0000)
-#define TIM_TS_ITR1 ((u16)0x0010)
-#define TIM_TS_ITR2 ((u16)0x0020)
-#define TIM_TS_ITR3 ((u16)0x0030)
-#define TIM_TS_TI1F_ED ((u16)0x0040)
-#define TIM_TS_TI1FP1 ((u16)0x0050)
-#define TIM_TS_TI2FP2 ((u16)0x0060)
-#define TIM_TS_ETRF ((u16)0x0070)
-
-#define IS_TIM_TRIGGER_SELECTION(SELECTION) (((SELECTION) == TIM_TS_ITR0) || \
- ((SELECTION) == TIM_TS_ITR1) || \
- ((SELECTION) == TIM_TS_ITR2) || \
- ((SELECTION) == TIM_TS_ITR3) || \
- ((SELECTION) == TIM_TS_TI1F_ED) || \
- ((SELECTION) == TIM_TS_TI1FP1) || \
- ((SELECTION) == TIM_TS_TI2FP2) || \
- ((SELECTION) == TIM_TS_ETRF))
-
-#define IS_TIM_INTERNAL_TRIGGER_SELECTION(SELECTION) (((SELECTION) == TIM_TS_ITR0) || \
- ((SELECTION) == TIM_TS_ITR1) || \
- ((SELECTION) == TIM_TS_ITR2) || \
- ((SELECTION) == TIM_TS_ITR3))
-
-/* TIM TIx External Clock Source -------------------------------------------*/
-#define TIM_TIxExternalCLK1Source_TI1 ((u16)0x0050)
-#define TIM_TIxExternalCLK1Source_TI2 ((u16)0x0060)
-#define TIM_TIxExternalCLK1Source_TI1ED ((u16)0x0040)
-
-#define IS_TIM_TIXCLK_SOURCE(SOURCE) (((SOURCE) == TIM_TIxExternalCLK1Source_TI1) || \
- ((SOURCE) == TIM_TIxExternalCLK1Source_TI2) || \
- ((SOURCE) == TIM_TIxExternalCLK1Source_TI1ED))
-
-/* TIM External Trigger Polarity -------------------------------------------*/
-#define TIM_ExtTRGPolarity_Inverted ((u16)0x8000)
-#define TIM_ExtTRGPolarity_NonInverted ((u16)0x0000)
-
-#define IS_TIM_EXT_POLARITY(POLARITY) (((POLARITY) == TIM_ExtTRGPolarity_Inverted) || \
- ((POLARITY) == TIM_ExtTRGPolarity_NonInverted))
-
-/* TIM Prescaler Reload Mode -----------------------------------------------*/
-#define TIM_PSCReloadMode_Update ((u16)0x0000)
-#define TIM_PSCReloadMode_Immediate ((u16)0x0001)
-
-#define IS_TIM_PRESCALER_RELOAD(RELOAD) (((RELOAD) == TIM_PSCReloadMode_Update) || \
- ((RELOAD) == TIM_PSCReloadMode_Immediate))
-
-/* TIM Forced Action -------------------------------------------------------*/
-#define TIM_ForcedAction_Active ((u16)0x0050)
-#define TIM_ForcedAction_InActive ((u16)0x0040)
-
-#define IS_TIM_FORCED_ACTION(ACTION) (((ACTION) == TIM_ForcedAction_Active) || \
- ((ACTION) == TIM_ForcedAction_InActive))
-
-/* TIM Encoder Mode --------------------------------------------------------*/
-#define TIM_EncoderMode_TI1 ((u16)0x0001)
-#define TIM_EncoderMode_TI2 ((u16)0x0002)
-#define TIM_EncoderMode_TI12 ((u16)0x0003)
-
-#define IS_TIM_ENCODER_MODE(MODE) (((MODE) == TIM_EncoderMode_TI1) || \
- ((MODE) == TIM_EncoderMode_TI2) || \
- ((MODE) == TIM_EncoderMode_TI12))
-
-/* TIM Event Source --------------------------------------------------------*/
-#define TIM_EventSource_Update ((u16)0x0001)
-#define TIM_EventSource_CC1 ((u16)0x0002)
-#define TIM_EventSource_CC2 ((u16)0x0004)
-#define TIM_EventSource_CC3 ((u16)0x0008)
-#define TIM_EventSource_CC4 ((u16)0x0010)
-#define TIM_EventSource_COM ((u16)0x0020)
-#define TIM_EventSource_Trigger ((u16)0x0040)
-#define TIM_EventSource_Break ((u16)0x0080)
-
-#define IS_TIM_EVENT_SOURCE(SOURCE) ((((SOURCE) & (u16)0xFF00) == 0x0000) && ((SOURCE) != 0x0000))
-
-#define IS_TIM_PERIPH_EVENT(PERIPH, EVENT) ((((((*(u32*)&(PERIPH)) == TIM2_BASE) || (((*(u32*)&(PERIPH)) == TIM3_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM4_BASE)) || (((*(u32*)&(PERIPH)) == TIM5_BASE))))&& \
- (((EVENT) & (u16)0xFFA0) == 0x0000) && ((EVENT) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM1_BASE) || (((*(u32*)&(PERIPH)) == TIM8_BASE))))&& \
- (((EVENT) & (u16)0xFF00) == 0x0000) && ((EVENT) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM6_BASE) || (((*(u32*)&(PERIPH)) == TIM7_BASE))))&& \
- (((EVENT) & (u16)0xFFFE) == 0x0000) && ((EVENT) != 0x0000)))
-
-/* TIM Update Source --------------------------------------------------------*/
-#define TIM_UpdateSource_Global ((u16)0x0000)
-#define TIM_UpdateSource_Regular ((u16)0x0001)
-
-#define IS_TIM_UPDATE_SOURCE(SOURCE) (((SOURCE) == TIM_UpdateSource_Global) || \
- ((SOURCE) == TIM_UpdateSource_Regular))
-
-/* TIM Ouput Compare Preload State ------------------------------------------*/
-#define TIM_OCPreload_Enable ((u16)0x0008)
-#define TIM_OCPreload_Disable ((u16)0x0000)
-
-#define IS_TIM_OCPRELOAD_STATE(STATE) (((STATE) == TIM_OCPreload_Enable) || \
- ((STATE) == TIM_OCPreload_Disable))
-
-/* TIM Ouput Compare Fast State ---------------------------------------------*/
-#define TIM_OCFast_Enable ((u16)0x0004)
-#define TIM_OCFast_Disable ((u16)0x0000)
-
-#define IS_TIM_OCFAST_STATE(STATE) (((STATE) == TIM_OCFast_Enable) || \
- ((STATE) == TIM_OCFast_Disable))
-
-/* TIM Ouput Compare Clear State --------------------------------------------*/
-#define TIM_OCClear_Enable ((u16)0x0080)
-#define TIM_OCClear_Disable ((u16)0x0000)
-
-#define IS_TIM_OCCLEAR_STATE(STATE) (((STATE) == TIM_OCClear_Enable) || \
- ((STATE) == TIM_OCClear_Disable))
-
-/* TIM Trigger Output Source ------------------------------------------------*/
-#define TIM_TRGOSource_Reset ((u16)0x0000)
-#define TIM_TRGOSource_Enable ((u16)0x0010)
-#define TIM_TRGOSource_Update ((u16)0x0020)
-#define TIM_TRGOSource_OC1 ((u16)0x0030)
-#define TIM_TRGOSource_OC1Ref ((u16)0x0040)
-#define TIM_TRGOSource_OC2Ref ((u16)0x0050)
-#define TIM_TRGOSource_OC3Ref ((u16)0x0060)
-#define TIM_TRGOSource_OC4Ref ((u16)0x0070)
-
-#define IS_TIM_TRGO_SOURCE(SOURCE) (((SOURCE) == TIM_TRGOSource_Reset) || \
- ((SOURCE) == TIM_TRGOSource_Enable) || \
- ((SOURCE) == TIM_TRGOSource_Update) || \
- ((SOURCE) == TIM_TRGOSource_OC1) || \
- ((SOURCE) == TIM_TRGOSource_OC1Ref) || \
- ((SOURCE) == TIM_TRGOSource_OC2Ref) || \
- ((SOURCE) == TIM_TRGOSource_OC3Ref) || \
- ((SOURCE) == TIM_TRGOSource_OC4Ref))
-
-#define IS_TIM_PERIPH_TRGO(PERIPH, TRGO) (((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM6_BASE))||(((*(u32*)&(PERIPH)) == TIM7_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_Reset)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM6_BASE))||(((*(u32*)&(PERIPH)) == TIM7_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_Enable)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM6_BASE))||(((*(u32*)&(PERIPH)) == TIM7_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_Update)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_OC1)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_OC1Ref)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_OC2Ref)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_OC3Ref)) ||\
- ((((*(u32*)&(PERIPH)) == TIM2_BASE)||(((*(u32*)&(PERIPH)) == TIM1_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM3_BASE))||(((*(u32*)&(PERIPH)) == TIM4_BASE))|| \
- (((*(u32*)&(PERIPH)) == TIM5_BASE))||(((*(u32*)&(PERIPH)) == TIM8_BASE))) && \
- ((TRGO) == TIM_TRGOSource_OC4Ref)))
-
-/* TIM Slave Mode ----------------------------------------------------------*/
-#define TIM_SlaveMode_Reset ((u16)0x0004)
-#define TIM_SlaveMode_Gated ((u16)0x0005)
-#define TIM_SlaveMode_Trigger ((u16)0x0006)
-#define TIM_SlaveMode_External1 ((u16)0x0007)
-
-#define IS_TIM_SLAVE_MODE(MODE) (((MODE) == TIM_SlaveMode_Reset) || \
- ((MODE) == TIM_SlaveMode_Gated) || \
- ((MODE) == TIM_SlaveMode_Trigger) || \
- ((MODE) == TIM_SlaveMode_External1))
-
-/* TIM Master Slave Mode ---------------------------------------------------*/
-#define TIM_MasterSlaveMode_Enable ((u16)0x0080)
-#define TIM_MasterSlaveMode_Disable ((u16)0x0000)
-
-#define IS_TIM_MSM_STATE(STATE) (((STATE) == TIM_MasterSlaveMode_Enable) || \
- ((STATE) == TIM_MasterSlaveMode_Disable))
-
-/* TIM Flags ---------------------------------------------------------------*/
-#define TIM_FLAG_Update ((u16)0x0001)
-#define TIM_FLAG_CC1 ((u16)0x0002)
-#define TIM_FLAG_CC2 ((u16)0x0004)
-#define TIM_FLAG_CC3 ((u16)0x0008)
-#define TIM_FLAG_CC4 ((u16)0x0010)
-#define TIM_FLAG_COM ((u16)0x0020)
-#define TIM_FLAG_Trigger ((u16)0x0040)
-#define TIM_FLAG_Break ((u16)0x0080)
-#define TIM_FLAG_CC1OF ((u16)0x0200)
-#define TIM_FLAG_CC2OF ((u16)0x0400)
-#define TIM_FLAG_CC3OF ((u16)0x0800)
-#define TIM_FLAG_CC4OF ((u16)0x1000)
-
-#define IS_TIM_GET_FLAG(FLAG) (((FLAG) == TIM_FLAG_Update) || \
- ((FLAG) == TIM_FLAG_CC1) || \
- ((FLAG) == TIM_FLAG_CC2) || \
- ((FLAG) == TIM_FLAG_CC3) || \
- ((FLAG) == TIM_FLAG_CC4) || \
- ((FLAG) == TIM_FLAG_COM) || \
- ((FLAG) == TIM_FLAG_Trigger) || \
- ((FLAG) == TIM_FLAG_Break) || \
- ((FLAG) == TIM_FLAG_CC1OF) || \
- ((FLAG) == TIM_FLAG_CC2OF) || \
- ((FLAG) == TIM_FLAG_CC3OF) || \
- ((FLAG) == TIM_FLAG_CC4OF))
-
-#define IS_TIM_CLEAR_FLAG(PERIPH, TIM_FLAG) ((((((*(u32*)&(PERIPH)) == TIM2_BASE) || (((*(u32*)&(PERIPH)) == TIM3_BASE))||\
- (((*(u32*)&(PERIPH)) == TIM4_BASE)) || (((*(u32*)&(PERIPH)) == TIM5_BASE))))&& \
- (((TIM_FLAG) & (u16)0xE1A0) == 0x0000) && ((TIM_FLAG) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM1_BASE) || (((*(u32*)&(PERIPH)) == TIM8_BASE))))&& \
- (((TIM_FLAG) & (u16)0xE100) == 0x0000) && ((TIM_FLAG) != 0x0000)) ||\
- (((((*(u32*)&(PERIPH)) == TIM6_BASE) || (((*(u32*)&(PERIPH)) == TIM7_BASE))))&& \
- (((TIM_FLAG) & (u16)0xFFFE) == 0x0000) && ((TIM_FLAG) != 0x0000)))
-
-#define IS_TIM_PERIPH_FLAG(PERIPH, TIM_FLAG) (((((*(u32*)&(PERIPH))==TIM2_BASE) || ((*(u32*)&(PERIPH)) == TIM3_BASE) ||\
- ((*(u32*)&(PERIPH)) == TIM4_BASE) || ((*(u32*)&(PERIPH))==TIM5_BASE) || \
- ((*(u32*)&(PERIPH))==TIM1_BASE) || ((*(u32*)&(PERIPH))==TIM8_BASE)) &&\
- (((TIM_FLAG) == TIM_FLAG_CC1) || ((TIM_FLAG) == TIM_FLAG_CC2) ||\
- ((TIM_FLAG) == TIM_FLAG_CC3) || ((TIM_FLAG) == TIM_FLAG_CC4) || \
- ((TIM_FLAG) == TIM_FLAG_Trigger))) ||\
- ((((*(u32*)&(PERIPH))==TIM2_BASE) || ((*(u32*)&(PERIPH)) == TIM3_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM4_BASE) || ((*(u32*)&(PERIPH))==TIM5_BASE) ||\
- ((*(u32*)&(PERIPH))==TIM1_BASE)|| ((*(u32*)&(PERIPH))==TIM8_BASE) || \
- ((*(u32*)&(PERIPH))==TIM7_BASE) || ((*(u32*)&(PERIPH))==TIM6_BASE)) && \
- (((TIM_FLAG) == TIM_FLAG_Update))) ||\
- ((((*(u32*)&(PERIPH))==TIM1_BASE) || ((*(u32*)&(PERIPH)) == TIM8_BASE)) &&\
- (((TIM_FLAG) == TIM_FLAG_COM) || ((TIM_FLAG) == TIM_FLAG_Break))) ||\
- ((((*(u32*)&(PERIPH))==TIM2_BASE) || ((*(u32*)&(PERIPH)) == TIM3_BASE) || \
- ((*(u32*)&(PERIPH)) == TIM4_BASE) || ((*(u32*)&(PERIPH))==TIM5_BASE) || \
- ((*(u32*)&(PERIPH))==TIM1_BASE) || ((*(u32*)&(PERIPH))==TIM8_BASE)) &&\
- (((TIM_FLAG) == TIM_FLAG_CC1OF) || ((TIM_FLAG) == TIM_FLAG_CC2OF) ||\
- ((TIM_FLAG) == TIM_FLAG_CC3OF) || ((TIM_FLAG) == TIM_FLAG_CC4OF))))
-
-/* TIM Input Capture Filer Value ---------------------------------------------*/
-#define IS_TIM_IC_FILTER(ICFILTER) ((ICFILTER) <= 0xF)
-
-/* TIM External Trigger Filter -----------------------------------------------*/
-#define IS_TIM_EXT_FILTER(EXTFILTER) ((EXTFILTER) <= 0xF)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions --------------------------------------------------------*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void TIM_DeInit(TIM_TypeDef* TIMx);
-void TIM_TimeBaseInit(TIM_TypeDef* TIMx, TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct);
-void TIM_OC1Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct);
-void TIM_OC2Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct);
-void TIM_OC3Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct);
-void TIM_OC4Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct);
-void TIM_ICInit(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct);
-void TIM_PWMIConfig(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct);
-void TIM_BDTRConfig(TIM_TypeDef* TIMx, TIM_BDTRInitTypeDef *TIM_BDTRInitStruct);
-void TIM_TimeBaseStructInit(TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct);
-void TIM_OCStructInit(TIM_OCInitTypeDef* TIM_OCInitStruct);
-void TIM_ICStructInit(TIM_ICInitTypeDef* TIM_ICInitStruct);
-void TIM_BDTRStructInit(TIM_BDTRInitTypeDef* TIM_BDTRInitStruct);
-void TIM_Cmd(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_CtrlPWMOutputs(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_ITConfig(TIM_TypeDef* TIMx, u16 TIM_IT, FunctionalState NewState);
-void TIM_GenerateEvent(TIM_TypeDef* TIMx, u16 TIM_EventSource);
-void TIM_DMAConfig(TIM_TypeDef* TIMx, u16 TIM_DMABase, u16 TIM_DMABurstLength);
-void TIM_DMACmd(TIM_TypeDef* TIMx, u16 TIM_DMASource, FunctionalState NewState);
-void TIM_InternalClockConfig(TIM_TypeDef* TIMx);
-void TIM_ITRxExternalClockConfig(TIM_TypeDef* TIMx, u16 TIM_InputTriggerSource);
-void TIM_TIxExternalClockConfig(TIM_TypeDef* TIMx, u16 TIM_TIxExternalCLKSource,
- u16 TIM_ICPolarity, u16 ICFilter);
-void TIM_ETRClockMode1Config(TIM_TypeDef* TIMx, u16 TIM_ExtTRGPrescaler, u16 TIM_ExtTRGPolarity,
- u16 ExtTRGFilter);
-void TIM_ETRClockMode2Config(TIM_TypeDef* TIMx, u16 TIM_ExtTRGPrescaler,
- u16 TIM_ExtTRGPolarity, u16 ExtTRGFilter);
-void TIM_ETRConfig(TIM_TypeDef* TIMx, u16 TIM_ExtTRGPrescaler, u16 TIM_ExtTRGPolarity,
- u16 ExtTRGFilter);
-void TIM_PrescalerConfig(TIM_TypeDef* TIMx, u16 Prescaler, u16 TIM_PSCReloadMode);
-void TIM_CounterModeConfig(TIM_TypeDef* TIMx, u16 TIM_CounterMode);
-void TIM_SelectInputTrigger(TIM_TypeDef* TIMx, u16 TIM_InputTriggerSource);
-void TIM_EncoderInterfaceConfig(TIM_TypeDef* TIMx, u16 TIM_EncoderMode,
- u16 TIM_IC1Polarity, u16 TIM_IC2Polarity);
-void TIM_ForcedOC1Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction);
-void TIM_ForcedOC2Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction);
-void TIM_ForcedOC3Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction);
-void TIM_ForcedOC4Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction);
-void TIM_ARRPreloadConfig(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_SelectCOM(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_SelectCCDMA(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_CCPreloadControl(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_OC1PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload);
-void TIM_OC2PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload);
-void TIM_OC3PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload);
-void TIM_OC4PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload);
-void TIM_OC1FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast);
-void TIM_OC2FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast);
-void TIM_OC3FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast);
-void TIM_OC4FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast);
-void TIM_ClearOC1Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear);
-void TIM_ClearOC2Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear);
-void TIM_ClearOC3Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear);
-void TIM_ClearOC4Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear);
-void TIM_OC1PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity);
-void TIM_OC1NPolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCNPolarity);
-void TIM_OC2PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity);
-void TIM_OC2NPolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCNPolarity);
-void TIM_OC3PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity);
-void TIM_OC3NPolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCNPolarity);
-void TIM_OC4PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity);
-void TIM_CCxCmd(TIM_TypeDef* TIMx, u16 TIM_Channel, u16 TIM_CCx);
-void TIM_CCxNCmd(TIM_TypeDef* TIMx, u16 TIM_Channel, u16 TIM_CCxN);
-void TIM_SelectOCxM(TIM_TypeDef* TIMx, u16 TIM_Channel, u16 TIM_OCMode);
-void TIM_UpdateDisableConfig(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_UpdateRequestConfig(TIM_TypeDef* TIMx, u16 TIM_UpdateSource);
-void TIM_SelectHallSensor(TIM_TypeDef* TIMx, FunctionalState NewState);
-void TIM_SelectOnePulseMode(TIM_TypeDef* TIMx, u16 TIM_OPMode);
-void TIM_SelectOutputTrigger(TIM_TypeDef* TIMx, u16 TIM_TRGOSource);
-void TIM_SelectSlaveMode(TIM_TypeDef* TIMx, u16 TIM_SlaveMode);
-void TIM_SelectMasterSlaveMode(TIM_TypeDef* TIMx, u16 TIM_MasterSlaveMode);
-void TIM_SetCounter(TIM_TypeDef* TIMx, u16 Counter);
-void TIM_SetAutoreload(TIM_TypeDef* TIMx, u16 Autoreload);
-void TIM_SetCompare1(TIM_TypeDef* TIMx, u16 Compare1);
-void TIM_SetCompare2(TIM_TypeDef* TIMx, u16 Compare2);
-void TIM_SetCompare3(TIM_TypeDef* TIMx, u16 Compare3);
-void TIM_SetCompare4(TIM_TypeDef* TIMx, u16 Compare4);
-void TIM_SetIC1Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC);
-void TIM_SetIC2Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC);
-void TIM_SetIC3Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC);
-void TIM_SetIC4Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC);
-void TIM_SetClockDivision(TIM_TypeDef* TIMx, u16 TIM_CKD);
-u16 TIM_GetCapture1(TIM_TypeDef* TIMx);
-u16 TIM_GetCapture2(TIM_TypeDef* TIMx);
-u16 TIM_GetCapture3(TIM_TypeDef* TIMx);
-u16 TIM_GetCapture4(TIM_TypeDef* TIMx);
-u16 TIM_GetCounter(TIM_TypeDef* TIMx);
-u16 TIM_GetPrescaler(TIM_TypeDef* TIMx);
-FlagStatus TIM_GetFlagStatus(TIM_TypeDef* TIMx, u16 TIM_FLAG);
-void TIM_ClearFlag(TIM_TypeDef* TIMx, u16 TIM_FLAG);
-ITStatus TIM_GetITStatus(TIM_TypeDef* TIMx, u16 TIM_IT);
-void TIM_ClearITPendingBit(TIM_TypeDef* TIMx, u16 TIM_IT);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__STM32F10x_TIM_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
-
-
-
-
-
-
-
-
diff --git a/stm32lib/inc/stm32f10x_type.h b/stm32lib/inc/stm32f10x_type.h
deleted file mode 100644
index 895cbb2..0000000
--- a/stm32lib/inc/stm32f10x_type.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_type.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the common data types used for the
-* STM32F10x firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_TYPE_H
-#define __STM32F10x_TYPE_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-typedef signed long s32;
-typedef signed short s16;
-typedef signed char s8;
-
-typedef signed long const sc32; /* Read Only */
-typedef signed short const sc16; /* Read Only */
-typedef signed char const sc8; /* Read Only */
-
-typedef volatile signed long vs32;
-typedef volatile signed short vs16;
-typedef volatile signed char vs8;
-
-typedef volatile signed long const vsc32; /* Read Only */
-typedef volatile signed short const vsc16; /* Read Only */
-typedef volatile signed char const vsc8; /* Read Only */
-
-typedef unsigned long u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
-
-typedef unsigned long const uc32; /* Read Only */
-typedef unsigned short const uc16; /* Read Only */
-typedef unsigned char const uc8; /* Read Only */
-
-typedef volatile unsigned long vu32;
-typedef volatile unsigned short vu16;
-typedef volatile unsigned char vu8;
-
-typedef volatile unsigned long const vuc32; /* Read Only */
-typedef volatile unsigned short const vuc16; /* Read Only */
-typedef volatile unsigned char const vuc8; /* Read Only */
-
-//typedef enum {FALSE = 0, TRUE = !FALSE} bool;
-
-typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus;
-
-typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState;
-#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-
-typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrorStatus;
-
-#define U8_MAX ((u8)255)
-#define S8_MAX ((s8)127)
-#define S8_MIN ((s8)-128)
-#define U16_MAX ((u16)65535u)
-#define S16_MAX ((s16)32767)
-#define S16_MIN ((s16)-32768)
-#define U32_MAX ((u32)4294967295uL)
-#define S32_MAX ((s32)2147483647)
-#define S32_MIN ((s32)-2147483648)
-
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#endif /* __STM32F10x_TYPE_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_usart.h b/stm32lib/inc/stm32f10x_usart.h
deleted file mode 100644
index 0731b7b..0000000
--- a/stm32lib/inc/stm32f10x_usart.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_usart.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* USART firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_USART_H
-#define __STM32F10x_USART_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* USART Init Structure definition */
-typedef struct
-{
- u32 USART_BaudRate;
- u16 USART_WordLength;
- u16 USART_StopBits;
- u16 USART_Parity;
- u16 USART_Mode;
- u16 USART_HardwareFlowControl;
-} USART_InitTypeDef;
-
-/* USART Clock Init Structure definition */
-typedef struct
-{
- u16 USART_Clock;
- u16 USART_CPOL;
- u16 USART_CPHA;
- u16 USART_LastBit;
-} USART_ClockInitTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define IS_USART_ALL_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == USART1_BASE) || \
- ((*(u32*)&(PERIPH)) == USART2_BASE) || \
- ((*(u32*)&(PERIPH)) == USART3_BASE) || \
- ((*(u32*)&(PERIPH)) == UART4_BASE) || \
- ((*(u32*)&(PERIPH)) == UART5_BASE))
-
-#define IS_USART_123_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == USART1_BASE) || \
- ((*(u32*)&(PERIPH)) == USART2_BASE) || \
- ((*(u32*)&(PERIPH)) == USART3_BASE))
-
-#define IS_USART_1234_PERIPH(PERIPH) (((*(u32*)&(PERIPH)) == USART1_BASE) || \
- ((*(u32*)&(PERIPH)) == USART2_BASE) || \
- ((*(u32*)&(PERIPH)) == USART3_BASE) || \
- ((*(u32*)&(PERIPH)) == UART4_BASE))
-
-/* USART Word Length ---------------------------------------------------------*/
-#define USART_WordLength_8b ((u16)0x0000)
-#define USART_WordLength_9b ((u16)0x1000)
-
-#define IS_USART_WORD_LENGTH(LENGTH) (((LENGTH) == USART_WordLength_8b) || \
- ((LENGTH) == USART_WordLength_9b))
-
-/* USART Stop Bits -----------------------------------------------------------*/
-#define USART_StopBits_1 ((u16)0x0000)
-#define USART_StopBits_0_5 ((u16)0x1000)
-#define USART_StopBits_2 ((u16)0x2000)
-#define USART_StopBits_1_5 ((u16)0x3000)
-
-#define IS_USART_STOPBITS(STOPBITS) (((STOPBITS) == USART_StopBits_1) || \
- ((STOPBITS) == USART_StopBits_0_5) || \
- ((STOPBITS) == USART_StopBits_2) || \
- ((STOPBITS) == USART_StopBits_1_5))
-/* USART Parity --------------------------------------------------------------*/
-#define USART_Parity_No ((u16)0x0000)
-#define USART_Parity_Even ((u16)0x0400)
-#define USART_Parity_Odd ((u16)0x0600)
-
-#define IS_USART_PARITY(PARITY) (((PARITY) == USART_Parity_No) || \
- ((PARITY) == USART_Parity_Even) || \
- ((PARITY) == USART_Parity_Odd))
-
-/* USART Mode ----------------------------------------------------------------*/
-#define USART_Mode_Rx ((u16)0x0004)
-#define USART_Mode_Tx ((u16)0x0008)
-
-#define IS_USART_MODE(MODE) ((((MODE) & (u16)0xFFF3) == 0x00) && ((MODE) != (u16)0x00))
-
-/* USART Hardware Flow Control -----------------------------------------------*/
-#define USART_HardwareFlowControl_None ((u16)0x0000)
-#define USART_HardwareFlowControl_RTS ((u16)0x0100)
-#define USART_HardwareFlowControl_CTS ((u16)0x0200)
-#define USART_HardwareFlowControl_RTS_CTS ((u16)0x0300)
-
-#define IS_USART_HARDWARE_FLOW_CONTROL(CONTROL)\
- (((CONTROL) == USART_HardwareFlowControl_None) || \
- ((CONTROL) == USART_HardwareFlowControl_RTS) || \
- ((CONTROL) == USART_HardwareFlowControl_CTS) || \
- ((CONTROL) == USART_HardwareFlowControl_RTS_CTS))
-
-#define IS_USART_PERIPH_HFC(PERIPH, HFC) ((((*(u32*)&(PERIPH)) != UART4_BASE) && \
- ((*(u32*)&(PERIPH)) != UART5_BASE)) \
- || ((HFC) == USART_HardwareFlowControl_None))
-
-/* USART Clock ---------------------------------------------------------------*/
-#define USART_Clock_Disable ((u16)0x0000)
-#define USART_Clock_Enable ((u16)0x0800)
-
-#define IS_USART_CLOCK(CLOCK) (((CLOCK) == USART_Clock_Disable) || \
- ((CLOCK) == USART_Clock_Enable))
-
-/* USART Clock Polarity ------------------------------------------------------*/
-#define USART_CPOL_Low ((u16)0x0000)
-#define USART_CPOL_High ((u16)0x0400)
-
-#define IS_USART_CPOL(CPOL) (((CPOL) == USART_CPOL_Low) || ((CPOL) == USART_CPOL_High))
-
-/* USART Clock Phase ---------------------------------------------------------*/
-#define USART_CPHA_1Edge ((u16)0x0000)
-#define USART_CPHA_2Edge ((u16)0x0200)
-#define IS_USART_CPHA(CPHA) (((CPHA) == USART_CPHA_1Edge) || ((CPHA) == USART_CPHA_2Edge))
-
-/* USART Last Bit ------------------------------------------------------------*/
-#define USART_LastBit_Disable ((u16)0x0000)
-#define USART_LastBit_Enable ((u16)0x0100)
-
-#define IS_USART_LASTBIT(LASTBIT) (((LASTBIT) == USART_LastBit_Disable) || \
- ((LASTBIT) == USART_LastBit_Enable))
-
-/* USART Interrupt definition ------------------------------------------------*/
-#define USART_IT_PE ((u16)0x0028)
-#define USART_IT_TXE ((u16)0x0727)
-#define USART_IT_TC ((u16)0x0626)
-#define USART_IT_RXNE ((u16)0x0525)
-#define USART_IT_IDLE ((u16)0x0424)
-#define USART_IT_LBD ((u16)0x0846)
-#define USART_IT_CTS ((u16)0x096A)
-#define USART_IT_ERR ((u16)0x0060)
-#define USART_IT_ORE ((u16)0x0360)
-#define USART_IT_NE ((u16)0x0260)
-#define USART_IT_FE ((u16)0x0160)
-
-#define IS_USART_CONFIG_IT(IT) (((IT) == USART_IT_PE) || ((IT) == USART_IT_TXE) || \
- ((IT) == USART_IT_TC) || ((IT) == USART_IT_RXNE) || \
- ((IT) == USART_IT_IDLE) || ((IT) == USART_IT_LBD) || \
- ((IT) == USART_IT_CTS) || ((IT) == USART_IT_ERR))
-
-#define IS_USART_GET_IT(IT) (((IT) == USART_IT_PE) || ((IT) == USART_IT_TXE) || \
- ((IT) == USART_IT_TC) || ((IT) == USART_IT_RXNE) || \
- ((IT) == USART_IT_IDLE) || ((IT) == USART_IT_LBD) || \
- ((IT) == USART_IT_CTS) || ((IT) == USART_IT_ORE) || \
- ((IT) == USART_IT_NE) || ((IT) == USART_IT_FE))
-
-#define IS_USART_CLEAR_IT(IT) (((IT) == USART_IT_TC) || ((IT) == USART_IT_RXNE) || \
- ((IT) == USART_IT_LBD) || ((IT) == USART_IT_CTS))
-
-#define IS_USART_PERIPH_IT(PERIPH, USART_IT) ((((*(u32*)&(PERIPH)) != UART4_BASE) && \
- ((*(u32*)&(PERIPH)) != UART5_BASE)) \
- || ((USART_IT) != USART_IT_CTS))
-
-/* USART DMA Requests --------------------------------------------------------*/
-#define USART_DMAReq_Tx ((u16)0x0080)
-#define USART_DMAReq_Rx ((u16)0x0040)
-
-#define IS_USART_DMAREQ(DMAREQ) ((((DMAREQ) & (u16)0xFF3F) == 0x00) && ((DMAREQ) != (u16)0x00))
-
-/* USART WakeUp methods ------------------------------------------------------*/
-#define USART_WakeUp_IdleLine ((u16)0x0000)
-#define USART_WakeUp_AddressMark ((u16)0x0800)
-
-#define IS_USART_WAKEUP(WAKEUP) (((WAKEUP) == USART_WakeUp_IdleLine) || \
- ((WAKEUP) == USART_WakeUp_AddressMark))
-
-/* USART LIN Break Detection Length ------------------------------------------*/
-#define USART_LINBreakDetectLength_10b ((u16)0x0000)
-#define USART_LINBreakDetectLength_11b ((u16)0x0020)
-
-#define IS_USART_LIN_BREAK_DETECT_LENGTH(LENGTH) \
- (((LENGTH) == USART_LINBreakDetectLength_10b) || \
- ((LENGTH) == USART_LINBreakDetectLength_11b))
-
-/* USART IrDA Low Power ------------------------------------------------------*/
-#define USART_IrDAMode_LowPower ((u16)0x0004)
-#define USART_IrDAMode_Normal ((u16)0x0000)
-
-#define IS_USART_IRDA_MODE(MODE) (((MODE) == USART_IrDAMode_LowPower) || \
- ((MODE) == USART_IrDAMode_Normal))
-
-/* USART Flags ---------------------------------------------------------------*/
-#define USART_FLAG_CTS ((u16)0x0200)
-#define USART_FLAG_LBD ((u16)0x0100)
-#define USART_FLAG_TXE ((u16)0x0080)
-#define USART_FLAG_TC ((u16)0x0040)
-#define USART_FLAG_RXNE ((u16)0x0020)
-#define USART_FLAG_IDLE ((u16)0x0010)
-#define USART_FLAG_ORE ((u16)0x0008)
-#define USART_FLAG_NE ((u16)0x0004)
-#define USART_FLAG_FE ((u16)0x0002)
-#define USART_FLAG_PE ((u16)0x0001)
-
-#define IS_USART_FLAG(FLAG) (((FLAG) == USART_FLAG_PE) || ((FLAG) == USART_FLAG_TXE) || \
- ((FLAG) == USART_FLAG_TC) || ((FLAG) == USART_FLAG_RXNE) || \
- ((FLAG) == USART_FLAG_IDLE) || ((FLAG) == USART_FLAG_LBD) || \
- ((FLAG) == USART_FLAG_CTS) || ((FLAG) == USART_FLAG_ORE) || \
- ((FLAG) == USART_FLAG_NE) || ((FLAG) == USART_FLAG_FE))
-
-#define IS_USART_CLEAR_FLAG(FLAG) ((((FLAG) & (u16)0xFC9F) == 0x00) && ((FLAG) != (u16)0x00))
-
-#define IS_USART_PERIPH_FLAG(PERIPH, USART_FLAG) ((((*(u32*)&(PERIPH)) != UART4_BASE) &&\
- ((*(u32*)&(PERIPH)) != UART5_BASE)) \
- || ((USART_FLAG) != USART_FLAG_CTS))
-
-#define IS_USART_BAUDRATE(BAUDRATE) (((BAUDRATE) > 0) && ((BAUDRATE) < 0x0044AA21))
-#define IS_USART_ADDRESS(ADDRESS) ((ADDRESS) <= 0xF)
-#define IS_USART_DATA(DATA) ((DATA) <= 0x1FF)
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void USART_DeInit(USART_TypeDef* USARTx);
-void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct);
-void USART_StructInit(USART_InitTypeDef* USART_InitStruct);
-void USART_ClockInit(USART_TypeDef* USARTx, USART_ClockInitTypeDef* USART_ClockInitStruct);
-void USART_ClockStructInit(USART_ClockInitTypeDef* USART_ClockInitStruct);
-void USART_Cmd(USART_TypeDef* USARTx, FunctionalState NewState);
-void USART_ITConfig(USART_TypeDef* USARTx, u16 USART_IT, FunctionalState NewState);
-void USART_DMACmd(USART_TypeDef* USARTx, u16 USART_DMAReq, FunctionalState NewState);
-void USART_SetAddress(USART_TypeDef* USARTx, u8 USART_Address);
-void USART_WakeUpConfig(USART_TypeDef* USARTx, u16 USART_WakeUp);
-void USART_ReceiverWakeUpCmd(USART_TypeDef* USARTx, FunctionalState NewState);
-void USART_LINBreakDetectLengthConfig(USART_TypeDef* USARTx, u16 USART_LINBreakDetectLength);
-void USART_LINCmd(USART_TypeDef* USARTx, FunctionalState NewState);
-void USART_SendData(USART_TypeDef* USARTx, u16 Data);
-u16 USART_ReceiveData(USART_TypeDef* USARTx);
-void USART_SendBreak(USART_TypeDef* USARTx);
-void USART_SetGuardTime(USART_TypeDef* USARTx, u8 USART_GuardTime);
-void USART_SetPrescaler(USART_TypeDef* USARTx, u8 USART_Prescaler);
-void USART_SmartCardCmd(USART_TypeDef* USARTx, FunctionalState NewState);
-void USART_SmartCardNACKCmd(USART_TypeDef* USARTx, FunctionalState NewState);
-void USART_HalfDuplexCmd(USART_TypeDef* USARTx, FunctionalState NewState);
-void USART_IrDAConfig(USART_TypeDef* USARTx, u16 USART_IrDAMode);
-void USART_IrDACmd(USART_TypeDef* USARTx, FunctionalState NewState);
-FlagStatus USART_GetFlagStatus(USART_TypeDef* USARTx, u16 USART_FLAG);
-void USART_ClearFlag(USART_TypeDef* USARTx, u16 USART_FLAG);
-ITStatus USART_GetITStatus(USART_TypeDef* USARTx, u16 USART_IT);
-void USART_ClearITPendingBit(USART_TypeDef* USARTx, u16 USART_IT);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __STM32F10x_USART_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/inc/stm32f10x_wwdg.h b/stm32lib/inc/stm32f10x_wwdg.h
deleted file mode 100644
index 3c5339e..0000000
--- a/stm32lib/inc/stm32f10x_wwdg.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_wwdg.h
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file contains all the functions prototypes for the
-* WWDG firmware library.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_WWDG_H
-#define __STM32F10x_WWDG_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_map.h"
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* WWDG Prescaler */
-#define WWDG_Prescaler_1 ((u32)0x00000000)
-#define WWDG_Prescaler_2 ((u32)0x00000080)
-#define WWDG_Prescaler_4 ((u32)0x00000100)
-#define WWDG_Prescaler_8 ((u32)0x00000180)
-
-#define IS_WWDG_PRESCALER(PRESCALER) (((PRESCALER) == WWDG_Prescaler_1) || \
- ((PRESCALER) == WWDG_Prescaler_2) || \
- ((PRESCALER) == WWDG_Prescaler_4) || \
- ((PRESCALER) == WWDG_Prescaler_8))
-
-#define IS_WWDG_WINDOW_VALUE(VALUE) ((VALUE) <= 0x7F)
-
-#define IS_WWDG_COUNTER(COUNTER) (((COUNTER) >= 0x40) && ((COUNTER) <= 0x7F))
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void WWDG_DeInit(void);
-void WWDG_SetPrescaler(u32 WWDG_Prescaler);
-void WWDG_SetWindowValue(u8 WindowValue);
-void WWDG_EnableIT(void);
-void WWDG_SetCounter(u8 Counter);
-void WWDG_Enable(u8 Counter);
-FlagStatus WWDG_GetFlagStatus(void);
-void WWDG_ClearFlag(void);
-
-#endif /* __STM32F10x_WWDG_H */
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_adc.c b/stm32lib/src/stm32f10x_adc.c
deleted file mode 100644
index 413c920..0000000
--- a/stm32lib/src/stm32f10x_adc.c
+++ /dev/null
@@ -1,1402 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_adc.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the ADC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_adc.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ADC DISCNUM mask */
-#define CR1_DISCNUM_Reset ((u32)0xFFFF1FFF)
-
-/* ADC DISCEN mask */
-#define CR1_DISCEN_Set ((u32)0x00000800)
-#define CR1_DISCEN_Reset ((u32)0xFFFFF7FF)
-
-/* ADC JAUTO mask */
-#define CR1_JAUTO_Set ((u32)0x00000400)
-#define CR1_JAUTO_Reset ((u32)0xFFFFFBFF)
-
-/* ADC JDISCEN mask */
-#define CR1_JDISCEN_Set ((u32)0x00001000)
-#define CR1_JDISCEN_Reset ((u32)0xFFFFEFFF)
-
-/* ADC AWDCH mask */
-#define CR1_AWDCH_Reset ((u32)0xFFFFFFE0)
-
-/* ADC Analog watchdog enable mode mask */
-#define CR1_AWDMode_Reset ((u32)0xFF3FFDFF)
-
-/* CR1 register Mask */
-#define CR1_CLEAR_Mask ((u32)0xFFF0FEFF)
-
-/* ADC ADON mask */
-#define CR2_ADON_Set ((u32)0x00000001)
-#define CR2_ADON_Reset ((u32)0xFFFFFFFE)
-
-/* ADC DMA mask */
-#define CR2_DMA_Set ((u32)0x00000100)
-#define CR2_DMA_Reset ((u32)0xFFFFFEFF)
-
-/* ADC RSTCAL mask */
-#define CR2_RSTCAL_Set ((u32)0x00000008)
-
-/* ADC CAL mask */
-#define CR2_CAL_Set ((u32)0x00000004)
-
-/* ADC SWSTART mask */
-#define CR2_SWSTART_Set ((u32)0x00400000)
-
-/* ADC EXTTRIG mask */
-#define CR2_EXTTRIG_Set ((u32)0x00100000)
-#define CR2_EXTTRIG_Reset ((u32)0xFFEFFFFF)
-
-/* ADC Software start mask */
-#define CR2_EXTTRIG_SWSTART_Set ((u32)0x00500000)
-#define CR2_EXTTRIG_SWSTART_Reset ((u32)0xFFAFFFFF)
-
-/* ADC JEXTSEL mask */
-#define CR2_JEXTSEL_Reset ((u32)0xFFFF8FFF)
-
-/* ADC JEXTTRIG mask */
-#define CR2_JEXTTRIG_Set ((u32)0x00008000)
-#define CR2_JEXTTRIG_Reset ((u32)0xFFFF7FFF)
-
-/* ADC JSWSTART mask */
-#define CR2_JSWSTART_Set ((u32)0x00200000)
-
-/* ADC injected software start mask */
-#define CR2_JEXTTRIG_JSWSTART_Set ((u32)0x00208000)
-#define CR2_JEXTTRIG_JSWSTART_Reset ((u32)0xFFDF7FFF)
-
-/* ADC TSPD mask */
-#define CR2_TSVREFE_Set ((u32)0x00800000)
-#define CR2_TSVREFE_Reset ((u32)0xFF7FFFFF)
-
-/* CR2 register Mask */
-#define CR2_CLEAR_Mask ((u32)0xFFF1F7FD)
-
-/* ADC SQx mask */
-#define SQR3_SQ_Set ((u32)0x0000001F)
-#define SQR2_SQ_Set ((u32)0x0000001F)
-#define SQR1_SQ_Set ((u32)0x0000001F)
-
-/* SQR1 register Mask */
-#define SQR1_CLEAR_Mask ((u32)0xFF0FFFFF)
-
-/* ADC JSQx mask */
-#define JSQR_JSQ_Set ((u32)0x0000001F)
-
-/* ADC JL mask */
-#define JSQR_JL_Set ((u32)0x00300000)
-#define JSQR_JL_Reset ((u32)0xFFCFFFFF)
-
-/* ADC SMPx mask */
-#define SMPR1_SMP_Set ((u32)0x00000007)
-#define SMPR2_SMP_Set ((u32)0x00000007)
-
-/* ADC JDRx registers offset */
-#define JDR_Offset ((u8)0x28)
-
-/* ADC1 DR register base address */
-#define DR_ADDRESS ((u32)0x4001244C)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : ADC_DeInit
-* Description : Deinitializes the ADCx peripheral registers to their default
-* reset values.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_DeInit(ADC_TypeDef* ADCx)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- switch (*(u32*)&ADCx)
- {
- case ADC1_BASE:
- /* Enable ADC1 reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC1, ENABLE);
- /* Release ADC1 from reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC1, DISABLE);
- break;
-
- case ADC2_BASE:
- /* Enable ADC2 reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC2, ENABLE);
- /* Release ADC2 from reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC2, DISABLE);
- break;
-
- case ADC3_BASE:
- /* Enable ADC3 reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC3, ENABLE);
- /* Release ADC3 from reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_ADC3, DISABLE);
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_Init
-* Description : Initializes the ADCx peripheral according to the specified parameters
-* in the ADC_InitStruct.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_InitStruct: pointer to an ADC_InitTypeDef structure that
-* contains the configuration information for the specified
-* ADC peripheral.
-* Output : None
-* Return : None
-******************************************************************************/
-void ADC_Init(ADC_TypeDef* ADCx, ADC_InitTypeDef* ADC_InitStruct)
-{
- u32 tmpreg1 = 0;
- u8 tmpreg2 = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_MODE(ADC_InitStruct->ADC_Mode));
- assert_param(IS_FUNCTIONAL_STATE(ADC_InitStruct->ADC_ScanConvMode));
- assert_param(IS_FUNCTIONAL_STATE(ADC_InitStruct->ADC_ContinuousConvMode));
- assert_param(IS_ADC_EXT_TRIG(ADC_InitStruct->ADC_ExternalTrigConv));
- assert_param(IS_ADC_DATA_ALIGN(ADC_InitStruct->ADC_DataAlign));
- assert_param(IS_ADC_REGULAR_LENGTH(ADC_InitStruct->ADC_NbrOfChannel));
-
- /*---------------------------- ADCx CR1 Configuration -----------------*/
- /* Get the ADCx CR1 value */
- tmpreg1 = ADCx->CR1;
- /* Clear DUALMOD and SCAN bits */
- tmpreg1 &= CR1_CLEAR_Mask;
- /* Configure ADCx: Dual mode and scan conversion mode */
- /* Set DUALMOD bits according to ADC_Mode value */
- /* Set SCAN bit according to ADC_ScanConvMode value */
- tmpreg1 |= (u32)(ADC_InitStruct->ADC_Mode | ((u32)ADC_InitStruct->ADC_ScanConvMode << 8));
- /* Write to ADCx CR1 */
- ADCx->CR1 = tmpreg1;
-
- /*---------------------------- ADCx CR2 Configuration -----------------*/
- /* Get the ADCx CR2 value */
- tmpreg1 = ADCx->CR2;
- /* Clear CONT, ALIGN and EXTSEL bits */
- tmpreg1 &= CR2_CLEAR_Mask;
- /* Configure ADCx: external trigger event and continuous conversion mode */
- /* Set ALIGN bit according to ADC_DataAlign value */
- /* Set EXTSEL bits according to ADC_ExternalTrigConv value */
- /* Set CONT bit according to ADC_ContinuousConvMode value */
- tmpreg1 |= (u32)(ADC_InitStruct->ADC_DataAlign | ADC_InitStruct->ADC_ExternalTrigConv |
- ((u32)ADC_InitStruct->ADC_ContinuousConvMode << 1));
- /* Write to ADCx CR2 */
- ADCx->CR2 = tmpreg1;
-
- /*---------------------------- ADCx SQR1 Configuration -----------------*/
- /* Get the ADCx SQR1 value */
- tmpreg1 = ADCx->SQR1;
- /* Clear L bits */
- tmpreg1 &= SQR1_CLEAR_Mask;
- /* Configure ADCx: regular channel sequence length */
- /* Set L bits according to ADC_NbrOfChannel value */
- tmpreg2 |= (ADC_InitStruct->ADC_NbrOfChannel - 1);
- tmpreg1 |= ((u32)tmpreg2 << 20);
- /* Write to ADCx SQR1 */
- ADCx->SQR1 = tmpreg1;
-}
-
-/*******************************************************************************
-* Function Name : ADC_StructInit
-* Description : Fills each ADC_InitStruct member with its default value.
-* Input : ADC_InitStruct : pointer to an ADC_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_StructInit(ADC_InitTypeDef* ADC_InitStruct)
-{
- /* Reset ADC init structure parameters values */
- /* Initialize the ADC_Mode member */
- ADC_InitStruct->ADC_Mode = ADC_Mode_Independent;
-
- /* initialize the ADC_ScanConvMode member */
- ADC_InitStruct->ADC_ScanConvMode = DISABLE;
-
- /* Initialize the ADC_ContinuousConvMode member */
- ADC_InitStruct->ADC_ContinuousConvMode = DISABLE;
-
- /* Initialize the ADC_ExternalTrigConv member */
- ADC_InitStruct->ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_CC1;
-
- /* Initialize the ADC_DataAlign member */
- ADC_InitStruct->ADC_DataAlign = ADC_DataAlign_Right;
-
- /* Initialize the ADC_NbrOfChannel member */
- ADC_InitStruct->ADC_NbrOfChannel = 1;
-}
-
-/*******************************************************************************
-* Function Name : ADC_Cmd
-* Description : Enables or disables the specified ADC peripheral.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the ADCx peripheral. This parameter
-* can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_Cmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the ADON bit to wake up the ADC from power down mode */
- ADCx->CR2 |= CR2_ADON_Set;
- }
- else
- {
- /* Disable the selected ADC peripheral */
- ADCx->CR2 &= CR2_ADON_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_DMACmd
-* Description : Enables or disables the specified ADC DMA request.
-* Input : - ADCx: where x can be 1 or 3 to select the ADC peripheral.
-* Note: ADC2 hasn't a DMA capability.
-* - NewState: new state of the selected ADC DMA transfer.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_DMACmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_DMA_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC DMA request */
- ADCx->CR2 |= CR2_DMA_Set;
- }
- else
- {
- /* Disable the selected ADC DMA request */
- ADCx->CR2 &= CR2_DMA_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_ITConfig
-* Description : Enables or disables the specified ADC interrupts.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_IT: specifies the ADC interrupt sources to be enabled
-* or disabled.
-* This parameter can be any combination of the following values:
-* - ADC_IT_EOC: End of conversion interrupt mask
-* - ADC_IT_AWD: Analog watchdog interrupt mask
-* - ADC_IT_JEOC: End of injected conversion interrupt mask
-* - NewState: new state of the specified ADC interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ITConfig(ADC_TypeDef* ADCx, u16 ADC_IT, FunctionalState NewState)
-{
- u8 itmask = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
- assert_param(IS_ADC_IT(ADC_IT));
-
- /* Get the ADC IT index */
- itmask = (u8)ADC_IT;
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC interrupts */
- ADCx->CR1 |= itmask;
- }
- else
- {
- /* Disable the selected ADC interrupts */
- ADCx->CR1 &= (~(u32)itmask);
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_ResetCalibration
-* Description : Resets the selected ADC calibration registers.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ResetCalibration(ADC_TypeDef* ADCx)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Resets the selected ADC calibartion registers */
- ADCx->CR2 |= CR2_RSTCAL_Set;
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetResetCalibrationStatus
-* Description : Gets the selected ADC reset calibration registers status.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : The new state of ADC reset calibration registers (SET or RESET).
-*******************************************************************************/
-FlagStatus ADC_GetResetCalibrationStatus(ADC_TypeDef* ADCx)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Check the status of RSTCAL bit */
- if ((ADCx->CR2 & CR2_RSTCAL_Set) != (u32)RESET)
- {
- /* RSTCAL bit is set */
- bitstatus = SET;
- }
- else
- {
- /* RSTCAL bit is reset */
- bitstatus = RESET;
- }
-
- /* Return the RSTCAL bit status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : ADC_StartCalibration
-* Description : Starts the selected ADC calibration process.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_StartCalibration(ADC_TypeDef* ADCx)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Enable the selected ADC calibration process */
- ADCx->CR2 |= CR2_CAL_Set;
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetCalibrationStatus
-* Description : Gets the selected ADC calibration status.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : The new state of ADC calibration (SET or RESET).
-*******************************************************************************/
-FlagStatus ADC_GetCalibrationStatus(ADC_TypeDef* ADCx)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Check the status of CAL bit */
- if ((ADCx->CR2 & CR2_CAL_Set) != (u32)RESET)
- {
- /* CAL bit is set: calibration on going */
- bitstatus = SET;
- }
- else
- {
- /* CAL bit is reset: end of calibration */
- bitstatus = RESET;
- }
-
- /* Return the CAL bit status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : ADC_SoftwareStartConvCmd
-* Description : Enables or disables the selected ADC software start conversion .
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC software start conversion.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_SoftwareStartConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC conversion on external event and start the selected
- ADC conversion */
- ADCx->CR2 |= CR2_EXTTRIG_SWSTART_Set;
- }
- else
- {
- /* Disable the selected ADC conversion on external event and stop the selected
- ADC conversion */
- ADCx->CR2 &= CR2_EXTTRIG_SWSTART_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetSoftwareStartConvStatus
-* Description : Gets the selected ADC Software start conversion Status.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : The new state of ADC software start conversion (SET or RESET).
-*******************************************************************************/
-FlagStatus ADC_GetSoftwareStartConvStatus(ADC_TypeDef* ADCx)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Check the status of SWSTART bit */
- if ((ADCx->CR2 & CR2_SWSTART_Set) != (u32)RESET)
- {
- /* SWSTART bit is set */
- bitstatus = SET;
- }
- else
- {
- /* SWSTART bit is reset */
- bitstatus = RESET;
- }
-
- /* Return the SWSTART bit status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : ADC_DiscModeChannelCountConfig
-* Description : Configures the discontinuous mode for the selected ADC regular
-* group channel.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - Number: specifies the discontinuous mode regular channel
-* count value. This number must be between 1 and 8.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, u8 Number)
-{
- u32 tmpreg1 = 0;
- u32 tmpreg2 = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_REGULAR_DISC_NUMBER(Number));
-
- /* Get the old register value */
- tmpreg1 = ADCx->CR1;
- /* Clear the old discontinuous mode channel count */
- tmpreg1 &= CR1_DISCNUM_Reset;
- /* Set the discontinuous mode channel count */
- tmpreg2 = Number - 1;
- tmpreg1 |= tmpreg2 << 13;
- /* Store the new register value */
- ADCx->CR1 = tmpreg1;
-}
-
-/*******************************************************************************
-* Function Name : ADC_DiscModeCmd
-* Description : Enables or disables the discontinuous mode on regular group
-* channel for the specified ADC
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC discontinuous mode
-* on regular group channel.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC regular discontinuous mode */
- ADCx->CR1 |= CR1_DISCEN_Set;
- }
- else
- {
- /* Disable the selected ADC regular discontinuous mode */
- ADCx->CR1 &= CR1_DISCEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_RegularChannelConfig
-* Description : Configures for the selected ADC regular channel its corresponding
-* rank in the sequencer and its sample time.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_Channel: the ADC channel to configure.
-* This parameter can be one of the following values:
-* - ADC_Channel_0: ADC Channel0 selected
-* - ADC_Channel_1: ADC Channel1 selected
-* - ADC_Channel_2: ADC Channel2 selected
-* - ADC_Channel_3: ADC Channel3 selected
-* - ADC_Channel_4: ADC Channel4 selected
-* - ADC_Channel_5: ADC Channel5 selected
-* - ADC_Channel_6: ADC Channel6 selected
-* - ADC_Channel_7: ADC Channel7 selected
-* - ADC_Channel_8: ADC Channel8 selected
-* - ADC_Channel_9: ADC Channel9 selected
-* - ADC_Channel_10: ADC Channel10 selected
-* - ADC_Channel_11: ADC Channel11 selected
-* - ADC_Channel_12: ADC Channel12 selected
-* - ADC_Channel_13: ADC Channel13 selected
-* - ADC_Channel_14: ADC Channel14 selected
-* - ADC_Channel_15: ADC Channel15 selected
-* - ADC_Channel_16: ADC Channel16 selected
-* - ADC_Channel_17: ADC Channel17 selected
-* - Rank: The rank in the regular group sequencer. This parameter
-* must be between 1 to 16.
-* - ADC_SampleTime: The sample time value to be set for the
-* selected channel.
-* This parameter can be one of the following values:
-* - ADC_SampleTime_1Cycles5: Sample time equal to 1.5 cycles
-* - ADC_SampleTime_7Cycles5: Sample time equal to 7.5 cycles
-* - ADC_SampleTime_13Cycles5: Sample time equal to 13.5 cycles
-* - ADC_SampleTime_28Cycles5: Sample time equal to 28.5 cycles
-* - ADC_SampleTime_41Cycles5: Sample time equal to 41.5 cycles
-* - ADC_SampleTime_55Cycles5: Sample time equal to 55.5 cycles
-* - ADC_SampleTime_71Cycles5: Sample time equal to 71.5 cycles
-* - ADC_SampleTime_239Cycles5: Sample time equal to 239.5 cycles
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_RegularChannelConfig(ADC_TypeDef* ADCx, u8 ADC_Channel, u8 Rank, u8 ADC_SampleTime)
-{
- u32 tmpreg1 = 0, tmpreg2 = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_CHANNEL(ADC_Channel));
- assert_param(IS_ADC_REGULAR_RANK(Rank));
- assert_param(IS_ADC_SAMPLE_TIME(ADC_SampleTime));
-
- /* if ADC_Channel_10 ... ADC_Channel_17 is selected */
- if (ADC_Channel > ADC_Channel_9)
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SMPR1;
- /* Calculate the mask to clear */
- tmpreg2 = SMPR1_SMP_Set << (3 * (ADC_Channel - 10));
- /* Clear the old discontinuous mode channel count */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_SampleTime << (3 * (ADC_Channel - 10));
- /* Set the discontinuous mode channel count */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SMPR1 = tmpreg1;
- }
- else /* ADC_Channel include in ADC_Channel_[0..9] */
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SMPR2;
- /* Calculate the mask to clear */
- tmpreg2 = SMPR2_SMP_Set << (3 * ADC_Channel);
- /* Clear the old discontinuous mode channel count */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_SampleTime << (3 * ADC_Channel);
- /* Set the discontinuous mode channel count */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SMPR2 = tmpreg1;
- }
- /* For Rank 1 to 6 */
- if (Rank < 7)
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SQR3;
- /* Calculate the mask to clear */
- tmpreg2 = SQR3_SQ_Set << (5 * (Rank - 1));
- /* Clear the old SQx bits for the selected rank */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_Channel << (5 * (Rank - 1));
- /* Set the SQx bits for the selected rank */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SQR3 = tmpreg1;
- }
- /* For Rank 7 to 12 */
- else if (Rank < 13)
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SQR2;
- /* Calculate the mask to clear */
- tmpreg2 = SQR2_SQ_Set << (5 * (Rank - 7));
- /* Clear the old SQx bits for the selected rank */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_Channel << (5 * (Rank - 7));
- /* Set the SQx bits for the selected rank */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SQR2 = tmpreg1;
- }
- /* For Rank 13 to 16 */
- else
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SQR1;
- /* Calculate the mask to clear */
- tmpreg2 = SQR1_SQ_Set << (5 * (Rank - 13));
- /* Clear the old SQx bits for the selected rank */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_Channel << (5 * (Rank - 13));
- /* Set the SQx bits for the selected rank */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SQR1 = tmpreg1;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_ExternalTrigConvCmd
-* Description : Enables or disables the ADCx conversion through external trigger.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC external trigger
-* start of conversion.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ExternalTrigConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC conversion on external event */
- ADCx->CR2 |= CR2_EXTTRIG_Set;
- }
- else
- {
- /* Disable the selected ADC conversion on external event */
- ADCx->CR2 &= CR2_EXTTRIG_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetConversionValue
-* Description : Returns the last ADCx conversion result data for regular channel.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : The Data conversion value.
-*******************************************************************************/
-u16 ADC_GetConversionValue(ADC_TypeDef* ADCx)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Return the selected ADC conversion value */
- return (u16) ADCx->DR;
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetDualModeConversionValue
-* Description : Returns the last ADC1 and ADC2 conversion result data in dual mode.
-* Output : None
-* Return : The Data conversion value.
-*******************************************************************************/
-u32 ADC_GetDualModeConversionValue(void)
-{
- /* Return the dual mode conversion value */
- return (*(vu32 *) DR_ADDRESS);
-}
-
-/*******************************************************************************
-* Function Name : ADC_AutoInjectedConvCmd
-* Description : Enables or disables the selected ADC automatic injected group
-* conversion after regular one.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC auto injected
-* conversion
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_AutoInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC automatic injected group conversion */
- ADCx->CR1 |= CR1_JAUTO_Set;
- }
- else
- {
- /* Disable the selected ADC automatic injected group conversion */
- ADCx->CR1 &= CR1_JAUTO_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_InjectedDiscModeCmd
-* Description : Enables or disables the discontinuous mode for injected group
-* channel for the specified ADC
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC discontinuous mode
-* on injected group channel.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_InjectedDiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC injected discontinuous mode */
- ADCx->CR1 |= CR1_JDISCEN_Set;
- }
- else
- {
- /* Disable the selected ADC injected discontinuous mode */
- ADCx->CR1 &= CR1_JDISCEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_ExternalTrigInjectedConvConfig
-* Description : Configures the ADCx external trigger for injected channels conversion.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_ExternalTrigInjecConv: specifies the ADC trigger to
-* start injected conversion.
-* This parameter can be one of the following values:
-* - ADC_ExternalTrigInjecConv_T1_TRGO: Timer1 TRGO event
-* selected (for ADC1, ADC2 and ADC3)
-* - ADC_ExternalTrigInjecConv_T1_CC4: Timer1 capture
-* compare4 selected (for ADC1, ADC2 and ADC3)
-* - ADC_ExternalTrigInjecConv_T2_TRGO: Timer2 TRGO event
-* selected (for ADC1 and ADC2)
-* - ADC_External TrigInjecConv_T2_CC1: Timer2 capture
-* compare1 selected (for ADC1 and ADC2)
-* - ADC_ExternalTrigInjecConv_T3_CC4: Timer3 capture
-* compare4 selected (for ADC1 and ADC2)
-* - ADC_ExternalTrigInjecConv_T4_TRGO: Timer4 TRGO event
-* selected (for ADC1 and ADC2)
-* - ADC_ExternalTrigInjecConv_Ext_IT15_TIM8_CC4: External
-* interrupt line 15 or Timer8 capture compare4 event selected
-* (for ADC1 and ADC2)
-* - ADC_External TrigInjecConv_T4_CC3: Timer4 capture
-* compare3 selected (for ADC3 only)
-* - ADC_External TrigInjecConv_T8_CC2: Timer8 capture
-* compare2 selected (for ADC3 only)
-* - ADC_External TrigInjecConv_T8_CC4: Timer8 capture
-* compare4 selected (for ADC3 only)
-* - ADC_ExternalTrigInjecConv_T5_TRGO: Timer5 TRGO event
-* selected (for ADC3 only)
-* - ADC_External TrigInjecConv_T5_CC4: Timer5 capture
-* compare4 selected (for ADC3 only)
-* - ADC_ExternalTrigInjecConv_None: Injected conversion
-* started by software and not by external trigger (for
-* ADC1, ADC2 and ADC3)
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ExternalTrigInjectedConvConfig(ADC_TypeDef* ADCx, u32 ADC_ExternalTrigInjecConv)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_EXT_INJEC_TRIG(ADC_ExternalTrigInjecConv));
-
- /* Get the old register value */
- tmpreg = ADCx->CR2;
- /* Clear the old external event selection for injected group */
- tmpreg &= CR2_JEXTSEL_Reset;
- /* Set the external event selection for injected group */
- tmpreg |= ADC_ExternalTrigInjecConv;
- /* Store the new register value */
- ADCx->CR2 = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : ADC_ExternalTrigInjectedConvCmd
-* Description : Enables or disables the ADCx injected channels conversion
-* through external trigger
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC external trigger
-* start of injected conversion.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ExternalTrigInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC external event selection for injected group */
- ADCx->CR2 |= CR2_JEXTTRIG_Set;
- }
- else
- {
- /* Disable the selected ADC external event selection for injected group */
- ADCx->CR2 &= CR2_JEXTTRIG_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_SoftwareStartInjectedConvCmd
-* Description : Enables or disables the selected ADC start of the injected
-* channels conversion.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - NewState: new state of the selected ADC software start
-* injected conversion.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_SoftwareStartInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected ADC conversion for injected group on external event and start the selected
- ADC injected conversion */
- ADCx->CR2 |= CR2_JEXTTRIG_JSWSTART_Set;
- }
- else
- {
- /* Disable the selected ADC conversion on external event for injected group and stop the selected
- ADC injected conversion */
- ADCx->CR2 &= CR2_JEXTTRIG_JSWSTART_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetSoftwareStartInjectedConvCmdStatus
-* Description : Gets the selected ADC Software start injected conversion Status.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* Output : None
-* Return : The new state of ADC software start injected conversion (SET or RESET).
-*******************************************************************************/
-FlagStatus ADC_GetSoftwareStartInjectedConvCmdStatus(ADC_TypeDef* ADCx)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
-
- /* Check the status of JSWSTART bit */
- if ((ADCx->CR2 & CR2_JSWSTART_Set) != (u32)RESET)
- {
- /* JSWSTART bit is set */
- bitstatus = SET;
- }
- else
- {
- /* JSWSTART bit is reset */
- bitstatus = RESET;
- }
-
- /* Return the JSWSTART bit status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : ADC_InjectedChannelConfig
-* Description : Configures for the selected ADC injected channel its corresponding
-* rank in the sequencer and its sample time.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_Channel: the ADC channel to configure.
-* This parameter can be one of the following values:
-* - ADC_Channel_0: ADC Channel0 selected
-* - ADC_Channel_1: ADC Channel1 selected
-* - ADC_Channel_2: ADC Channel2 selected
-* - ADC_Channel_3: ADC Channel3 selected
-* - ADC_Channel_4: ADC Channel4 selected
-* - ADC_Channel_5: ADC Channel5 selected
-* - ADC_Channel_6: ADC Channel6 selected
-* - ADC_Channel_7: ADC Channel7 selected
-* - ADC_Channel_8: ADC Channel8 selected
-* - ADC_Channel_9: ADC Channel9 selected
-* - ADC_Channel_10: ADC Channel10 selected
-* - ADC_Channel_11: ADC Channel11 selected
-* - ADC_Channel_12: ADC Channel12 selected
-* - ADC_Channel_13: ADC Channel13 selected
-* - ADC_Channel_14: ADC Channel14 selected
-* - ADC_Channel_15: ADC Channel15 selected
-* - ADC_Channel_16: ADC Channel16 selected
-* - ADC_Channel_17: ADC Channel17 selected
-* - Rank: The rank in the injected group sequencer. This parameter
-* must be between 1 to 4.
-* - ADC_SampleTime: The sample time value to be set for the
-* selected channel.
-* This parameter can be one of the following values:
-* - ADC_SampleTime_1Cycles5: Sample time equal to 1.5 cycles
-* - ADC_SampleTime_7Cycles5: Sample time equal to 7.5 cycles
-* - ADC_SampleTime_13Cycles5: Sample time equal to 13.5 cycles
-* - ADC_SampleTime_28Cycles5: Sample time equal to 28.5 cycles
-* - ADC_SampleTime_41Cycles5: Sample time equal to 41.5 cycles
-* - ADC_SampleTime_55Cycles5: Sample time equal to 55.5 cycles
-* - ADC_SampleTime_71Cycles5: Sample time equal to 71.5 cycles
-* - ADC_SampleTime_239Cycles5: Sample time equal to 239.5 cycles
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_InjectedChannelConfig(ADC_TypeDef* ADCx, u8 ADC_Channel, u8 Rank, u8 ADC_SampleTime)
-{
- u32 tmpreg1 = 0, tmpreg2 = 0, tmpreg3 = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_CHANNEL(ADC_Channel));
- assert_param(IS_ADC_INJECTED_RANK(Rank));
- assert_param(IS_ADC_SAMPLE_TIME(ADC_SampleTime));
-
- /* if ADC_Channel_10 ... ADC_Channel_17 is selected */
- if (ADC_Channel > ADC_Channel_9)
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SMPR1;
- /* Calculate the mask to clear */
- tmpreg2 = SMPR1_SMP_Set << (3*(ADC_Channel - 10));
- /* Clear the old discontinuous mode channel count */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_SampleTime << (3*(ADC_Channel - 10));
- /* Set the discontinuous mode channel count */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SMPR1 = tmpreg1;
- }
- else /* ADC_Channel include in ADC_Channel_[0..9] */
- {
- /* Get the old register value */
- tmpreg1 = ADCx->SMPR2;
- /* Calculate the mask to clear */
- tmpreg2 = SMPR2_SMP_Set << (3 * ADC_Channel);
- /* Clear the old discontinuous mode channel count */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set */
- tmpreg2 = (u32)ADC_SampleTime << (3 * ADC_Channel);
- /* Set the discontinuous mode channel count */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->SMPR2 = tmpreg1;
- }
-
- /* Rank configuration */
- /* Get the old register value */
- tmpreg1 = ADCx->JSQR;
- /* Get JL value: Number = JL+1 */
- tmpreg3 = (tmpreg1 & JSQR_JL_Set)>> 20;
- /* Calculate the mask to clear: ((Rank-1)+(4-JL-1)) */
- tmpreg2 = JSQR_JSQ_Set << (5 * (u8)((Rank + 3) - (tmpreg3 + 1)));
- /* Clear the old JSQx bits for the selected rank */
- tmpreg1 &= ~tmpreg2;
- /* Calculate the mask to set: ((Rank-1)+(4-JL-1)) */
- tmpreg2 = (u32)ADC_Channel << (5 * (u8)((Rank + 3) - (tmpreg3 + 1)));
- /* Set the JSQx bits for the selected rank */
- tmpreg1 |= tmpreg2;
- /* Store the new register value */
- ADCx->JSQR = tmpreg1;
-}
-
-/*******************************************************************************
-* Function Name : ADC_InjectedSequencerLengthConfig
-* Description : Configures the sequencer length for injected channels
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - Length: The sequencer length.
-* This parameter must be a number between 1 to 4.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_InjectedSequencerLengthConfig(ADC_TypeDef* ADCx, u8 Length)
-{
- u32 tmpreg1 = 0;
- u32 tmpreg2 = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_INJECTED_LENGTH(Length));
-
- /* Get the old register value */
- tmpreg1 = ADCx->JSQR;
- /* Clear the old injected sequnence lenght JL bits */
- tmpreg1 &= JSQR_JL_Reset;
- /* Set the injected sequnence lenght JL bits */
- tmpreg2 = Length - 1;
- tmpreg1 |= tmpreg2 << 20;
- /* Store the new register value */
- ADCx->JSQR = tmpreg1;
-}
-
-/*******************************************************************************
-* Function Name : ADC_SetInjectedOffset
-* Description : Set the injected channels conversion value offset
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_InjectedChannel: the ADC injected channel to set its
-* offset.
-* This parameter can be one of the following values:
-* - ADC_InjectedChannel_1: Injected Channel1 selected
-* - ADC_InjectedChannel_2: Injected Channel2 selected
-* - ADC_InjectedChannel_3: Injected Channel3 selected
-* - ADC_InjectedChannel_4: Injected Channel4 selected
-* - Offset: the offset value for the selected ADC injected channel
-* This parameter must be a 12bit value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_SetInjectedOffset(ADC_TypeDef* ADCx, u8 ADC_InjectedChannel, u16 Offset)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_INJECTED_CHANNEL(ADC_InjectedChannel));
- assert_param(IS_ADC_OFFSET(Offset));
-
- /* Set the selected injected channel data offset */
- *((vu32 *)((*(u32*)&ADCx) + ADC_InjectedChannel)) = (u32)Offset;
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetInjectedConversionValue
-* Description : Returns the ADC injected channel conversion result
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_InjectedChannel: the converted ADC injected channel.
-* This parameter can be one of the following values:
-* - ADC_InjectedChannel_1: Injected Channel1 selected
-* - ADC_InjectedChannel_2: Injected Channel2 selected
-* - ADC_InjectedChannel_3: Injected Channel3 selected
-* - ADC_InjectedChannel_4: Injected Channel4 selected
-* Output : None
-* Return : The Data conversion value.
-*******************************************************************************/
-u16 ADC_GetInjectedConversionValue(ADC_TypeDef* ADCx, u8 ADC_InjectedChannel)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_INJECTED_CHANNEL(ADC_InjectedChannel));
-
- /* Returns the selected injected channel conversion data value */
- return (u16) (*(vu32*) (((*(u32*)&ADCx) + ADC_InjectedChannel + JDR_Offset)));
-}
-
-/*******************************************************************************
-* Function Name : ADC_AnalogWatchdogCmd
-* Description : Enables or disables the analog watchdog on single/all regular
-* or injected channels
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_AnalogWatchdog: the ADC analog watchdog configuration.
-* This parameter can be one of the following values:
-* - ADC_AnalogWatchdog_SingleRegEnable: Analog watchdog on
-* a single regular channel
-* - ADC_AnalogWatchdog_SingleInjecEnable: Analog watchdog on
-* a single injected channel
-* - ADC_AnalogWatchdog_SingleRegOrInjecEnable: Analog
-* watchdog on a single regular or injected channel
-* - ADC_AnalogWatchdog_AllRegEnable: Analog watchdog on
-* all regular channel
-* - ADC_AnalogWatchdog_AllInjecEnable: Analog watchdog on
-* all injected channel
-* - ADC_AnalogWatchdog_AllRegAllInjecEnable: Analog watchdog
-* on all regular and injected channels
-* - ADC_AnalogWatchdog_None: No channel guarded by the
-* analog watchdog
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_AnalogWatchdogCmd(ADC_TypeDef* ADCx, u32 ADC_AnalogWatchdog)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_ANALOG_WATCHDOG(ADC_AnalogWatchdog));
-
- /* Get the old register value */
- tmpreg = ADCx->CR1;
- /* Clear AWDEN, AWDENJ and AWDSGL bits */
- tmpreg &= CR1_AWDMode_Reset;
- /* Set the analog watchdog enable mode */
- tmpreg |= ADC_AnalogWatchdog;
- /* Store the new register value */
- ADCx->CR1 = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : ADC_AnalogWatchdogThresholdsConfig
-* Description : Configures the high and low thresholds of the analog watchdog.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - HighThreshold: the ADC analog watchdog High threshold value.
-* This parameter must be a 12bit value.
-* - LowThreshold: the ADC analog watchdog Low threshold value.
-* This parameter must be a 12bit value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_AnalogWatchdogThresholdsConfig(ADC_TypeDef* ADCx, u16 HighThreshold,
- u16 LowThreshold)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_THRESHOLD(HighThreshold));
- assert_param(IS_ADC_THRESHOLD(LowThreshold));
-
- /* Set the ADCx high threshold */
- ADCx->HTR = HighThreshold;
- /* Set the ADCx low threshold */
- ADCx->LTR = LowThreshold;
-}
-
-/*******************************************************************************
-* Function Name : ADC_AnalogWatchdogSingleChannelConfig
-* Description : Configures the analog watchdog guarded single channel
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_Channel: the ADC channel to configure for the analog
-* watchdog.
-* This parameter can be one of the following values:
-* - ADC_Channel_0: ADC Channel0 selected
-* - ADC_Channel_1: ADC Channel1 selected
-* - ADC_Channel_2: ADC Channel2 selected
-* - ADC_Channel_3: ADC Channel3 selected
-* - ADC_Channel_4: ADC Channel4 selected
-* - ADC_Channel_5: ADC Channel5 selected
-* - ADC_Channel_6: ADC Channel6 selected
-* - ADC_Channel_7: ADC Channel7 selected
-* - ADC_Channel_8: ADC Channel8 selected
-* - ADC_Channel_9: ADC Channel9 selected
-* - ADC_Channel_10: ADC Channel10 selected
-* - ADC_Channel_11: ADC Channel11 selected
-* - ADC_Channel_12: ADC Channel12 selected
-* - ADC_Channel_13: ADC Channel13 selected
-* - ADC_Channel_14: ADC Channel14 selected
-* - ADC_Channel_15: ADC Channel15 selected
-* - ADC_Channel_16: ADC Channel16 selected
-* - ADC_Channel_17: ADC Channel17 selected
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_AnalogWatchdogSingleChannelConfig(ADC_TypeDef* ADCx, u8 ADC_Channel)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_CHANNEL(ADC_Channel));
-
- /* Get the old register value */
- tmpreg = ADCx->CR1;
- /* Clear the Analog watchdog channel select bits */
- tmpreg &= CR1_AWDCH_Reset;
- /* Set the Analog watchdog channel */
- tmpreg |= ADC_Channel;
- /* Store the new register value */
- ADCx->CR1 = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : ADC_TempSensorVrefintCmd
-* Description : Enables or disables the temperature sensor and Vrefint channel.
-* Input : - NewState: new state of the temperature sensor.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_TempSensorVrefintCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the temperature sensor and Vrefint channel*/
- ADC1->CR2 |= CR2_TSVREFE_Set;
- }
- else
- {
- /* Disable the temperature sensor and Vrefint channel*/
- ADC1->CR2 &= CR2_TSVREFE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetFlagStatus
-* Description : Checks whether the specified ADC flag is set or not.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - ADC_FLAG_AWD: Analog watchdog flag
-* - ADC_FLAG_EOC: End of conversion flag
-* - ADC_FLAG_JEOC: End of injected group conversion flag
-* - ADC_FLAG_JSTRT: Start of injected group conversion flag
-* - ADC_FLAG_STRT: Start of regular group conversion flag
-* Output : None
-* Return : The new state of ADC_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus ADC_GetFlagStatus(ADC_TypeDef* ADCx, u8 ADC_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_GET_FLAG(ADC_FLAG));
-
- /* Check the status of the specified ADC flag */
- if ((ADCx->SR & ADC_FLAG) != (u8)RESET)
- {
- /* ADC_FLAG is set */
- bitstatus = SET;
- }
- else
- {
- /* ADC_FLAG is reset */
- bitstatus = RESET;
- }
-
- /* Return the ADC_FLAG status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : ADC_ClearFlag
-* Description : Clears the ADCx's pending flags.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_FLAG: specifies the flag to clear.
-* This parameter can be any combination of the following values:
-* - ADC_FLAG_AWD: Analog watchdog flag
-* - ADC_FLAG_EOC: End of conversion flag
-* - ADC_FLAG_JEOC: End of injected group conversion flag
-* - ADC_FLAG_JSTRT: Start of injected group conversion flag
-* - ADC_FLAG_STRT: Start of regular group conversion flag
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ClearFlag(ADC_TypeDef* ADCx, u8 ADC_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_CLEAR_FLAG(ADC_FLAG));
-
- /* Clear the selected ADC flags */
- ADCx->SR = ~(u32)ADC_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : ADC_GetITStatus
-* Description : Checks whether the specified ADC interrupt has occurred or not.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_IT: specifies the ADC interrupt source to check.
-* This parameter can be one of the following values:
-* - ADC_IT_EOC: End of conversion interrupt mask
-* - ADC_IT_AWD: Analog watchdog interrupt mask
-* - ADC_IT_JEOC: End of injected conversion interrupt mask
-* Output : None
-* Return : The new state of ADC_IT (SET or RESET).
-*******************************************************************************/
-ITStatus ADC_GetITStatus(ADC_TypeDef* ADCx, u16 ADC_IT)
-{
- ITStatus bitstatus = RESET;
- u32 itmask = 0, enablestatus = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_GET_IT(ADC_IT));
-
- /* Get the ADC IT index */
- itmask = ADC_IT >> 8;
-
- /* Get the ADC_IT enable bit status */
- enablestatus = (ADCx->CR1 & (u8)ADC_IT) ;
-
- /* Check the status of the specified ADC interrupt */
- if (((ADCx->SR & itmask) != (u32)RESET) && enablestatus)
- {
- /* ADC_IT is set */
- bitstatus = SET;
- }
- else
- {
- /* ADC_IT is reset */
- bitstatus = RESET;
- }
-
- /* Return the ADC_IT status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : ADC_ClearITPendingBit
-* Description : Clears the ADCx’s interrupt pending bits.
-* Input : - ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.
-* - ADC_IT: specifies the ADC interrupt pending bit to clear.
-* This parameter can be any combination of the following values:
-* - ADC_IT_EOC: End of conversion interrupt mask
-* - ADC_IT_AWD: Analog watchdog interrupt mask
-* - ADC_IT_JEOC: End of injected conversion interrupt mask
-* Output : None
-* Return : None
-*******************************************************************************/
-void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, u16 ADC_IT)
-{
- u8 itmask = 0;
-
- /* Check the parameters */
- assert_param(IS_ADC_ALL_PERIPH(ADCx));
- assert_param(IS_ADC_IT(ADC_IT));
-
- /* Get the ADC IT index */
- itmask = (u8)(ADC_IT >> 8);
-
- /* Clear the selected ADC interrupt pending bits */
- ADCx->SR = ~(u32)itmask;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_bkp.c b/stm32lib/src/stm32f10x_bkp.c
deleted file mode 100644
index a6d3825..0000000
--- a/stm32lib/src/stm32f10x_bkp.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_bkp.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the BKP firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_bkp.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ------------ BKP registers bit address in the alias region ----------- */
-#define BKP_OFFSET (BKP_BASE - PERIPH_BASE)
-
-/* --- CR Register ---*/
-/* Alias word address of TPAL bit */
-#define CR_OFFSET (BKP_OFFSET + 0x30)
-#define TPAL_BitNumber 0x01
-#define CR_TPAL_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (TPAL_BitNumber * 4))
-
-/* Alias word address of TPE bit */
-#define TPE_BitNumber 0x00
-#define CR_TPE_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (TPE_BitNumber * 4))
-
-/* --- CSR Register ---*/
-/* Alias word address of TPIE bit */
-#define CSR_OFFSET (BKP_OFFSET + 0x34)
-#define TPIE_BitNumber 0x02
-#define CSR_TPIE_BB (PERIPH_BB_BASE + (CSR_OFFSET * 32) + (TPIE_BitNumber * 4))
-
-/* Alias word address of TIF bit */
-#define TIF_BitNumber 0x09
-#define CSR_TIF_BB (PERIPH_BB_BASE + (CSR_OFFSET * 32) + (TIF_BitNumber * 4))
-
-/* Alias word address of TEF bit */
-#define TEF_BitNumber 0x08
-#define CSR_TEF_BB (PERIPH_BB_BASE + (CSR_OFFSET * 32) + (TEF_BitNumber * 4))
-
-
-/* ---------------------- BKP registers bit mask ------------------------ */
-/* RTCCR register bit mask */
-#define RTCCR_CAL_Mask ((u16)0xFF80)
-#define RTCCR_Mask ((u16)0xFC7F)
-
-/* CSR register bit mask */
-#define CSR_CTE_Set ((u16)0x0001)
-#define CSR_CTI_Set ((u16)0x0002)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : BKP_DeInit
-* Description : Deinitializes the BKP peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_DeInit(void)
-{
- RCC_BackupResetCmd(ENABLE);
- RCC_BackupResetCmd(DISABLE);
-}
-
-/*******************************************************************************
-* Function Name : BKP_TamperPinLevelConfig
-* Description : Configures the Tamper Pin active level.
-* Input : - BKP_TamperPinLevel: specifies the Tamper Pin active level.
-* This parameter can be one of the following values:
-* - BKP_TamperPinLevel_High: Tamper pin active on high level
-* - BKP_TamperPinLevel_Low: Tamper pin active on low level
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_TamperPinLevelConfig(u16 BKP_TamperPinLevel)
-{
- /* Check the parameters */
- assert_param(IS_BKP_TAMPER_PIN_LEVEL(BKP_TamperPinLevel));
-
- *(vu32 *) CR_TPAL_BB = BKP_TamperPinLevel;
-}
-
-/*******************************************************************************
-* Function Name : BKP_TamperPinCmd
-* Description : Enables or disables the Tamper Pin activation.
-* Input : - NewState: new state of the Tamper Pin activation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_TamperPinCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CR_TPE_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : BKP_ITConfig
-* Description : Enables or disables the Tamper Pin Interrupt.
-* Input : - NewState: new state of the Tamper Pin Interrupt.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_ITConfig(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CSR_TPIE_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : BKP_RTCOutputConfig
-* Description : Select the RTC output source to output on the Tamper pin.
-* Input : - BKP_RTCOutputSource: specifies the RTC output source.
-* This parameter can be one of the following values:
-* - BKP_RTCOutputSource_None: no RTC output on the Tamper pin.
-* - BKP_RTCOutputSource_CalibClock: output the RTC clock
-* with frequency divided by 64 on the Tamper pin.
-* - BKP_RTCOutputSource_Alarm: output the RTC Alarm pulse
-* signal on the Tamper pin.
-* - BKP_RTCOutputSource_Second: output the RTC Second pulse
-* signal on the Tamper pin.
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_RTCOutputConfig(u16 BKP_RTCOutputSource)
-{
- u16 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_BKP_RTC_OUTPUT_SOURCE(BKP_RTCOutputSource));
-
- tmpreg = BKP->RTCCR;
-
- /* Clear CCO, ASOE and ASOS bits */
- tmpreg &= RTCCR_Mask;
-
- /* Set CCO, ASOE and ASOS bits according to BKP_RTCOutputSource value */
- tmpreg |= BKP_RTCOutputSource;
-
- /* Store the new value */
- BKP->RTCCR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : BKP_SetRTCCalibrationValue
-* Description : Sets RTC Clock Calibration value.
-* Input : - CalibrationValue: specifies the RTC Clock Calibration value.
-* This parameter must be a number between 0 and 0x7F.
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_SetRTCCalibrationValue(u8 CalibrationValue)
-{
- u16 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_BKP_CALIBRATION_VALUE(CalibrationValue));
-
- tmpreg = BKP->RTCCR;
-
- /* Clear CAL[6:0] bits */
- tmpreg &= RTCCR_CAL_Mask;
-
- /* Set CAL[6:0] bits according to CalibrationValue value */
- tmpreg |= CalibrationValue;
-
- /* Store the new value */
- BKP->RTCCR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : BKP_WriteBackupRegister
-* Description : Writes user data to the specified Data Backup Register.
-* Input : - BKP_DR: specifies the Data Backup Register.
-* This parameter can be BKP_DRx where x:[1, 42]
-* - Data: data to write
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_WriteBackupRegister(u16 BKP_DR, u16 Data)
-{
- /* Check the parameters */
- assert_param(IS_BKP_DR(BKP_DR));
-
- *(vu16 *) (BKP_BASE + BKP_DR) = Data;
-}
-
-/*******************************************************************************
-* Function Name : BKP_ReadBackupRegister
-* Description : Reads data from the specified Data Backup Register.
-* Input : - BKP_DR: specifies the Data Backup Register.
-* This parameter can be BKP_DRx where x:[1, 42]
-* Output : None
-* Return : The content of the specified Data Backup Register
-*******************************************************************************/
-u16 BKP_ReadBackupRegister(u16 BKP_DR)
-{
- /* Check the parameters */
- assert_param(IS_BKP_DR(BKP_DR));
-
- return (*(vu16 *) (BKP_BASE + BKP_DR));
-}
-
-/*******************************************************************************
-* Function Name : BKP_GetFlagStatus
-* Description : Checks whether the Tamper Pin Event flag is set or not.
-* Input : None
-* Output : None
-* Return : The new state of the Tamper Pin Event flag (SET or RESET).
-*******************************************************************************/
-FlagStatus BKP_GetFlagStatus(void)
-{
- return (FlagStatus)(*(vu32 *) CSR_TEF_BB);
-}
-
-/*******************************************************************************
-* Function Name : BKP_ClearFlag
-* Description : Clears Tamper Pin Event pending flag.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_ClearFlag(void)
-{
- /* Set CTE bit to clear Tamper Pin Event flag */
- BKP->CSR |= CSR_CTE_Set;
-}
-
-/*******************************************************************************
-* Function Name : BKP_GetITStatus
-* Description : Checks whether the Tamper Pin Interrupt has occurred or not.
-* Input : None
-* Output : None
-* Return : The new state of the Tamper Pin Interrupt (SET or RESET).
-*******************************************************************************/
-ITStatus BKP_GetITStatus(void)
-{
- return (ITStatus)(*(vu32 *) CSR_TIF_BB);
-}
-
-/*******************************************************************************
-* Function Name : BKP_ClearITPendingBit
-* Description : Clears Tamper Pin Interrupt pending bit.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void BKP_ClearITPendingBit(void)
-{
- /* Set CTI bit to clear Tamper Pin Interrupt pending bit */
- BKP->CSR |= CSR_CTI_Set;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_can.c b/stm32lib/src/stm32f10x_can.c
deleted file mode 100644
index afb472d..0000000
--- a/stm32lib/src/stm32f10x_can.c
+++ /dev/null
@@ -1,907 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_can.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the CAN firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_can.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-
-/* Private define ------------------------------------------------------------*/
-/* CAN Master Control Register bits */
-#define CAN_MCR_INRQ ((u32)0x00000001) /* Initialization request */
-#define CAN_MCR_SLEEP ((u32)0x00000002) /* Sleep mode request */
-#define CAN_MCR_TXFP ((u32)0x00000004) /* Transmit FIFO priority */
-#define CAN_MCR_RFLM ((u32)0x00000008) /* Receive FIFO locked mode */
-#define CAN_MCR_NART ((u32)0x00000010) /* No automatic retransmission */
-#define CAN_MCR_AWUM ((u32)0x00000020) /* Automatic wake up mode */
-#define CAN_MCR_ABOM ((u32)0x00000040) /* Automatic bus-off management */
-#define CAN_MCR_TTCM ((u32)0x00000080) /* time triggered communication */
-
-/* CAN Master Status Register bits */
-#define CAN_MSR_INAK ((u32)0x00000001) /* Initialization acknowledge */
-#define CAN_MSR_WKUI ((u32)0x00000008) /* Wake-up interrupt */
-#define CAN_MSR_SLAKI ((u32)0x00000010) /* Sleep acknowledge interrupt */
-
-/* CAN Transmit Status Register bits */
-#define CAN_TSR_RQCP0 ((u32)0x00000001) /* Request completed mailbox0 */
-#define CAN_TSR_TXOK0 ((u32)0x00000002) /* Transmission OK of mailbox0 */
-#define CAN_TSR_ABRQ0 ((u32)0x00000080) /* Abort request for mailbox0 */
-#define CAN_TSR_RQCP1 ((u32)0x00000100) /* Request completed mailbox1 */
-#define CAN_TSR_TXOK1 ((u32)0x00000200) /* Transmission OK of mailbox1 */
-#define CAN_TSR_ABRQ1 ((u32)0x00008000) /* Abort request for mailbox1 */
-#define CAN_TSR_RQCP2 ((u32)0x00010000) /* Request completed mailbox2 */
-#define CAN_TSR_TXOK2 ((u32)0x00020000) /* Transmission OK of mailbox2 */
-#define CAN_TSR_ABRQ2 ((u32)0x00800000) /* Abort request for mailbox2 */
-#define CAN_TSR_TME0 ((u32)0x04000000) /* Transmit mailbox 0 empty */
-#define CAN_TSR_TME1 ((u32)0x08000000) /* Transmit mailbox 1 empty */
-#define CAN_TSR_TME2 ((u32)0x10000000) /* Transmit mailbox 2 empty */
-
-/* CAN Receive FIFO 0 Register bits */
-#define CAN_RF0R_FULL0 ((u32)0x00000008) /* FIFO 0 full */
-#define CAN_RF0R_FOVR0 ((u32)0x00000010) /* FIFO 0 overrun */
-#define CAN_RF0R_RFOM0 ((u32)0x00000020) /* Release FIFO 0 output mailbox */
-
-/* CAN Receive FIFO 1 Register bits */
-#define CAN_RF1R_FULL1 ((u32)0x00000008) /* FIFO 1 full */
-#define CAN_RF1R_FOVR1 ((u32)0x00000010) /* FIFO 1 overrun */
-#define CAN_RF1R_RFOM1 ((u32)0x00000020) /* Release FIFO 1 output mailbox */
-
-/* CAN Error Status Register bits */
-#define CAN_ESR_EWGF ((u32)0x00000001) /* Error warning flag */
-#define CAN_ESR_EPVF ((u32)0x00000002) /* Error passive flag */
-#define CAN_ESR_BOFF ((u32)0x00000004) /* Bus-off flag */
-
-/* CAN Mailbox Transmit Request */
-#define CAN_TMIDxR_TXRQ ((u32)0x00000001) /* Transmit mailbox request */
-
-/* CAN Filter Master Register bits */
-#define CAN_FMR_FINIT ((u32)0x00000001) /* Filter init mode */
-
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-static ITStatus CheckITStatus(u32 CAN_Reg, u32 It_Bit);
-
-/* Private functions ---------------------------------------------------------*/
-/*******************************************************************************
-* Function Name : CAN_DeInit
-* Description : Deinitializes the CAN peripheral registers to their default
-* reset values.
-* Input : None.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_DeInit(void)
-{
- /* Enable CAN reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_CAN, ENABLE);
- /* Release CAN from reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_CAN, DISABLE);
-}
-
-/*******************************************************************************
-* Function Name : CAN_Init
-* Description : Initializes the CAN peripheral according to the specified
-* parameters in the CAN_InitStruct.
-* Input : CAN_InitStruct: pointer to a CAN_InitTypeDef structure that
- contains the configuration information for the CAN peripheral.
-* Output : None.
-* Return : Constant indicates initialization succeed which will be
-* CANINITFAILED or CANINITOK.
-*******************************************************************************/
-u8 CAN_Init(CAN_InitTypeDef* CAN_InitStruct)
-{
- u8 InitStatus = 0;
- u16 WaitAck = 0;
-
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(CAN_InitStruct->CAN_TTCM));
- assert_param(IS_FUNCTIONAL_STATE(CAN_InitStruct->CAN_ABOM));
- assert_param(IS_FUNCTIONAL_STATE(CAN_InitStruct->CAN_AWUM));
- assert_param(IS_FUNCTIONAL_STATE(CAN_InitStruct->CAN_NART));
- assert_param(IS_FUNCTIONAL_STATE(CAN_InitStruct->CAN_RFLM));
- assert_param(IS_FUNCTIONAL_STATE(CAN_InitStruct->CAN_TXFP));
- assert_param(IS_CAN_MODE(CAN_InitStruct->CAN_Mode));
- assert_param(IS_CAN_SJW(CAN_InitStruct->CAN_SJW));
- assert_param(IS_CAN_BS1(CAN_InitStruct->CAN_BS1));
- assert_param(IS_CAN_BS2(CAN_InitStruct->CAN_BS2));
- assert_param(IS_CAN_PRESCALER(CAN_InitStruct->CAN_Prescaler));
-
- /* Request initialisation */
- CAN->MCR = CAN_MCR_INRQ;
-
- /* ...and check acknowledged */
- if ((CAN->MSR & CAN_MSR_INAK) == 0)
- {
- InitStatus = CANINITFAILED;
- }
- else
- {
- /* Set the time triggered communication mode */
- if (CAN_InitStruct->CAN_TTCM == ENABLE)
- {
- CAN->MCR |= CAN_MCR_TTCM;
- }
- else
- {
- CAN->MCR &= ~CAN_MCR_TTCM;
- }
-
- /* Set the automatic bus-off management */
- if (CAN_InitStruct->CAN_ABOM == ENABLE)
- {
- CAN->MCR |= CAN_MCR_ABOM;
- }
- else
- {
- CAN->MCR &= ~CAN_MCR_ABOM;
- }
-
- /* Set the automatic wake-up mode */
- if (CAN_InitStruct->CAN_AWUM == ENABLE)
- {
- CAN->MCR |= CAN_MCR_AWUM;
- }
- else
- {
- CAN->MCR &= ~CAN_MCR_AWUM;
- }
-
- /* Set the no automatic retransmission */
- if (CAN_InitStruct->CAN_NART == ENABLE)
- {
- CAN->MCR |= CAN_MCR_NART;
- }
- else
- {
- CAN->MCR &= ~CAN_MCR_NART;
- }
-
- /* Set the receive FIFO locked mode */
- if (CAN_InitStruct->CAN_RFLM == ENABLE)
- {
- CAN->MCR |= CAN_MCR_RFLM;
- }
- else
- {
- CAN->MCR &= ~CAN_MCR_RFLM;
- }
-
- /* Set the transmit FIFO priority */
- if (CAN_InitStruct->CAN_TXFP == ENABLE)
- {
- CAN->MCR |= CAN_MCR_TXFP;
- }
- else
- {
- CAN->MCR &= ~CAN_MCR_TXFP;
- }
-
- /* Set the bit timing register */
- CAN->BTR = (u32)((u32)CAN_InitStruct->CAN_Mode << 30) | ((u32)CAN_InitStruct->CAN_SJW << 24) |
- ((u32)CAN_InitStruct->CAN_BS1 << 16) | ((u32)CAN_InitStruct->CAN_BS2 << 20) |
- ((u32)CAN_InitStruct->CAN_Prescaler - 1);
-
- InitStatus = CANINITOK;
-
- /* Request leave initialisation */
- CAN->MCR &= ~CAN_MCR_INRQ;
-
- /* Wait the acknowledge */
- for(WaitAck = 0x400; WaitAck > 0x0; WaitAck--)
- {
- }
-
- /* ...and check acknowledged */
- if ((CAN->MSR & CAN_MSR_INAK) == CAN_MSR_INAK)
- {
- InitStatus = CANINITFAILED;
- }
- }
-
- /* At this step, return the status of initialization */
- return InitStatus;
-}
-
-/*******************************************************************************
-* Function Name : CAN_FilterInit
-* Description : Initializes the CAN peripheral according to the specified
-* parameters in the CAN_FilterInitStruct.
-* Input : CAN_FilterInitStruct: pointer to a CAN_FilterInitTypeDef
-* structure that contains the configuration information.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_FilterInit(CAN_FilterInitTypeDef* CAN_FilterInitStruct)
-{
- u16 FilterNumber_BitPos = 0;
-
- /* Check the parameters */
- assert_param(IS_CAN_FILTER_NUMBER(CAN_FilterInitStruct->CAN_FilterNumber));
- assert_param(IS_CAN_FILTER_MODE(CAN_FilterInitStruct->CAN_FilterMode));
- assert_param(IS_CAN_FILTER_SCALE(CAN_FilterInitStruct->CAN_FilterScale));
- assert_param(IS_CAN_FILTER_FIFO(CAN_FilterInitStruct->CAN_FilterFIFOAssignment));
- assert_param(IS_FUNCTIONAL_STATE(CAN_FilterInitStruct->CAN_FilterActivation));
-
- FilterNumber_BitPos =
- (u16)((u16)0x0001 << ((u16)CAN_FilterInitStruct->CAN_FilterNumber));
-
- /* Initialisation mode for the filter */
- CAN->FMR |= CAN_FMR_FINIT;
-
- /* Filter Deactivation */
- CAN->FA1R &= ~(u32)FilterNumber_BitPos;
-
- /* Filter Scale */
- if (CAN_FilterInitStruct->CAN_FilterScale == CAN_FilterScale_16bit)
- {
- /* 16-bit scale for the filter */
- CAN->FS1R &= ~(u32)FilterNumber_BitPos;
-
- /* First 16-bit identifier and First 16-bit mask */
- /* Or First 16-bit identifier and Second 16-bit identifier */
- CAN->sFilterRegister[CAN_FilterInitStruct->CAN_FilterNumber].FR1 =
- ((u32)((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterMaskIdLow) << 16) |
- ((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterIdLow);
-
- /* Second 16-bit identifier and Second 16-bit mask */
- /* Or Third 16-bit identifier and Fourth 16-bit identifier */
- CAN->sFilterRegister[CAN_FilterInitStruct->CAN_FilterNumber].FR2 =
- ((u32)((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterMaskIdHigh) << 16) |
- ((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterIdHigh);
- }
- if (CAN_FilterInitStruct->CAN_FilterScale == CAN_FilterScale_32bit)
- {
- /* 32-bit scale for the filter */
- CAN->FS1R |= FilterNumber_BitPos;
-
- /* 32-bit identifier or First 32-bit identifier */
- CAN->sFilterRegister[CAN_FilterInitStruct->CAN_FilterNumber].FR1 =
- ((u32)((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterIdHigh) << 16) |
- ((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterIdLow);
-
- /* 32-bit mask or Second 32-bit identifier */
- CAN->sFilterRegister[CAN_FilterInitStruct->CAN_FilterNumber].FR2 =
- ((u32)((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterMaskIdHigh) << 16) |
- ((u32)0x0000FFFF & CAN_FilterInitStruct->CAN_FilterMaskIdLow);
-
- }
-
- /* Filter Mode */
- if (CAN_FilterInitStruct->CAN_FilterMode == CAN_FilterMode_IdMask)
- {
- /*Id/Mask mode for the filter*/
- CAN->FM1R &= ~(u32)FilterNumber_BitPos;
- }
- else /* CAN_FilterInitStruct->CAN_FilterMode == CAN_FilterMode_IdList */
- {
- /*Identifier list mode for the filter*/
- CAN->FM1R |= (u32)FilterNumber_BitPos;
- }
-
- /* Filter FIFO assignment */
- if (CAN_FilterInitStruct->CAN_FilterFIFOAssignment == CAN_FilterFIFO0)
- {
- /* FIFO 0 assignation for the filter */
- CAN->FFA1R &= ~(u32)FilterNumber_BitPos;
- }
- if (CAN_FilterInitStruct->CAN_FilterFIFOAssignment == CAN_FilterFIFO1)
- {
- /* FIFO 1 assignation for the filter */
- CAN->FFA1R |= (u32)FilterNumber_BitPos;
- }
-
- /* Filter activation */
- if (CAN_FilterInitStruct->CAN_FilterActivation == ENABLE)
- {
- CAN->FA1R |= FilterNumber_BitPos;
- }
-
- /* Leave the initialisation mode for the filter */
- CAN->FMR &= ~CAN_FMR_FINIT;
-}
-
-/*******************************************************************************
-* Function Name : CAN_StructInit
-* Description : Fills each CAN_InitStruct member with its default value.
-* Input : CAN_InitStruct: pointer to a CAN_InitTypeDef structure which
-* will be initialized.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_StructInit(CAN_InitTypeDef* CAN_InitStruct)
-{
- /* Reset CAN init structure parameters values */
-
- /* Initialize the time triggered communication mode */
- CAN_InitStruct->CAN_TTCM = DISABLE;
-
- /* Initialize the automatic bus-off management */
- CAN_InitStruct->CAN_ABOM = DISABLE;
-
- /* Initialize the automatic wake-up mode */
- CAN_InitStruct->CAN_AWUM = DISABLE;
-
- /* Initialize the no automatic retransmission */
- CAN_InitStruct->CAN_NART = DISABLE;
-
- /* Initialize the receive FIFO locked mode */
- CAN_InitStruct->CAN_RFLM = DISABLE;
-
- /* Initialize the transmit FIFO priority */
- CAN_InitStruct->CAN_TXFP = DISABLE;
-
- /* Initialize the CAN_Mode member */
- CAN_InitStruct->CAN_Mode = CAN_Mode_Normal;
-
- /* Initialize the CAN_SJW member */
- CAN_InitStruct->CAN_SJW = CAN_SJW_1tq;
-
- /* Initialize the CAN_BS1 member */
- CAN_InitStruct->CAN_BS1 = CAN_BS1_4tq;
-
- /* Initialize the CAN_BS2 member */
- CAN_InitStruct->CAN_BS2 = CAN_BS2_3tq;
-
- /* Initialize the CAN_Prescaler member */
- CAN_InitStruct->CAN_Prescaler = 1;
-}
-
-/*******************************************************************************
-* Function Name : CAN_ITConfig
-* Description : Enables or disables the specified CAN interrupts.
-* Input : - CAN_IT: specifies the CAN interrupt sources to be enabled or
-* disabled.
-* This parameter can be: CAN_IT_TME, CAN_IT_FMP0, CAN_IT_FF0,
-* CAN_IT_FOV0, CAN_IT_FMP1, CAN_IT_FF1,
-* CAN_IT_FOV1, CAN_IT_EWG, CAN_IT_EPV,
-* CAN_IT_LEC, CAN_IT_ERR, CAN_IT_WKU or
-* CAN_IT_SLK.
-* - NewState: new state of the CAN interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_ITConfig(u32 CAN_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_CAN_ITConfig(CAN_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected CAN interrupt */
- CAN->IER |= CAN_IT;
- }
- else
- {
- /* Disable the selected CAN interrupt */
- CAN->IER &= ~CAN_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : CAN_Transmit
-* Description : Initiates the transmission of a message.
-* Input : TxMessage: pointer to a structure which contains CAN Id, CAN
-* DLC and CAN datas.
-* Output : None.
-* Return : The number of the mailbox that is used for transmission
-* or CAN_NO_MB if there is no empty mailbox.
-*******************************************************************************/
-u8 CAN_Transmit(CanTxMsg* TxMessage)
-{
- u8 TransmitMailbox = 0;
-
- /* Check the parameters */
- assert_param(IS_CAN_STDID(TxMessage->StdId));
- assert_param(IS_CAN_EXTID(TxMessage->StdId));
- assert_param(IS_CAN_IDTYPE(TxMessage->IDE));
- assert_param(IS_CAN_RTR(TxMessage->RTR));
- assert_param(IS_CAN_DLC(TxMessage->DLC));
-
- /* Select one empty transmit mailbox */
- if ((CAN->TSR&CAN_TSR_TME0) == CAN_TSR_TME0)
- {
- TransmitMailbox = 0;
- }
- else if ((CAN->TSR&CAN_TSR_TME1) == CAN_TSR_TME1)
- {
- TransmitMailbox = 1;
- }
- else if ((CAN->TSR&CAN_TSR_TME2) == CAN_TSR_TME2)
- {
- TransmitMailbox = 2;
- }
- else
- {
- TransmitMailbox = CAN_NO_MB;
- }
-
- if (TransmitMailbox != CAN_NO_MB)
- {
- /* Set up the Id */
- CAN->sTxMailBox[TransmitMailbox].TIR &= CAN_TMIDxR_TXRQ;
- if (TxMessage->IDE == CAN_ID_STD)
- {
- TxMessage->StdId &= (u32)0x000007FF;
- TxMessage->StdId = TxMessage->StdId << 21;
-
- CAN->sTxMailBox[TransmitMailbox].TIR |= (TxMessage->StdId | TxMessage->IDE |
- TxMessage->RTR);
- }
- else
- {
- TxMessage->ExtId &= (u32)0x1FFFFFFF;
- TxMessage->ExtId <<= 3;
-
- CAN->sTxMailBox[TransmitMailbox].TIR |= (TxMessage->ExtId | TxMessage->IDE |
- TxMessage->RTR);
- }
-
- /* Set up the DLC */
- TxMessage->DLC &= (u8)0x0000000F;
- CAN->sTxMailBox[TransmitMailbox].TDTR &= (u32)0xFFFFFFF0;
- CAN->sTxMailBox[TransmitMailbox].TDTR |= TxMessage->DLC;
-
- /* Set up the data field */
- CAN->sTxMailBox[TransmitMailbox].TDLR = (((u32)TxMessage->Data[3] << 24) |
- ((u32)TxMessage->Data[2] << 16) |
- ((u32)TxMessage->Data[1] << 8) |
- ((u32)TxMessage->Data[0]));
- CAN->sTxMailBox[TransmitMailbox].TDHR = (((u32)TxMessage->Data[7] << 24) |
- ((u32)TxMessage->Data[6] << 16) |
- ((u32)TxMessage->Data[5] << 8) |
- ((u32)TxMessage->Data[4]));
-
- /* Request transmission */
- CAN->sTxMailBox[TransmitMailbox].TIR |= CAN_TMIDxR_TXRQ;
- }
-
- return TransmitMailbox;
-}
-
-/*******************************************************************************
-* Function Name : CAN_TransmitStatus
-* Description : Checks the transmission of a message.
-* Input : TransmitMailbox: the number of the mailbox that is used for
-* transmission.
-* Output : None.
-* Return : CANTXOK if the CAN driver transmits the message, CANTXFAILED
-* in an other case.
-*******************************************************************************/
-u8 CAN_TransmitStatus(u8 TransmitMailbox)
-{
- /* RQCP, TXOK and TME bits */
- u8 State = 0;
-
- /* Check the parameters */
- assert_param(IS_CAN_TRANSMITMAILBOX(TransmitMailbox));
-
- switch (TransmitMailbox)
- {
- case (0): State |= (u8)((CAN->TSR & CAN_TSR_RQCP0) << 2);
- State |= (u8)((CAN->TSR & CAN_TSR_TXOK0) >> 0);
- State |= (u8)((CAN->TSR & CAN_TSR_TME0) >> 26);
- break;
- case (1): State |= (u8)((CAN->TSR & CAN_TSR_RQCP1) >> 6);
- State |= (u8)((CAN->TSR & CAN_TSR_TXOK1) >> 8);
- State |= (u8)((CAN->TSR & CAN_TSR_TME1) >> 27);
- break;
- case (2): State |= (u8)((CAN->TSR & CAN_TSR_RQCP2) >> 14);
- State |= (u8)((CAN->TSR & CAN_TSR_TXOK2) >> 16);
- State |= (u8)((CAN->TSR & CAN_TSR_TME2) >> 28);
- break;
- default:
- State = CANTXFAILED;
- break;
- }
-
- switch (State)
- {
- /* transmit pending */
- case (0x0): State = CANTXPENDING;
- break;
- /* transmit failed */
- case (0x5): State = CANTXFAILED;
- break;
- /* transmit succedeed */
- case (0x7): State = CANTXOK;
- break;
- default:
- State = CANTXFAILED;
- break;
- }
-
- return State;
-}
-
-/*******************************************************************************
-* Function Name : CAN_CancelTransmit
-* Description : Cancels a transmit request.
-* Input : Mailbox number.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_CancelTransmit(u8 Mailbox)
-{
- /* Check the parameters */
- assert_param(IS_CAN_TRANSMITMAILBOX(Mailbox));
-
- /* abort transmission */
- switch (Mailbox)
- {
- case (0): CAN->TSR |= CAN_TSR_ABRQ0;
- break;
- case (1): CAN->TSR |= CAN_TSR_ABRQ1;
- break;
- case (2): CAN->TSR |= CAN_TSR_ABRQ2;
- break;
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : CAN_FIFORelease
-* Description : Releases a FIFO.
-* Input : FIFONumber: FIFO to release, CAN_FIFO0 or CAN_FIFO1.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_FIFORelease(u8 FIFONumber)
-{
- /* Check the parameters */
- assert_param(IS_CAN_FIFO(FIFONumber));
-
- /* Release FIFO0 */
- if (FIFONumber == CAN_FIFO0)
- {
- CAN->RF0R = CAN_RF0R_RFOM0;
- }
- /* Release FIFO1 */
- else /* FIFONumber == CAN_FIFO1 */
- {
- CAN->RF1R = CAN_RF1R_RFOM1;
- }
-}
-
-/*******************************************************************************
-* Function Name : CAN_MessagePending
-* Description : Returns the number of pending messages.
-* Input : FIFONumber: Receive FIFO number, CAN_FIFO0 or CAN_FIFO1.
-* Output : None.
-* Return : NbMessage which is the number of pending message.
-*******************************************************************************/
-u8 CAN_MessagePending(u8 FIFONumber)
-{
- u8 MessagePending=0;
-
- /* Check the parameters */
- assert_param(IS_CAN_FIFO(FIFONumber));
-
- if (FIFONumber == CAN_FIFO0)
- {
- MessagePending = (u8)(CAN->RF0R&(u32)0x03);
- }
- else if (FIFONumber == CAN_FIFO1)
- {
- MessagePending = (u8)(CAN->RF1R&(u32)0x03);
- }
- else
- {
- MessagePending = 0;
- }
- return MessagePending;
-}
-
-/*******************************************************************************
-* Function Name : CAN_Receive
-* Description : Receives a message.
-* Input : FIFONumber: Receive FIFO number, CAN_FIFO0 or CAN_FIFO1.
-* Output : RxMessage: pointer to a structure which contains CAN Id,
-* CAN DLC, CAN datas and FMI number.
-* Return : None.
-*******************************************************************************/
-void CAN_Receive(u8 FIFONumber, CanRxMsg* RxMessage)
-{
- /* Check the parameters */
- assert_param(IS_CAN_FIFO(FIFONumber));
-
- /* Get the Id */
- RxMessage->IDE = (u8)0x04 & CAN->sFIFOMailBox[FIFONumber].RIR;
- if (RxMessage->IDE == CAN_ID_STD)
- {
- RxMessage->StdId = (u32)0x000007FF & (CAN->sFIFOMailBox[FIFONumber].RIR >> 21);
- }
- else
- {
- RxMessage->ExtId = (u32)0x1FFFFFFF & (CAN->sFIFOMailBox[FIFONumber].RIR >> 3);
- }
-
- RxMessage->RTR = (u8)0x02 & CAN->sFIFOMailBox[FIFONumber].RIR;
-
- /* Get the DLC */
- RxMessage->DLC = (u8)0x0F & CAN->sFIFOMailBox[FIFONumber].RDTR;
-
- /* Get the FMI */
- RxMessage->FMI = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDTR >> 8);
-
- /* Get the data field */
- RxMessage->Data[0] = (u8)0xFF & CAN->sFIFOMailBox[FIFONumber].RDLR;
- RxMessage->Data[1] = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDLR >> 8);
- RxMessage->Data[2] = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDLR >> 16);
- RxMessage->Data[3] = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDLR >> 24);
-
- RxMessage->Data[4] = (u8)0xFF & CAN->sFIFOMailBox[FIFONumber].RDHR;
- RxMessage->Data[5] = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDHR >> 8);
- RxMessage->Data[6] = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDHR >> 16);
- RxMessage->Data[7] = (u8)0xFF & (CAN->sFIFOMailBox[FIFONumber].RDHR >> 24);
-
- /* Release the FIFO */
- CAN_FIFORelease(FIFONumber);
-}
-
-/*******************************************************************************
-* Function Name : CAN_Sleep
-* Description : Enters the low power mode.
-* Input : None.
-* Output : None.
-* Return : CANSLEEPOK if sleep entered, CANSLEEPFAILED in an other case.
-*******************************************************************************/
-u8 CAN_Sleep(void)
-{
- u8 SleepStatus = 0;
-
- /* Sleep mode entering request */
- CAN->MCR |= CAN_MCR_SLEEP;
- SleepStatus = CANSLEEPOK;
-
- /* Sleep mode status */
- if ((CAN->MCR&CAN_MCR_SLEEP) == 0)
- {
- /* Sleep mode not entered */
- SleepStatus = CANSLEEPFAILED;
- }
-
- /* At this step, sleep mode status */
- return SleepStatus;
-}
-
-/*******************************************************************************
-* Function Name : CAN_WakeUp
-* Description : Wakes the CAN up.
-* Input : None.
-* Output : None.
-* Return : CANWAKEUPOK if sleep mode left, CANWAKEUPFAILED in an other
-* case.
-*******************************************************************************/
-u8 CAN_WakeUp(void)
-{
- u8 WakeUpStatus = 0;
-
- /* Wake up request */
- CAN->MCR &= ~CAN_MCR_SLEEP;
- WakeUpStatus = CANWAKEUPFAILED;
-
- /* Sleep mode status */
- if ((CAN->MCR&CAN_MCR_SLEEP) == 0)
- {
- /* Sleep mode exited */
- WakeUpStatus = CANWAKEUPOK;
- }
-
- /* At this step, sleep mode status */
- return WakeUpStatus;
-}
-
-/*******************************************************************************
-* Function Name : CAN_GetFlagStatus
-* Description : Checks whether the specified CAN flag is set or not.
-* Input : CAN_FLAG: specifies the flag to check.
-* This parameter can be: CAN_FLAG_EWG, CAN_FLAG_EPV or
-* CAN_FLAG_BOF.
-* Output : None.
-* Return : The new state of CAN_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus CAN_GetFlagStatus(u32 CAN_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_CAN_FLAG(CAN_FLAG));
-
- /* Check the status of the specified CAN flag */
- if ((CAN->ESR & CAN_FLAG) != (u32)RESET)
- {
- /* CAN_FLAG is set */
- bitstatus = SET;
- }
- else
- {
- /* CAN_FLAG is reset */
- bitstatus = RESET;
- }
- /* Return the CAN_FLAG status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : CAN_ClearFlag
-* Description : Clears the CAN's pending flags.
-* Input : CAN_FLAG: specifies the flag to clear.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_ClearFlag(u32 CAN_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_CAN_FLAG(CAN_FLAG));
-
- /* Clear the selected CAN flags */
- CAN->ESR &= ~CAN_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : CAN_GetITStatus
-* Description : Checks whether the specified CAN interrupt has occurred or
-* not.
-* Input : CAN_IT: specifies the CAN interrupt source to check.
-* This parameter can be: CAN_IT_RQCP0, CAN_IT_RQCP1, CAN_IT_RQCP2,
-* CAN_IT_FF0, CAN_IT_FOV0, CAN_IT_FF1,
-* CAN_IT_FOV1, CAN_IT_EWG, CAN_IT_EPV,
-* CAN_IT_BOF, CAN_IT_WKU or CAN_IT_SLK.
-* Output : None.
-* Return : The new state of CAN_IT (SET or RESET).
-*******************************************************************************/
-ITStatus CAN_GetITStatus(u32 CAN_IT)
-{
- ITStatus pendingbitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_CAN_ITStatus(CAN_IT));
-
- switch (CAN_IT)
- {
- case CAN_IT_RQCP0:
- pendingbitstatus = CheckITStatus(CAN->TSR, CAN_TSR_RQCP0);
- break;
- case CAN_IT_RQCP1:
- pendingbitstatus = CheckITStatus(CAN->TSR, CAN_TSR_RQCP1);
- break;
- case CAN_IT_RQCP2:
- pendingbitstatus = CheckITStatus(CAN->TSR, CAN_TSR_RQCP2);
- break;
- case CAN_IT_FF0:
- pendingbitstatus = CheckITStatus(CAN->RF0R, CAN_RF0R_FULL0);
- break;
- case CAN_IT_FOV0:
- pendingbitstatus = CheckITStatus(CAN->RF0R, CAN_RF0R_FOVR0);
- break;
- case CAN_IT_FF1:
- pendingbitstatus = CheckITStatus(CAN->RF1R, CAN_RF1R_FULL1);
- break;
- case CAN_IT_FOV1:
- pendingbitstatus = CheckITStatus(CAN->RF1R, CAN_RF1R_FOVR1);
- break;
- case CAN_IT_EWG:
- pendingbitstatus = CheckITStatus(CAN->ESR, CAN_ESR_EWGF);
- break;
- case CAN_IT_EPV:
- pendingbitstatus = CheckITStatus(CAN->ESR, CAN_ESR_EPVF);
- break;
- case CAN_IT_BOF:
- pendingbitstatus = CheckITStatus(CAN->ESR, CAN_ESR_BOFF);
- break;
- case CAN_IT_SLK:
- pendingbitstatus = CheckITStatus(CAN->MSR, CAN_MSR_SLAKI);
- break;
- case CAN_IT_WKU:
- pendingbitstatus = CheckITStatus(CAN->MSR, CAN_MSR_WKUI);
- break;
-
- default :
- pendingbitstatus = RESET;
- break;
- }
-
- /* Return the CAN_IT status */
- return pendingbitstatus;
-}
-
-/*******************************************************************************
-* Function Name : CAN_ClearITPendingBit
-* Description : Clears the CAN’s interrupt pending bits.
-* Input : CAN_IT: specifies the interrupt pending bit to clear.
-* Output : None.
-* Return : None.
-*******************************************************************************/
-void CAN_ClearITPendingBit(u32 CAN_IT)
-{
- /* Check the parameters */
- assert_param(IS_CAN_ITStatus(CAN_IT));
-
- switch (CAN_IT)
- {
- case CAN_IT_RQCP0:
- CAN->TSR = CAN_TSR_RQCP0; /* rc_w1*/
- break;
- case CAN_IT_RQCP1:
- CAN->TSR = CAN_TSR_RQCP1; /* rc_w1*/
- break;
- case CAN_IT_RQCP2:
- CAN->TSR = CAN_TSR_RQCP2; /* rc_w1*/
- break;
- case CAN_IT_FF0:
- CAN->RF0R = CAN_RF0R_FULL0; /* rc_w1*/
- break;
- case CAN_IT_FOV0:
- CAN->RF0R = CAN_RF0R_FOVR0; /* rc_w1*/
- break;
- case CAN_IT_FF1:
- CAN->RF1R = CAN_RF1R_FULL1; /* rc_w1*/
- break;
- case CAN_IT_FOV1:
- CAN->RF1R = CAN_RF1R_FOVR1; /* rc_w1*/
- break;
- case CAN_IT_EWG:
- CAN->ESR &= ~ CAN_ESR_EWGF; /* rw */
- break;
- case CAN_IT_EPV:
- CAN->ESR &= ~ CAN_ESR_EPVF; /* rw */
- break;
- case CAN_IT_BOF:
- CAN->ESR &= ~ CAN_ESR_BOFF; /* rw */
- break;
- case CAN_IT_WKU:
- CAN->MSR = CAN_MSR_WKUI; /* rc_w1*/
- break;
- case CAN_IT_SLK:
- CAN->MSR = CAN_MSR_SLAKI; /* rc_w1*/
- break;
- default :
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : CheckITStatus
-* Description : Checks whether the CAN interrupt has occurred or not.
-* Input : CAN_Reg: specifies the CAN interrupt register to check.
-* It_Bit: specifies the interrupt source bit to check.
-* Output : None.
-* Return : The new state of the CAN Interrupt (SET or RESET).
-*******************************************************************************/
-static ITStatus CheckITStatus(u32 CAN_Reg, u32 It_Bit)
-{
- ITStatus pendingbitstatus = RESET;
-
- if ((CAN_Reg & It_Bit) != (u32)RESET)
- {
- /* CAN_IT is set */
- pendingbitstatus = SET;
- }
- else
- {
- /* CAN_IT is reset */
- pendingbitstatus = RESET;
- }
-
- return pendingbitstatus;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_crc.c b/stm32lib/src/stm32f10x_crc.c
deleted file mode 100644
index ac8c7c4..0000000
--- a/stm32lib/src/stm32f10x_crc.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_crc.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the CRC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_crc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-
-/* CR register bit mask */
-#define CR_RESET_Set ((u32)0x00000001)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : CRC_ResetDR
-* Description : Resets the CRC Data register (DR).
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void CRC_ResetDR(void)
-{
- /* Reset CRC generator */
- CRC->CR = CR_RESET_Set;
-}
-
-/*******************************************************************************
-* Function Name : CRC_CalcCRC
-* Description : Computes the 32-bit CRC of a given data word(32-bit).
-* Input : - Data: data word(32-bit) to compute its CRC
-* Output : None
-* Return : 32-bit CRC
-*******************************************************************************/
-u32 CRC_CalcCRC(u32 Data)
-{
- CRC->DR = Data;
-
- return (CRC->DR);
-}
-
-/*******************************************************************************
-* Function Name : CRC_CalcBlockCRC
-* Description : Computes the 32-bit CRC of a given buffer of data word(32-bit).
-* Input : - pBuffer: pointer to the buffer containing the data to be
-* computed
-* - BufferLength: length of the buffer to be computed
-* Output : None
-* Return : 32-bit CRC
-*******************************************************************************/
-u32 CRC_CalcBlockCRC(u32 pBuffer[], u32 BufferLength)
-{
- u32 index = 0;
-
- for(index = 0; index < BufferLength; index++)
- {
- CRC->DR = pBuffer[index];
- }
-
- return (CRC->DR);
-}
-
-/*******************************************************************************
-* Function Name : CRC_GetCRC
-* Description : Returns the current CRC value.
-* Input : None
-* Output : None
-* Return : 32-bit CRC
-*******************************************************************************/
-u32 CRC_GetCRC(void)
-{
- return (CRC->DR);
-}
-
-/*******************************************************************************
-* Function Name : CRC_SetIDRegister
-* Description : Stores a 8-bit data in the Independent Data(ID) register.
-* Input : - IDValue: 8-bit value to be stored in the ID register
-* Output : None
-* Return : None
-*******************************************************************************/
-void CRC_SetIDRegister(u8 IDValue)
-{
- CRC->IDR = IDValue;
-}
-
-/*******************************************************************************
-* Function Name : CRC_GetIDRegister
-* Description : Returns the 8-bit data stored in the Independent Data(ID) register
-* Input : None
-* Output : None
-* Return : 8-bit value of the ID register
-*******************************************************************************/
-u8 CRC_GetIDRegister(void)
-{
- return (CRC->IDR);
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_dac.c b/stm32lib/src/stm32f10x_dac.c
deleted file mode 100644
index 80eec1a..0000000
--- a/stm32lib/src/stm32f10x_dac.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_dac.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the DAC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_dac.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* DAC EN mask */
-#define CR_EN_Set ((u32)0x00000001)
-
-/* DAC DMAEN mask */
-#define CR_DMAEN_Set ((u32)0x00001000)
-
-/* CR register Mask */
-#define CR_CLEAR_Mask ((u32)0x00000FFE)
-
-/* DAC SWTRIG mask */
-#define SWTRIGR_SWTRIG_Set ((u32)0x00000001)
-
-/* DAC Dual Channels SWTRIG masks */
-#define DUAL_SWTRIG_Set ((u32)0x00000003)
-#define DUAL_SWTRIG_Reset ((u32)0xFFFFFFFC)
-
-/* DHR registers offsets */
-#define DHR12R1_Offset ((u32)0x00000008)
-#define DHR12R2_Offset ((u32)0x00000014)
-#define DHR12RD_Offset ((u32)0x00000020)
-
-/* DOR register offset */
-#define DOR_Offset ((u32)0x0000002C)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : DAC_DeInit
-* Description : Deinitializes the DAC peripheral registers to their default
-* reset values.
-* Input : None.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_DeInit(void)
-{
- /* Enable DAC reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_DAC, ENABLE);
- /* Release DAC from reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_DAC, DISABLE);
-}
-
-/*******************************************************************************
-* Function Name : DAC_Init
-* Description : Initializes the DAC peripheral according to the specified
-* parameters in the DAC_InitStruct.
-* Input : - DAC_Channel: the selected DAC channel.
-* This parameter can be one of the following values:
-* - DAC_Channel_1: DAC Channel1 selected
-* - DAC_Channel_2: DAC Channel2 selected
-* - DAC_InitStruct: pointer to a DAC_InitTypeDef structure that
-* contains the configuration information for the specified
-* DAC channel.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_Init(u32 DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)
-{
- u32 tmpreg1 = 0, tmpreg2 = 0;
-
- /* Check the DAC parameters */
- assert_param(IS_DAC_TRIGGER(DAC_InitStruct->DAC_Trigger));
- assert_param(IS_DAC_GENERATE_WAVE(DAC_InitStruct->DAC_WaveGeneration));
- assert_param(IS_DAC_LFSR_UNMASK_TRIANGLE_AMPLITUDE(DAC_InitStruct->DAC_LFSRUnmask_TriangleAmplitude));
- assert_param(IS_DAC_OUTPUT_BUFFER_STATE(DAC_InitStruct->DAC_OutputBuffer));
-
-/*---------------------------- DAC CR Configuration --------------------------*/
- /* Get the DAC CR value */
- tmpreg1 = DAC->CR;
- /* Clear BOFFx, TENx, TSELx, WAVEx and MAMPx bits */
- tmpreg1 &= ~(CR_CLEAR_Mask << DAC_Channel);
- /* Configure for the selected DAC channel: buffer output, trigger, wave genration,
- mask/amplitude for wave genration */
- /* Set TSELx and TENx bits according to DAC_Trigger value */
- /* Set WAVEx bits according to DAC_WaveGeneration value */
- /* Set MAMPx bits according to DAC_LFSRUnmask_TriangleAmplitude value */
- /* Set BOFFx bit according to DAC_OutputBuffer value */
- tmpreg2 = (DAC_InitStruct->DAC_Trigger | DAC_InitStruct->DAC_WaveGeneration |
- DAC_InitStruct->DAC_LFSRUnmask_TriangleAmplitude | DAC_InitStruct->DAC_OutputBuffer);
- /* Calculate CR register value depending on DAC_Channel */
- tmpreg1 |= tmpreg2 << DAC_Channel;
- /* Write to DAC CR */
- DAC->CR = tmpreg1;
-}
-
-/*******************************************************************************
-* Function Name : DAC_StructInit
-* Description : Fills each DAC_InitStruct member with its default value.
-* Input : - DAC_InitStruct : pointer to a DAC_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_StructInit(DAC_InitTypeDef* DAC_InitStruct)
-{
-/*--------------- Reset DAC init structure parameters values -----------------*/
- /* Initialize the DAC_Trigger member */
- DAC_InitStruct->DAC_Trigger = DAC_Trigger_None;
-
- /* Initialize the DAC_WaveGeneration member */
- DAC_InitStruct->DAC_WaveGeneration = DAC_WaveGeneration_None;
-
- /* Initialize the DAC_LFSRUnmask_TriangleAmplitude member */
- DAC_InitStruct->DAC_LFSRUnmask_TriangleAmplitude = DAC_LFSRUnmask_Bit0;
-
- /* Initialize the DAC_OutputBuffer member */
- DAC_InitStruct->DAC_OutputBuffer = DAC_OutputBuffer_Enable;
-}
-
-/*******************************************************************************
-* Function Name : DAC_Cmd
-* Description : Enables or disables the specified DAC channel.
-* Input - DAC_Channel: the selected DAC channel.
-* This parameter can be one of the following values:
-* - DAC_Channel_1: DAC Channel1 selected
-* - DAC_Channel_2: DAC Channel2 selected
-* - NewState: new state of the DAC channel.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_Cmd(u32 DAC_Channel, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DAC_CHANNEL(DAC_Channel));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected DAC channel */
- DAC->CR |= CR_EN_Set << DAC_Channel;
- }
- else
- {
- /* Disable the selected DAC channel */
- DAC->CR &= ~(CR_EN_Set << DAC_Channel);
- }
-}
-
-/*******************************************************************************
-* Function Name : DAC_DMACmd
-* Description : Enables or disables the specified DAC channel DMA request.
-* Input - DAC_Channel: the selected DAC channel.
-* This parameter can be one of the following values:
-* - DAC_Channel_1: DAC Channel1 selected
-* - DAC_Channel_2: DAC Channel2 selected
-* - NewState: new state of the selected DAC channel DMA request.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_DMACmd(u32 DAC_Channel, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DAC_CHANNEL(DAC_Channel));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected DAC channel DMA request */
- DAC->CR |= CR_DMAEN_Set << DAC_Channel;
- }
- else
- {
- /* Disable the selected DAC channel DMA request */
- DAC->CR &= ~(CR_DMAEN_Set << DAC_Channel);
- }
-}
-
-/*******************************************************************************
-* Function Name : DAC_SoftwareTriggerCmd
-* Description : Enables or disables the selected DAC channel software trigger.
-* Input - DAC_Channel: the selected DAC channel.
-* This parameter can be one of the following values:
-* - DAC_Channel_1: DAC Channel1 selected
-* - DAC_Channel_2: DAC Channel2 selected
-* - NewState: new state of the selected DAC channel software trigger.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_SoftwareTriggerCmd(u32 DAC_Channel, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DAC_CHANNEL(DAC_Channel));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable software trigger for the selected DAC channel */
- DAC->SWTRIGR |= SWTRIGR_SWTRIG_Set << (DAC_Channel >> 4);
- }
- else
- {
- /* Disable software trigger for the selected DAC channel */
- DAC->SWTRIGR &= ~(SWTRIGR_SWTRIG_Set << (DAC_Channel >> 4));
- }
-}
-
-/*******************************************************************************
-* Function Name : DAC_DualSoftwareTriggerCmd
-* Description : Enables or disables simultaneously the two DAC channels software
-* triggers.
-* Input - NewState: new state of the DAC channels software triggers.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_DualSoftwareTriggerCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable software trigger for both DAC channels */
- DAC->SWTRIGR |= DUAL_SWTRIG_Set ;
- }
- else
- {
- /* Disable software trigger for both DAC channels */
- DAC->SWTRIGR &= DUAL_SWTRIG_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : DAC_WaveGenerationCmd
-* Description : Enables or disables the selected DAC channel wave generation.
-* Input - DAC_Channel: the selected DAC channel.
-* This parameter can be one of the following values:
-* - DAC_Channel_1: DAC Channel1 selected
-* - DAC_Channel_2: DAC Channel2 selected
-* - DAC_Wave: Specifies the wave type to enable or disable.
-* This parameter can be one of the following values:
-* - DAC_Wave_Noise: noise wave generation
-* - DAC_Wave_Triangle: triangle wave generation
-* - NewState: new state of the selected DAC channel wave generation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_WaveGenerationCmd(u32 DAC_Channel, u32 DAC_Wave, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DAC_CHANNEL(DAC_Channel));
- assert_param(IS_DAC_WAVE(DAC_Wave));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected wave generation for the selected DAC channel */
- DAC->CR |= DAC_Wave << DAC_Channel;
- }
- else
- {
- /* Disable the selected wave generation for the selected DAC channel */
- DAC->CR &= ~(DAC_Wave << DAC_Channel);
- }
-}
-
-/*******************************************************************************
-* Function Name : DAC_SetChannel1Data
-* Description : Set the specified data holding register value for DAC channel1.
-* Input : - DAC_Align: Specifies the data alignement for DAC channel1.
-* This parameter can be one of the following values:
-* - DAC_Align_8b_R: 8bit right data alignement selected
-* - DAC_Align_12b_L: 12bit left data alignement selected
-* - DAC_Align_12b_R: 12bit right data alignement selected
-* - Data : Data to be loaded in the selected data holding
-* register.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_SetChannel1Data(u32 DAC_Align, u16 Data)
-{
- /* Check the parameters */
- assert_param(IS_DAC_ALIGN(DAC_Align));
- assert_param(IS_DAC_DATA(Data));
-
- /* Set the DAC channel1 selected data holding register */
- *((vu32 *)(DAC_BASE + DHR12R1_Offset + DAC_Align)) = (u32)Data;
-}
-
-/*******************************************************************************
-* Function Name : DAC_SetChannel2Data
-* Description : Set the specified data holding register value for DAC channel2.
-* Input : - DAC_Align: Specifies the data alignement for DAC channel2.
-* This parameter can be one of the following values:
-* - DAC_Align_8b_R: 8bit right data alignement selected
-* - DAC_Align_12b_L: 12bit left data alignement selected
-* - DAC_Align_12b_R: 12bit right data alignement selected
-* - Data : Data to be loaded in the selected data holding
-* register.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_SetChannel2Data(u32 DAC_Align, u16 Data)
-{
- /* Check the parameters */
- assert_param(IS_DAC_ALIGN(DAC_Align));
- assert_param(IS_DAC_DATA(Data));
-
- /* Set the DAC channel2 selected data holding register */
- *((vu32 *)(DAC_BASE + DHR12R2_Offset + DAC_Align)) = (u32)Data;
-}
-
-/*******************************************************************************
-* Function Name : DAC_SetDualChannelData
-* Description : Set the specified data holding register value for dual channel
-* DAC.
-* Input : - DAC_Align: Specifies the data alignement for dual channel DAC.
-* This parameter can be one of the following values:
-* - DAC_Align_8b_R: 8bit right data alignement selected
-* - DAC_Align_12b_L: 12bit left data alignement selected
-* - DAC_Align_12b_R: 12bit right data alignement selected
-* - Data2: Data for DAC Channel2 to be loaded in the selected data
-* holding register.
-* - Data1: Data for DAC Channel1 to be loaded in the selected data
-* holding register.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DAC_SetDualChannelData(u32 DAC_Align, u16 Data2, u16 Data1)
-{
- u32 data = 0;
-
- /* Check the parameters */
- assert_param(IS_DAC_ALIGN(DAC_Align));
- assert_param(IS_DAC_DATA(Data1));
- assert_param(IS_DAC_DATA(Data2));
-
- /* Calculate and set dual DAC data holding register value */
- if (DAC_Align == DAC_Align_8b_R)
- {
- data = ((u32)Data2 << 8) | Data1;
- }
- else
- {
- data = ((u32)Data2 << 16) | Data1;
- }
-
- /* Set the dual DAC selected data holding register */
- *((vu32 *)(DAC_BASE + DHR12RD_Offset + DAC_Align)) = data;
-}
-
-/*******************************************************************************
-* Function Name : DAC_GetDataOutputValue
-* Description : Returns the last data output value of the selected DAC cahnnel.
-* Input - DAC_Channel: the selected DAC channel.
-* This parameter can be one of the following values:
-* - DAC_Channel_1: DAC Channel1 selected
-* - DAC_Channel_2: DAC Channel2 selected
-* Output : None
-* Return : The selected DAC channel data output value.
-*******************************************************************************/
-u16 DAC_GetDataOutputValue(u32 DAC_Channel)
-{
- /* Check the parameters */
- assert_param(IS_DAC_CHANNEL(DAC_Channel));
-
- /* Returns the DAC channel data output register value */
- return (u16) (*(vu32*)(DAC_BASE + DOR_Offset + ((u32)DAC_Channel >> 2)));
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_dbgmcu.c b/stm32lib/src/stm32f10x_dbgmcu.c
deleted file mode 100644
index 04103b1..0000000
--- a/stm32lib/src/stm32f10x_dbgmcu.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_dbgmcu.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the DBGMCU firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_dbgmcu.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define IDCODE_DEVID_Mask ((u32)0x00000FFF)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : DBGMCU_GetREVID
-* Description : Returns the device revision identifier.
-* Input : None
-* Output : None
-* Return : Device revision identifier
-*******************************************************************************/
-u32 DBGMCU_GetREVID(void)
-{
- return(DBGMCU->IDCODE >> 16);
-}
-
-/*******************************************************************************
-* Function Name : DBGMCU_GetDEVID
-* Description : Returns the device identifier.
-* Input : None
-* Output : None
-* Return : Device identifier
-*******************************************************************************/
-u32 DBGMCU_GetDEVID(void)
-{
- return(DBGMCU->IDCODE & IDCODE_DEVID_Mask);
-}
-
-/*******************************************************************************
-* Function Name : DBGMCU_Config
-* Description : Configures the specified peripheral and low power mode behavior
-* when the MCU under Debug mode.
-* Input : - DBGMCU_Periph: specifies the peripheral and low power mode.
-* This parameter can be any combination of the following values:
-* - DBGMCU_SLEEP: Keep debugger connection during SLEEP mode
-* - DBGMCU_STOP: Keep debugger connection during STOP mode
-* - DBGMCU_STANDBY: Keep debugger connection during STANDBY mode
-* - DBGMCU_IWDG_STOP: Debug IWDG stopped when Core is halted
-* - DBGMCU_WWDG_STOP: Debug WWDG stopped when Core is halted
-* - DBGMCU_TIM1_STOP: TIM1 counter stopped when Core is halted
-* - DBGMCU_TIM2_STOP: TIM2 counter stopped when Core is halted
-* - DBGMCU_TIM3_STOP: TIM3 counter stopped when Core is halted
-* - DBGMCU_TIM4_STOP: TIM4 counter stopped when Core is halted
-* - DBGMCU_CAN_STOP: Debug CAN stopped when Core is halted
-* - DBGMCU_I2C1_SMBUS_TIMEOUT: I2C1 SMBUS timeout mode stopped
-* when Core is halted
-* - DBGMCU_I2C2_SMBUS_TIMEOUT: I2C2 SMBUS timeout mode stopped
-* when Core is halted
-* - DBGMCU_TIM5_STOP: TIM5 counter stopped when Core is halted
-* - DBGMCU_TIM6_STOP: TIM6 counter stopped when Core is halted
-* - DBGMCU_TIM7_STOP: TIM7 counter stopped when Core is halted
-* - DBGMCU_TIM8_STOP: TIM8 counter stopped when Core is halted
-* - NewState: new state of the specified peripheral in Debug mode.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DBGMCU_Config(u32 DBGMCU_Periph, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DBGMCU_PERIPH(DBGMCU_Periph));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- DBGMCU->CR |= DBGMCU_Periph;
- }
- else
- {
- DBGMCU->CR &= ~DBGMCU_Periph;
- }
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_dma.c b/stm32lib/src/stm32f10x_dma.c
deleted file mode 100644
index eaefcb9..0000000
--- a/stm32lib/src/stm32f10x_dma.c
+++ /dev/null
@@ -1,678 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_dma.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the DMA firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_dma.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* DMA ENABLE mask */
-#define CCR_ENABLE_Set ((u32)0x00000001)
-#define CCR_ENABLE_Reset ((u32)0xFFFFFFFE)
-
-/* DMA1 Channelx interrupt pending bit masks */
-#define DMA1_Channel1_IT_Mask ((u32)0x0000000F)
-#define DMA1_Channel2_IT_Mask ((u32)0x000000F0)
-#define DMA1_Channel3_IT_Mask ((u32)0x00000F00)
-#define DMA1_Channel4_IT_Mask ((u32)0x0000F000)
-#define DMA1_Channel5_IT_Mask ((u32)0x000F0000)
-#define DMA1_Channel6_IT_Mask ((u32)0x00F00000)
-#define DMA1_Channel7_IT_Mask ((u32)0x0F000000)
-
-/* DMA2 Channelx interrupt pending bit masks */
-#define DMA2_Channel1_IT_Mask ((u32)0x0000000F)
-#define DMA2_Channel2_IT_Mask ((u32)0x000000F0)
-#define DMA2_Channel3_IT_Mask ((u32)0x00000F00)
-#define DMA2_Channel4_IT_Mask ((u32)0x0000F000)
-#define DMA2_Channel5_IT_Mask ((u32)0x000F0000)
-
-/* DMA2 FLAG mask */
-#define FLAG_Mask ((u32)0x10000000)
-
-/* DMA registers Masks */
-#define CCR_CLEAR_Mask ((u32)0xFFFF800F)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : DMA_DeInit
-* Description : Deinitializes the DMAy Channelx registers to their default reset
-* values.
-* Input : - 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.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DMA_DeInit(DMA_Channel_TypeDef* DMAy_Channelx)
-{
- /* Check the parameters */
- assert_param(IS_DMA_ALL_PERIPH(DMAy_Channelx));
-
- /* Disable the selected DMAy Channelx */
- DMAy_Channelx->CCR &= CCR_ENABLE_Reset;
-
- /* Reset DMAy Channelx control register */
- DMAy_Channelx->CCR = 0;
-
- /* Reset DMAy Channelx remaining bytes register */
- DMAy_Channelx->CNDTR = 0;
-
- /* Reset DMAy Channelx peripheral address register */
- DMAy_Channelx->CPAR = 0;
-
- /* Reset DMAy Channelx memory address register */
- DMAy_Channelx->CMAR = 0;
-
- switch (*(u32*)&DMAy_Channelx)
- {
- case DMA1_Channel1_BASE:
- /* Reset interrupt pending bits for DMA1 Channel1 */
- DMA1->IFCR |= DMA1_Channel1_IT_Mask;
- break;
-
- case DMA1_Channel2_BASE:
- /* Reset interrupt pending bits for DMA1 Channel2 */
- DMA1->IFCR |= DMA1_Channel2_IT_Mask;
- break;
-
- case DMA1_Channel3_BASE:
- /* Reset interrupt pending bits for DMA1 Channel3 */
- DMA1->IFCR |= DMA1_Channel3_IT_Mask;
- break;
-
- case DMA1_Channel4_BASE:
- /* Reset interrupt pending bits for DMA1 Channel4 */
- DMA1->IFCR |= DMA1_Channel4_IT_Mask;
- break;
-
- case DMA1_Channel5_BASE:
- /* Reset interrupt pending bits for DMA1 Channel5 */
- DMA1->IFCR |= DMA1_Channel5_IT_Mask;
- break;
-
- case DMA1_Channel6_BASE:
- /* Reset interrupt pending bits for DMA1 Channel6 */
- DMA1->IFCR |= DMA1_Channel6_IT_Mask;
- break;
-
- case DMA1_Channel7_BASE:
- /* Reset interrupt pending bits for DMA1 Channel7 */
- DMA1->IFCR |= DMA1_Channel7_IT_Mask;
- break;
-
- case DMA2_Channel1_BASE:
- /* Reset interrupt pending bits for DMA2 Channel1 */
- DMA2->IFCR |= DMA2_Channel1_IT_Mask;
- break;
-
- case DMA2_Channel2_BASE:
- /* Reset interrupt pending bits for DMA2 Channel2 */
- DMA2->IFCR |= DMA2_Channel2_IT_Mask;
- break;
-
- case DMA2_Channel3_BASE:
- /* Reset interrupt pending bits for DMA2 Channel3 */
- DMA2->IFCR |= DMA2_Channel3_IT_Mask;
- break;
-
- case DMA2_Channel4_BASE:
- /* Reset interrupt pending bits for DMA2 Channel4 */
- DMA2->IFCR |= DMA2_Channel4_IT_Mask;
- break;
-
- case DMA2_Channel5_BASE:
- /* Reset interrupt pending bits for DMA2 Channel5 */
- DMA2->IFCR |= DMA2_Channel5_IT_Mask;
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : DMA_Init
-* Description : Initializes the DMAy Channelx according to the specified
-* parameters in the DMA_InitStruct.
-* Input : - 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.
-* - DMA_InitStruct: pointer to a DMA_InitTypeDef structure that
-* contains the configuration information for the specified
-* DMA Channel.
-* Output : None
-* Return : None
-******************************************************************************/
-void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruct)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_DMA_ALL_PERIPH(DMAy_Channelx));
- assert_param(IS_DMA_DIR(DMA_InitStruct->DMA_DIR));
- assert_param(IS_DMA_BUFFER_SIZE(DMA_InitStruct->DMA_BufferSize));
- assert_param(IS_DMA_PERIPHERAL_INC_STATE(DMA_InitStruct->DMA_PeripheralInc));
- assert_param(IS_DMA_MEMORY_INC_STATE(DMA_InitStruct->DMA_MemoryInc));
- assert_param(IS_DMA_PERIPHERAL_DATA_SIZE(DMA_InitStruct->DMA_PeripheralDataSize));
- assert_param(IS_DMA_MEMORY_DATA_SIZE(DMA_InitStruct->DMA_MemoryDataSize));
- assert_param(IS_DMA_MODE(DMA_InitStruct->DMA_Mode));
- assert_param(IS_DMA_PRIORITY(DMA_InitStruct->DMA_Priority));
- assert_param(IS_DMA_M2M_STATE(DMA_InitStruct->DMA_M2M));
-
-/*--------------------------- DMAy Channelx CCR Configuration -----------------*/
- /* Get the DMAy_Channelx CCR value */
- tmpreg = DMAy_Channelx->CCR;
- /* Clear MEM2MEM, PL, MSIZE, PSIZE, MINC, PINC, CIRC and DIR bits */
- tmpreg &= CCR_CLEAR_Mask;
- /* Configure DMAy Channelx: data transfer, data size, priority level and mode */
- /* Set DIR bit according to DMA_DIR value */
- /* Set CIRC bit according to DMA_Mode value */
- /* Set PINC bit according to DMA_PeripheralInc value */
- /* Set MINC bit according to DMA_MemoryInc value */
- /* Set PSIZE bits according to DMA_PeripheralDataSize value */
- /* Set MSIZE bits according to DMA_MemoryDataSize value */
- /* Set PL bits according to DMA_Priority value */
- /* Set the MEM2MEM bit according to DMA_M2M value */
- tmpreg |= DMA_InitStruct->DMA_DIR | DMA_InitStruct->DMA_Mode |
- DMA_InitStruct->DMA_PeripheralInc | DMA_InitStruct->DMA_MemoryInc |
- DMA_InitStruct->DMA_PeripheralDataSize | DMA_InitStruct->DMA_MemoryDataSize |
- DMA_InitStruct->DMA_Priority | DMA_InitStruct->DMA_M2M;
- /* Write to DMAy Channelx CCR */
- DMAy_Channelx->CCR = tmpreg;
-
-/*--------------------------- DMAy Channelx CNDTR Configuration ---------------*/
- /* Write to DMAy Channelx CNDTR */
- DMAy_Channelx->CNDTR = DMA_InitStruct->DMA_BufferSize;
-
-/*--------------------------- DMAy Channelx CPAR Configuration ----------------*/
- /* Write to DMAy Channelx CPAR */
- DMAy_Channelx->CPAR = DMA_InitStruct->DMA_PeripheralBaseAddr;
-
-/*--------------------------- DMAy Channelx CMAR Configuration ----------------*/
- /* Write to DMAy Channelx CMAR */
- DMAy_Channelx->CMAR = DMA_InitStruct->DMA_MemoryBaseAddr;
-}
-
-/*******************************************************************************
-* Function Name : DMA_StructInit
-* Description : Fills each DMA_InitStruct member with its default value.
-* Input : - DMA_InitStruct : pointer to a DMA_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct)
-{
-/*-------------- Reset DMA init structure parameters values ------------------*/
- /* Initialize the DMA_PeripheralBaseAddr member */
- DMA_InitStruct->DMA_PeripheralBaseAddr = 0;
-
- /* Initialize the DMA_MemoryBaseAddr member */
- DMA_InitStruct->DMA_MemoryBaseAddr = 0;
-
- /* Initialize the DMA_DIR member */
- DMA_InitStruct->DMA_DIR = DMA_DIR_PeripheralSRC;
-
- /* Initialize the DMA_BufferSize member */
- DMA_InitStruct->DMA_BufferSize = 0;
-
- /* Initialize the DMA_PeripheralInc member */
- DMA_InitStruct->DMA_PeripheralInc = DMA_PeripheralInc_Disable;
-
- /* Initialize the DMA_MemoryInc member */
- DMA_InitStruct->DMA_MemoryInc = DMA_MemoryInc_Disable;
-
- /* Initialize the DMA_PeripheralDataSize member */
- DMA_InitStruct->DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte;
-
- /* Initialize the DMA_MemoryDataSize member */
- DMA_InitStruct->DMA_MemoryDataSize = DMA_MemoryDataSize_Byte;
-
- /* Initialize the DMA_Mode member */
- DMA_InitStruct->DMA_Mode = DMA_Mode_Normal;
-
- /* Initialize the DMA_Priority member */
- DMA_InitStruct->DMA_Priority = DMA_Priority_Low;
-
- /* Initialize the DMA_M2M member */
- DMA_InitStruct->DMA_M2M = DMA_M2M_Disable;
-}
-
-/*******************************************************************************
-* Function Name : DMA_Cmd
-* Description : Enables or disables the specified DMAy Channelx.
-* Input : - 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.
-* - NewState: new state of the DMAy Channelx.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DMA_Cmd(DMA_Channel_TypeDef* DMAy_Channelx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DMA_ALL_PERIPH(DMAy_Channelx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected DMAy Channelx */
- DMAy_Channelx->CCR |= CCR_ENABLE_Set;
- }
- else
- {
- /* Disable the selected DMAy Channelx */
- DMAy_Channelx->CCR &= CCR_ENABLE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : DMA_ITConfig
-* Description : Enables or disables the specified DMAy Channelx interrupts.
-* Input : - 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.
-* - DMA_IT: specifies the DMA interrupts sources to be enabled
-* or disabled.
-* This parameter can be any combination of the following values:
-* - DMA_IT_TC: Transfer complete interrupt mask
-* - DMA_IT_HT: Half transfer interrupt mask
-* - DMA_IT_TE: Transfer error interrupt mask
-* - NewState: new state of the specified DMA interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DMA_ITConfig(DMA_Channel_TypeDef* DMAy_Channelx, u32 DMA_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_DMA_ALL_PERIPH(DMAy_Channelx));
- assert_param(IS_DMA_CONFIG_IT(DMA_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected DMA interrupts */
- DMAy_Channelx->CCR |= DMA_IT;
- }
- else
- {
- /* Disable the selected DMA interrupts */
- DMAy_Channelx->CCR &= ~DMA_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : DMA_GetCurrDataCounter
-* Description : Returns the number of remaining data units in the current
-* DMAy Channelx transfer.
-* Input : - 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.
-* Output : None
-* Return : The number of remaining data units in the current DMAy Channelx
-* transfer.
-*******************************************************************************/
-u16 DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)
-{
- /* Check the parameters */
- assert_param(IS_DMA_ALL_PERIPH(DMAy_Channelx));
-
- /* Return the number of remaining data units for DMAy Channelx */
- return ((u16)(DMAy_Channelx->CNDTR));
-}
-
-/*******************************************************************************
-* Function Name : DMA_GetFlagStatus
-* Description : Checks whether the specified DMAy Channelx flag is set or not.
-* Input : - DMA_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - DMA1_FLAG_GL1: DMA1 Channel1 global flag.
-* - DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.
-* - DMA1_FLAG_HT1: DMA1 Channel1 half transfer flag.
-* - DMA1_FLAG_TE1: DMA1 Channel1 transfer error flag.
-* - DMA1_FLAG_GL2: DMA1 Channel2 global flag.
-* - DMA1_FLAG_TC2: DMA1 Channel2 transfer complete flag.
-* - DMA1_FLAG_HT2: DMA1 Channel2 half transfer flag.
-* - DMA1_FLAG_TE2: DMA1 Channel2 transfer error flag.
-* - DMA1_FLAG_GL3: DMA1 Channel3 global flag.
-* - DMA1_FLAG_TC3: DMA1 Channel3 transfer complete flag.
-* - DMA1_FLAG_HT3: DMA1 Channel3 half transfer flag.
-* - DMA1_FLAG_TE3: DMA1 Channel3 transfer error flag.
-* - DMA1_FLAG_GL4: DMA1 Channel4 global flag.
-* - DMA1_FLAG_TC4: DMA1 Channel4 transfer complete flag.
-* - DMA1_FLAG_HT4: DMA1 Channel4 half transfer flag.
-* - DMA1_FLAG_TE4: DMA1 Channel4 transfer error flag.
-* - DMA1_FLAG_GL5: DMA1 Channel5 global flag.
-* - DMA1_FLAG_TC5: DMA1 Channel5 transfer complete flag.
-* - DMA1_FLAG_HT5: DMA1 Channel5 half transfer flag.
-* - DMA1_FLAG_TE5: DMA1 Channel5 transfer error flag.
-* - DMA1_FLAG_GL6: DMA1 Channel6 global flag.
-* - DMA1_FLAG_TC6: DMA1 Channel6 transfer complete flag.
-* - DMA1_FLAG_HT6: DMA1 Channel6 half transfer flag.
-* - DMA1_FLAG_TE6: DMA1 Channel6 transfer error flag.
-* - DMA1_FLAG_GL7: DMA1 Channel7 global flag.
-* - DMA1_FLAG_TC7: DMA1 Channel7 transfer complete flag.
-* - DMA1_FLAG_HT7: DMA1 Channel7 half transfer flag.
-* - DMA1_FLAG_TE7: DMA1 Channel7 transfer error flag.
-* - DMA2_FLAG_GL1: DMA2 Channel1 global flag.
-* - DMA2_FLAG_TC1: DMA2 Channel1 transfer complete flag.
-* - DMA2_FLAG_HT1: DMA2 Channel1 half transfer flag.
-* - DMA2_FLAG_TE1: DMA2 Channel1 transfer error flag.
-* - DMA2_FLAG_GL2: DMA2 Channel2 global flag.
-* - DMA2_FLAG_TC2: DMA2 Channel2 transfer complete flag.
-* - DMA2_FLAG_HT2: DMA2 Channel2 half transfer flag.
-* - DMA2_FLAG_TE2: DMA2 Channel2 transfer error flag.
-* - DMA2_FLAG_GL3: DMA2 Channel3 global flag.
-* - DMA2_FLAG_TC3: DMA2 Channel3 transfer complete flag.
-* - DMA2_FLAG_HT3: DMA2 Channel3 half transfer flag.
-* - DMA2_FLAG_TE3: DMA2 Channel3 transfer error flag.
-* - DMA2_FLAG_GL4: DMA2 Channel4 global flag.
-* - DMA2_FLAG_TC4: DMA2 Channel4 transfer complete flag.
-* - DMA2_FLAG_HT4: DMA2 Channel4 half transfer flag.
-* - DMA2_FLAG_TE4: DMA2 Channel4 transfer error flag.
-* - DMA2_FLAG_GL5: DMA2 Channel5 global flag.
-* - DMA2_FLAG_TC5: DMA2 Channel5 transfer complete flag.
-* - DMA2_FLAG_HT5: DMA2 Channel5 half transfer flag.
-* - DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.
-* Output : None
-* Return : The new state of DMA_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus DMA_GetFlagStatus(u32 DMA_FLAG)
-{
- FlagStatus bitstatus = RESET;
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_DMA_GET_FLAG(DMA_FLAG));
-
- /* Calculate the used DMA */
- if ((DMA_FLAG & FLAG_Mask) != (u32)RESET)
- {
- /* Get DMA2 ISR register value */
- tmpreg = DMA2->ISR ;
- }
- else
- {
- /* Get DMA1 ISR register value */
- tmpreg = DMA1->ISR ;
- }
-
- /* Check the status of the specified DMA flag */
- if ((tmpreg & DMA_FLAG) != (u32)RESET)
- {
- /* DMA_FLAG is set */
- bitstatus = SET;
- }
- else
- {
- /* DMA_FLAG is reset */
- bitstatus = RESET;
- }
-
- /* Return the DMA_FLAG status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : DMA_ClearFlag
-* Description : Clears the DMAy Channelx's pending flags.
-* Input : - DMA_FLAG: specifies the flag to clear.
-* This parameter can be any combination (for the same DMA) of
-* the following values:
-* - DMA1_FLAG_GL1: DMA1 Channel1 global flag.
-* - DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.
-* - DMA1_FLAG_HT1: DMA1 Channel1 half transfer flag.
-* - DMA1_FLAG_TE1: DMA1 Channel1 transfer error flag.
-* - DMA1_FLAG_GL2: DMA1 Channel2 global flag.
-* - DMA1_FLAG_TC2: DMA1 Channel2 transfer complete flag.
-* - DMA1_FLAG_HT2: DMA1 Channel2 half transfer flag.
-* - DMA1_FLAG_TE2: DMA1 Channel2 transfer error flag.
-* - DMA1_FLAG_GL3: DMA1 Channel3 global flag.
-* - DMA1_FLAG_TC3: DMA1 Channel3 transfer complete flag.
-* - DMA1_FLAG_HT3: DMA1 Channel3 half transfer flag.
-* - DMA1_FLAG_TE3: DMA1 Channel3 transfer error flag.
-* - DMA1_FLAG_GL4: DMA1 Channel4 global flag.
-* - DMA1_FLAG_TC4: DMA1 Channel4 transfer complete flag.
-* - DMA1_FLAG_HT4: DMA1 Channel4 half transfer flag.
-* - DMA1_FLAG_TE4: DMA1 Channel4 transfer error flag.
-* - DMA1_FLAG_GL5: DMA1 Channel5 global flag.
-* - DMA1_FLAG_TC5: DMA1 Channel5 transfer complete flag.
-* - DMA1_FLAG_HT5: DMA1 Channel5 half transfer flag.
-* - DMA1_FLAG_TE5: DMA1 Channel5 transfer error flag.
-* - DMA1_FLAG_GL6: DMA1 Channel6 global flag.
-* - DMA1_FLAG_TC6: DMA1 Channel6 transfer complete flag.
-* - DMA1_FLAG_HT6: DMA1 Channel6 half transfer flag.
-* - DMA1_FLAG_TE6: DMA1 Channel6 transfer error flag.
-* - DMA1_FLAG_GL7: DMA1 Channel7 global flag.
-* - DMA1_FLAG_TC7: DMA1 Channel7 transfer complete flag.
-* - DMA1_FLAG_HT7: DMA1 Channel7 half transfer flag.
-* - DMA1_FLAG_TE7: DMA1 Channel7 transfer error flag.
-* - DMA2_FLAG_GL1: DMA2 Channel1 global flag.
-* - DMA2_FLAG_TC1: DMA2 Channel1 transfer complete flag.
-* - DMA2_FLAG_HT1: DMA2 Channel1 half transfer flag.
-* - DMA2_FLAG_TE1: DMA2 Channel1 transfer error flag.
-* - DMA2_FLAG_GL2: DMA2 Channel2 global flag.
-* - DMA2_FLAG_TC2: DMA2 Channel2 transfer complete flag.
-* - DMA2_FLAG_HT2: DMA2 Channel2 half transfer flag.
-* - DMA2_FLAG_TE2: DMA2 Channel2 transfer error flag.
-* - DMA2_FLAG_GL3: DMA2 Channel3 global flag.
-* - DMA2_FLAG_TC3: DMA2 Channel3 transfer complete flag.
-* - DMA2_FLAG_HT3: DMA2 Channel3 half transfer flag.
-* - DMA2_FLAG_TE3: DMA2 Channel3 transfer error flag.
-* - DMA2_FLAG_GL4: DMA2 Channel4 global flag.
-* - DMA2_FLAG_TC4: DMA2 Channel4 transfer complete flag.
-* - DMA2_FLAG_HT4: DMA2 Channel4 half transfer flag.
-* - DMA2_FLAG_TE4: DMA2 Channel4 transfer error flag.
-* - DMA2_FLAG_GL5: DMA2 Channel5 global flag.
-* - DMA2_FLAG_TC5: DMA2 Channel5 transfer complete flag.
-* - DMA2_FLAG_HT5: DMA2 Channel5 half transfer flag.
-* - DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DMA_ClearFlag(u32 DMA_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_DMA_CLEAR_FLAG(DMA_FLAG));
-
- /* Calculate the used DMA */
- if ((DMA_FLAG & FLAG_Mask) != (u32)RESET)
- {
- /* Clear the selected DMA flags */
- DMA2->IFCR = DMA_FLAG;
- }
- else
- {
- /* Clear the selected DMA flags */
- DMA1->IFCR = DMA_FLAG;
- }
-}
-
-/*******************************************************************************
-* Function Name : DMA_GetITStatus
-* Description : Checks whether the specified DMAy Channelx interrupt has
-* occurred or not.
-* Input : - DMA_IT: specifies the DMA interrupt source to check.
-* This parameter can be one of the following values:
-* - DMA1_IT_GL1: DMA1 Channel1 global interrupt.
-* - DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.
-* - DMA1_IT_HT1: DMA1 Channel1 half transfer interrupt.
-* - DMA1_IT_TE1: DMA1 Channel1 transfer error interrupt.
-* - DMA1_IT_GL2: DMA1 Channel2 global interrupt.
-* - DMA1_IT_TC2: DMA1 Channel2 transfer complete interrupt.
-* - DMA1_IT_HT2: DMA1 Channel2 half transfer interrupt.
-* - DMA1_IT_TE2: DMA1 Channel2 transfer error interrupt.
-* - DMA1_IT_GL3: DMA1 Channel3 global interrupt.
-* - DMA1_IT_TC3: DMA1 Channel3 transfer complete interrupt.
-* - DMA1_IT_HT3: DMA1 Channel3 half transfer interrupt.
-* - DMA1_IT_TE3: DMA1 Channel3 transfer error interrupt.
-* - DMA1_IT_GL4: DMA1 Channel4 global interrupt.
-* - DMA1_IT_TC4: DMA1 Channel4 transfer complete interrupt.
-* - DMA1_IT_HT4: DMA1 Channel4 half transfer interrupt.
-* - DMA1_IT_TE4: DMA1 Channel4 transfer error interrupt.
-* - DMA1_IT_GL5: DMA1 Channel5 global interrupt.
-* - DMA1_IT_TC5: DMA1 Channel5 transfer complete interrupt.
-* - DMA1_IT_HT5: DMA1 Channel5 half transfer interrupt.
-* - DMA1_IT_TE5: DMA1 Channel5 transfer error interrupt.
-* - DMA1_IT_GL6: DMA1 Channel6 global interrupt.
-* - DMA1_IT_TC6: DMA1 Channel6 transfer complete interrupt.
-* - DMA1_IT_HT6: DMA1 Channel6 half transfer interrupt.
-* - DMA1_IT_TE6: DMA1 Channel6 transfer error interrupt.
-* - DMA1_IT_GL7: DMA1 Channel7 global interrupt.
-* - DMA1_IT_TC7: DMA1 Channel7 transfer complete interrupt.
-* - DMA1_IT_HT7: DMA1 Channel7 half transfer interrupt.
-* - DMA1_IT_TE7: DMA1 Channel7 transfer error interrupt.
-* - DMA2_IT_GL1: DMA2 Channel1 global interrupt.
-* - DMA2_IT_TC1: DMA2 Channel1 transfer complete interrupt.
-* - DMA2_IT_HT1: DMA2 Channel1 half transfer interrupt.
-* - DMA2_IT_TE1: DMA2 Channel1 transfer error interrupt.
-* - DMA2_IT_GL2: DMA2 Channel2 global interrupt.
-* - DMA2_IT_TC2: DMA2 Channel2 transfer complete interrupt.
-* - DMA2_IT_HT2: DMA2 Channel2 half transfer interrupt.
-* - DMA2_IT_TE2: DMA2 Channel2 transfer error interrupt.
-* - DMA2_IT_GL3: DMA2 Channel3 global interrupt.
-* - DMA2_IT_TC3: DMA2 Channel3 transfer complete interrupt.
-* - DMA2_IT_HT3: DMA2 Channel3 half transfer interrupt.
-* - DMA2_IT_TE3: DMA2 Channel3 transfer error interrupt.
-* - DMA2_IT_GL4: DMA2 Channel4 global interrupt.
-* - DMA2_IT_TC4: DMA2 Channel4 transfer complete interrupt.
-* - DMA2_IT_HT4: DMA2 Channel4 half transfer interrupt.
-* - DMA2_IT_TE4: DMA2 Channel4 transfer error interrupt.
-* - DMA2_IT_GL5: DMA2 Channel5 global interrupt.
-* - DMA2_IT_TC5: DMA2 Channel5 transfer complete interrupt.
-* - DMA2_IT_HT5: DMA2 Channel5 half transfer interrupt.
-* - DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.
-* Output : None
-* Return : The new state of DMA_IT (SET or RESET).
-*******************************************************************************/
-ITStatus DMA_GetITStatus(u32 DMA_IT)
-{
- ITStatus bitstatus = RESET;
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_DMA_GET_IT(DMA_IT));
-
- /* Calculate the used DMA */
- if ((DMA_IT & FLAG_Mask) != (u32)RESET)
- {
- /* Get DMA2 ISR register value */
- tmpreg = DMA2->ISR ;
- }
- else
- {
- /* Get DMA1 ISR register value */
- tmpreg = DMA1->ISR ;
- }
-
- /* Check the status of the specified DMA interrupt */
- if ((tmpreg & DMA_IT) != (u32)RESET)
- {
- /* DMA_IT is set */
- bitstatus = SET;
- }
- else
- {
- /* DMA_IT is reset */
- bitstatus = RESET;
- }
- /* Return the DMA_IT status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : DMA_ClearITPendingBit
-* Description : Clears the DMAy Channelx’s interrupt pending bits.
-* Input : - DMA_IT: specifies the DMA interrupt pending bit to clear.
-* This parameter can be any combination (for the same DMA) of
-* the following values:
-* - DMA1_IT_GL1: DMA1 Channel1 global interrupt.
-* - DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.
-* - DMA1_IT_HT1: DMA1 Channel1 half transfer interrupt.
-* - DMA1_IT_TE1: DMA1 Channel1 transfer error interrupt.
-* - DMA1_IT_GL2: DMA1 Channel2 global interrupt.
-* - DMA1_IT_TC2: DMA1 Channel2 transfer complete interrupt.
-* - DMA1_IT_HT2: DMA1 Channel2 half transfer interrupt.
-* - DMA1_IT_TE2: DMA1 Channel2 transfer error interrupt.
-* - DMA1_IT_GL3: DMA1 Channel3 global interrupt.
-* - DMA1_IT_TC3: DMA1 Channel3 transfer complete interrupt.
-* - DMA1_IT_HT3: DMA1 Channel3 half transfer interrupt.
-* - DMA1_IT_TE3: DMA1 Channel3 transfer error interrupt.
-* - DMA1_IT_GL4: DMA1 Channel4 global interrupt.
-* - DMA1_IT_TC4: DMA1 Channel4 transfer complete interrupt.
-* - DMA1_IT_HT4: DMA1 Channel4 half transfer interrupt.
-* - DMA1_IT_TE4: DMA1 Channel4 transfer error interrupt.
-* - DMA1_IT_GL5: DMA1 Channel5 global interrupt.
-* - DMA1_IT_TC5: DMA1 Channel5 transfer complete interrupt.
-* - DMA1_IT_HT5: DMA1 Channel5 half transfer interrupt.
-* - DMA1_IT_TE5: DMA1 Channel5 transfer error interrupt.
-* - DMA1_IT_GL6: DMA1 Channel6 global interrupt.
-* - DMA1_IT_TC6: DMA1 Channel6 transfer complete interrupt.
-* - DMA1_IT_HT6: DMA1 Channel6 half transfer interrupt.
-* - DMA1_IT_TE6: DMA1 Channel6 transfer error interrupt.
-* - DMA1_IT_GL7: DMA1 Channel7 global interrupt.
-* - DMA1_IT_TC7: DMA1 Channel7 transfer complete interrupt.
-* - DMA1_IT_HT7: DMA1 Channel7 half transfer interrupt.
-* - DMA1_IT_TE7: DMA1 Channel7 transfer error interrupt.
-* - DMA2_IT_GL1: DMA2 Channel1 global interrupt.
-* - DMA2_IT_TC1: DMA2 Channel1 transfer complete interrupt.
-* - DMA2_IT_HT1: DMA2 Channel1 half transfer interrupt.
-* - DMA2_IT_TE1: DMA2 Channel1 transfer error interrupt.
-* - DMA2_IT_GL2: DMA2 Channel2 global interrupt.
-* - DMA2_IT_TC2: DMA2 Channel2 transfer complete interrupt.
-* - DMA2_IT_HT2: DMA2 Channel2 half transfer interrupt.
-* - DMA2_IT_TE2: DMA2 Channel2 transfer error interrupt.
-* - DMA2_IT_GL3: DMA2 Channel3 global interrupt.
-* - DMA2_IT_TC3: DMA2 Channel3 transfer complete interrupt.
-* - DMA2_IT_HT3: DMA2 Channel3 half transfer interrupt.
-* - DMA2_IT_TE3: DMA2 Channel3 transfer error interrupt.
-* - DMA2_IT_GL4: DMA2 Channel4 global interrupt.
-* - DMA2_IT_TC4: DMA2 Channel4 transfer complete interrupt.
-* - DMA2_IT_HT4: DMA2 Channel4 half transfer interrupt.
-* - DMA2_IT_TE4: DMA2 Channel4 transfer error interrupt.
-* - DMA2_IT_GL5: DMA2 Channel5 global interrupt.
-* - DMA2_IT_TC5: DMA2 Channel5 transfer complete interrupt.
-* - DMA2_IT_HT5: DMA2 Channel5 half transfer interrupt.
-* - DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.
-* Output : None
-* Return : None
-*******************************************************************************/
-void DMA_ClearITPendingBit(u32 DMA_IT)
-{
- /* Check the parameters */
- assert_param(IS_DMA_CLEAR_IT(DMA_IT));
-
- /* Calculate the used DMA */
- if ((DMA_IT & FLAG_Mask) != (u32)RESET)
- {
- /* Clear the selected DMA interrupt pending bits */
- DMA2->IFCR = DMA_IT;
- }
- else
- {
- /* Clear the selected DMA interrupt pending bits */
- DMA1->IFCR = DMA_IT;
- }
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
-
diff --git a/stm32lib/src/stm32f10x_exti.c b/stm32lib/src/stm32f10x_exti.c
deleted file mode 100644
index 021a051..0000000
--- a/stm32lib/src/stm32f10x_exti.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_exti.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the EXTI firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_exti.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define EXTI_LineNone ((u32)0x00000) /* No interrupt selected */
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : EXTI_DeInit
-* Description : Deinitializes the EXTI peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void EXTI_DeInit(void)
-{
- EXTI->IMR = 0x00000000;
- EXTI->EMR = 0x00000000;
- EXTI->RTSR = 0x00000000;
- EXTI->FTSR = 0x00000000;
- EXTI->PR = 0x0007FFFF;
-}
-
-/*******************************************************************************
-* Function Name : EXTI_Init
-* Description : Initializes the EXTI peripheral according to the specified
-* parameters in the EXTI_InitStruct.
-* Input : - EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure
-* that contains the configuration information for the EXTI
-* peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct)
-{
- /* Check the parameters */
- assert_param(IS_EXTI_MODE(EXTI_InitStruct->EXTI_Mode));
- assert_param(IS_EXTI_TRIGGER(EXTI_InitStruct->EXTI_Trigger));
- assert_param(IS_EXTI_LINE(EXTI_InitStruct->EXTI_Line));
- assert_param(IS_FUNCTIONAL_STATE(EXTI_InitStruct->EXTI_LineCmd));
-
- if (EXTI_InitStruct->EXTI_LineCmd != DISABLE)
- {
- /* Clear EXTI line configuration */
- EXTI->IMR &= ~EXTI_InitStruct->EXTI_Line;
- EXTI->EMR &= ~EXTI_InitStruct->EXTI_Line;
-
- *(vu32 *)(EXTI_BASE + (u32)EXTI_InitStruct->EXTI_Mode)|= EXTI_InitStruct->EXTI_Line;
-
- /* Clear Rising Falling edge configuration */
- EXTI->RTSR &= ~EXTI_InitStruct->EXTI_Line;
- EXTI->FTSR &= ~EXTI_InitStruct->EXTI_Line;
-
- /* Select the trigger for the selected external interrupts */
- if (EXTI_InitStruct->EXTI_Trigger == EXTI_Trigger_Rising_Falling)
- {
- /* Rising Falling edge */
- EXTI->RTSR |= EXTI_InitStruct->EXTI_Line;
- EXTI->FTSR |= EXTI_InitStruct->EXTI_Line;
- }
- else
- {
- *(vu32 *)(EXTI_BASE + (u32)EXTI_InitStruct->EXTI_Trigger)|= EXTI_InitStruct->EXTI_Line;
- }
- }
- else
- {
- /* Disable the selected external lines */
- *(vu32 *)(EXTI_BASE + (u32)EXTI_InitStruct->EXTI_Mode)&= ~EXTI_InitStruct->EXTI_Line;
- }
-}
-
-/*******************************************************************************
-* Function Name : EXTI_StructInit
-* Description : Fills each EXTI_InitStruct member with its reset value.
-* Input : - EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void EXTI_StructInit(EXTI_InitTypeDef* EXTI_InitStruct)
-{
- EXTI_InitStruct->EXTI_Line = EXTI_LineNone;
- EXTI_InitStruct->EXTI_Mode = EXTI_Mode_Interrupt;
- EXTI_InitStruct->EXTI_Trigger = EXTI_Trigger_Falling;
- EXTI_InitStruct->EXTI_LineCmd = DISABLE;
-}
-
-/*******************************************************************************
-* Function Name : EXTI_GenerateSWInterrupt
-* Description : Generates a Software interrupt.
-* Input : - EXTI_Line: specifies the EXTI lines to be enabled or
-* disabled.
-* This parameter can be any combination of EXTI_Linex where
-* x can be (0..18).
-* Output : None
-* Return : None
-*******************************************************************************/
-void EXTI_GenerateSWInterrupt(u32 EXTI_Line)
-{
- /* Check the parameters */
- assert_param(IS_EXTI_LINE(EXTI_Line));
-
- EXTI->SWIER |= EXTI_Line;
-}
-
-/*******************************************************************************
-* Function Name : EXTI_GetFlagStatus
-* Description : Checks whether the specified EXTI line flag is set or not.
-* Input : - EXTI_Line: specifies the EXTI line flag to check.
-* This parameter can be:
-* - EXTI_Linex: External interrupt line x where x(0..18)
-* Output : None
-* Return : The new state of EXTI_Line (SET or RESET).
-*******************************************************************************/
-FlagStatus EXTI_GetFlagStatus(u32 EXTI_Line)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_GET_EXTI_LINE(EXTI_Line));
-
- if ((EXTI->PR & EXTI_Line) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : EXTI_ClearFlag
-* Description : Clears the EXTI’s line pending flags.
-* Input : - EXTI_Line: specifies the EXTI lines flags to clear.
-* This parameter can be any combination of EXTI_Linex where
-* x can be (0..18).
-* Output : None
-* Return : None
-*******************************************************************************/
-void EXTI_ClearFlag(u32 EXTI_Line)
-{
- /* Check the parameters */
- assert_param(IS_EXTI_LINE(EXTI_Line));
-
- EXTI->PR = EXTI_Line;
-}
-
-/*******************************************************************************
-* Function Name : EXTI_GetITStatus
-* Description : Checks whether the specified EXTI line is asserted or not.
-* Input : - EXTI_Line: specifies the EXTI line to check.
-* This parameter can be:
-* - EXTI_Linex: External interrupt line x where x(0..18)
-* Output : None
-* Return : The new state of EXTI_Line (SET or RESET).
-*******************************************************************************/
-ITStatus EXTI_GetITStatus(u32 EXTI_Line)
-{
- ITStatus bitstatus = RESET;
- u32 enablestatus = 0;
-
- /* Check the parameters */
- assert_param(IS_GET_EXTI_LINE(EXTI_Line));
-
- enablestatus = EXTI->IMR & EXTI_Line;
-
- if (((EXTI->PR & EXTI_Line) != (u32)RESET) && (enablestatus != (u32)RESET))
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : EXTI_ClearITPendingBit
-* Description : Clears the EXTI’s line pending bits.
-* Input : - EXTI_Line: specifies the EXTI lines to clear.
-* This parameter can be any combination of EXTI_Linex where
-* x can be (0..18).
-* Output : None
-* Return : None
-*******************************************************************************/
-void EXTI_ClearITPendingBit(u32 EXTI_Line)
-{
- /* Check the parameters */
- assert_param(IS_EXTI_LINE(EXTI_Line));
-
- EXTI->PR = EXTI_Line;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_flash.c b/stm32lib/src/stm32f10x_flash.c
deleted file mode 100644
index 66952f2..0000000
--- a/stm32lib/src/stm32f10x_flash.c
+++ /dev/null
@@ -1,916 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_flash.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the FLASH firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_flash.h"
-void test(u32 x) {
- int y;
- x = 1;
- y = x;
-}
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Flash Access Control Register bits */
-#define ACR_LATENCY_Mask ((u32)0x00000038)
-#define ACR_HLFCYA_Mask ((u32)0xFFFFFFF7)
-#define ACR_PRFTBE_Mask ((u32)0xFFFFFFEF)
-
-#ifdef _FLASH_PROG
-/* Flash Access Control Register bits */
-#define ACR_PRFTBS_Mask ((u32)0x00000020)
-
-/* Flash Control Register bits */
-#define CR_PG_Set ((u32)0x00000001)
-#define CR_PG_Reset ((u32)0x00001FFE)
-
-#define CR_PER_Set ((u32)0x00000002)
-#define CR_PER_Reset ((u32)0x00001FFD)
-
-#define CR_MER_Set ((u32)0x00000004)
-#define CR_MER_Reset ((u32)0x00001FFB)
-
-#define CR_OPTPG_Set ((u32)0x00000010)
-#define CR_OPTPG_Reset ((u32)0x00001FEF)
-
-#define CR_OPTER_Set ((u32)0x00000020)
-#define CR_OPTER_Reset ((u32)0x00001FDF)
-
-#define CR_STRT_Set ((u32)0x00000040)
-
-#define CR_LOCK_Set ((u32)0x00000080)
-
-/* FLASH Mask */
-#define RDPRT_Mask ((u32)0x00000002)
-#define WRP0_Mask ((u32)0x000000FF)
-#define WRP1_Mask ((u32)0x0000FF00)
-#define WRP2_Mask ((u32)0x00FF0000)
-#define WRP3_Mask ((u32)0xFF000000)
-
-/* FLASH Keys */
-#define RDP_Key ((u16)0x00A5)
-#define FLASH_KEY1 ((u32)0x45670123)
-#define FLASH_KEY2 ((u32)0xCDEF89AB)
-
-/* Delay definition */
-#define EraseTimeout ((u32)0x00000FFF)
-#define ProgramTimeout ((u32)0x0000000F)
-#endif
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-#ifdef _FLASH_PROG
-static void delay(void);
-#endif
-
-/* Private functions ---------------------------------------------------------*/
-/*******************************************************************************
-* Function Name : FLASH_SetLatency
-* Description : Sets the code latency value.
-* Input : - FLASH_Latency: specifies the FLASH Latency value.
-* This parameter can be one of the following values:
-* - FLASH_Latency_0: FLASH Zero Latency cycle
-* - FLASH_Latency_1: FLASH One Latency cycle
-* - FLASH_Latency_2: FLASH Two Latency cycles
-* Output : None
-* Return : None
-*******************************************************************************/
-void FLASH_SetLatency(u32 FLASH_Latency)
-{
- /* Check the parameters */
- assert_param(IS_FLASH_LATENCY(FLASH_Latency));
-
- /* Sets the Latency value */
- FLASH->ACR &= ACR_LATENCY_Mask;
- FLASH->ACR |= FLASH_Latency;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_HalfCycleAccessCmd
-* Description : Enables or disables the Half cycle flash access.
-* Input : - FLASH_HalfCycle: specifies the FLASH Half cycle Access mode.
-* This parameter can be one of the following values:
-* - FLASH_HalfCycleAccess_Enable: FLASH Half Cycle Enable
-* - FLASH_HalfCycleAccess_Disable: FLASH Half Cycle Disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void FLASH_HalfCycleAccessCmd(u32 FLASH_HalfCycleAccess)
-{
- /* Check the parameters */
- assert_param(IS_FLASH_HALFCYCLEACCESS_STATE(FLASH_HalfCycleAccess));
-
- /* Enable or disable the Half cycle access */
- FLASH->ACR &= ACR_HLFCYA_Mask;
- FLASH->ACR |= FLASH_HalfCycleAccess;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_PrefetchBufferCmd
-* Description : Enables or disables the Prefetch Buffer.
-* Input : - FLASH_PrefetchBuffer: specifies the Prefetch buffer status.
-* This parameter can be one of the following values:
-* - FLASH_PrefetchBuffer_Enable: FLASH Prefetch Buffer Enable
-* - FLASH_PrefetchBuffer_Disable: FLASH Prefetch Buffer Disable
-* Output : None
-* Return : None
-*******************************************************************************/
-
-void FLASH_PrefetchBufferCmd(u32 FLASH_PrefetchBuffer)
-{
- /* Check the parameters */
- assert_param(IS_FLASH_PREFETCHBUFFER_STATE(FLASH_PrefetchBuffer));
-
- /* Enable or disable the Prefetch Buffer */
- FLASH->ACR &= ACR_PRFTBE_Mask;
- FLASH->ACR |= FLASH_PrefetchBuffer;
-}
-
-#ifdef _FLASH_PROG
-/*******************************************************************************
-* Function Name : FLASH_Unlock
-* Description : Unlocks the FLASH Program Erase Controller.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void FLASH_Unlock(void)
-{
- /* Authorize the FPEC Access */
- FLASH->KEYR = FLASH_KEY1;
- FLASH->KEYR = FLASH_KEY2;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_Lock
-* Description : Locks the FLASH Program Erase Controller.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void FLASH_Lock(void)
-{
- /* Set the Lock Bit to lock the FPEC and the FCR */
- FLASH->CR |= CR_LOCK_Set;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ErasePage
-* Description : Erases a specified FLASH page.
-* Input : - Page_Address: The page address to be erased.
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_ErasePage(u32 Page_Address)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_FLASH_ADDRESS(Page_Address));
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the previous operation is completed, proceed to erase the page */
- FLASH->CR|= CR_PER_Set;
- FLASH->AR = Page_Address;
- FLASH->CR|= CR_STRT_Set;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the erase operation is completed, disable the PER Bit */
- FLASH->CR &= CR_PER_Reset;
- }
- }
- /* Return the Erase Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_EraseAllPages
-* Description : Erases all FLASH pages.
-* Input : None
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_EraseAllPages(void)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the previous operation is completed, proceed to erase all pages */
- FLASH->CR |= CR_MER_Set;
- FLASH->CR |= CR_STRT_Set;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the erase operation is completed, disable the MER Bit */
- FLASH->CR &= CR_MER_Reset;
- }
- }
- /* Return the Erase Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_EraseOptionBytes
-* Description : Erases the FLASH option bytes.
-* Input : None
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_EraseOptionBytes(void)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* Authorize the small information block programming */
- FLASH->OPTKEYR = FLASH_KEY1;
- FLASH->OPTKEYR = FLASH_KEY2;
-
- /* if the previous operation is completed, proceed to erase the option bytes */
- FLASH->CR |= CR_OPTER_Set;
- FLASH->CR |= CR_STRT_Set;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the erase operation is completed, disable the OPTER Bit */
- FLASH->CR &= CR_OPTER_Reset;
-
- /* Enable the Option Bytes Programming operation */
- FLASH->CR |= CR_OPTPG_Set;
-
- /* Enable the readout access */
- OB->RDP= RDP_Key;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the program operation is completed, disable the OPTPG Bit */
- FLASH->CR &= CR_OPTPG_Reset;
- }
- }
- else
- {
- if (status != FLASH_BUSY)
- {
- /* Disable the OPTPG Bit */
- FLASH->CR &= CR_OPTPG_Reset;
- }
- }
- }
- /* Return the erase status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ProgramWord
-* Description : Programs a word at a specified address.
-* Input : - Address: specifies the address to be programmed.
-* - Data: specifies the data to be programmed.
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_ProgramWord(u32 Address, u32 Data)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_FLASH_ADDRESS(Address));
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the previous operation is completed, proceed to program the new first
- half word */
- FLASH->CR |= CR_PG_Set;
-
- *(vu16*)Address = (u16)Data;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the previous operation is completed, proceed to program the new second
- half word */
- *(vu16*)(Address + 2) = Data >> 16;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* Disable the PG Bit */
- FLASH->CR &= CR_PG_Reset;
- }
- }
- else
- {
- if (status != FLASH_BUSY)
- {
- /* Disable the PG Bit */
- FLASH->CR &= CR_PG_Reset;
- }
- }
- }
- /* Return the Program Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ProgramHalfWord
-* Description : Programs a half word at a specified address.
-* Input : - Address: specifies the address to be programmed.
-* - Data: specifies the data to be programmed.
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_ProgramHalfWord(u32 Address, u16 Data)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_FLASH_ADDRESS(Address));
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the previous operation is completed, proceed to program the new data */
- FLASH->CR |= CR_PG_Set;
-
- *(vu16*)Address = Data;
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the program operation is completed, disable the PG Bit */
- FLASH->CR &= CR_PG_Reset;
- }
- }
- /* Return the Program Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ProgramOptionByteData
-* Description : Programs a half word at a specified Option Byte Data address.
-* Input : - Address: specifies the address to be programmed.
-* This parameter can be 0x1FFFF804 or 0x1FFFF806.
-* - Data: specifies the data to be programmed.
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_ProgramOptionByteData(u32 Address, u8 Data)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_OB_DATA_ADDRESS(Address));
-
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* Authorize the small information block programming */
- FLASH->OPTKEYR = FLASH_KEY1;
- FLASH->OPTKEYR = FLASH_KEY2;
-
- /* Enables the Option Bytes Programming operation */
- FLASH->CR |= CR_OPTPG_Set;
- *(vu16*)Address = Data;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the program operation is completed, disable the OPTPG Bit */
- FLASH->CR &= CR_OPTPG_Reset;
- }
- }
- /* Return the Option Byte Data Program Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_EnableWriteProtection
-* Description : Write protects the desired pages
-* Input : - FLASH_Pages: specifies the address of the pages to be
-* write protected. This parameter can be:
-* - For STM32F10Xxx Medium-density devices (FLASH page size equal to 1 KB)
-* - A value between FLASH_WRProt_Pages0to3 and
-* FLASH_WRProt_Pages124to127
-* - For STM32F10Xxx High-density devices (FLASH page size equal to 2 KB)
-* - A value between FLASH_WRProt_Pages0to1 and
-* FLASH_WRProt_Pages60to61 or FLASH_WRProt_Pages62to255
-* - FLASH_WRProt_AllPages
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_EnableWriteProtection(u32 FLASH_Pages)
-{
- u16 WRP0_Data = 0xFFFF, WRP1_Data = 0xFFFF, WRP2_Data = 0xFFFF, WRP3_Data = 0xFFFF;
-
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_FLASH_WRPROT_PAGE(FLASH_Pages));
-
- FLASH_Pages = (u32)(~FLASH_Pages);
- WRP0_Data = (vu16)(FLASH_Pages & WRP0_Mask);
- WRP1_Data = (vu16)((FLASH_Pages & WRP1_Mask) >> 8);
- WRP2_Data = (vu16)((FLASH_Pages & WRP2_Mask) >> 16);
- WRP3_Data = (vu16)((FLASH_Pages & WRP3_Mask) >> 24);
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* Authorizes the small information block programming */
- FLASH->OPTKEYR = FLASH_KEY1;
- FLASH->OPTKEYR = FLASH_KEY2;
- FLASH->CR |= CR_OPTPG_Set;
-
- if(WRP0_Data != 0xFF)
- {
- OB->WRP0 = WRP0_Data;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
- }
- if((status == FLASH_COMPLETE) && (WRP1_Data != 0xFF))
- {
- OB->WRP1 = WRP1_Data;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
- }
-
- if((status == FLASH_COMPLETE) && (WRP2_Data != 0xFF))
- {
- OB->WRP2 = WRP2_Data;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
- }
-
- if((status == FLASH_COMPLETE)&& (WRP3_Data != 0xFF))
- {
- OB->WRP3 = WRP3_Data;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
- }
-
- if(status != FLASH_BUSY)
- {
- /* if the program operation is completed, disable the OPTPG Bit */
- FLASH->CR &= CR_OPTPG_Reset;
- }
- }
- /* Return the write protection operation Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ReadOutProtection
-* Description : Enables or disables the read out protection.
-* If the user has already programmed the other option bytes before
-* calling this function, he must re-program them since this
-* function erases all option bytes.
-* Input : - Newstate: new state of the ReadOut Protection.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_ReadOutProtection(FunctionalState NewState)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* Authorizes the small information block programming */
- FLASH->OPTKEYR = FLASH_KEY1;
- FLASH->OPTKEYR = FLASH_KEY2;
-
- FLASH->CR |= CR_OPTER_Set;
- FLASH->CR |= CR_STRT_Set;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* if the erase operation is completed, disable the OPTER Bit */
- FLASH->CR &= CR_OPTER_Reset;
-
- /* Enable the Option Bytes Programming operation */
- FLASH->CR |= CR_OPTPG_Set;
-
- if(NewState != DISABLE)
- {
- OB->RDP = 0x00;
- }
- else
- {
- OB->RDP = RDP_Key;
- }
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(EraseTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the program operation is completed, disable the OPTPG Bit */
- FLASH->CR &= CR_OPTPG_Reset;
- }
- }
- else
- {
- if(status != FLASH_BUSY)
- {
- /* Disable the OPTER Bit */
- FLASH->CR &= CR_OPTER_Reset;
- }
- }
- }
- /* Return the protection operation Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_UserOptionByteConfig
-* Description : Programs the FLASH User Option Byte: IWDG_SW / RST_STOP /
-* RST_STDBY.
-* Input : - OB_IWDG: Selects the IWDG mode
-* This parameter can be one of the following values:
-* - OB_IWDG_SW: Software IWDG selected
-* - OB_IWDG_HW: Hardware IWDG selected
-* - OB_STOP: Reset event when entering STOP mode.
-* This parameter can be one of the following values:
-* - OB_STOP_NoRST: No reset generated when entering in STOP
-* - OB_STOP_RST: Reset generated when entering in STOP
-* - OB_STDBY: Reset event when entering Standby mode.
-* This parameter can be one of the following values:
-* - OB_STDBY_NoRST: No reset generated when entering in STANDBY
-* - OB_STDBY_RST: Reset generated when entering in STANDBY
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_UserOptionByteConfig(u16 OB_IWDG, u16 OB_STOP, u16 OB_STDBY)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check the parameters */
- assert_param(IS_OB_IWDG_SOURCE(OB_IWDG));
- assert_param(IS_OB_STOP_SOURCE(OB_STOP));
- assert_param(IS_OB_STDBY_SOURCE(OB_STDBY));
-
- /* Authorize the small information block programming */
- FLASH->OPTKEYR = FLASH_KEY1;
- FLASH->OPTKEYR = FLASH_KEY2;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status == FLASH_COMPLETE)
- {
- /* Enable the Option Bytes Programming operation */
- FLASH->CR |= CR_OPTPG_Set;
-
- OB->USER = ( OB_IWDG | OB_STOP |OB_STDBY) | (u16)0xF8;
-
- /* Wait for last operation to be completed */
- status = FLASH_WaitForLastOperation(ProgramTimeout);
-
- if(status != FLASH_BUSY)
- {
- /* if the program operation is completed, disable the OPTPG Bit */
- FLASH->CR &= CR_OPTPG_Reset;
- }
- }
- /* Return the Option Byte program Status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_GetUserOptionByte
-* Description : Returns the FLASH User Option Bytes values.
-* Input : None
-* Output : None
-* Return : The FLASH User Option Bytes values:IWDG_SW(Bit0), RST_STOP(Bit1)
-* and RST_STDBY(Bit2).
-*******************************************************************************/
-u32 FLASH_GetUserOptionByte(void)
-{
- /* Return the User Option Byte */
- return (u32)(FLASH->OBR >> 2);
-}
-
-/*******************************************************************************
-* Function Name : FLASH_GetWriteProtectionOptionByte
-* Description : Returns the FLASH Write Protection Option Bytes Register value.
-* Input : None
-* Output : None
-* Return : The FLASH Write Protection Option Bytes Register value
-*******************************************************************************/
-u32 FLASH_GetWriteProtectionOptionByte(void)
-{
- /* Return the Falsh write protection Register value */
- return (u32)(FLASH->WRPR);
-}
-
-/*******************************************************************************
-* Function Name : FLASH_GetReadOutProtectionStatus
-* Description : Checks whether the FLASH Read Out Protection Status is set
-* or not.
-* Input : None
-* Output : None
-* Return : FLASH ReadOut Protection Status(SET or RESET)
-*******************************************************************************/
-FlagStatus FLASH_GetReadOutProtectionStatus(void)
-{
- FlagStatus readoutstatus = RESET;
-
- if ((FLASH->OBR & RDPRT_Mask) != (u32)RESET)
- {
- readoutstatus = SET;
- }
- else
- {
- readoutstatus = RESET;
- }
- return readoutstatus;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_GetPrefetchBufferStatus
-* Description : Checks whether the FLASH Prefetch Buffer status is set or not.
-* Input : None
-* Output : None
-* Return : FLASH Prefetch Buffer Status (SET or RESET).
-*******************************************************************************/
-FlagStatus FLASH_GetPrefetchBufferStatus(void)
-{
- FlagStatus bitstatus = RESET;
-
- if ((FLASH->ACR & ACR_PRFTBS_Mask) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- /* Return the new state of FLASH Prefetch Buffer Status (SET or RESET) */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ITConfig
-* Description : Enables or disables the specified FLASH interrupts.
-* Input : - FLASH_IT: specifies the FLASH interrupt sources to be
-* enabled or disabled.
-* This parameter can be any combination of the following values:
-* - FLASH_IT_ERROR: FLASH Error Interrupt
-* - FLASH_IT_EOP: FLASH end of operation Interrupt
-* Output : None
-* Return : None
-*******************************************************************************/
-void FLASH_ITConfig(u16 FLASH_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FLASH_IT(FLASH_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if(NewState != DISABLE)
- {
- /* Enable the interrupt sources */
- FLASH->CR |= FLASH_IT;
- }
- else
- {
- /* Disable the interrupt sources */
- FLASH->CR &= ~(u32)FLASH_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : FLASH_GetFlagStatus
-* Description : Checks whether the specified FLASH flag is set or not.
-* Input : - FLASH_FLAG: specifies the FLASH flag to check.
-* This parameter can be one of the following values:
-* - FLASH_FLAG_BSY: FLASH Busy flag
-* - FLASH_FLAG_PGERR: FLASH Program error flag
-* - FLASH_FLAG_WRPRTERR: FLASH Write protected error flag
-* - FLASH_FLAG_EOP: FLASH End of Operation flag
-* - FLASH_FLAG_OPTERR: FLASH Option Byte error flag
-* Output : None
-* Return : The new state of FLASH_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus FLASH_GetFlagStatus(u16 FLASH_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_FLASH_GET_FLAG(FLASH_FLAG)) ;
-
- if(FLASH_FLAG == FLASH_FLAG_OPTERR)
- {
- if((FLASH->OBR & FLASH_FLAG_OPTERR) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- }
- else
- {
- if((FLASH->SR & FLASH_FLAG) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- }
- /* Return the new state of FLASH_FLAG (SET or RESET) */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_ClearFlag
-* Description : Clears the FLASH’s pending flags.
-* Input : - FLASH_FLAG: specifies the FLASH flags to clear.
-* This parameter can be any combination of the following values:
-* - FLASH_FLAG_BSY: FLASH Busy flag
-* - FLASH_FLAG_PGERR: FLASH Program error flag
-* - FLASH_FLAG_WRPRTERR: FLASH Write protected error flag
-* - FLASH_FLAG_EOP: FLASH End of Operation flag
-* Output : None
-* Return : None
-*******************************************************************************/
-void FLASH_ClearFlag(u16 FLASH_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_FLASH_CLEAR_FLAG(FLASH_FLAG)) ;
-
- /* Clear the flags */
- FLASH->SR = FLASH_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_GetStatus
-* Description : Returns the FLASH Status.
-* Input : None
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP or FLASH_COMPLETE
-*******************************************************************************/
-FLASH_Status FLASH_GetStatus(void)
-{
- FLASH_Status flashstatus = FLASH_COMPLETE;
-
- if((FLASH->SR & FLASH_FLAG_BSY) == FLASH_FLAG_BSY)
- {
- flashstatus = FLASH_BUSY;
- }
- else
- {
- if(FLASH->SR & FLASH_FLAG_PGERR)
- {
- flashstatus = FLASH_ERROR_PG;
- }
- else
- {
- if(FLASH->SR & FLASH_FLAG_WRPRTERR)
- {
- flashstatus = FLASH_ERROR_WRP;
- }
- else
- {
- flashstatus = FLASH_COMPLETE;
- }
- }
- }
- /* Return the Flash Status */
- return flashstatus;
-}
-
-/*******************************************************************************
-* Function Name : FLASH_WaitForLastOperation
-* Description : Waits for a Flash operation to complete or a TIMEOUT to occur.
-* Input : - Timeout: FLASH progamming Timeout
-* Output : None
-* Return : FLASH Status: The returned value can be: FLASH_BUSY,
-* FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_COMPLETE or
-* FLASH_TIMEOUT.
-*******************************************************************************/
-FLASH_Status FLASH_WaitForLastOperation(u32 Timeout)
-{
- FLASH_Status status = FLASH_COMPLETE;
-
- /* Check for the Flash Status */
- status = FLASH_GetStatus();
-
- /* Wait for a Flash operation to complete or a TIMEOUT to occur */
- while((status == FLASH_BUSY) && (Timeout != 0x00))
- {
- delay();
- status = FLASH_GetStatus();
- Timeout--;
- }
-
- if(Timeout == 0x00 )
- {
- status = FLASH_TIMEOUT;
- }
-
- /* Return the operation status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : delay
-* Description : Inserts a time delay.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-static void delay(void)
-{
- vu32 i = 0;
-
- for(i = 0xFF; i != 0; i--)
- {
- }
-}
-#endif
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_fsmc.c b/stm32lib/src/stm32f10x_fsmc.c
deleted file mode 100644
index 4068a7f..0000000
--- a/stm32lib/src/stm32f10x_fsmc.c
+++ /dev/null
@@ -1,861 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_fsmc.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the FSMC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_fsmc.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* --------------------- FSMC registers bit mask ---------------------------- */
-/* FSMC BCRx Mask */
-#define BCR_MBKEN_Set ((u32)0x00000001)
-#define BCR_MBKEN_Reset ((u32)0x000FFFFE)
-#define BCR_FACCEN_Set ((u32)0x00000040)
-
-/* FSMC PCRx Mask */
-#define PCR_PBKEN_Set ((u32)0x00000004)
-#define PCR_PBKEN_Reset ((u32)0x000FFFFB)
-#define PCR_ECCEN_Set ((u32)0x00000040)
-#define PCR_ECCEN_Reset ((u32)0x000FFFBF)
-#define PCR_MemoryType_NAND ((u32)0x00000008)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : FSMC_NORSRAMDeInit
-* Description : Deinitializes the FSMC NOR/SRAM Banks registers to their default
-* reset values.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank1_NORSRAM1: FSMC Bank1 NOR/SRAM1
-* - FSMC_Bank1_NORSRAM2: FSMC Bank1 NOR/SRAM2
-* - FSMC_Bank1_NORSRAM3: FSMC Bank1 NOR/SRAM3
-* - FSMC_Bank1_NORSRAM4: FSMC Bank1 NOR/SRAM4
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NORSRAMDeInit(u32 FSMC_Bank)
-{
- /* Check the parameter */
- assert_param(IS_FSMC_NORSRAM_BANK(FSMC_Bank));
-
- /* FSMC_Bank1_NORSRAM1 */
- if(FSMC_Bank == FSMC_Bank1_NORSRAM1)
- {
- FSMC_Bank1->BTCR[FSMC_Bank] = 0x000030DB;
- }
- /* FSMC_Bank1_NORSRAM2, FSMC_Bank1_NORSRAM3 or FSMC_Bank1_NORSRAM4 */
- else
- {
- FSMC_Bank1->BTCR[FSMC_Bank] = 0x000030D2;
- }
-
- FSMC_Bank1->BTCR[FSMC_Bank + 1] = 0x0FFFFFFF;
- FSMC_Bank1E->BWTR[FSMC_Bank] = 0x0FFFFFFF;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NANDDeInit
-* Description : Deinitializes the FSMC NAND Banks registers to their default
-* reset values.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NANDDeInit(u32 FSMC_Bank)
-{
- /* Check the parameter */
- assert_param(IS_FSMC_NAND_BANK(FSMC_Bank));
-
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- /* Set the FSMC_Bank2 registers to their reset values */
- FSMC_Bank2->PCR2 = 0x00000018;
- FSMC_Bank2->SR2 = 0x00000040;
- FSMC_Bank2->PMEM2 = 0xFCFCFCFC;
- FSMC_Bank2->PATT2 = 0xFCFCFCFC;
- }
- /* FSMC_Bank3_NAND */
- else
- {
- /* Set the FSMC_Bank3 registers to their reset values */
- FSMC_Bank3->PCR3 = 0x00000018;
- FSMC_Bank3->SR3 = 0x00000040;
- FSMC_Bank3->PMEM3 = 0xFCFCFCFC;
- FSMC_Bank3->PATT3 = 0xFCFCFCFC;
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_PCCARDDeInit
-* Description : Deinitializes the FSMC PCCARD Bank registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_PCCARDDeInit(void)
-{
- /* Set the FSMC_Bank4 registers to their reset values */
- FSMC_Bank4->PCR4 = 0x00000018;
- FSMC_Bank4->SR4 = 0x00000000;
- FSMC_Bank4->PMEM4 = 0xFCFCFCFC;
- FSMC_Bank4->PATT4 = 0xFCFCFCFC;
- FSMC_Bank4->PIO4 = 0xFCFCFCFC;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NORSRAMInit
-* Description : Initializes the FSMC NOR/SRAM Banks according to the
-* specified parameters in the FSMC_NORSRAMInitStruct.
-* Input : - FSMC_NORSRAMInitStruct : pointer to a FSMC_NORSRAMInitTypeDef
-* structure that contains the configuration information for
-* the FSMC NOR/SRAM specified Banks.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
-{
- /* Check the parameters */
- assert_param(IS_FSMC_NORSRAM_BANK(FSMC_NORSRAMInitStruct->FSMC_Bank));
- assert_param(IS_FSMC_MUX(FSMC_NORSRAMInitStruct->FSMC_DataAddressMux));
- assert_param(IS_FSMC_MEMORY(FSMC_NORSRAMInitStruct->FSMC_MemoryType));
- assert_param(IS_FSMC_MEMORY_WIDTH(FSMC_NORSRAMInitStruct->FSMC_MemoryDataWidth));
- assert_param(IS_FSMC_BURSTMODE(FSMC_NORSRAMInitStruct->FSMC_BurstAccessMode));
- assert_param(IS_FSMC_WAIT_POLARITY(FSMC_NORSRAMInitStruct->FSMC_WaitSignalPolarity));
- assert_param(IS_FSMC_WRAP_MODE(FSMC_NORSRAMInitStruct->FSMC_WrapMode));
- assert_param(IS_FSMC_WAIT_SIGNAL_ACTIVE(FSMC_NORSRAMInitStruct->FSMC_WaitSignalActive));
- assert_param(IS_FSMC_WRITE_OPERATION(FSMC_NORSRAMInitStruct->FSMC_WriteOperation));
- assert_param(IS_FSMC_WAITE_SIGNAL(FSMC_NORSRAMInitStruct->FSMC_WaitSignal));
- assert_param(IS_FSMC_EXTENDED_MODE(FSMC_NORSRAMInitStruct->FSMC_ExtendedMode));
- assert_param(IS_FSMC_ASYNC_WAIT(FSMC_NORSRAMInitStruct->FSMC_AsyncWait));
- assert_param(IS_FSMC_WRITE_BURST(FSMC_NORSRAMInitStruct->FSMC_WriteBurst));
- assert_param(IS_FSMC_ADDRESS_SETUP_TIME(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AddressSetupTime));
- assert_param(IS_FSMC_ADDRESS_HOLD_TIME(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AddressHoldTime));
- assert_param(IS_FSMC_DATASETUP_TIME(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_DataSetupTime));
- assert_param(IS_FSMC_TURNAROUND_TIME(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_BusTurnAroundDuration));
- assert_param(IS_FSMC_CLK_DIV(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_CLKDivision));
- assert_param(IS_FSMC_DATA_LATENCY(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_DataLatency));
- assert_param(IS_FSMC_ACCESS_MODE(FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AccessMode));
-
- /* Bank1 NOR/SRAM control register configuration */
- FSMC_Bank1->BTCR[FSMC_NORSRAMInitStruct->FSMC_Bank] =
- (u32)FSMC_NORSRAMInitStruct->FSMC_DataAddressMux |
- FSMC_NORSRAMInitStruct->FSMC_MemoryType |
- FSMC_NORSRAMInitStruct->FSMC_MemoryDataWidth |
- FSMC_NORSRAMInitStruct->FSMC_BurstAccessMode |
- FSMC_NORSRAMInitStruct->FSMC_WaitSignalPolarity |
- FSMC_NORSRAMInitStruct->FSMC_WrapMode |
- FSMC_NORSRAMInitStruct->FSMC_WaitSignalActive |
- FSMC_NORSRAMInitStruct->FSMC_WriteOperation |
- FSMC_NORSRAMInitStruct->FSMC_WaitSignal |
- FSMC_NORSRAMInitStruct->FSMC_ExtendedMode |
- FSMC_NORSRAMInitStruct->FSMC_AsyncWait |
- FSMC_NORSRAMInitStruct->FSMC_WriteBurst;
-
- if(FSMC_NORSRAMInitStruct->FSMC_MemoryType == FSMC_MemoryType_NOR)
- {
- FSMC_Bank1->BTCR[FSMC_NORSRAMInitStruct->FSMC_Bank] |= (u32)BCR_FACCEN_Set;
- }
-
- /* Bank1 NOR/SRAM timing register configuration */
- FSMC_Bank1->BTCR[FSMC_NORSRAMInitStruct->FSMC_Bank+1] =
- (u32)FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AddressSetupTime |
- (FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AddressHoldTime << 4) |
- (FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_DataSetupTime << 8) |
- (FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_BusTurnAroundDuration << 16) |
- (FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_CLKDivision << 20) |
- (FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_DataLatency << 24) |
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AccessMode;
-
-
-
- /* Bank1 NOR/SRAM timing register for write configuration, if extended mode is used */
- if(FSMC_NORSRAMInitStruct->FSMC_ExtendedMode == FSMC_ExtendedMode_Enable)
- {
- assert_param(IS_FSMC_ADDRESS_SETUP_TIME(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AddressSetupTime));
- assert_param(IS_FSMC_ADDRESS_HOLD_TIME(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AddressHoldTime));
- assert_param(IS_FSMC_DATASETUP_TIME(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_DataSetupTime));
- assert_param(IS_FSMC_TURNAROUND_TIME(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_BusTurnAroundDuration));
- assert_param(IS_FSMC_CLK_DIV(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_CLKDivision));
- assert_param(IS_FSMC_DATA_LATENCY(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_DataLatency));
- assert_param(IS_FSMC_ACCESS_MODE(FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AccessMode));
-
- FSMC_Bank1E->BWTR[FSMC_NORSRAMInitStruct->FSMC_Bank] =
- (u32)FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AddressSetupTime |
- (FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AddressHoldTime << 4 )|
- (FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_DataSetupTime << 8) |
- (FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_BusTurnAroundDuration << 16) |
- (FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_CLKDivision << 20) |
- (FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_DataLatency << 24) |
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AccessMode;
- }
- else
- {
- FSMC_Bank1E->BWTR[FSMC_NORSRAMInitStruct->FSMC_Bank] = 0x0FFFFFFF;
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NANDInit
-* Description : Initializes the FSMC NAND Banks according to the specified
-* parameters in the FSMC_NANDInitStruct.
-* Input : - FSMC_NANDInitStruct : pointer to a FSMC_NANDInitTypeDef
-* structure that contains the configuration information for
-* the FSMC NAND specified Banks.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
-{
- u32 tmppcr = 0x00000000, tmppmem = 0x00000000, tmppatt = 0x00000000;
-
- /* Check the parameters */
- assert_param( IS_FSMC_NAND_BANK(FSMC_NANDInitStruct->FSMC_Bank));
- assert_param( IS_FSMC_WAIT_FEATURE(FSMC_NANDInitStruct->FSMC_Waitfeature));
- assert_param( IS_FSMC_DATA_WIDTH(FSMC_NANDInitStruct->FSMC_MemoryDataWidth));
- assert_param( IS_FSMC_ECC_STATE(FSMC_NANDInitStruct->FSMC_ECC));
- assert_param( IS_FSMC_ECCPAGE_SIZE(FSMC_NANDInitStruct->FSMC_ECCPageSize));
- assert_param( IS_FSMC_ADDRESS_LOW_MAPPING(FSMC_NANDInitStruct->FSMC_AddressLowMapping));
- assert_param( IS_FSMC_TCLR_TIME(FSMC_NANDInitStruct->FSMC_TCLRSetupTime));
- assert_param( IS_FSMC_TAR_TIME(FSMC_NANDInitStruct->FSMC_TARSetupTime));
-
- assert_param(IS_FSMC_SETUP_TIME(FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_SetupTime));
- assert_param(IS_FSMC_WAIT_TIME(FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_WaitSetupTime));
- assert_param(IS_FSMC_HOLD_TIME(FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HoldSetupTime));
- assert_param(IS_FSMC_HIZ_TIME(FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HiZSetupTime));
-
- assert_param(IS_FSMC_SETUP_TIME(FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_SetupTime));
- assert_param(IS_FSMC_WAIT_TIME(FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_WaitSetupTime));
- assert_param(IS_FSMC_HOLD_TIME(FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HoldSetupTime));
- assert_param(IS_FSMC_HIZ_TIME(FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HiZSetupTime));
-
- /* Set the tmppcr value according to FSMC_NANDInitStruct parameters */
- tmppcr = (u32)FSMC_NANDInitStruct->FSMC_Waitfeature |
- PCR_MemoryType_NAND |
- FSMC_NANDInitStruct->FSMC_MemoryDataWidth |
- FSMC_NANDInitStruct->FSMC_ECC |
- FSMC_NANDInitStruct->FSMC_ECCPageSize |
- FSMC_NANDInitStruct->FSMC_AddressLowMapping |
- (FSMC_NANDInitStruct->FSMC_TCLRSetupTime << 9 )|
- (FSMC_NANDInitStruct->FSMC_TARSetupTime << 13);
-
- /* Set tmppmem value according to FSMC_CommonSpaceTimingStructure parameters */
- tmppmem = (u32)FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_SetupTime |
- (FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_WaitSetupTime << 8) |
- (FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HoldSetupTime << 16)|
- (FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HiZSetupTime << 24);
-
- /* Set tmppatt value according to FSMC_AttributeSpaceTimingStructure parameters */
- tmppatt = (u32)FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_SetupTime |
- (FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_WaitSetupTime << 8) |
- (FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HoldSetupTime << 16)|
- (FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HiZSetupTime << 24);
-
- if(FSMC_NANDInitStruct->FSMC_Bank == FSMC_Bank2_NAND)
- {
- /* FSMC_Bank2_NAND registers configuration */
- FSMC_Bank2->PCR2 = tmppcr;
- FSMC_Bank2->PMEM2 = tmppmem;
- FSMC_Bank2->PATT2 = tmppatt;
- }
- else
- {
- /* FSMC_Bank3_NAND registers configuration */
- FSMC_Bank3->PCR3 = tmppcr;
- FSMC_Bank3->PMEM3 = tmppmem;
- FSMC_Bank3->PATT3 = tmppatt;
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_PCCARDInit
-* Description : Initializes the FSMC PCCARD Bank according to the specified
-* parameters in the FSMC_PCCARDInitStruct.
-* Input : - FSMC_PCCARDInitStruct : pointer to a FSMC_PCCARDInitTypeDef
-* structure that contains the configuration information for
-* the FSMC PCCARD Bank.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)
-{
- /* Check the parameters */
- assert_param(IS_FSMC_WAIT_FEATURE(FSMC_PCCARDInitStruct->FSMC_Waitfeature));
- assert_param(IS_FSMC_ADDRESS_LOW_MAPPING(FSMC_PCCARDInitStruct->FSMC_AddressLowMapping));
- assert_param(IS_FSMC_TCLR_TIME(FSMC_PCCARDInitStruct->FSMC_TCLRSetupTime));
- assert_param(IS_FSMC_TAR_TIME(FSMC_PCCARDInitStruct->FSMC_TARSetupTime));
-
-
- assert_param(IS_FSMC_SETUP_TIME(FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_SetupTime));
- assert_param(IS_FSMC_WAIT_TIME(FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_WaitSetupTime));
- assert_param(IS_FSMC_HOLD_TIME(FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HoldSetupTime));
- assert_param(IS_FSMC_HIZ_TIME(FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HiZSetupTime));
-
- assert_param(IS_FSMC_SETUP_TIME(FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_SetupTime));
- assert_param(IS_FSMC_WAIT_TIME(FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_WaitSetupTime));
- assert_param(IS_FSMC_HOLD_TIME(FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HoldSetupTime));
- assert_param(IS_FSMC_HIZ_TIME(FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HiZSetupTime));
-
- assert_param(IS_FSMC_SETUP_TIME(FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_SetupTime));
- assert_param(IS_FSMC_WAIT_TIME(FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_WaitSetupTime));
- assert_param(IS_FSMC_HOLD_TIME(FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_HoldSetupTime));
- assert_param(IS_FSMC_HIZ_TIME(FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_HiZSetupTime));
-
- /* Set the PCR4 register value according to FSMC_PCCARDInitStruct parameters */
- FSMC_Bank4->PCR4 = (u32)FSMC_PCCARDInitStruct->FSMC_Waitfeature |
- FSMC_PCCARDInitStruct->FSMC_AddressLowMapping |
- (FSMC_PCCARDInitStruct->FSMC_TCLRSetupTime << 9) |
- (FSMC_PCCARDInitStruct->FSMC_TARSetupTime << 13);
-
- /* Set PMEM4 register value according to FSMC_CommonSpaceTimingStructure parameters */
- FSMC_Bank4->PMEM4 = (u32)FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_SetupTime |
- (FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_WaitSetupTime << 8) |
- (FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HoldSetupTime << 16)|
- (FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HiZSetupTime << 24);
-
- /* Set PATT4 register value according to FSMC_AttributeSpaceTimingStructure parameters */
- FSMC_Bank4->PATT4 = (u32)FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_SetupTime |
- (FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_WaitSetupTime << 8) |
- (FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HoldSetupTime << 16)|
- (FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HiZSetupTime << 24);
-
- /* Set PIO4 register value according to FSMC_IOSpaceTimingStructure parameters */
- FSMC_Bank4->PIO4 = (u32)FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_SetupTime |
- (FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_WaitSetupTime << 8) |
- (FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_HoldSetupTime << 16)|
- (FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_HiZSetupTime << 24);
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NORSRAMStructInit
-* Description : Fills each FSMC_NORSRAMInitStruct member with its default value.
-* Input : - FSMC_NORSRAMInitStruct: pointer to a FSMC_NORSRAMInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
-{
- /* Reset NOR/SRAM Init structure parameters values */
- FSMC_NORSRAMInitStruct->FSMC_Bank = FSMC_Bank1_NORSRAM1;
- FSMC_NORSRAMInitStruct->FSMC_DataAddressMux = FSMC_DataAddressMux_Enable;
- FSMC_NORSRAMInitStruct->FSMC_MemoryType = FSMC_MemoryType_SRAM;
- FSMC_NORSRAMInitStruct->FSMC_MemoryDataWidth = FSMC_MemoryDataWidth_8b;
- FSMC_NORSRAMInitStruct->FSMC_BurstAccessMode = FSMC_BurstAccessMode_Disable;
- FSMC_NORSRAMInitStruct->FSMC_WaitSignalPolarity = FSMC_WaitSignalPolarity_Low;
- FSMC_NORSRAMInitStruct->FSMC_WrapMode = FSMC_WrapMode_Disable;
- FSMC_NORSRAMInitStruct->FSMC_WaitSignalActive = FSMC_WaitSignalActive_BeforeWaitState;
- FSMC_NORSRAMInitStruct->FSMC_WriteOperation = FSMC_WriteOperation_Enable;
- FSMC_NORSRAMInitStruct->FSMC_WaitSignal = FSMC_WaitSignal_Enable;
- FSMC_NORSRAMInitStruct->FSMC_ExtendedMode = FSMC_ExtendedMode_Disable;
- FSMC_NORSRAMInitStruct->FSMC_AsyncWait = FSMC_AsyncWait_Disable;
- FSMC_NORSRAMInitStruct->FSMC_WriteBurst = FSMC_WriteBurst_Disable;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AddressSetupTime = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AddressHoldTime = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_DataSetupTime = 0xFF;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_BusTurnAroundDuration = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_CLKDivision = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_DataLatency = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_ReadWriteTimingStruct->FSMC_AccessMode = FSMC_AccessMode_A;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AddressSetupTime = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AddressHoldTime = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_DataSetupTime = 0xFF;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_BusTurnAroundDuration = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_CLKDivision = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_DataLatency = 0xF;
- FSMC_NORSRAMInitStruct->FSMC_WriteTimingStruct->FSMC_AccessMode = FSMC_AccessMode_A;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NANDStructInit
-* Description : Fills each FSMC_NANDInitStruct member with its default value.
-* Input : - FSMC_NORSRAMInitStruct: pointer to a FSMC_NANDInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
-{
- /* Reset NAND Init structure parameters values */
- FSMC_NANDInitStruct->FSMC_Bank = FSMC_Bank2_NAND;
- FSMC_NANDInitStruct->FSMC_Waitfeature = FSMC_Waitfeature_Disable;
- FSMC_NANDInitStruct->FSMC_MemoryDataWidth = FSMC_MemoryDataWidth_8b;
- FSMC_NANDInitStruct->FSMC_ECC = FSMC_ECC_Disable;
- FSMC_NANDInitStruct->FSMC_ECCPageSize = FSMC_ECCPageSize_256Bytes;
- FSMC_NANDInitStruct->FSMC_AddressLowMapping = FSMC_AddressLowMapping_Direct;
- FSMC_NANDInitStruct->FSMC_TCLRSetupTime = 0x0;
- FSMC_NANDInitStruct->FSMC_TARSetupTime = 0x0;
- FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_SetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_WaitSetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HoldSetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HiZSetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_SetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_WaitSetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HoldSetupTime = 0xFC;
- FSMC_NANDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HiZSetupTime = 0xFC;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_PCCARDStructInit
-* Description : Fills each FSMC_PCCARDInitStruct member with its default value.
-* Input : - FSMC_PCCARDInitStruct: pointer to a FSMC_PCCARDInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_PCCARDStructInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)
-{
- /* Reset PCCARD Init structure parameters values */
- FSMC_PCCARDInitStruct->FSMC_Waitfeature = FSMC_Waitfeature_Disable;
- FSMC_PCCARDInitStruct->FSMC_AddressLowMapping = FSMC_AddressLowMapping_Direct;
- FSMC_PCCARDInitStruct->FSMC_TCLRSetupTime = 0x0;
- FSMC_PCCARDInitStruct->FSMC_TARSetupTime = 0x0;
- FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_SetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_WaitSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HoldSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_CommonSpaceTimingStruct->FSMC_HiZSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_SetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_WaitSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HoldSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_AttributeSpaceTimingStruct->FSMC_HiZSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_SetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_WaitSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_HoldSetupTime = 0xFC;
- FSMC_PCCARDInitStruct->FSMC_IOSpaceTimingStruct->FSMC_HiZSetupTime = 0xFC;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NORSRAMCmd
-* Description : Enables or disables the specified NOR/SRAM Memory Bank.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank1_NORSRAM1: FSMC Bank1 NOR/SRAM1
-* - FSMC_Bank1_NORSRAM2: FSMC Bank1 NOR/SRAM2
-* - FSMC_Bank1_NORSRAM3: FSMC Bank1 NOR/SRAM3
-* - FSMC_Bank1_NORSRAM4: FSMC Bank1 NOR/SRAM4
-* : - NewState: new state of the FSMC_Bank.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NORSRAMCmd(u32 FSMC_Bank, FunctionalState NewState)
-{
- assert_param(IS_FSMC_NORSRAM_BANK(FSMC_Bank));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected NOR/SRAM Bank by setting the PBKEN bit in the BCRx register */
- FSMC_Bank1->BTCR[FSMC_Bank] |= BCR_MBKEN_Set;
- }
- else
- {
- /* Disable the selected NOR/SRAM Bank by clearing the PBKEN bit in the BCRx register */
- FSMC_Bank1->BTCR[FSMC_Bank] &= BCR_MBKEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NANDCmd
-* Description : Enables or disables the specified NAND Memory Bank.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* : - NewState: new state of the FSMC_Bank.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NANDCmd(u32 FSMC_Bank, FunctionalState NewState)
-{
- assert_param(IS_FSMC_NAND_BANK(FSMC_Bank));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected NAND Bank by setting the PBKEN bit in the PCRx register */
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->PCR2 |= PCR_PBKEN_Set;
- }
- else
- {
- FSMC_Bank3->PCR3 |= PCR_PBKEN_Set;
- }
- }
- else
- {
- /* Disable the selected NAND Bank by clearing the PBKEN bit in the PCRx register */
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->PCR2 &= PCR_PBKEN_Reset;
- }
- else
- {
- FSMC_Bank3->PCR3 &= PCR_PBKEN_Reset;
- }
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_PCCARDCmd
-* Description : Enables or disables the PCCARD Memory Bank.
-* Input : - NewState: new state of the PCCARD Memory Bank.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_PCCARDCmd(FunctionalState NewState)
-{
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the PCCARD Bank by setting the PBKEN bit in the PCR4 register */
- FSMC_Bank4->PCR4 |= PCR_PBKEN_Set;
- }
- else
- {
- /* Disable the PCCARD Bank by clearing the PBKEN bit in the PCR4 register */
- FSMC_Bank4->PCR4 &= PCR_PBKEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_NANDECCCmd
-* Description : Enables or disables the FSMC NAND ECC feature.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* : - NewState: new state of the FSMC NAND ECC feature.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_NANDECCCmd(u32 FSMC_Bank, FunctionalState NewState)
-{
- assert_param(IS_FSMC_NAND_BANK(FSMC_Bank));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected NAND Bank ECC function by setting the ECCEN bit in the PCRx register */
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->PCR2 |= PCR_ECCEN_Set;
- }
- else
- {
- FSMC_Bank3->PCR3 |= PCR_ECCEN_Set;
- }
- }
- else
- {
- /* Disable the selected NAND Bank ECC function by clearing the ECCEN bit in the PCRx register */
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->PCR2 &= PCR_ECCEN_Reset;
- }
- else
- {
- FSMC_Bank3->PCR3 &= PCR_ECCEN_Reset;
- }
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_GetECC
-* Description : Returns the error correction code register value.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* Output : None
-* Return : The Error Correction Code (ECC) value.
-*******************************************************************************/
-u32 FSMC_GetECC(u32 FSMC_Bank)
-{
- u32 eccval = 0x00000000;
-
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- /* Get the ECCR2 register value */
- eccval = FSMC_Bank2->ECCR2;
- }
- else
- {
- /* Get the ECCR3 register value */
- eccval = FSMC_Bank3->ECCR3;
- }
- /* Return the error correction code value */
- return(eccval);
-}
-
-/*******************************************************************************
-* Function Name : FSMC_ITConfig
-* Description : Enables or disables the specified FSMC interrupts.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* - FSMC_Bank4_PCCARD: FSMC Bank4 PCCARD
-* - FSMC_IT: specifies the FSMC interrupt sources to be
-* enabled or disabled.
-* This parameter can be any combination of the following values:
-* - FSMC_IT_RisingEdge: Rising edge detection interrupt.
-* - FSMC_IT_Level: Level edge detection interrupt.
-* - FSMC_IT_FallingEdge: Falling edge detection interrupt.
-* - NewState: new state of the specified FSMC interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_ITConfig(u32 FSMC_Bank, u32 FSMC_IT, FunctionalState NewState)
-{
- assert_param(IS_FSMC_IT_BANK(FSMC_Bank));
- assert_param(IS_FSMC_IT(FSMC_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected FSMC_Bank2 interrupts */
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->SR2 |= FSMC_IT;
- }
- /* Enable the selected FSMC_Bank3 interrupts */
- else if (FSMC_Bank == FSMC_Bank3_NAND)
- {
- FSMC_Bank3->SR3 |= FSMC_IT;
- }
- /* Enable the selected FSMC_Bank4 interrupts */
- else
- {
- FSMC_Bank4->SR4 |= FSMC_IT;
- }
- }
- else
- {
- /* Disable the selected FSMC_Bank2 interrupts */
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
-
- FSMC_Bank2->SR2 &= (u32)~FSMC_IT;
- }
- /* Disable the selected FSMC_Bank3 interrupts */
- else if (FSMC_Bank == FSMC_Bank3_NAND)
- {
- FSMC_Bank3->SR3 &= (u32)~FSMC_IT;
- }
- /* Disable the selected FSMC_Bank4 interrupts */
- else
- {
- FSMC_Bank4->SR4 &= (u32)~FSMC_IT;
- }
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_GetFlagStatus
-* Description : Checks whether the specified FSMC flag is set or not.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* - FSMC_Bank4_PCCARD: FSMC Bank4 PCCARD
-* - FSMC_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - FSMC_FLAG_RisingEdge: Rising egde detection Flag.
-* - FSMC_FLAG_Level: Level detection Flag.
-* - FSMC_FLAG_FallingEdge: Falling egde detection Flag.
-* - FSMC_FLAG_FEMPT: Fifo empty Flag.
-* Output : None
-* Return : The new state of FSMC_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus FSMC_GetFlagStatus(u32 FSMC_Bank, u32 FSMC_FLAG)
-{
- FlagStatus bitstatus = RESET;
- u32 tmpsr = 0x00000000;
-
- /* Check the parameters */
- assert_param(IS_FSMC_GETFLAG_BANK(FSMC_Bank));
- assert_param(IS_FSMC_GET_FLAG(FSMC_FLAG));
-
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- tmpsr = FSMC_Bank2->SR2;
- }
- else if(FSMC_Bank == FSMC_Bank3_NAND)
- {
- tmpsr = FSMC_Bank3->SR3;
- }
- /* FSMC_Bank4_PCCARD*/
- else
- {
- tmpsr = FSMC_Bank4->SR4;
- }
-
- /* Get the flag status */
- if ((tmpsr & FSMC_FLAG) != (u16)RESET )
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- /* Return the flag status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_ClearFlag
-* Description : Clears the FSMC’s pending flags.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* - FSMC_Bank4_PCCARD: FSMC Bank4 PCCARD
-* - FSMC_FLAG: specifies the flag to clear.
-* This parameter can be any combination of the following values:
-* - FSMC_FLAG_RisingEdge: Rising egde detection Flag.
-* - FSMC_FLAG_Level: Level detection Flag.
-* - FSMC_FLAG_FallingEdge: Falling egde detection Flag.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_ClearFlag(u32 FSMC_Bank, u32 FSMC_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_FSMC_GETFLAG_BANK(FSMC_Bank));
- assert_param(IS_FSMC_CLEAR_FLAG(FSMC_FLAG)) ;
-
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->SR2 &= ~FSMC_FLAG;
- }
- else if(FSMC_Bank == FSMC_Bank3_NAND)
- {
- FSMC_Bank3->SR3 &= ~FSMC_FLAG;
- }
- /* FSMC_Bank4_PCCARD*/
- else
- {
- FSMC_Bank4->SR4 &= ~FSMC_FLAG;
- }
-}
-
-/*******************************************************************************
-* Function Name : FSMC_GetITStatus
-* Description : Checks whether the specified FSMC interrupt has occurred or not.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* - FSMC_Bank4_PCCARD: FSMC Bank4 PCCARD
-* - FSMC_IT: specifies the FSMC interrupt source to check.
-* This parameter can be one of the following values:
-* - FSMC_IT_RisingEdge: Rising edge detection interrupt.
-* - FSMC_IT_Level: Level edge detection interrupt.
-* - FSMC_IT_FallingEdge: Falling edge detection interrupt.
-* Output : None
-* Return : The new state of FSMC_IT (SET or RESET).
-*******************************************************************************/
-ITStatus FSMC_GetITStatus(u32 FSMC_Bank, u32 FSMC_IT)
-{
- ITStatus bitstatus = RESET;
- u32 tmpsr = 0x0, itstatus = 0x0, itenable = 0x0;
-
- /* Check the parameters */
- assert_param(IS_FSMC_IT_BANK(FSMC_Bank));
- assert_param(IS_FSMC_GET_IT(FSMC_IT));
-
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- tmpsr = FSMC_Bank2->SR2;
- }
- else if(FSMC_Bank == FSMC_Bank3_NAND)
- {
- tmpsr = FSMC_Bank3->SR3;
- }
- /* FSMC_Bank4_PCCARD*/
- else
- {
- tmpsr = FSMC_Bank4->SR4;
- }
-
- itstatus = tmpsr & FSMC_IT;
-
- itenable = tmpsr & (FSMC_IT >> 3);
-
- if ((itstatus != (u32)RESET) && (itenable != (u32)RESET))
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : FSMC_ClearITPendingBit
-* Description : Clears the FSMC’s interrupt pending bits.
-* Input : - FSMC_Bank: specifies the FSMC Bank to be used
-* This parameter can be one of the following values:
-* - FSMC_Bank2_NAND: FSMC Bank2 NAND
-* - FSMC_Bank3_NAND: FSMC Bank3 NAND
-* - FSMC_Bank4_PCCARD: FSMC Bank4 PCCARD
-* - FSMC_IT: specifies the interrupt pending bit to clear.
-* This parameter can be any combination of the following values:
-* - FSMC_IT_RisingEdge: Rising edge detection interrupt.
-* - FSMC_IT_Level: Level edge detection interrupt.
-* - FSMC_IT_FallingEdge: Falling edge detection interrupt.
-* Output : None
-* Return : None
-*******************************************************************************/
-void FSMC_ClearITPendingBit(u32 FSMC_Bank, u32 FSMC_IT)
-{
- /* Check the parameters */
- assert_param(IS_FSMC_IT_BANK(FSMC_Bank));
- assert_param(IS_FSMC_IT(FSMC_IT));
-
- if(FSMC_Bank == FSMC_Bank2_NAND)
- {
- FSMC_Bank2->SR2 &= ~(FSMC_IT >> 3);
- }
- else if(FSMC_Bank == FSMC_Bank3_NAND)
- {
- FSMC_Bank3->SR3 &= ~(FSMC_IT >> 3);
- }
- /* FSMC_Bank4_PCCARD*/
- else
- {
- FSMC_Bank4->SR4 &= ~(FSMC_IT >> 3);
- }
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_gpio.c b/stm32lib/src/stm32f10x_gpio.c
deleted file mode 100644
index 1979c05..0000000
--- a/stm32lib/src/stm32f10x_gpio.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_gpio.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the GPIO firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_gpio.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ------------ RCC registers bit address in the alias region ----------- */
-#define AFIO_OFFSET (AFIO_BASE - PERIPH_BASE)
-
-/* --- EVENTCR Register ---*/
-/* Alias word address of EVOE bit */
-#define EVCR_OFFSET (AFIO_OFFSET + 0x00)
-#define EVOE_BitNumber ((u8)0x07)
-#define EVCR_EVOE_BB (PERIPH_BB_BASE + (EVCR_OFFSET * 32) + (EVOE_BitNumber * 4))
-
-#define EVCR_PORTPINCONFIG_MASK ((u16)0xFF80)
-#define LSB_MASK ((u16)0xFFFF)
-#define DBGAFR_POSITION_MASK ((u32)0x000F0000)
-#define DBGAFR_SWJCFG_MASK ((u32)0xF0FFFFFF)
-#define DBGAFR_LOCATION_MASK ((u32)0x00200000)
-#define DBGAFR_NUMBITS_MASK ((u32)0x00100000)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : GPIO_DeInit
-* Description : Deinitializes the GPIOx peripheral registers to their default
-* reset values.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_DeInit(GPIO_TypeDef* GPIOx)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
-
- switch (*(u32*)&GPIOx)
- {
- case GPIOA_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOA, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOA, DISABLE);
- break;
-
- case GPIOB_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOB, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOB, DISABLE);
- break;
-
- case GPIOC_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOC, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOC, DISABLE);
- break;
-
- case GPIOD_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOD, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOD, DISABLE);
- break;
-
- case GPIOE_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOE, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOE, DISABLE);
- break;
-
- case GPIOF_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOF, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOF, DISABLE);
- break;
-
- case GPIOG_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOG, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_GPIOG, DISABLE);
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : GPIO_AFIODeInit
-* Description : Deinitializes the Alternate Functions (remap, event control
-* and EXTI configuration) registers to their default reset
-* values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_AFIODeInit(void)
-{
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_AFIO, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_AFIO, DISABLE);
-}
-
-/*******************************************************************************
-* Function Name : GPIO_Init
-* Description : Initializes the GPIOx peripheral according to the specified
-* parameters in the GPIO_InitStruct.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* - GPIO_InitStruct: pointer to a GPIO_InitTypeDef structure that
-* contains the configuration information for the specified GPIO
-* peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct)
-{
- u32 currentmode = 0x00, currentpin = 0x00, pinpos = 0x00, pos = 0x00;
- u32 tmpreg = 0x00, pinmask = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GPIO_MODE(GPIO_InitStruct->GPIO_Mode));
- assert_param(IS_GPIO_PIN(GPIO_InitStruct->GPIO_Pin));
-
-/*---------------------------- GPIO Mode Configuration -----------------------*/
- currentmode = ((u32)GPIO_InitStruct->GPIO_Mode) & ((u32)0x0F);
-
- if ((((u32)GPIO_InitStruct->GPIO_Mode) & ((u32)0x10)) != 0x00)
- {
- /* Check the parameters */
- assert_param(IS_GPIO_SPEED(GPIO_InitStruct->GPIO_Speed));
- /* Output mode */
- currentmode |= (u32)GPIO_InitStruct->GPIO_Speed;
- }
-
-/*---------------------------- GPIO CRL Configuration ------------------------*/
- /* Configure the eight low port pins */
- if (((u32)GPIO_InitStruct->GPIO_Pin & ((u32)0x00FF)) != 0x00)
- {
- tmpreg = GPIOx->CRL;
-
- for (pinpos = 0x00; pinpos < 0x08; pinpos++)
- {
- pos = ((u32)0x01) << pinpos;
- /* Get the port pins position */
- currentpin = (GPIO_InitStruct->GPIO_Pin) & pos;
-
- if (currentpin == pos)
- {
- pos = pinpos << 2;
- /* Clear the corresponding low control register bits */
- pinmask = ((u32)0x0F) << pos;
- tmpreg &= ~pinmask;
-
- /* Write the mode configuration in the corresponding bits */
- tmpreg |= (currentmode << pos);
-
- /* Reset the corresponding ODR bit */
- if (GPIO_InitStruct->GPIO_Mode == GPIO_Mode_IPD)
- {
- GPIOx->BRR = (((u32)0x01) << pinpos);
- }
- else
- {
- /* Set the corresponding ODR bit */
- if (GPIO_InitStruct->GPIO_Mode == GPIO_Mode_IPU)
- {
- GPIOx->BSRR = (((u32)0x01) << pinpos);
- }
- }
- }
- }
- GPIOx->CRL = tmpreg;
- }
-
-/*---------------------------- GPIO CRH Configuration ------------------------*/
- /* Configure the eight high port pins */
- if (GPIO_InitStruct->GPIO_Pin > 0x00FF)
- {
- tmpreg = GPIOx->CRH;
- for (pinpos = 0x00; pinpos < 0x08; pinpos++)
- {
- pos = (((u32)0x01) << (pinpos + 0x08));
- /* Get the port pins position */
- currentpin = ((GPIO_InitStruct->GPIO_Pin) & pos);
- if (currentpin == pos)
- {
- pos = pinpos << 2;
- /* Clear the corresponding high control register bits */
- pinmask = ((u32)0x0F) << pos;
- tmpreg &= ~pinmask;
-
- /* Write the mode configuration in the corresponding bits */
- tmpreg |= (currentmode << pos);
-
- /* Reset the corresponding ODR bit */
- if (GPIO_InitStruct->GPIO_Mode == GPIO_Mode_IPD)
- {
- GPIOx->BRR = (((u32)0x01) << (pinpos + 0x08));
- }
- /* Set the corresponding ODR bit */
- if (GPIO_InitStruct->GPIO_Mode == GPIO_Mode_IPU)
- {
- GPIOx->BSRR = (((u32)0x01) << (pinpos + 0x08));
- }
- }
- }
- GPIOx->CRH = tmpreg;
- }
-}
-
-/*******************************************************************************
-* Function Name : GPIO_StructInit
-* Description : Fills each GPIO_InitStruct member with its default value.
-* Input : - GPIO_InitStruct : pointer to a GPIO_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct)
-{
- /* Reset GPIO init structure parameters values */
- GPIO_InitStruct->GPIO_Pin = GPIO_Pin_All;
- GPIO_InitStruct->GPIO_Speed = GPIO_Speed_2MHz;
- GPIO_InitStruct->GPIO_Mode = GPIO_Mode_IN_FLOATING;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_ReadInputDataBit
-* Description : Reads the specified input port pin.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* : - GPIO_Pin: specifies the port bit to read.
-* This parameter can be GPIO_Pin_x where x can be (0..15).
-* Output : None
-* Return : The input port pin value.
-*******************************************************************************/
-u8 GPIO_ReadInputDataBit(GPIO_TypeDef* GPIOx, u16 GPIO_Pin)
-{
- u8 bitstatus = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GET_GPIO_PIN(GPIO_Pin));
-
- if ((GPIOx->IDR & GPIO_Pin) != (u32)Bit_RESET)
- {
- bitstatus = (u8)Bit_SET;
- }
- else
- {
- bitstatus = (u8)Bit_RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_ReadInputData
-* Description : Reads the specified GPIO input data port.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* Output : None
-* Return : GPIO input data port value.
-*******************************************************************************/
-u16 GPIO_ReadInputData(GPIO_TypeDef* GPIOx)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
-
- return ((u16)GPIOx->IDR);
-}
-
-/*******************************************************************************
-* Function Name : GPIO_ReadOutputDataBit
-* Description : Reads the specified output data port bit.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* : - GPIO_Pin: specifies the port bit to read.
-* This parameter can be GPIO_Pin_x where x can be (0..15).
-* Output : None
-* Return : The output port pin value.
-*******************************************************************************/
-u8 GPIO_ReadOutputDataBit(GPIO_TypeDef* GPIOx, u16 GPIO_Pin)
-{
- u8 bitstatus = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GET_GPIO_PIN(GPIO_Pin));
-
- if ((GPIOx->ODR & GPIO_Pin) != (u32)Bit_RESET)
- {
- bitstatus = (u8)Bit_SET;
- }
- else
- {
- bitstatus = (u8)Bit_RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_ReadOutputData
-* Description : Reads the specified GPIO output data port.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* Output : None
-* Return : GPIO output data port value.
-*******************************************************************************/
-u16 GPIO_ReadOutputData(GPIO_TypeDef* GPIOx)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
-
- return ((u16)GPIOx->ODR);
-}
-
-/*******************************************************************************
-* Function Name : GPIO_SetBits
-* Description : Sets the selected data port bits.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* - GPIO_Pin: specifies the port bits to be written.
-* This parameter can be any combination of GPIO_Pin_x where
-* x can be (0..15).
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_SetBits(GPIO_TypeDef* GPIOx, u16 GPIO_Pin)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GPIO_PIN(GPIO_Pin));
-
- GPIOx->BSRR = GPIO_Pin;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_ResetBits
-* Description : Clears the selected data port bits.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* - GPIO_Pin: specifies the port bits to be written.
-* This parameter can be any combination of GPIO_Pin_x where
-* x can be (0..15).
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_ResetBits(GPIO_TypeDef* GPIOx, u16 GPIO_Pin)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GPIO_PIN(GPIO_Pin));
-
- GPIOx->BRR = GPIO_Pin;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_WriteBit
-* Description : Sets or clears the selected data port bit.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* - GPIO_Pin: specifies the port bit to be written.
-* This parameter can be one of GPIO_Pin_x where x can be (0..15).
-* - BitVal: specifies the value to be written to the selected bit.
-* This parameter can be one of the BitAction enum values:
-* - Bit_RESET: to clear the port pin
-* - Bit_SET: to set the port pin
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_WriteBit(GPIO_TypeDef* GPIOx, u16 GPIO_Pin, BitAction BitVal)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GET_GPIO_PIN(GPIO_Pin));
- assert_param(IS_GPIO_BIT_ACTION(BitVal));
-
- if (BitVal != Bit_RESET)
- {
- GPIOx->BSRR = GPIO_Pin;
- }
- else
- {
- GPIOx->BRR = GPIO_Pin;
- }
-}
-
-/*******************************************************************************
-* Function Name : GPIO_Write
-* Description : Writes data to the specified GPIO data port.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* - PortVal: specifies the value to be written to the port output
-* data register.
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_Write(GPIO_TypeDef* GPIOx, u16 PortVal)
-{
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
-
- GPIOx->ODR = PortVal;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_PinLockConfig
-* Description : Locks GPIO Pins configuration registers.
-* Input : - GPIOx: where x can be (A..G) to select the GPIO peripheral.
-* - GPIO_Pin: specifies the port bit to be written.
-* This parameter can be any combination of GPIO_Pin_x where
-* x can be (0..15).
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_PinLockConfig(GPIO_TypeDef* GPIOx, u16 GPIO_Pin)
-{
- u32 tmp = 0x00010000;
-
- /* Check the parameters */
- assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
- assert_param(IS_GPIO_PIN(GPIO_Pin));
-
- tmp |= GPIO_Pin;
- /* Set LCKK bit */
- GPIOx->LCKR = tmp;
- /* Reset LCKK bit */
- GPIOx->LCKR = GPIO_Pin;
- /* Set LCKK bit */
- GPIOx->LCKR = tmp;
- /* Read LCKK bit*/
- tmp = GPIOx->LCKR;
- /* Read LCKK bit*/
- tmp = GPIOx->LCKR;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_EventOutputConfig
-* Description : Selects the GPIO pin used as Event output.
-* Input : - GPIO_PortSource: selects the GPIO port to be used as source
-* for Event output.
-* This parameter can be GPIO_PortSourceGPIOx where x can be
-* (A..E).
-* - GPIO_PinSource: specifies the pin for the Event output.
-* This parameter can be GPIO_PinSourcex where x can be (0..15).
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_EventOutputConfig(u8 GPIO_PortSource, u8 GPIO_PinSource)
-{
- u32 tmpreg = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GPIO_EVENTOUT_PORT_SOURCE(GPIO_PortSource));
- assert_param(IS_GPIO_PIN_SOURCE(GPIO_PinSource));
-
- tmpreg = AFIO->EVCR;
- /* Clear the PORT[6:4] and PIN[3:0] bits */
- tmpreg &= EVCR_PORTPINCONFIG_MASK;
- tmpreg |= (u32)GPIO_PortSource << 0x04;
- tmpreg |= GPIO_PinSource;
-
- AFIO->EVCR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_EventOutputCmd
-* Description : Enables or disables the Event Output.
-* Input : - NewState: new state of the Event output.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_EventOutputCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) EVCR_EVOE_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_PinRemapConfig
-* Description : Changes the mapping of the specified pin.
-* Input : - GPIO_Remap: selects the pin to remap.
-* This parameter can be one of the following values:
-* - GPIO_Remap_SPI1
-* - GPIO_Remap_I2C1
-* - GPIO_Remap_USART1
-* - GPIO_Remap_USART2
-* - GPIO_PartialRemap_USART3
-* - GPIO_FullRemap_USART3
-* - GPIO_PartialRemap_TIM1
-* - GPIO_FullRemap_TIM1
-* - GPIO_PartialRemap1_TIM2
-* - GPIO_PartialRemap2_TIM2
-* - GPIO_FullRemap_TIM2
-* - GPIO_PartialRemap_TIM3
-* - GPIO_FullRemap_TIM3
-* - GPIO_Remap_TIM4
-* - GPIO_Remap1_CAN
-* - GPIO_Remap2_CAN
-* - GPIO_Remap_PD01
-* - GPIO_Remap_TIM5CH4_LSI
-* - GPIO_Remap_ADC1_ETRGINJ
-* - GPIO_Remap_ADC1_ETRGREG
-* - GPIO_Remap_ADC2_ETRGINJ
-* - GPIO_Remap_ADC2_ETRGREG
-* - GPIO_Remap_SWJ_NoJTRST
-* - GPIO_Remap_SWJ_JTAGDisable
-* - GPIO_Remap_SWJ_Disable
-* - NewState: new state of the port pin remapping.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_PinRemapConfig(u32 GPIO_Remap, FunctionalState NewState)
-{
- u32 tmp = 0x00, tmp1 = 0x00, tmpreg = 0x00, tmpmask = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GPIO_REMAP(GPIO_Remap));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- tmpreg = AFIO->MAPR;
-
- tmpmask = (GPIO_Remap & DBGAFR_POSITION_MASK) >> 0x10;
- tmp = GPIO_Remap & LSB_MASK;
-
- if ((GPIO_Remap & (DBGAFR_LOCATION_MASK | DBGAFR_NUMBITS_MASK)) == (DBGAFR_LOCATION_MASK | DBGAFR_NUMBITS_MASK))
- {
- tmpreg &= DBGAFR_SWJCFG_MASK;
- AFIO->MAPR &= DBGAFR_SWJCFG_MASK;
- }
- else if ((GPIO_Remap & DBGAFR_NUMBITS_MASK) == DBGAFR_NUMBITS_MASK)
- {
- tmp1 = ((u32)0x03) << tmpmask;
- tmpreg &= ~tmp1;
- tmpreg |= ~DBGAFR_SWJCFG_MASK;
- }
- else
- {
- tmpreg &= ~(tmp << ((GPIO_Remap >> 0x15)*0x10));
- tmpreg |= ~DBGAFR_SWJCFG_MASK;
- }
-
- if (NewState != DISABLE)
- {
- tmpreg |= (tmp << ((GPIO_Remap >> 0x15)*0x10));
- }
-
- AFIO->MAPR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : GPIO_EXTILineConfig
-* Description : Selects the GPIO pin used as EXTI Line.
-* Input : - GPIO_PortSource: selects the GPIO port to be used as
-* source for EXTI lines.
-* This parameter can be GPIO_PortSourceGPIOx where x can be
-* (A..G).
-* - GPIO_PinSource: specifies the EXTI line to be configured.
-* This parameter can be GPIO_PinSourcex where x can be (0..15).
-* Output : None
-* Return : None
-*******************************************************************************/
-void GPIO_EXTILineConfig(u8 GPIO_PortSource, u8 GPIO_PinSource)
-{
- u32 tmp = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GPIO_EXTI_PORT_SOURCE(GPIO_PortSource));
- assert_param(IS_GPIO_PIN_SOURCE(GPIO_PinSource));
-
- tmp = ((u32)0x0F) << (0x04 * (GPIO_PinSource & (u8)0x03));
-
- AFIO->EXTICR[GPIO_PinSource >> 0x02] &= ~tmp;
- AFIO->EXTICR[GPIO_PinSource >> 0x02] |= (((u32)GPIO_PortSource) << (0x04 * (GPIO_PinSource & (u8)0x03)));
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_i2c.c b/stm32lib/src/stm32f10x_i2c.c
deleted file mode 100644
index 360f71d..0000000
--- a/stm32lib/src/stm32f10x_i2c.c
+++ /dev/null
@@ -1,1216 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_i2c.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the I2C firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_i2c.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* I2C SPE mask */
-#define CR1_PE_Set ((u16)0x0001)
-#define CR1_PE_Reset ((u16)0xFFFE)
-
-/* I2C START mask */
-#define CR1_START_Set ((u16)0x0100)
-#define CR1_START_Reset ((u16)0xFEFF)
-
-/* I2C STOP mask */
-#define CR1_STOP_Set ((u16)0x0200)
-#define CR1_STOP_Reset ((u16)0xFDFF)
-
-/* I2C ACK mask */
-#define CR1_ACK_Set ((u16)0x0400)
-#define CR1_ACK_Reset ((u16)0xFBFF)
-
-/* I2C ENGC mask */
-#define CR1_ENGC_Set ((u16)0x0040)
-#define CR1_ENGC_Reset ((u16)0xFFBF)
-
-/* I2C SWRST mask */
-#define CR1_SWRST_Set ((u16)0x8000)
-#define CR1_SWRST_Reset ((u16)0x7FFF)
-
-/* I2C PEC mask */
-#define CR1_PEC_Set ((u16)0x1000)
-#define CR1_PEC_Reset ((u16)0xEFFF)
-
-/* I2C ENPEC mask */
-#define CR1_ENPEC_Set ((u16)0x0020)
-#define CR1_ENPEC_Reset ((u16)0xFFDF)
-
-/* I2C ENARP mask */
-#define CR1_ENARP_Set ((u16)0x0010)
-#define CR1_ENARP_Reset ((u16)0xFFEF)
-
-/* I2C NOSTRETCH mask */
-#define CR1_NOSTRETCH_Set ((u16)0x0080)
-#define CR1_NOSTRETCH_Reset ((u16)0xFF7F)
-
-/* I2C registers Masks */
-#define CR1_CLEAR_Mask ((u16)0xFBF5)
-
-/* I2C DMAEN mask */
-#define CR2_DMAEN_Set ((u16)0x0800)
-#define CR2_DMAEN_Reset ((u16)0xF7FF)
-
-/* I2C LAST mask */
-#define CR2_LAST_Set ((u16)0x1000)
-#define CR2_LAST_Reset ((u16)0xEFFF)
-
-/* I2C FREQ mask */
-#define CR2_FREQ_Reset ((u16)0xFFC0)
-
-/* I2C ADD0 mask */
-#define OAR1_ADD0_Set ((u16)0x0001)
-#define OAR1_ADD0_Reset ((u16)0xFFFE)
-
-/* I2C ENDUAL mask */
-#define OAR2_ENDUAL_Set ((u16)0x0001)
-#define OAR2_ENDUAL_Reset ((u16)0xFFFE)
-
-/* I2C ADD2 mask */
-#define OAR2_ADD2_Reset ((u16)0xFF01)
-
-/* I2C F/S mask */
-#define CCR_FS_Set ((u16)0x8000)
-
-/* I2C CCR mask */
-#define CCR_CCR_Set ((u16)0x0FFF)
-
-/* I2C FLAG mask */
-#define FLAG_Mask ((u32)0x00FFFFFF)
-
-/* I2C Interrupt Enable mask */
-#define ITEN_Mask ((u32)0x07000000)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : I2C_DeInit
-* Description : Deinitializes the I2Cx peripheral registers to their default
-* reset values.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_DeInit(I2C_TypeDef* I2Cx)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
-
- switch (*(u32*)&I2Cx)
- {
- case I2C1_BASE:
- /* Enable I2C1 reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, ENABLE);
- /* Release I2C1 from reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C1, DISABLE);
- break;
-
- case I2C2_BASE:
- /* Enable I2C2 reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, ENABLE);
- /* Release I2C2 from reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_I2C2, DISABLE);
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_Init
-* Description : Initializes the I2Cx peripheral according to the specified
-* parameters in the I2C_InitStruct.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_InitStruct: pointer to a I2C_InitTypeDef structure that
-* contains the configuration information for the specified
-* I2C peripheral.
-* Output : None
-* Return : None
-******************************************************************************/
-void I2C_Init(I2C_TypeDef* I2Cx, I2C_InitTypeDef* I2C_InitStruct)
-{
- u16 tmpreg = 0, freqrange = 0;
- u16 result = 0x04;
- u32 pclk1 = 8000000;
- RCC_ClocksTypeDef rcc_clocks;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_MODE(I2C_InitStruct->I2C_Mode));
- assert_param(IS_I2C_DUTY_CYCLE(I2C_InitStruct->I2C_DutyCycle));
- assert_param(IS_I2C_OWN_ADDRESS1(I2C_InitStruct->I2C_OwnAddress1));
- assert_param(IS_I2C_ACK_STATE(I2C_InitStruct->I2C_Ack));
- assert_param(IS_I2C_ACKNOWLEDGE_ADDRESS(I2C_InitStruct->I2C_AcknowledgedAddress));
- assert_param(IS_I2C_CLOCK_SPEED(I2C_InitStruct->I2C_ClockSpeed));
-
-/*---------------------------- I2Cx CR2 Configuration ------------------------*/
- /* Get the I2Cx CR2 value */
- tmpreg = I2Cx->CR2;
- /* Clear frequency FREQ[5:0] bits */
- tmpreg &= CR2_FREQ_Reset;
- /* Get pclk1 frequency value */
- RCC_GetClocksFreq(&rcc_clocks);
- pclk1 = rcc_clocks.PCLK1_Frequency;
- /* Set frequency bits depending on pclk1 value */
- freqrange = (u16)(pclk1 / 1000000);
- tmpreg |= freqrange;
- /* Write to I2Cx CR2 */
- I2Cx->CR2 = tmpreg;
-
-/*---------------------------- I2Cx CCR Configuration ------------------------*/
- /* Disable the selected I2C peripheral to configure TRISE */
- I2Cx->CR1 &= CR1_PE_Reset;
-
- /* Reset tmpreg value */
- /* Clear F/S, DUTY and CCR[11:0] bits */
- tmpreg = 0;
-
- /* Configure speed in standard mode */
- if (I2C_InitStruct->I2C_ClockSpeed <= 100000)
- {
- /* Standard mode speed calculate */
- result = (u16)(pclk1 / (I2C_InitStruct->I2C_ClockSpeed << 1));
- /* Test if CCR value is under 0x4*/
- if (result < 0x04)
- {
- /* Set minimum allowed value */
- result = 0x04;
- }
- /* Set speed value for standard mode */
- tmpreg |= result;
- /* Set Maximum Rise Time for standard mode */
- I2Cx->TRISE = freqrange + 1;
- }
- /* Configure speed in fast mode */
- else /*(I2C_InitStruct->I2C_ClockSpeed <= 400000)*/
- {
- if (I2C_InitStruct->I2C_DutyCycle == I2C_DutyCycle_2)
- {
- /* Fast mode speed calculate: Tlow/Thigh = 2 */
- result = (u16)(pclk1 / (I2C_InitStruct->I2C_ClockSpeed * 3));
- }
- else /*I2C_InitStruct->I2C_DutyCycle == I2C_DutyCycle_16_9*/
- {
- /* Fast mode speed calculate: Tlow/Thigh = 16/9 */
- result = (u16)(pclk1 / (I2C_InitStruct->I2C_ClockSpeed * 25));
- /* Set DUTY bit */
- result |= I2C_DutyCycle_16_9;
- }
- /* Test if CCR value is under 0x1*/
- if ((result & CCR_CCR_Set) == 0)
- {
- /* Set minimum allowed value */
- result |= (u16)0x0001;
- }
- /* Set speed value and set F/S bit for fast mode */
- tmpreg |= result | CCR_FS_Set;
- /* Set Maximum Rise Time for fast mode */
- I2Cx->TRISE = (u16)(((freqrange * 300) / 1000) + 1);
- }
- /* Write to I2Cx CCR */
- I2Cx->CCR = tmpreg;
-
- /* Enable the selected I2C peripheral */
- I2Cx->CR1 |= CR1_PE_Set;
-
-/*---------------------------- I2Cx CR1 Configuration ------------------------*/
- /* Get the I2Cx CR1 value */
- tmpreg = I2Cx->CR1;
- /* Clear ACK, SMBTYPE and SMBUS bits */
- tmpreg &= CR1_CLEAR_Mask;
- /* Configure I2Cx: mode and acknowledgement */
- /* Set SMBTYPE and SMBUS bits according to I2C_Mode value */
- /* Set ACK bit according to I2C_Ack value */
- tmpreg |= (u16)((u32)I2C_InitStruct->I2C_Mode | I2C_InitStruct->I2C_Ack);
- /* Write to I2Cx CR1 */
- I2Cx->CR1 = tmpreg;
-
-/*---------------------------- I2Cx OAR1 Configuration -----------------------*/
- /* Set I2Cx Own Address1 and acknowledged address */
- I2Cx->OAR1 = (I2C_InitStruct->I2C_AcknowledgedAddress | I2C_InitStruct->I2C_OwnAddress1);
-}
-
-/*******************************************************************************
-* Function Name : I2C_StructInit
-* Description : Fills each I2C_InitStruct member with its default value.
-* Input : - I2C_InitStruct: pointer to an I2C_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_StructInit(I2C_InitTypeDef* I2C_InitStruct)
-{
-/*---------------- Reset I2C init structure parameters values ----------------*/
- /* Initialize the I2C_Mode member */
- I2C_InitStruct->I2C_Mode = I2C_Mode_I2C;
-
- /* Initialize the I2C_DutyCycle member */
- I2C_InitStruct->I2C_DutyCycle = I2C_DutyCycle_2;
-
- /* Initialize the I2C_OwnAddress1 member */
- I2C_InitStruct->I2C_OwnAddress1 = 0;
-
- /* Initialize the I2C_Ack member */
- I2C_InitStruct->I2C_Ack = I2C_Ack_Disable;
-
- /* Initialize the I2C_AcknowledgedAddress member */
- I2C_InitStruct->I2C_AcknowledgedAddress = I2C_AcknowledgedAddress_7bit;
-
- /* initialize the I2C_ClockSpeed member */
- I2C_InitStruct->I2C_ClockSpeed = 5000;
-}
-
-/*******************************************************************************
-* Function Name : I2C_Cmd
-* Description : Enables or disables the specified I2C peripheral.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2Cx peripheral. This parameter
-* can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_Cmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected I2C peripheral */
- I2Cx->CR1 |= CR1_PE_Set;
- }
- else
- {
- /* Disable the selected I2C peripheral */
- I2Cx->CR1 &= CR1_PE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_DMACmd
-* Description : Enables or disables the specified I2C DMA requests.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C DMA transfer.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_DMACmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected I2C DMA requests */
- I2Cx->CR2 |= CR2_DMAEN_Set;
- }
- else
- {
- /* Disable the selected I2C DMA requests */
- I2Cx->CR2 &= CR2_DMAEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_DMALastTransferCmd
-* Description : Specifies that the next DMA transfer is the last one.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C DMA last transfer.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_DMALastTransferCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Next DMA transfer is the last transfer */
- I2Cx->CR2 |= CR2_LAST_Set;
- }
- else
- {
- /* Next DMA transfer is not the last transfer */
- I2Cx->CR2 &= CR2_LAST_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_GenerateSTART
-* Description : Generates I2Cx communication START condition.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C START condition generation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None.
-*******************************************************************************/
-void I2C_GenerateSTART(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Generate a START condition */
- I2Cx->CR1 |= CR1_START_Set;
- }
- else
- {
- /* Disable the START condition generation */
- I2Cx->CR1 &= CR1_START_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_GenerateSTOP
-* Description : Generates I2Cx communication STOP condition.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C STOP condition generation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None.
-*******************************************************************************/
-void I2C_GenerateSTOP(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Generate a STOP condition */
- I2Cx->CR1 |= CR1_STOP_Set;
- }
- else
- {
- /* Disable the STOP condition generation */
- I2Cx->CR1 &= CR1_STOP_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_AcknowledgeConfig
-* Description : Enables or disables the specified I2C acknowledge feature.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C Acknowledgement.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None.
-*******************************************************************************/
-void I2C_AcknowledgeConfig(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the acknowledgement */
- I2Cx->CR1 |= CR1_ACK_Set;
- }
- else
- {
- /* Disable the acknowledgement */
- I2Cx->CR1 &= CR1_ACK_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_OwnAddress2Config
-* Description : Configures the specified I2C own address2.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - Address: specifies the 7bit I2C own address2.
-* Output : None
-* Return : None.
-*******************************************************************************/
-void I2C_OwnAddress2Config(I2C_TypeDef* I2Cx, u8 Address)
-{
- u16 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
-
- /* Get the old register value */
- tmpreg = I2Cx->OAR2;
- /* Reset I2Cx Own address2 bit [7:1] */
- tmpreg &= OAR2_ADD2_Reset;
- /* Set I2Cx Own address2 */
- tmpreg |= (u16)(Address & (u16)0x00FE);
- /* Store the new register value */
- I2Cx->OAR2 = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : I2C_DualAddressCmd
-* Description : Enables or disables the specified I2C dual addressing mode.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C dual addressing mode.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_DualAddressCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable dual addressing mode */
- I2Cx->OAR2 |= OAR2_ENDUAL_Set;
- }
- else
- {
- /* Disable dual addressing mode */
- I2Cx->OAR2 &= OAR2_ENDUAL_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_GeneralCallCmd
-* Description : Enables or disables the specified I2C general call feature.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C General call.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_GeneralCallCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable generall call */
- I2Cx->CR1 |= CR1_ENGC_Set;
- }
- else
- {
- /* Disable generall call */
- I2Cx->CR1 &= CR1_ENGC_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_ITConfig
-* Description : Enables or disables the specified I2C interrupts.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_IT: specifies the I2C interrupts sources to be enabled
-* or disabled.
-* This parameter can be any combination of the following values:
-* - I2C_IT_BUF: Buffer interrupt mask
-* - I2C_IT_EVT: Event interrupt mask
-* - I2C_IT_ERR: Error interrupt mask
-* - NewState: new state of the specified I2C interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_ITConfig(I2C_TypeDef* I2Cx, u16 I2C_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
- assert_param(IS_I2C_CONFIG_IT(I2C_IT));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected I2C interrupts */
- I2Cx->CR2 |= I2C_IT;
- }
- else
- {
- /* Disable the selected I2C interrupts */
- I2Cx->CR2 &= (u16)~I2C_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_SendData
-* Description : Sends a data byte through the I2Cx peripheral.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - Data: Byte to be transmitted..
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_SendData(I2C_TypeDef* I2Cx, u8 Data)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
-
- /* Write in the DR register the data to be sent */
- I2Cx->DR = Data;
-}
-
-/*******************************************************************************
-* Function Name : I2C_ReceiveData
-* Description : Returns the most recent received data by the I2Cx peripheral.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* Output : None
-* Return : The value of the received data.
-*******************************************************************************/
-u8 I2C_ReceiveData(I2C_TypeDef* I2Cx)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
-
- /* Return the data in the DR register */
- return (u8)I2Cx->DR;
-}
-
-/*******************************************************************************
-* Function Name : I2C_Send7bitAddress
-* Description : Transmits the address byte to select the slave device.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - Address: specifies the slave address which will be transmitted
-* - I2C_Direction: specifies whether the I2C device will be a
-* Transmitter or a Receiver.
-* This parameter can be one of the following values
-* - I2C_Direction_Transmitter: Transmitter mode
-* - I2C_Direction_Receiver: Receiver mode
-* Output : None
-* Return : None.
-*******************************************************************************/
-void I2C_Send7bitAddress(I2C_TypeDef* I2Cx, u8 Address, u8 I2C_Direction)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_DIRECTION(I2C_Direction));
-
- /* Test on the direction to set/reset the read/write bit */
- if (I2C_Direction != I2C_Direction_Transmitter)
- {
- /* Set the address bit0 for read */
- Address |= OAR1_ADD0_Set;
- }
- else
- {
- /* Reset the address bit0 for write */
- Address &= OAR1_ADD0_Reset;
- }
- /* Send the address */
- I2Cx->DR = Address;
-}
-
-/*******************************************************************************
-* Function Name : I2C_ReadRegister
-* Description : Reads the specified I2C register and returns its value.
-* Input1 : - I2C_Register: specifies the register to read.
-* This parameter can be one of the following values:
-* - I2C_Register_CR1: CR1 register.
-* - I2C_Register_CR2: CR2 register.
-* - I2C_Register_OAR1: OAR1 register.
-* - I2C_Register_OAR2: OAR2 register.
-* - I2C_Register_DR: DR register.
-* - I2C_Register_SR1: SR1 register.
-* - I2C_Register_SR2: SR2 register.
-* - I2C_Register_CCR: CCR register.
-* - I2C_Register_TRISE: TRISE register.
-* Output : None
-* Return : The value of the read register.
-*******************************************************************************/
-u16 I2C_ReadRegister(I2C_TypeDef* I2Cx, u8 I2C_Register)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_REGISTER(I2C_Register));
-
- /* Return the selected register value */
- return (*(vu16 *)(*((vu32 *)&I2Cx) + I2C_Register));
-}
-
-/*******************************************************************************
-* Function Name : I2C_SoftwareResetCmd
-* Description : Enables or disables the specified I2C software reset.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C software reset.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Peripheral under reset */
- I2Cx->CR1 |= CR1_SWRST_Set;
- }
- else
- {
- /* Peripheral not under reset */
- I2Cx->CR1 &= CR1_SWRST_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_SMBusAlertConfig
-* Description : Drives the SMBusAlert pin high or low for the specified I2C.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_SMBusAlert: specifies SMBAlert pin level.
-* This parameter can be one of the following values:
-* - I2C_SMBusAlert_Low: SMBAlert pin driven low
-* - I2C_SMBusAlert_High: SMBAlert pin driven high
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_SMBusAlertConfig(I2C_TypeDef* I2Cx, u16 I2C_SMBusAlert)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_SMBUS_ALERT(I2C_SMBusAlert));
-
- if (I2C_SMBusAlert == I2C_SMBusAlert_Low)
- {
- /* Drive the SMBusAlert pin Low */
- I2Cx->CR1 |= I2C_SMBusAlert_Low;
- }
- else
- {
- /* Drive the SMBusAlert pin High */
- I2Cx->CR1 &= I2C_SMBusAlert_High;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_TransmitPEC
-* Description : Enables or disables the specified I2C PEC transfer.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2C PEC transmission.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected I2C PEC transmission */
- I2Cx->CR1 |= CR1_PEC_Set;
- }
- else
- {
- /* Disable the selected I2C PEC transmission */
- I2Cx->CR1 &= CR1_PEC_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_PECPositionConfig
-* Description : Selects the specified I2C PEC position.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_PECPosition: specifies the PEC position.
-* This parameter can be one of the following values:
-* - I2C_PECPosition_Next: indicates that the next
-* byte is PEC
-* - I2C_PECPosition_Current: indicates that current
-* byte is PEC
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, u16 I2C_PECPosition)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_PEC_POSITION(I2C_PECPosition));
-
- if (I2C_PECPosition == I2C_PECPosition_Next)
- {
- /* Next byte in shift register is PEC */
- I2Cx->CR1 |= I2C_PECPosition_Next;
- }
- else
- {
- /* Current byte in shift register is PEC */
- I2Cx->CR1 &= I2C_PECPosition_Current;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_CalculatePEC
-* Description : Enables or disables the PEC value calculation of the
-* transfered bytes.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2Cx PEC value calculation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_CalculatePEC(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected I2C PEC calculation */
- I2Cx->CR1 |= CR1_ENPEC_Set;
- }
- else
- {
- /* Disable the selected I2C PEC calculation */
- I2Cx->CR1 &= CR1_ENPEC_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_GetPEC
-* Description : Returns the PEC value for the specified I2C.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* Output : None
-* Return : The PEC value.
-*******************************************************************************/
-u8 I2C_GetPEC(I2C_TypeDef* I2Cx)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
-
- /* Return the selected I2C PEC value */
- return ((I2Cx->SR2) >> 8);
-}
-
-/*******************************************************************************
-* Function Name : I2C_ARPCmd
-* Description : Enables or disables the specified I2C ARP.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2Cx ARP.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_ARPCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected I2C ARP */
- I2Cx->CR1 |= CR1_ENARP_Set;
- }
- else
- {
- /* Disable the selected I2C ARP */
- I2Cx->CR1 &= CR1_ENARP_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_StretchClockCmd
-* Description : Enables or disables the specified I2C Clock stretching.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - NewState: new state of the I2Cx Clock stretching.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_StretchClockCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState == DISABLE)
- {
- /* Enable the selected I2C Clock stretching */
- I2Cx->CR1 |= CR1_NOSTRETCH_Set;
- }
- else
- {
- /* Disable the selected I2C Clock stretching */
- I2Cx->CR1 &= CR1_NOSTRETCH_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_FastModeDutyCycleConfig
-* Description : Selects the specified I2C fast mode duty cycle.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_DutyCycle: specifies the fast mode duty cycle.
-* This parameter can be one of the following values:
-* - I2C_DutyCycle_2: I2C fast mode Tlow/Thigh = 2
-* - I2C_DutyCycle_16_9: I2C fast mode Tlow/Thigh = 16/9
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, u16 I2C_DutyCycle)
-{
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_DUTY_CYCLE(I2C_DutyCycle));
-
- if (I2C_DutyCycle != I2C_DutyCycle_16_9)
- {
- /* I2C fast mode Tlow/Thigh=2 */
- I2Cx->CCR &= I2C_DutyCycle_2;
- }
- else
- {
- /* I2C fast mode Tlow/Thigh=16/9 */
- I2Cx->CCR |= I2C_DutyCycle_16_9;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2C_GetLastEvent
-* Description : Returns the last I2Cx Event.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* Output : None
-* Return : The last event
-*******************************************************************************/
-u32 I2C_GetLastEvent(I2C_TypeDef* I2Cx)
-{
- u32 lastevent = 0;
- u32 flag1 = 0, flag2 = 0;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
-
- /* Read the I2Cx status register */
- flag1 = I2Cx->SR1;
- flag2 = I2Cx->SR2;
- flag2 = flag2 << 16;
-
- /* Get the last event value from I2C status register */
- lastevent = (flag1 | flag2) & FLAG_Mask;
-
- /* Return status */
- return lastevent;
-}
-
-/*******************************************************************************
-* Function Name : I2C_CheckEvent
-* Description : Checks whether the last I2Cx Event is equal to the one passed
-* as parameter.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_EVENT: specifies the event to be checked.
-* This parameter can be one of the following values:
-* - I2C_EVENT_SLAVE_ADDRESS_MATCHED : EV1
-* - I2C_EVENT_SLAVE_BYTE_RECEIVED : EV2
-* - I2C_EVENT_SLAVE_BYTE_TRANSMITTED : EV3
-* - I2C_EVENT_SLAVE_ACK_FAILURE : EV3-2
-* - I2C_EVENT_MASTER_MODE_SELECT : EV5
-* - I2C_EVENT_MASTER_MODE_SELECTED : EV6
-* - I2C_EVENT_MASTER_BYTE_RECEIVED : EV7
-* - I2C_EVENT_MASTER_BYTE_TRANSMITTED : EV8
-* - I2C_EVENT_MASTER_MODE_ADDRESS10 : EV9
-* - I2C_EVENT_SLAVE_STOP_DETECTED : EV4
-* Output : None
-* Return : An ErrorStatus enumuration value:
-* - SUCCESS: Last event is equal to the I2C_EVENT
-* - ERROR: Last event is different from the I2C_EVENT
-*******************************************************************************/
-ErrorStatus I2C_CheckEvent(I2C_TypeDef* I2Cx, u32 I2C_EVENT)
-{
- u32 lastevent = 0;
- u32 flag1 = 0, flag2 = 0;
- ErrorStatus status = ERROR;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_EVENT(I2C_EVENT));
-
- /* Read the I2Cx status register */
- flag1 = I2Cx->SR1;
- flag2 = I2Cx->SR2;
- flag2 = flag2 << 16;
-
- /* Get the last event value from I2C status register */
- lastevent = (flag1 | flag2) & FLAG_Mask;
-
- /* Check whether the last event is equal to I2C_EVENT */
- if (lastevent == I2C_EVENT )
- {
- /* SUCCESS: last event is equal to I2C_EVENT */
- status = SUCCESS;
- }
- else
- {
- /* ERROR: last event is different from I2C_EVENT */
- status = ERROR;
- }
-
- /* Return status */
- return status;
-}
-
-/*******************************************************************************
-* Function Name : I2C_GetFlagStatus
-* Description : Checks whether the specified I2C flag is set or not.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - I2C_FLAG_DUALF: Dual flag (Slave mode)
-* - I2C_FLAG_SMBHOST: SMBus host header (Slave mode)
-* - I2C_FLAG_SMBDEFAULT: SMBus default header (Slave mode)
-* - I2C_FLAG_GENCALL: General call header flag (Slave mode)
-* - I2C_FLAG_TRA: Transmitter/Receiver flag
-* - I2C_FLAG_BUSY: Bus busy flag
-* - I2C_FLAG_MSL: Master/Slave flag
-* - I2C_FLAG_SMBALERT: SMBus Alert flag
-* - I2C_FLAG_TIMEOUT: Timeout or Tlow error flag
-* - I2C_FLAG_PECERR: PEC error in reception flag
-* - I2C_FLAG_OVR: Overrun/Underrun flag (Slave mode)
-* - I2C_FLAG_AF: Acknowledge failure flag
-* - I2C_FLAG_ARLO: Arbitration lost flag (Master mode)
-* - I2C_FLAG_BERR: Bus error flag
-* - I2C_FLAG_TXE: Data register empty flag (Transmitter)
-* - I2C_FLAG_RXNE: Data register not empty (Receiver) flag
-* - I2C_FLAG_STOPF: Stop detection flag (Slave mode)
-* - I2C_FLAG_ADD10: 10-bit header sent flag (Master mode)
-* - I2C_FLAG_BTF: Byte transfer finished flag
-* - I2C_FLAG_ADDR: Address sent flag (Master mode) “ADSL”
-* Address matched flag (Slave mode)”ENDAD”
-* - I2C_FLAG_SB: Start bit flag (Master mode)
-* Output : None
-* Return : The new state of I2C_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus I2C_GetFlagStatus(I2C_TypeDef* I2Cx, u32 I2C_FLAG)
-{
- FlagStatus bitstatus = RESET;
- u32 i2creg = 0, i2cxbase = 0;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_GET_FLAG(I2C_FLAG));
-
- /* Get the I2Cx peripheral base address */
- i2cxbase = (*(u32*)&(I2Cx));
-
- /* Read flag register index */
- i2creg = I2C_FLAG >> 28;
-
- /* Get bit[23:0] of the flag */
- I2C_FLAG &= FLAG_Mask;
-
- if(i2creg != 0)
- {
- /* Get the I2Cx SR1 register address */
- i2cxbase += 0x14;
- }
- else
- {
- /* Flag in I2Cx SR2 Register */
- I2C_FLAG = (u32)(I2C_FLAG >> 16);
- /* Get the I2Cx SR2 register address */
- i2cxbase += 0x18;
- }
-
- if(((*(vu32 *)i2cxbase) & I2C_FLAG) != (u32)RESET)
- {
- /* I2C_FLAG is set */
- bitstatus = SET;
- }
- else
- {
- /* I2C_FLAG is reset */
- bitstatus = RESET;
- }
-
- /* Return the I2C_FLAG status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : I2C_ClearFlag
-* Description : Clears the I2Cx's pending flags.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_FLAG: specifies the flag to clear.
-* This parameter can be any combination of the following
-* values:
-* - I2C_FLAG_SMBALERT: SMBus Alert flag
-* - I2C_FLAG_TIMEOUT: Timeout or Tlow error flag
-* - I2C_FLAG_PECERR: PEC error in reception flag
-* - I2C_FLAG_OVR: Overrun/Underrun flag (Slave mode)
-* - I2C_FLAG_AF: Acknowledge failure flag
-* - I2C_FLAG_ARLO: Arbitration lost flag (Master mode)
-* - I2C_FLAG_BERR: Bus error flag
-*
-* Notes:
-* - STOPF (STOP detection) is cleared by software
-* sequence: a read operation to I2C_SR1 register
-* (I2C_GetFlagStatus()) followed by a write operation
-* to I2C_CR1 register (I2C_Cmd() to re-enable the
-* I2C peripheral).
-* - ADD10 (10-bit header sent) is cleared by software
-* sequence: a read operation to I2C_SR1
-* (I2C_GetFlagStatus()) followed by writing the
-* second byte of the address in DR register.
-* - BTF (Byte Transfer Finished) is cleared by software
-* sequence: a read operation to I2C_SR1 register
-* (I2C_GetFlagStatus()) followed by a read/write to
-* I2C_DR register (I2C_SendData()).
-* - ADDR (Address sent) is cleared by software sequence:
-* a read operation to I2C_SR1 register
-* (I2C_GetFlagStatus()) followed by a read operation to
-* I2C_SR2 register ((void)(I2Cx->SR2)).
-* - SB (Start Bit) is cleared software sequence: a read
-* operation to I2C_SR1 register (I2C_GetFlagStatus())
-* followed by a write operation to I2C_DR reigister
-* (I2C_SendData()).
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_ClearFlag(I2C_TypeDef* I2Cx, u32 I2C_FLAG)
-{
- u32 flagpos = 0;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_CLEAR_FLAG(I2C_FLAG));
-
- /* Get the I2C flag position */
- flagpos = I2C_FLAG & FLAG_Mask;
-
- /* Clear the selected I2C flag */
- I2Cx->SR1 = (u16)~flagpos;
-}
-
-/*******************************************************************************
-* Function Name : I2C_GetITStatus
-* Description : Checks whether the specified I2C interrupt has occurred or not.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_IT: specifies the interrupt source to check.
-* This parameter can be one of the following values:
-* - I2C_IT_SMBALERT: SMBus Alert flag
-* - I2C_IT_TIMEOUT: Timeout or Tlow error flag
-* - I2C_IT_PECERR: PEC error in reception flag
-* - I2C_IT_OVR: Overrun/Underrun flag (Slave mode)
-* - I2C_IT_AF: Acknowledge failure flag
-* - I2C_IT_ARLO: Arbitration lost flag (Master mode)
-* - I2C_IT_BERR: Bus error flag
-* - I2C_IT_TXE: Data register empty flag (Transmitter)
-* - I2C_IT_RXNE: Data register not empty (Receiver) flag
-* - I2C_IT_STOPF: Stop detection flag (Slave mode)
-* - I2C_IT_ADD10: 10-bit header sent flag (Master mode)
-* - I2C_IT_BTF: Byte transfer finished flag
-* - I2C_IT_ADDR: Address sent flag (Master mode) “ADSL”
-* Address matched flag (Slave mode)”ENDAD”
-* - I2C_IT_SB: Start bit flag (Master mode)
-* Output : None
-* Return : The new state of I2C_IT (SET or RESET).
-*******************************************************************************/
-ITStatus I2C_GetITStatus(I2C_TypeDef* I2Cx, u32 I2C_IT)
-{
- ITStatus bitstatus = RESET;
- u32 enablestatus = 0;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_GET_IT(I2C_IT));
-
- /* Check if the interrupt source is enabled or not */
- enablestatus = (u32)(((I2C_IT & ITEN_Mask) >> 16) & (I2Cx->CR2)) ;
-
- /* Get bit[23:0] of the flag */
- I2C_IT &= FLAG_Mask;
-
- /* Check the status of the specified I2C flag */
- if (((I2Cx->SR1 & I2C_IT) != (u32)RESET) && enablestatus)
- {
- /* I2C_IT is set */
- bitstatus = SET;
- }
- else
- {
- /* I2C_IT is reset */
- bitstatus = RESET;
- }
- /* Return the I2C_IT status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : I2C_ClearITPendingBit
-* Description : Clears the I2Cx’s interrupt pending bits.
-* Input : - I2Cx: where x can be 1 or 2 to select the I2C peripheral.
-* - I2C_IT: specifies the interrupt pending bit to clear.
-* This parameter can be any combination of the following
-* values:
-* - I2C_IT_SMBALERT: SMBus Alert interrupt
-* - I2C_IT_TIMEOUT: Timeout or Tlow error interrupt
-* - I2C_IT_PECERR: PEC error in reception interrupt
-* - I2C_IT_OVR: Overrun/Underrun interrupt (Slave mode)
-* - I2C_IT_AF: Acknowledge failure interrupt
-* - I2C_IT_ARLO: Arbitration lost interrupt (Master mode)
-* - I2C_IT_BERR: Bus error interrupt
-*
-* Notes:
-* - STOPF (STOP detection) is cleared by software
-* sequence: a read operation to I2C_SR1 register
-* (I2C_GetITStatus()) followed by a write operation to
-* I2C_CR1 register (I2C_Cmd() to re-enable the I2C
-* peripheral).
-* - ADD10 (10-bit header sent) is cleared by software
-* sequence: a read operation to I2C_SR1
-* (I2C_GetITStatus()) followed by writing the second
-* byte of the address in I2C_DR register.
-* - BTF (Byte Transfer Finished) is cleared by software
-* sequence: a read operation to I2C_SR1 register
-* (I2C_GetITStatus()) followed by a read/write to
-* I2C_DR register (I2C_SendData()).
-* - ADDR (Address sent) is cleared by software sequence:
-* a read operation to I2C_SR1 register (I2C_GetITStatus())
-* followed by a read operation to I2C_SR2 register
-* ((void)(I2Cx->SR2)).
-* - SB (Start Bit) is cleared by software sequence: a
-* read operation to I2C_SR1 register (I2C_GetITStatus())
-* followed by a write operation to I2C_DR reigister
-* (I2C_SendData()).
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2C_ClearITPendingBit(I2C_TypeDef* I2Cx, u32 I2C_IT)
-{
- u32 flagpos = 0;
-
- /* Check the parameters */
- assert_param(IS_I2C_ALL_PERIPH(I2Cx));
- assert_param(IS_I2C_CLEAR_IT(I2C_IT));
-
- /* Get the I2C flag position */
- flagpos = I2C_IT & FLAG_Mask;
-
- /* Clear the selected I2C flag */
- I2Cx->SR1 = (u16)~flagpos;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_iwdg.c b/stm32lib/src/stm32f10x_iwdg.c
deleted file mode 100644
index 77cb094..0000000
--- a/stm32lib/src/stm32f10x_iwdg.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_iwdg.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the IWDG firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_iwdg.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ---------------------- IWDG registers bit mask ------------------------ */
-/* KR register bit mask */
-#define KR_KEY_Reload ((u16)0xAAAA)
-#define KR_KEY_Enable ((u16)0xCCCC)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : IWDG_WriteAccessCmd
-* Description : Enables or disables write access to IWDG_PR and IWDG_RLR
-* registers.
-* Input : - IWDG_WriteAccess: new state of write access to IWDG_PR and
-* IWDG_RLR registers.
-* This parameter can be one of the following values:
-* - IWDG_WriteAccess_Enable: Enable write access to
-* IWDG_PR and IWDG_RLR registers
-* - IWDG_WriteAccess_Disable: Disable write access to
-* IWDG_PR and IWDG_RLR registers
-* Output : None
-* Return : None
-*******************************************************************************/
-void IWDG_WriteAccessCmd(u16 IWDG_WriteAccess)
-{
- /* Check the parameters */
- assert_param(IS_IWDG_WRITE_ACCESS(IWDG_WriteAccess));
-
- IWDG->KR = IWDG_WriteAccess;
-}
-
-/*******************************************************************************
-* Function Name : IWDG_SetPrescaler
-* Description : Sets IWDG Prescaler value.
-* Input : - IWDG_Prescaler: specifies the IWDG Prescaler value.
-* This parameter can be one of the following values:
-* - IWDG_Prescaler_4: IWDG prescaler set to 4
-* - IWDG_Prescaler_8: IWDG prescaler set to 8
-* - IWDG_Prescaler_16: IWDG prescaler set to 16
-* - IWDG_Prescaler_32: IWDG prescaler set to 32
-* - IWDG_Prescaler_64: IWDG prescaler set to 64
-* - IWDG_Prescaler_128: IWDG prescaler set to 128
-* - IWDG_Prescaler_256: IWDG prescaler set to 256
-* Output : None
-* Return : None
-*******************************************************************************/
-void IWDG_SetPrescaler(u8 IWDG_Prescaler)
-{
- /* Check the parameters */
- assert_param(IS_IWDG_PRESCALER(IWDG_Prescaler));
-
- IWDG->PR = IWDG_Prescaler;
-}
-
-/*******************************************************************************
-* Function Name : IWDG_SetReload
-* Description : Sets IWDG Reload value.
-* Input : - Reload: specifies the IWDG Reload value.
-* This parameter must be a number between 0 and 0x0FFF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void IWDG_SetReload(u16 Reload)
-{
- /* Check the parameters */
- assert_param(IS_IWDG_RELOAD(Reload));
-
- IWDG->RLR = Reload;
-}
-
-/*******************************************************************************
-* Function Name : IWDG_ReloadCounter
-* Description : Reloads IWDG counter with value defined in the reload register
-* (write access to IWDG_PR and IWDG_RLR registers disabled).
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void IWDG_ReloadCounter(void)
-{
- IWDG->KR = KR_KEY_Reload;
-}
-
-/*******************************************************************************
-* Function Name : IWDG_Enable
-* Description : Enables IWDG (write access to IWDG_PR and IWDG_RLR registers
-* disabled).
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void IWDG_Enable(void)
-{
- IWDG->KR = KR_KEY_Enable;
-}
-
-/*******************************************************************************
-* Function Name : IWDG_GetFlagStatus
-* Description : Checks whether the specified IWDG flag is set or not.
-* Input : - IWDG_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - IWDG_FLAG_PVU: Prescaler Value Update on going
-* - IWDG_FLAG_RVU: Reload Value Update on going
-* Output : None
-* Return : The new state of IWDG_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus IWDG_GetFlagStatus(u16 IWDG_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_IWDG_FLAG(IWDG_FLAG));
-
- if ((IWDG->SR & IWDG_FLAG) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
-
- /* Return the flag status */
- return bitstatus;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_lib.c b/stm32lib/src/stm32f10x_lib.c
deleted file mode 100644
index 21d5ce5..0000000
--- a/stm32lib/src/stm32f10x_lib.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_lib.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all peripherals pointers initialization.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-#define EXT
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_lib.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-#ifdef DEBUG
-/*******************************************************************************
-* Function Name : debug
-* Description : This function initialize peripherals pointers.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void debug(void)
-{
-
-/************************************* ADC ************************************/
-#ifdef _ADC1
- ADC1 = (ADC_TypeDef *) ADC1_BASE;
-#endif /*_ADC1 */
-
-#ifdef _ADC2
- ADC2 = (ADC_TypeDef *) ADC2_BASE;
-#endif /*_ADC2 */
-
-#ifdef _ADC3
- ADC3 = (ADC_TypeDef *) ADC3_BASE;
-#endif /*_ADC3 */
-
-/************************************* BKP ************************************/
-#ifdef _BKP
- BKP = (BKP_TypeDef *) BKP_BASE;
-#endif /*_BKP */
-
-/************************************* CAN ************************************/
-#ifdef _CAN
- CAN = (CAN_TypeDef *) CAN_BASE;
-#endif /*_CAN */
-
-/************************************* CRC ************************************/
-#ifdef _CRC
- CRC = (CRC_TypeDef *) CRC_BASE;
-#endif /*_CRC */
-
-/************************************* DAC ************************************/
-#ifdef _DAC
- DAC = (DAC_TypeDef *) DAC_BASE;
-#endif /*_DAC */
-
-/************************************* DBGMCU**********************************/
-#ifdef _DBGMCU
- DBGMCU = (DBGMCU_TypeDef *) DBGMCU_BASE;
-#endif /*_DBGMCU */
-
-/************************************* DMA ************************************/
-#ifdef _DMA
- DMA1 = (DMA_TypeDef *) DMA1_BASE;
- DMA2 = (DMA_TypeDef *) DMA2_BASE;
-#endif /*_DMA */
-
-#ifdef _DMA1_Channel1
- DMA1_Channel1 = (DMA_Channel_TypeDef *) DMA1_Channel1_BASE;
-#endif /*_DMA1_Channel1 */
-
-#ifdef _DMA1_Channel2
- DMA1_Channel2 = (DMA_Channel_TypeDef *) DMA1_Channel2_BASE;
-#endif /*_DMA1_Channel2 */
-
-#ifdef _DMA1_Channel3
- DMA1_Channel3 = (DMA_Channel_TypeDef *) DMA1_Channel3_BASE;
-#endif /*_DMA1_Channel3 */
-
-#ifdef _DMA1_Channel4
- DMA1_Channel4 = (DMA_Channel_TypeDef *) DMA1_Channel4_BASE;
-#endif /*_DMA1_Channel4 */
-
-#ifdef _DMA1_Channel5
- DMA1_Channel5 = (DMA_Channel_TypeDef *) DMA1_Channel5_BASE;
-#endif /*_DMA1_Channel5 */
-
-#ifdef _DMA1_Channel6
- DMA1_Channel6 = (DMA_Channel_TypeDef *) DMA1_Channel6_BASE;
-#endif /*_DMA1_Channel6 */
-
-#ifdef _DMA1_Channel7
- DMA1_Channel7 = (DMA_Channel_TypeDef *) DMA1_Channel7_BASE;
-#endif /*_DMA1_Channel7 */
-
-#ifdef _DMA2_Channel1
- DMA2_Channel1 = (DMA_Channel_TypeDef *) DMA2_Channel1_BASE;
-#endif /*_DMA2_Channel1 */
-
-#ifdef _DMA2_Channel2
- DMA2_Channel2 = (DMA_Channel_TypeDef *) DMA2_Channel2_BASE;
-#endif /*_DMA2_Channel2 */
-
-#ifdef _DMA2_Channel3
- DMA2_Channel3 = (DMA_Channel_TypeDef *) DMA2_Channel3_BASE;
-#endif /*_DMA2_Channel3 */
-
-#ifdef _DMA2_Channel4
- DMA2_Channel4 = (DMA_Channel_TypeDef *) DMA2_Channel4_BASE;
-#endif /*_DMA2_Channel4 */
-
-#ifdef _DMA2_Channel5
- DMA2_Channel5 = (DMA_Channel_TypeDef *) DMA2_Channel5_BASE;
-#endif /*_DMA2_Channel5 */
-
-/************************************* EXTI ***********************************/
-#ifdef _EXTI
- EXTI = (EXTI_TypeDef *) EXTI_BASE;
-#endif /*_EXTI */
-
-/************************************* FLASH and Option Bytes *****************/
-#ifdef _FLASH
- FLASH = (FLASH_TypeDef *) FLASH_R_BASE;
- OB = (OB_TypeDef *) OB_BASE;
-#endif /*_FLASH */
-
-/************************************* FSMC ***********************************/
-#ifdef _FSMC
- FSMC_Bank1 = (FSMC_Bank1_TypeDef *) FSMC_Bank1_R_BASE;
- FSMC_Bank1E = (FSMC_Bank1E_TypeDef *) FSMC_Bank1E_R_BASE;
- FSMC_Bank2 = (FSMC_Bank2_TypeDef *) FSMC_Bank2_R_BASE;
- FSMC_Bank3 = (FSMC_Bank3_TypeDef *) FSMC_Bank3_R_BASE;
- FSMC_Bank4 = (FSMC_Bank4_TypeDef *) FSMC_Bank4_R_BASE;
-#endif /*_FSMC */
-
-/************************************* GPIO ***********************************/
-#ifdef _GPIOA
- GPIOA = (GPIO_TypeDef *) GPIOA_BASE;
-#endif /*_GPIOA */
-
-#ifdef _GPIOB
- GPIOB = (GPIO_TypeDef *) GPIOB_BASE;
-#endif /*_GPIOB */
-
-#ifdef _GPIOC
- GPIOC = (GPIO_TypeDef *) GPIOC_BASE;
-#endif /*_GPIOC */
-
-#ifdef _GPIOD
- GPIOD = (GPIO_TypeDef *) GPIOD_BASE;
-#endif /*_GPIOD */
-
-#ifdef _GPIOE
- GPIOE = (GPIO_TypeDef *) GPIOE_BASE;
-#endif /*_GPIOE */
-
-#ifdef _GPIOF
- GPIOF = (GPIO_TypeDef *) GPIOF_BASE;
-#endif /*_GPIOF */
-
-#ifdef _GPIOG
- GPIOG = (GPIO_TypeDef *) GPIOG_BASE;
-#endif /*_GPIOG */
-
-#ifdef _AFIO
- AFIO = (AFIO_TypeDef *) AFIO_BASE;
-#endif /*_AFIO */
-
-/************************************* I2C ************************************/
-#ifdef _I2C1
- I2C1 = (I2C_TypeDef *) I2C1_BASE;
-#endif /*_I2C1 */
-
-#ifdef _I2C2
- I2C2 = (I2C_TypeDef *) I2C2_BASE;
-#endif /*_I2C2 */
-
-/************************************* IWDG ***********************************/
-#ifdef _IWDG
- IWDG = (IWDG_TypeDef *) IWDG_BASE;
-#endif /*_IWDG */
-
-/************************************* NVIC ***********************************/
-#ifdef _NVIC
- NVIC = (NVIC_TypeDef *) NVIC_BASE;
- SCB = (SCB_TypeDef *) SCB_BASE;
-#endif /*_NVIC */
-
-/************************************* PWR ************************************/
-#ifdef _PWR
- PWR = (PWR_TypeDef *) PWR_BASE;
-#endif /*_PWR */
-
-/************************************* RCC ************************************/
-#ifdef _RCC
- RCC = (RCC_TypeDef *) RCC_BASE;
-#endif /*_RCC */
-
-/************************************* RTC ************************************/
-#ifdef _RTC
- RTC = (RTC_TypeDef *) RTC_BASE;
-#endif /*_RTC */
-
-/************************************* SDIO ***********************************/
-#ifdef _SDIO
- SDIO = (SDIO_TypeDef *) SDIO_BASE;
-#endif /*_SDIO */
-
-/************************************* SPI ************************************/
-#ifdef _SPI1
- SPI1 = (SPI_TypeDef *) SPI1_BASE;
-#endif /*_SPI1 */
-
-#ifdef _SPI2
- SPI2 = (SPI_TypeDef *) SPI2_BASE;
-#endif /*_SPI2 */
-
-#ifdef _SPI3
- SPI3 = (SPI_TypeDef *) SPI3_BASE;
-#endif /*_SPI3 */
-
-/************************************* SysTick ********************************/
-#ifdef _SysTick
- SysTick = (SysTick_TypeDef *) SysTick_BASE;
-#endif /*_SysTick */
-
-/************************************* TIM ************************************/
-#ifdef _TIM1
- TIM1 = (TIM_TypeDef *) TIM1_BASE;
-#endif /*_TIM1 */
-
-#ifdef _TIM2
- TIM2 = (TIM_TypeDef *) TIM2_BASE;
-#endif /*_TIM2 */
-
-#ifdef _TIM3
- TIM3 = (TIM_TypeDef *) TIM3_BASE;
-#endif /*_TIM3 */
-
-#ifdef _TIM4
- TIM4 = (TIM_TypeDef *) TIM4_BASE;
-#endif /*_TIM4 */
-
-#ifdef _TIM5
- TIM5 = (TIM_TypeDef *) TIM5_BASE;
-#endif /*_TIM5 */
-
-#ifdef _TIM6
- TIM6 = (TIM_TypeDef *) TIM6_BASE;
-#endif /*_TIM6 */
-
-#ifdef _TIM7
- TIM7 = (TIM_TypeDef *) TIM7_BASE;
-#endif /*_TIM7 */
-
-#ifdef _TIM8
- TIM8 = (TIM_TypeDef *) TIM8_BASE;
-#endif /*_TIM8 */
-
-/************************************* USART **********************************/
-#ifdef _USART1
- USART1 = (USART_TypeDef *) USART1_BASE;
-#endif /*_USART1 */
-
-#ifdef _USART2
- USART2 = (USART_TypeDef *) USART2_BASE;
-#endif /*_USART2 */
-
-#ifdef _USART3
- USART3 = (USART_TypeDef *) USART3_BASE;
-#endif /*_USART3 */
-
-#ifdef _UART4
- UART4 = (USART_TypeDef *) UART4_BASE;
-#endif /*_UART4 */
-
-#ifdef _UART5
- UART5 = (USART_TypeDef *) UART5_BASE;
-#endif /*_UART5 */
-
-/************************************* WWDG ***********************************/
-#ifdef _WWDG
- WWDG = (WWDG_TypeDef *) WWDG_BASE;
-#endif /*_WWDG */
-}
-#endif /* DEBUG*/
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_nvic.c b/stm32lib/src/stm32f10x_nvic.c
deleted file mode 100644
index 0ce30af..0000000
--- a/stm32lib/src/stm32f10x_nvic.c
+++ /dev/null
@@ -1,751 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_nvic.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the NVIC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_nvic.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define AIRCR_VECTKEY_MASK ((u32)0x05FA0000)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : NVIC_DeInit
-* Description : Deinitializes the NVIC peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_DeInit(void)
-{
- u32 index = 0;
-
- NVIC->ICER[0] = 0xFFFFFFFF;
- NVIC->ICER[1] = 0x0FFFFFFF;
- NVIC->ICPR[0] = 0xFFFFFFFF;
- NVIC->ICPR[1] = 0x0FFFFFFF;
-
- for(index = 0; index < 0x0F; index++)
- {
- NVIC->IPR[index] = 0x00000000;
- }
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SCBDeInit
-* Description : Deinitializes the SCB peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SCBDeInit(void)
-{
- u32 index = 0x00;
-
- SCB->ICSR = 0x0A000000;
- SCB->VTOR = 0x00000000;
- SCB->AIRCR = AIRCR_VECTKEY_MASK;
- SCB->SCR = 0x00000000;
- SCB->CCR = 0x00000000;
- for(index = 0; index < 0x03; index++)
- {
- SCB->SHPR[index] = 0;
- }
- SCB->SHCSR = 0x00000000;
- SCB->CFSR = 0xFFFFFFFF;
- SCB->HFSR = 0xFFFFFFFF;
- SCB->DFSR = 0xFFFFFFFF;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_PriorityGroupConfig
-* Description : Configures the priority grouping: pre-emption priority
-* and subpriority.
-* Input : - NVIC_PriorityGroup: specifies the priority grouping bits
-* length. This parameter can be one of the following values:
-* - NVIC_PriorityGroup_0: 0 bits for pre-emption priority
-* 4 bits for subpriority
-* - NVIC_PriorityGroup_1: 1 bits for pre-emption priority
-* 3 bits for subpriority
-* - NVIC_PriorityGroup_2: 2 bits for pre-emption priority
-* 2 bits for subpriority
-* - NVIC_PriorityGroup_3: 3 bits for pre-emption priority
-* 1 bits for subpriority
-* - NVIC_PriorityGroup_4: 4 bits for pre-emption priority
-* 0 bits for subpriority
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_PriorityGroupConfig(u32 NVIC_PriorityGroup)
-{
- /* Check the parameters */
- assert_param(IS_NVIC_PRIORITY_GROUP(NVIC_PriorityGroup));
-
- /* Set the PRIGROUP[10:8] bits according to NVIC_PriorityGroup value */
- SCB->AIRCR = AIRCR_VECTKEY_MASK | NVIC_PriorityGroup;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_Init
-* Description : Initializes the NVIC peripheral according to the specified
-* parameters in the NVIC_InitStruct.
-* Input : - NVIC_InitStruct: pointer to a NVIC_InitTypeDef structure
-* that contains the configuration information for the
-* specified NVIC peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct)
-{
- u32 tmppriority = 0x00, tmpreg = 0x00, tmpmask = 0x00;
- u32 tmppre = 0, tmpsub = 0x0F;
-
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NVIC_InitStruct->NVIC_IRQChannelCmd));
- assert_param(IS_NVIC_IRQ_CHANNEL(NVIC_InitStruct->NVIC_IRQChannel));
- assert_param(IS_NVIC_PREEMPTION_PRIORITY(NVIC_InitStruct->NVIC_IRQChannelPreemptionPriority));
- assert_param(IS_NVIC_SUB_PRIORITY(NVIC_InitStruct->NVIC_IRQChannelSubPriority));
-
- if (NVIC_InitStruct->NVIC_IRQChannelCmd != DISABLE)
- {
- /* Compute the Corresponding IRQ Priority --------------------------------*/
- tmppriority = (0x700 - (SCB->AIRCR & (u32)0x700))>> 0x08;
- tmppre = (0x4 - tmppriority);
- tmpsub = tmpsub >> tmppriority;
-
- tmppriority = (u32)NVIC_InitStruct->NVIC_IRQChannelPreemptionPriority << tmppre;
- tmppriority |= NVIC_InitStruct->NVIC_IRQChannelSubPriority & tmpsub;
-
- tmppriority = tmppriority << 0x04;
- tmppriority = ((u32)tmppriority) << ((NVIC_InitStruct->NVIC_IRQChannel & (u8)0x03) * 0x08);
-
- tmpreg = NVIC->IPR[(NVIC_InitStruct->NVIC_IRQChannel >> 0x02)];
- tmpmask = (u32)0xFF << ((NVIC_InitStruct->NVIC_IRQChannel & (u8)0x03) * 0x08);
- tmpreg &= ~tmpmask;
- tmppriority &= tmpmask;
- tmpreg |= tmppriority;
-
- NVIC->IPR[(NVIC_InitStruct->NVIC_IRQChannel >> 0x02)] = tmpreg;
-
- /* Enable the Selected IRQ Channels --------------------------------------*/
- NVIC->ISER[(NVIC_InitStruct->NVIC_IRQChannel >> 0x05)] =
- (u32)0x01 << (NVIC_InitStruct->NVIC_IRQChannel & (u8)0x1F);
- }
- else
- {
- /* Disable the Selected IRQ Channels -------------------------------------*/
- NVIC->ICER[(NVIC_InitStruct->NVIC_IRQChannel >> 0x05)] =
- (u32)0x01 << (NVIC_InitStruct->NVIC_IRQChannel & (u8)0x1F);
- }
-}
-
-/*******************************************************************************
-* Function Name : NVIC_StructInit
-* Description : Fills each NVIC_InitStruct member with its default value.
-* Input : - NVIC_InitStruct: pointer to a NVIC_InitTypeDef structure which
-* will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_StructInit(NVIC_InitTypeDef* NVIC_InitStruct)
-{
- /* NVIC_InitStruct members default value */
- NVIC_InitStruct->NVIC_IRQChannel = 0x00;
- NVIC_InitStruct->NVIC_IRQChannelPreemptionPriority = 0x00;
- NVIC_InitStruct->NVIC_IRQChannelSubPriority = 0x00;
- NVIC_InitStruct->NVIC_IRQChannelCmd = DISABLE;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SETPRIMASK
-* Description : Enables the PRIMASK priority: Raises the execution priority to 0.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SETPRIMASK(void)
-{
- __SETPRIMASK();
-}
-
-/*******************************************************************************
-* Function Name : NVIC_RESETPRIMASK
-* Description : Disables the PRIMASK priority.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_RESETPRIMASK(void)
-{
- __RESETPRIMASK();
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SETFAULTMASK
-* Description : Enables the FAULTMASK priority: Raises the execution priority to -1.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SETFAULTMASK(void)
-{
- __SETFAULTMASK();
-}
-
-/*******************************************************************************
-* Function Name : NVIC_RESETFAULTMASK
-* Description : Disables the FAULTMASK priority.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_RESETFAULTMASK(void)
-{
- __RESETFAULTMASK();
-}
-
-/*******************************************************************************
-* Function Name : NVIC_BASEPRICONFIG
-* Description : The execution priority can be changed from 15 (lowest
- configurable priority) to 1. Writing a zero value will disable
-* the mask of execution priority.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_BASEPRICONFIG(u32 NewPriority)
-{
- /* Check the parameters */
- assert_param(IS_NVIC_BASE_PRI(NewPriority));
-
- __BASEPRICONFIG(NewPriority << 0x04);
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetBASEPRI
-* Description : Returns the BASEPRI mask value.
-* Input : None
-* Output : None
-* Return : BASEPRI register value
-*******************************************************************************/
-u32 NVIC_GetBASEPRI(void)
-{
- return (__GetBASEPRI());
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetCurrentPendingIRQChannel
-* Description : Returns the current pending IRQ channel identifier.
-* Input : None
-* Output : None
-* Return : Pending IRQ Channel Identifier.
-*******************************************************************************/
-u16 NVIC_GetCurrentPendingIRQChannel(void)
-{
- return ((u16)((SCB->ICSR & (u32)0x003FF000) >> 0x0C));
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetIRQChannelPendingBitStatus
-* Description : Checks whether the specified IRQ Channel pending bit is set
-* or not.
-* Input : - NVIC_IRQChannel: specifies the interrupt pending bit to check.
-* Output : None
-* Return : The new state of IRQ Channel pending bit(SET or RESET).
-*******************************************************************************/
-ITStatus NVIC_GetIRQChannelPendingBitStatus(u8 NVIC_IRQChannel)
-{
- ITStatus pendingirqstatus = RESET;
- u32 tmp = 0x00;
-
- /* Check the parameters */
- assert_param(IS_NVIC_IRQ_CHANNEL(NVIC_IRQChannel));
-
- tmp = ((u32)0x01 << (NVIC_IRQChannel & (u32)0x1F));
-
- if (((NVIC->ISPR[(NVIC_IRQChannel >> 0x05)]) & tmp) == tmp)
- {
- pendingirqstatus = SET;
- }
- else
- {
- pendingirqstatus = RESET;
- }
- return pendingirqstatus;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SetIRQChannelPendingBit
-* Description : Sets the NVIC’s interrupt pending bit.
-* Input : - NVIC_IRQChannel: specifies the interrupt pending bit to Set.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SetIRQChannelPendingBit(u8 NVIC_IRQChannel)
-{
- /* Check the parameters */
- assert_param(IS_NVIC_IRQ_CHANNEL(NVIC_IRQChannel));
-
- *(vu32*) 0xE000EF00 = (u32)NVIC_IRQChannel;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_ClearIRQChannelPendingBit
-* Description : Clears the NVIC’s interrupt pending bit.
-* Input : - NVIC_IRQChannel: specifies the interrupt pending bit to clear.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_ClearIRQChannelPendingBit(u8 NVIC_IRQChannel)
-{
- /* Check the parameters */
- assert_param(IS_NVIC_IRQ_CHANNEL(NVIC_IRQChannel));
-
- NVIC->ICPR[(NVIC_IRQChannel >> 0x05)] = (u32)0x01 << (NVIC_IRQChannel & (u32)0x1F);
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetCurrentActiveHandler
-* Description : Returns the current active Handler (IRQ Channel and
-* SystemHandler) identifier.
-* Input : None
-* Output : None
-* Return : Active Handler Identifier.
-*******************************************************************************/
-u16 NVIC_GetCurrentActiveHandler(void)
-{
- return ((u16)(SCB->ICSR & (u32)0x3FF));
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetIRQChannelActiveBitStatus
-* Description : Checks whether the specified IRQ Channel active bit is set
-* or not.
-* Input : - NVIC_IRQChannel: specifies the interrupt active bit to check.
-* Output : None
-* Return : The new state of IRQ Channel active bit(SET or RESET).
-*******************************************************************************/
-ITStatus NVIC_GetIRQChannelActiveBitStatus(u8 NVIC_IRQChannel)
-{
- ITStatus activeirqstatus = RESET;
- u32 tmp = 0x00;
-
- /* Check the parameters */
- assert_param(IS_NVIC_IRQ_CHANNEL(NVIC_IRQChannel));
-
- tmp = ((u32)0x01 << (NVIC_IRQChannel & (u32)0x1F));
-
- if (((NVIC->IABR[(NVIC_IRQChannel >> 0x05)]) & tmp) == tmp )
- {
- activeirqstatus = SET;
- }
- else
- {
- activeirqstatus = RESET;
- }
- return activeirqstatus;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetCPUID
-* Description : Returns the ID number, the version number and the implementation
-* details of the Cortex-M3 core.
-* Input : None
-* Output : None
-* Return : CPU ID.
-*******************************************************************************/
-u32 NVIC_GetCPUID(void)
-{
- return (SCB->CPUID);
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SetVectorTable
-* Description : Sets the vector table location and Offset.
-* Input : - NVIC_VectTab: specifies if the vector table is in RAM or
-* FLASH memory.
-* This parameter can be one of the following values:
-* - NVIC_VectTab_RAM
-* - NVIC_VectTab_FLASH
-* - Offset: Vector Table base offset field.
-* This value must be a multiple of 0x100.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SetVectorTable(u32 NVIC_VectTab, u32 Offset)
-{
- /* Check the parameters */
- assert_param(IS_NVIC_VECTTAB(NVIC_VectTab));
- assert_param(IS_NVIC_OFFSET(Offset));
-
- SCB->VTOR = NVIC_VectTab | (Offset & (u32)0x1FFFFF80);
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GenerateSystemReset
-* Description : Generates a system reset.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_GenerateSystemReset(void)
-{
- SCB->AIRCR = AIRCR_VECTKEY_MASK | (u32)0x04;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GenerateCoreReset
-* Description : Generates a Core (Core + NVIC) reset.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_GenerateCoreReset(void)
-{
- SCB->AIRCR = AIRCR_VECTKEY_MASK | (u32)0x01;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SystemLPConfig
-* Description : Selects the condition for the system to enter low power mode.
-* Input : - LowPowerMode: Specifies the new mode for the system to enter
-* low power mode.
-* This parameter can be one of the following values:
-* - NVIC_LP_SEVONPEND
-* - NVIC_LP_SLEEPDEEP
-* - NVIC_LP_SLEEPONEXIT
-* - NewState: new state of LP condition.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SystemLPConfig(u8 LowPowerMode, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_NVIC_LP(LowPowerMode));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- SCB->SCR |= LowPowerMode;
- }
- else
- {
- SCB->SCR &= (u32)(~(u32)LowPowerMode);
- }
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SystemHandlerConfig
-* Description : Enables or disables the specified System Handlers.
-* Input : - SystemHandler: specifies the system handler to be enabled
-* or disabled.
-* This parameter can be one of the following values:
-* - SystemHandler_MemoryManage
-* - SystemHandler_BusFault
-* - SystemHandler_UsageFault
-* - NewState: new state of specified System Handlers.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SystemHandlerConfig(u32 SystemHandler, FunctionalState NewState)
-{
- u32 tmpreg = 0x00;
-
- /* Check the parameters */
- assert_param(IS_CONFIG_SYSTEM_HANDLER(SystemHandler));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- tmpreg = (u32)0x01 << (SystemHandler & (u32)0x1F);
-
- if (NewState != DISABLE)
- {
- SCB->SHCSR |= tmpreg;
- }
- else
- {
- SCB->SHCSR &= ~tmpreg;
- }
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SystemHandlerPriorityConfig
-* Description : Configures the specified System Handlers priority.
-* Input : - SystemHandler: specifies the system handler to be
-* enabled or disabled.
-* This parameter can be one of the following values:
-* - SystemHandler_MemoryManage
-* - SystemHandler_BusFault
-* - SystemHandler_UsageFault
-* - SystemHandler_SVCall
-* - SystemHandler_DebugMonitor
-* - SystemHandler_PSV
-* - SystemHandler_SysTick
-* - SystemHandlerPreemptionPriority: new priority group of the
-* specified system handlers.
-* - SystemHandlerSubPriority: new sub priority of the specified
-* system handlers.
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SystemHandlerPriorityConfig(u32 SystemHandler, u8 SystemHandlerPreemptionPriority,
- u8 SystemHandlerSubPriority)
-{
- u32 tmp1 = 0x00, tmp2 = 0xFF, handlermask = 0x00;
- u32 tmppriority = 0x00;
-
- /* Check the parameters */
- assert_param(IS_PRIORITY_SYSTEM_HANDLER(SystemHandler));
- assert_param(IS_NVIC_PREEMPTION_PRIORITY(SystemHandlerPreemptionPriority));
- assert_param(IS_NVIC_SUB_PRIORITY(SystemHandlerSubPriority));
-
- tmppriority = (0x700 - (SCB->AIRCR & (u32)0x700))>> 0x08;
- tmp1 = (0x4 - tmppriority);
- tmp2 = tmp2 >> tmppriority;
-
- tmppriority = (u32)SystemHandlerPreemptionPriority << tmp1;
- tmppriority |= SystemHandlerSubPriority & tmp2;
-
- tmppriority = tmppriority << 0x04;
- tmp1 = SystemHandler & (u32)0xC0;
- tmp1 = tmp1 >> 0x06;
- tmp2 = (SystemHandler >> 0x08) & (u32)0x03;
- tmppriority = tmppriority << (tmp2 * 0x08);
- handlermask = (u32)0xFF << (tmp2 * 0x08);
-
- SCB->SHPR[tmp1] &= ~handlermask;
- SCB->SHPR[tmp1] |= tmppriority;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetSystemHandlerPendingBitStatus
-* Description : Checks whether the specified System handlers pending bit is
-* set or not.
-* Input : - SystemHandler: specifies the system handler pending bit to
-* check.
-* This parameter can be one of the following values:
-* - SystemHandler_MemoryManage
-* - SystemHandler_BusFault
-* - SystemHandler_SVCall
-* Output : None
-* Return : The new state of System Handler pending bit(SET or RESET).
-*******************************************************************************/
-ITStatus NVIC_GetSystemHandlerPendingBitStatus(u32 SystemHandler)
-{
- ITStatus bitstatus = RESET;
- u32 tmp = 0x00, tmppos = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GET_PENDING_SYSTEM_HANDLER(SystemHandler));
-
- tmppos = (SystemHandler >> 0x0A);
- tmppos &= (u32)0x0F;
-
- tmppos = (u32)0x01 << tmppos;
-
- tmp = SCB->SHCSR & tmppos;
-
- if (tmp == tmppos)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_SetSystemHandlerPendingBit
-* Description : Sets System Handler pending bit.
-* Input : - SystemHandler: specifies the system handler pending bit
-* to be set.
-* This parameter can be one of the following values:
-* - SystemHandler_NMI
-* - SystemHandler_PSV
-* - SystemHandler_SysTick
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_SetSystemHandlerPendingBit(u32 SystemHandler)
-{
- u32 tmp = 0x00;
-
- /* Check the parameters */
- assert_param(IS_SET_PENDING_SYSTEM_HANDLER(SystemHandler));
-
- /* Get the System Handler pending bit position */
- tmp = SystemHandler & (u32)0x1F;
- /* Set the corresponding System Handler pending bit */
- SCB->ICSR |= ((u32)0x01 << tmp);
-}
-
-/*******************************************************************************
-* Function Name : NVIC_ClearSystemHandlerPendingBit
-* Description : Clears System Handler pending bit.
-* Input : - SystemHandler: specifies the system handler pending bit to
-* be clear.
-* This parameter can be one of the following values:
-* - SystemHandler_PSV
-* - SystemHandler_SysTick
-* Output : None
-* Return : None
-*******************************************************************************/
-void NVIC_ClearSystemHandlerPendingBit(u32 SystemHandler)
-{
- u32 tmp = 0x00;
-
- /* Check the parameters */
- assert_param(IS_CLEAR_SYSTEM_HANDLER(SystemHandler));
-
- /* Get the System Handler pending bit position */
- tmp = SystemHandler & (u32)0x1F;
- /* Clear the corresponding System Handler pending bit */
- SCB->ICSR |= ((u32)0x01 << (tmp - 0x01));
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetSystemHandlerActiveBitStatus
-* Description : Checks whether the specified System handlers active bit is
-* set or not.
-* Input : - SystemHandler: specifies the system handler active bit to
-* check.
-* This parameter can be one of the following values:
-* - SystemHandler_MemoryManage
-* - SystemHandler_BusFault
-* - SystemHandler_UsageFault
-* - SystemHandler_SVCall
-* - SystemHandler_DebugMonitor
-* - SystemHandler_PSV
-* - SystemHandler_SysTick
-* Output : None
-* Return : The new state of System Handler active bit(SET or RESET).
-*******************************************************************************/
-ITStatus NVIC_GetSystemHandlerActiveBitStatus(u32 SystemHandler)
-{
- ITStatus bitstatus = RESET;
-
- u32 tmp = 0x00, tmppos = 0x00;
-
- /* Check the parameters */
- assert_param(IS_GET_ACTIVE_SYSTEM_HANDLER(SystemHandler));
-
- tmppos = (SystemHandler >> 0x0E) & (u32)0x0F;
-
- tmppos = (u32)0x01 << tmppos;
-
- tmp = SCB->SHCSR & tmppos;
-
- if (tmp == tmppos)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetFaultHandlerSources
-* Description : Returns the system fault handlers sources.
-* Input : - SystemHandler: specifies the system handler to get its fault
-* sources.
-* This parameter can be one of the following values:
-* - SystemHandler_HardFault
-* - SystemHandler_MemoryManage
-* - SystemHandler_BusFault
-* - SystemHandler_UsageFault
-* - SystemHandler_DebugMonitor
-* Output : None
-* Return : Source of the fault handler.
-*******************************************************************************/
-u32 NVIC_GetFaultHandlerSources(u32 SystemHandler)
-{
- u32 faultsources = 0x00;
- u32 tmpreg = 0x00, tmppos = 0x00;
-
- /* Check the parameters */
- assert_param(IS_FAULT_SOURCE_SYSTEM_HANDLER(SystemHandler));
-
- tmpreg = (SystemHandler >> 0x12) & (u32)0x03;
- tmppos = (SystemHandler >> 0x14) & (u32)0x03;
-
- if (tmpreg == 0x00)
- {
- faultsources = SCB->HFSR;
- }
- else if (tmpreg == 0x01)
- {
- faultsources = SCB->CFSR >> (tmppos * 0x08);
- if (tmppos != 0x02)
- {
- faultsources &= (u32)0x0F;
- }
- else
- {
- faultsources &= (u32)0xFF;
- }
- }
- else
- {
- faultsources = SCB->DFSR;
- }
- return faultsources;
-}
-
-/*******************************************************************************
-* Function Name : NVIC_GetFaultAddress
-* Description : Returns the address of the location that generated a fault
-* handler.
-* Input : - SystemHandler: specifies the system handler to get its
-* fault address.
-* This parameter can be one of the following values:
-* - SystemHandler_MemoryManage
-* - SystemHandler_BusFault
-* Output : None
-* Return : Fault address.
-*******************************************************************************/
-u32 NVIC_GetFaultAddress(u32 SystemHandler)
-{
- u32 faultaddress = 0x00;
- u32 tmp = 0x00;
-
- /* Check the parameters */
- assert_param(IS_FAULT_ADDRESS_SYSTEM_HANDLER(SystemHandler));
-
- tmp = (SystemHandler >> 0x16) & (u32)0x01;
-
- if (tmp == 0x00)
- {
- faultaddress = SCB->MMFAR;
- }
- else
- {
- faultaddress = SCB->BFAR;
- }
- return faultaddress;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_pwr.c b/stm32lib/src/stm32f10x_pwr.c
deleted file mode 100644
index e02594a..0000000
--- a/stm32lib/src/stm32f10x_pwr.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_pwr.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the PWR firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_pwr.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* --------- PWR registers bit address in the alias region ---------- */
-#define PWR_OFFSET (PWR_BASE - PERIPH_BASE)
-
-/* --- CR Register ---*/
-/* Alias word address of DBP bit */
-#define CR_OFFSET (PWR_OFFSET + 0x00)
-#define DBP_BitNumber 0x08
-#define CR_DBP_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (DBP_BitNumber * 4))
-
-/* Alias word address of PVDE bit */
-#define PVDE_BitNumber 0x04
-#define CR_PVDE_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (PVDE_BitNumber * 4))
-
-/* --- CSR Register ---*/
-/* Alias word address of EWUP bit */
-#define CSR_OFFSET (PWR_OFFSET + 0x04)
-#define EWUP_BitNumber 0x08
-#define CSR_EWUP_BB (PERIPH_BB_BASE + (CSR_OFFSET * 32) + (EWUP_BitNumber * 4))
-
-/* ------------------ PWR registers bit mask ------------------------ */
-/* CR register bit mask */
-#define CR_PDDS_Set ((u32)0x00000002)
-#define CR_DS_Mask ((u32)0xFFFFFFFC)
-#define CR_CWUF_Set ((u32)0x00000004)
-#define CR_PLS_Mask ((u32)0xFFFFFF1F)
-
-/* --------- Cortex System Control register bit mask ---------------- */
-/* Cortex System Control register address */
-#define SCB_SysCtrl ((u32)0xE000ED10)
-/* SLEEPDEEP bit mask */
-#define SysCtrl_SLEEPDEEP_Set ((u32)0x00000004)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : PWR_DeInit
-* Description : Deinitializes the PWR peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_DeInit(void)
-{
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_PWR, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_PWR, DISABLE);
-}
-
-/*******************************************************************************
-* Function Name : PWR_BackupAccessCmd
-* Description : Enables or disables access to the RTC and backup registers.
-* Input : - NewState: new state of the access to the RTC and backup
-* registers. This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_BackupAccessCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CR_DBP_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : PWR_PVDCmd
-* Description : Enables or disables the Power Voltage Detector(PVD).
-* Input : - NewState: new state of the PVD.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_PVDCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CR_PVDE_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : PWR_PVDLevelConfig
-* Description : Configures the voltage threshold detected by the Power Voltage
-* Detector(PVD).
-* Input : - PWR_PVDLevel: specifies the PVD detection level
-* This parameter can be one of the following values:
-* - PWR_PVDLevel_2V2: PVD detection level set to 2.2V
-* - PWR_PVDLevel_2V3: PVD detection level set to 2.3V
-* - PWR_PVDLevel_2V4: PVD detection level set to 2.4V
-* - PWR_PVDLevel_2V5: PVD detection level set to 2.5V
-* - PWR_PVDLevel_2V6: PVD detection level set to 2.6V
-* - PWR_PVDLevel_2V7: PVD detection level set to 2.7V
-* - PWR_PVDLevel_2V8: PVD detection level set to 2.8V
-* - PWR_PVDLevel_2V9: PVD detection level set to 2.9V
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_PVDLevelConfig(u32 PWR_PVDLevel)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_PWR_PVD_LEVEL(PWR_PVDLevel));
-
- tmpreg = PWR->CR;
-
- /* Clear PLS[7:5] bits */
- tmpreg &= CR_PLS_Mask;
-
- /* Set PLS[7:5] bits according to PWR_PVDLevel value */
- tmpreg |= PWR_PVDLevel;
-
- /* Store the new value */
- PWR->CR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : PWR_WakeUpPinCmd
-* Description : Enables or disables the WakeUp Pin functionality.
-* Input : - NewState: new state of the WakeUp Pin functionality.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_WakeUpPinCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CSR_EWUP_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : PWR_EnterSTOPMode
-* Description : Enters STOP mode.
-* Input : - PWR_Regulator: specifies the regulator state in STOP mode.
-* This parameter can be one of the following values:
-* - PWR_Regulator_ON: STOP mode with regulator ON
-* - PWR_Regulator_LowPower: STOP mode with
-* regulator in low power mode
-* - PWR_STOPEntry: specifies if STOP mode in entered with WFI or
-* WFE instruction.
-* This parameter can be one of the following values:
-* - PWR_STOPEntry_WFI: enter STOP mode with WFI instruction
-* - PWR_STOPEntry_WFE: enter STOP mode with WFE instruction
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_EnterSTOPMode(u32 PWR_Regulator, u8 PWR_STOPEntry)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_PWR_REGULATOR(PWR_Regulator));
- assert_param(IS_PWR_STOP_ENTRY(PWR_STOPEntry));
-
- /* Select the regulator state in STOP mode ---------------------------------*/
- tmpreg = PWR->CR;
-
- /* Clear PDDS and LPDS bits */
- tmpreg &= CR_DS_Mask;
-
- /* Set LPDS bit according to PWR_Regulator value */
- tmpreg |= PWR_Regulator;
-
- /* Store the new value */
- PWR->CR = tmpreg;
-
- /* Set SLEEPDEEP bit of Cortex System Control Register */
- *(vu32 *) SCB_SysCtrl |= SysCtrl_SLEEPDEEP_Set;
-
- /* Select STOP mode entry --------------------------------------------------*/
- if(PWR_STOPEntry == PWR_STOPEntry_WFI)
- {
- /* Request Wait For Interrupt */
- __WFI();
- }
- else
- {
- /* Request Wait For Event */
- __WFE();
- }
-}
-
-/*******************************************************************************
-* Function Name : PWR_EnterSTANDBYMode
-* Description : Enters STANDBY mode.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_EnterSTANDBYMode(void)
-{
- /* Clear Wake-up flag */
- PWR->CR |= CR_CWUF_Set;
-
- /* Select STANDBY mode */
- PWR->CR |= CR_PDDS_Set;
-
- /* Set SLEEPDEEP bit of Cortex System Control Register */
- *(vu32 *) SCB_SysCtrl |= SysCtrl_SLEEPDEEP_Set;
-
- /* Request Wait For Interrupt */
- __WFI();
-}
-
-/*******************************************************************************
-* Function Name : PWR_GetFlagStatus
-* Description : Checks whether the specified PWR flag is set or not.
-* Input : - PWR_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - PWR_FLAG_WU: Wake Up flag
-* - PWR_FLAG_SB: StandBy flag
-* - PWR_FLAG_PVDO: PVD Output
-* Output : None
-* Return : The new state of PWR_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus PWR_GetFlagStatus(u32 PWR_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_PWR_GET_FLAG(PWR_FLAG));
-
- if ((PWR->CSR & PWR_FLAG) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
-
- /* Return the flag status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : PWR_ClearFlag
-* Description : Clears the PWR's pending flags.
-* Input : - PWR_FLAG: specifies the flag to clear.
-* This parameter can be one of the following values:
-* - PWR_FLAG_WU: Wake Up flag
-* - PWR_FLAG_SB: StandBy flag
-* Output : None
-* Return : None
-*******************************************************************************/
-void PWR_ClearFlag(u32 PWR_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_PWR_CLEAR_FLAG(PWR_FLAG));
-
- PWR->CR |= PWR_FLAG << 2;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_rcc.c b/stm32lib/src/stm32f10x_rcc.c
deleted file mode 100644
index 0ab6387..0000000
--- a/stm32lib/src/stm32f10x_rcc.c
+++ /dev/null
@@ -1,1104 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_rcc.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the RCC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ------------ RCC registers bit address in the alias region ----------- */
-#define RCC_OFFSET (RCC_BASE - PERIPH_BASE)
-
-/* --- CR Register ---*/
-/* Alias word address of HSION bit */
-#define CR_OFFSET (RCC_OFFSET + 0x00)
-#define HSION_BitNumber 0x00
-#define CR_HSION_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (HSION_BitNumber * 4))
-
-/* Alias word address of PLLON bit */
-#define PLLON_BitNumber 0x18
-#define CR_PLLON_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (PLLON_BitNumber * 4))
-
-/* Alias word address of CSSON bit */
-#define CSSON_BitNumber 0x13
-#define CR_CSSON_BB (PERIPH_BB_BASE + (CR_OFFSET * 32) + (CSSON_BitNumber * 4))
-
-/* --- CFGR Register ---*/
-/* Alias word address of USBPRE bit */
-#define CFGR_OFFSET (RCC_OFFSET + 0x04)
-#define USBPRE_BitNumber 0x16
-#define CFGR_USBPRE_BB (PERIPH_BB_BASE + (CFGR_OFFSET * 32) + (USBPRE_BitNumber * 4))
-
-/* --- BDCR Register ---*/
-/* Alias word address of RTCEN bit */
-#define BDCR_OFFSET (RCC_OFFSET + 0x20)
-#define RTCEN_BitNumber 0x0F
-#define BDCR_RTCEN_BB (PERIPH_BB_BASE + (BDCR_OFFSET * 32) + (RTCEN_BitNumber * 4))
-
-/* Alias word address of BDRST bit */
-#define BDRST_BitNumber 0x10
-#define BDCR_BDRST_BB (PERIPH_BB_BASE + (BDCR_OFFSET * 32) + (BDRST_BitNumber * 4))
-
-/* --- CSR Register ---*/
-/* Alias word address of LSION bit */
-#define CSR_OFFSET (RCC_OFFSET + 0x24)
-#define LSION_BitNumber 0x00
-#define CSR_LSION_BB (PERIPH_BB_BASE + (CSR_OFFSET * 32) + (LSION_BitNumber * 4))
-
-/* ---------------------- RCC registers bit mask ------------------------ */
-/* CR register bit mask */
-#define CR_HSEBYP_Reset ((u32)0xFFFBFFFF)
-#define CR_HSEBYP_Set ((u32)0x00040000)
-#define CR_HSEON_Reset ((u32)0xFFFEFFFF)
-#define CR_HSEON_Set ((u32)0x00010000)
-#define CR_HSITRIM_Mask ((u32)0xFFFFFF07)
-
-/* CFGR register bit mask */
-#define CFGR_PLL_Mask ((u32)0xFFC0FFFF)
-#define CFGR_PLLMull_Mask ((u32)0x003C0000)
-#define CFGR_PLLSRC_Mask ((u32)0x00010000)
-#define CFGR_PLLXTPRE_Mask ((u32)0x00020000)
-#define CFGR_SWS_Mask ((u32)0x0000000C)
-#define CFGR_SW_Mask ((u32)0xFFFFFFFC)
-#define CFGR_HPRE_Reset_Mask ((u32)0xFFFFFF0F)
-#define CFGR_HPRE_Set_Mask ((u32)0x000000F0)
-#define CFGR_PPRE1_Reset_Mask ((u32)0xFFFFF8FF)
-#define CFGR_PPRE1_Set_Mask ((u32)0x00000700)
-#define CFGR_PPRE2_Reset_Mask ((u32)0xFFFFC7FF)
-#define CFGR_PPRE2_Set_Mask ((u32)0x00003800)
-#define CFGR_ADCPRE_Reset_Mask ((u32)0xFFFF3FFF)
-#define CFGR_ADCPRE_Set_Mask ((u32)0x0000C000)
-
-/* CSR register bit mask */
-#define CSR_RMVF_Set ((u32)0x01000000)
-
-/* RCC Flag Mask */
-#define FLAG_Mask ((u8)0x1F)
-
-/* Typical Value of the HSI in Hz */
-#define HSI_Value ((u32)8000000)
-
-/* CIR register byte 2 (Bits[15:8]) base address */
-#define CIR_BYTE2_ADDRESS ((u32)0x40021009)
-/* CIR register byte 3 (Bits[23:16]) base address */
-#define CIR_BYTE3_ADDRESS ((u32)0x4002100A)
-
-/* CFGR register byte 4 (Bits[31:24]) base address */
-#define CFGR_BYTE4_ADDRESS ((u32)0x40021007)
-
-/* BDCR register base address */
-#define BDCR_ADDRESS (PERIPH_BASE + BDCR_OFFSET)
-
-/* Time out for HSE start up */
-#define HSEStartUp_TimeOut ((u16)0x01FF)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-static uc8 APBAHBPrescTable[16] = {0, 0, 0, 0, 1, 2, 3, 4, 1, 2, 3, 4, 6, 7, 8, 9};
-static uc8 ADCPrescTable[4] = {2, 4, 6, 8};
-
-static volatile FlagStatus HSEStatus;
-static vu32 StartUpCounter = 0;
-
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : RCC_DeInit
-* Description : Resets the RCC clock configuration to the default reset state.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_DeInit(void)
-{
- /* Set HSION bit */
- RCC->CR |= (u32)0x00000001;
-
- /* Reset SW[1:0], HPRE[3:0], PPRE1[2:0], PPRE2[2:0], ADCPRE[1:0] and MCO[2:0] bits */
- RCC->CFGR &= (u32)0xF8FF0000;
-
- /* Reset HSEON, CSSON and PLLON bits */
- RCC->CR &= (u32)0xFEF6FFFF;
-
- /* Reset HSEBYP bit */
- RCC->CR &= (u32)0xFFFBFFFF;
-
- /* Reset PLLSRC, PLLXTPRE, PLLMUL[3:0] and USBPRE bits */
- RCC->CFGR &= (u32)0xFF80FFFF;
-
- /* Disable all interrupts */
- RCC->CIR = 0x00000000;
-}
-
-/*******************************************************************************
-* Function Name : RCC_HSEConfig
-* Description : Configures the External High Speed oscillator (HSE).
-* HSE can not be stopped if it is used directly or through the
-* PLL as system clock.
-* Input : - RCC_HSE: specifies the new state of the HSE.
-* This parameter can be one of the following values:
-* - RCC_HSE_OFF: HSE oscillator OFF
-* - RCC_HSE_ON: HSE oscillator ON
-* - RCC_HSE_Bypass: HSE oscillator bypassed with external
-* clock
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_HSEConfig(u32 RCC_HSE)
-{
- /* Check the parameters */
- assert_param(IS_RCC_HSE(RCC_HSE));
-
- /* Reset HSEON and HSEBYP bits before configuring the HSE ------------------*/
- /* Reset HSEON bit */
- RCC->CR &= CR_HSEON_Reset;
-
- /* Reset HSEBYP bit */
- RCC->CR &= CR_HSEBYP_Reset;
-
- /* Configure HSE (RCC_HSE_OFF is already covered by the code section above) */
- switch(RCC_HSE)
- {
- case RCC_HSE_ON:
- /* Set HSEON bit */
- RCC->CR |= CR_HSEON_Set;
- break;
-
- case RCC_HSE_Bypass:
- /* Set HSEBYP and HSEON bits */
- RCC->CR |= CR_HSEBYP_Set | CR_HSEON_Set;
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_WaitForHSEStartUp
-* Description : Waits for HSE start-up.
-* Input : None
-* Output : None
-* Return : An ErrorStatus enumuration value:
-* - SUCCESS: HSE oscillator is stable and ready to use
-* - ERROR: HSE oscillator not yet ready
-*******************************************************************************/
-ErrorStatus RCC_WaitForHSEStartUp(void)
-{
- ErrorStatus status = ERROR;
-
- /* Wait till HSE is ready and if Time out is reached exit */
- do
- {
- HSEStatus = RCC_GetFlagStatus(RCC_FLAG_HSERDY);
- StartUpCounter++;
- } while((HSEStatus == RESET) && (StartUpCounter != HSEStartUp_TimeOut));
-
-
- if (RCC_GetFlagStatus(RCC_FLAG_HSERDY) != RESET)
- {
- status = SUCCESS;
- }
- else
- {
- status = ERROR;
- }
-
- return (status);
-}
-
-/*******************************************************************************
-* Function Name : RCC_AdjustHSICalibrationValue
-* Description : Adjusts the Internal High Speed oscillator (HSI) calibration
-* value.
-* Input : - HSICalibrationValue: specifies the calibration trimming value.
-* This parameter must be a number between 0 and 0x1F.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_AdjustHSICalibrationValue(u8 HSICalibrationValue)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_CALIBRATION_VALUE(HSICalibrationValue));
-
- tmpreg = RCC->CR;
-
- /* Clear HSITRIM[4:0] bits */
- tmpreg &= CR_HSITRIM_Mask;
-
- /* Set the HSITRIM[4:0] bits according to HSICalibrationValue value */
- tmpreg |= (u32)HSICalibrationValue << 3;
-
- /* Store the new value */
- RCC->CR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_HSICmd
-* Description : Enables or disables the Internal High Speed oscillator (HSI).
-* HSI can not be stopped if it is used directly or through the
-* PLL as system clock.
-* Input : - NewState: new state of the HSI.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_HSICmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CR_HSION_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : RCC_PLLConfig
-* Description : Configures the PLL clock source and multiplication factor.
-* This function must be used only when the PLL is disabled.
-* Input : - RCC_PLLSource: specifies the PLL entry clock source.
-* This parameter can be one of the following values:
-* - RCC_PLLSource_HSI_Div2: HSI oscillator clock divided
-* by 2 selected as PLL clock entry
-* - RCC_PLLSource_HSE_Div1: HSE oscillator clock selected
-* as PLL clock entry
-* - RCC_PLLSource_HSE_Div2: HSE oscillator clock divided
-* by 2 selected as PLL clock entry
-* - RCC_PLLMul: specifies the PLL multiplication factor.
-* This parameter can be RCC_PLLMul_x where x:[2,16]
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_PLLConfig(u32 RCC_PLLSource, u32 RCC_PLLMul)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_PLL_SOURCE(RCC_PLLSource));
- assert_param(IS_RCC_PLL_MUL(RCC_PLLMul));
-
- tmpreg = RCC->CFGR;
-
- /* Clear PLLSRC, PLLXTPRE and PLLMUL[3:0] bits */
- tmpreg &= CFGR_PLL_Mask;
-
- /* Set the PLL configuration bits */
- tmpreg |= RCC_PLLSource | RCC_PLLMul;
-
- /* Store the new value */
- RCC->CFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_PLLCmd
-* Description : Enables or disables the PLL.
-* The PLL can not be disabled if it is used as system clock.
-* Input : - NewState: new state of the PLL.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_PLLCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CR_PLLON_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : RCC_SYSCLKConfig
-* Description : Configures the system clock (SYSCLK).
-* Input : - RCC_SYSCLKSource: specifies the clock source used as system
-* clock. This parameter can be one of the following values:
-* - RCC_SYSCLKSource_HSI: HSI selected as system clock
-* - RCC_SYSCLKSource_HSE: HSE selected as system clock
-* - RCC_SYSCLKSource_PLLCLK: PLL selected as system clock
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_SYSCLKConfig(u32 RCC_SYSCLKSource)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_SYSCLK_SOURCE(RCC_SYSCLKSource));
-
- tmpreg = RCC->CFGR;
-
- /* Clear SW[1:0] bits */
- tmpreg &= CFGR_SW_Mask;
-
- /* Set SW[1:0] bits according to RCC_SYSCLKSource value */
- tmpreg |= RCC_SYSCLKSource;
-
- /* Store the new value */
- RCC->CFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_GetSYSCLKSource
-* Description : Returns the clock source used as system clock.
-* Input : None
-* Output : None
-* Return : The clock source used as system clock. The returned value can
-* be one of the following:
-* - 0x00: HSI used as system clock
-* - 0x04: HSE used as system clock
-* - 0x08: PLL used as system clock
-*******************************************************************************/
-u8 RCC_GetSYSCLKSource(void)
-{
- return ((u8)(RCC->CFGR & CFGR_SWS_Mask));
-}
-
-/*******************************************************************************
-* Function Name : RCC_HCLKConfig
-* Description : Configures the AHB clock (HCLK).
-* Input : - RCC_SYSCLK: defines the AHB clock divider. This clock is
-* derived from the system clock (SYSCLK).
-* This parameter can be one of the following values:
-* - RCC_SYSCLK_Div1: AHB clock = SYSCLK
-* - RCC_SYSCLK_Div2: AHB clock = SYSCLK/2
-* - RCC_SYSCLK_Div4: AHB clock = SYSCLK/4
-* - RCC_SYSCLK_Div8: AHB clock = SYSCLK/8
-* - RCC_SYSCLK_Div16: AHB clock = SYSCLK/16
-* - RCC_SYSCLK_Div64: AHB clock = SYSCLK/64
-* - RCC_SYSCLK_Div128: AHB clock = SYSCLK/128
-* - RCC_SYSCLK_Div256: AHB clock = SYSCLK/256
-* - RCC_SYSCLK_Div512: AHB clock = SYSCLK/512
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_HCLKConfig(u32 RCC_SYSCLK)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_HCLK(RCC_SYSCLK));
-
- tmpreg = RCC->CFGR;
-
- /* Clear HPRE[3:0] bits */
- tmpreg &= CFGR_HPRE_Reset_Mask;
-
- /* Set HPRE[3:0] bits according to RCC_SYSCLK value */
- tmpreg |= RCC_SYSCLK;
-
- /* Store the new value */
- RCC->CFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_PCLK1Config
-* Description : Configures the Low Speed APB clock (PCLK1).
-* Input : - RCC_HCLK: defines the APB1 clock divider. This clock is
-* derived from the AHB clock (HCLK).
-* This parameter can be one of the following values:
-* - RCC_HCLK_Div1: APB1 clock = HCLK
-* - RCC_HCLK_Div2: APB1 clock = HCLK/2
-* - RCC_HCLK_Div4: APB1 clock = HCLK/4
-* - RCC_HCLK_Div8: APB1 clock = HCLK/8
-* - RCC_HCLK_Div16: APB1 clock = HCLK/16
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_PCLK1Config(u32 RCC_HCLK)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_PCLK(RCC_HCLK));
-
- tmpreg = RCC->CFGR;
-
- /* Clear PPRE1[2:0] bits */
- tmpreg &= CFGR_PPRE1_Reset_Mask;
-
- /* Set PPRE1[2:0] bits according to RCC_HCLK value */
- tmpreg |= RCC_HCLK;
-
- /* Store the new value */
- RCC->CFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_PCLK2Config
-* Description : Configures the High Speed APB clock (PCLK2).
-* Input : - RCC_HCLK: defines the APB2 clock divider. This clock is
-* derived from the AHB clock (HCLK).
-* This parameter can be one of the following values:
-* - RCC_HCLK_Div1: APB2 clock = HCLK
-* - RCC_HCLK_Div2: APB2 clock = HCLK/2
-* - RCC_HCLK_Div4: APB2 clock = HCLK/4
-* - RCC_HCLK_Div8: APB2 clock = HCLK/8
-* - RCC_HCLK_Div16: APB2 clock = HCLK/16
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_PCLK2Config(u32 RCC_HCLK)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_PCLK(RCC_HCLK));
-
- tmpreg = RCC->CFGR;
-
- /* Clear PPRE2[2:0] bits */
- tmpreg &= CFGR_PPRE2_Reset_Mask;
-
- /* Set PPRE2[2:0] bits according to RCC_HCLK value */
- tmpreg |= RCC_HCLK << 3;
-
- /* Store the new value */
- RCC->CFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_ITConfig
-* Description : Enables or disables the specified RCC interrupts.
-* Input : - RCC_IT: specifies the RCC interrupt sources to be enabled
-* or disabled.
-* This parameter can be any combination of the following values:
-* - RCC_IT_LSIRDY: LSI ready interrupt
-* - RCC_IT_LSERDY: LSE ready interrupt
-* - RCC_IT_HSIRDY: HSI ready interrupt
-* - RCC_IT_HSERDY: HSE ready interrupt
-* - RCC_IT_PLLRDY: PLL ready interrupt
-* - NewState: new state of the specified RCC interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_ITConfig(u8 RCC_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RCC_IT(RCC_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Perform Byte access to RCC_CIR[12:8] bits to enable the selected interrupts */
- *(vu8 *) CIR_BYTE2_ADDRESS |= RCC_IT;
- }
- else
- {
- /* Perform Byte access to RCC_CIR[12:8] bits to disable the selected interrupts */
- *(vu8 *) CIR_BYTE2_ADDRESS &= (u8)~RCC_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_USBCLKConfig
-* Description : Configures the USB clock (USBCLK).
-* Input : - RCC_USBCLKSource: specifies the USB clock source. This clock
-* is derived from the PLL output.
-* This parameter can be one of the following values:
-* - RCC_USBCLKSource_PLLCLK_1Div5: PLL clock divided by 1,5
-* selected as USB clock source
-* - RCC_USBCLKSource_PLLCLK_Div1: PLL clock selected as USB
-* clock source
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_USBCLKConfig(u32 RCC_USBCLKSource)
-{
- /* Check the parameters */
- assert_param(IS_RCC_USBCLK_SOURCE(RCC_USBCLKSource));
-
- *(vu32 *) CFGR_USBPRE_BB = RCC_USBCLKSource;
-}
-
-/*******************************************************************************
-* Function Name : RCC_ADCCLKConfig
-* Description : Configures the ADC clock (ADCCLK).
-* Input : - RCC_PCLK2: defines the ADC clock divider. This clock is
-* derived from the APB2 clock (PCLK2).
-* This parameter can be one of the following values:
-* - RCC_PCLK2_Div2: ADC clock = PCLK2/2
-* - RCC_PCLK2_Div4: ADC clock = PCLK2/4
-* - RCC_PCLK2_Div6: ADC clock = PCLK2/6
-* - RCC_PCLK2_Div8: ADC clock = PCLK2/8
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_ADCCLKConfig(u32 RCC_PCLK2)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_RCC_ADCCLK(RCC_PCLK2));
-
- tmpreg = RCC->CFGR;
-
- /* Clear ADCPRE[1:0] bits */
- tmpreg &= CFGR_ADCPRE_Reset_Mask;
-
- /* Set ADCPRE[1:0] bits according to RCC_PCLK2 value */
- tmpreg |= RCC_PCLK2;
-
- /* Store the new value */
- RCC->CFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : RCC_LSEConfig
-* Description : Configures the External Low Speed oscillator (LSE).
-* Input : - RCC_LSE: specifies the new state of the LSE.
-* This parameter can be one of the following values:
-* - RCC_LSE_OFF: LSE oscillator OFF
-* - RCC_LSE_ON: LSE oscillator ON
-* - RCC_LSE_Bypass: LSE oscillator bypassed with external
-* clock
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_LSEConfig(u8 RCC_LSE)
-{
- /* Check the parameters */
- assert_param(IS_RCC_LSE(RCC_LSE));
-
- /* Reset LSEON and LSEBYP bits before configuring the LSE ------------------*/
- /* Reset LSEON bit */
- *(vu8 *) BDCR_ADDRESS = RCC_LSE_OFF;
-
- /* Reset LSEBYP bit */
- *(vu8 *) BDCR_ADDRESS = RCC_LSE_OFF;
-
- /* Configure LSE (RCC_LSE_OFF is already covered by the code section above) */
- switch(RCC_LSE)
- {
- case RCC_LSE_ON:
- /* Set LSEON bit */
- *(vu8 *) BDCR_ADDRESS = RCC_LSE_ON;
- break;
-
- case RCC_LSE_Bypass:
- /* Set LSEBYP and LSEON bits */
- *(vu8 *) BDCR_ADDRESS = RCC_LSE_Bypass | RCC_LSE_ON;
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_LSICmd
-* Description : Enables or disables the Internal Low Speed oscillator (LSI).
-* LSI can not be disabled if the IWDG is running.
-* Input : - NewState: new state of the LSI.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_LSICmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CSR_LSION_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : RCC_RTCCLKConfig
-* Description : Configures the RTC clock (RTCCLK).
-* Once the RTC clock is selected it can’t be changed unless the
-* Backup domain is reset.
-* Input : - RCC_RTCCLKSource: specifies the RTC clock source.
-* This parameter can be one of the following values:
-* - RCC_RTCCLKSource_LSE: LSE selected as RTC clock
-* - RCC_RTCCLKSource_LSI: LSI selected as RTC clock
-* - RCC_RTCCLKSource_HSE_Div128: HSE clock divided by 128
-* selected as RTC clock
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_RTCCLKConfig(u32 RCC_RTCCLKSource)
-{
- /* Check the parameters */
- assert_param(IS_RCC_RTCCLK_SOURCE(RCC_RTCCLKSource));
-
- /* Select the RTC clock source */
- RCC->BDCR |= RCC_RTCCLKSource;
-}
-
-/*******************************************************************************
-* Function Name : RCC_RTCCLKCmd
-* Description : Enables or disables the RTC clock.
-* This function must be used only after the RTC clock was
-* selected using the RCC_RTCCLKConfig function.
-* Input : - NewState: new state of the RTC clock.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_RTCCLKCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) BDCR_RTCEN_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : RCC_GetClocksFreq
-* Description : Returns the frequencies of different on chip clocks.
-* Input : - RCC_Clocks: pointer to a RCC_ClocksTypeDef structure which
-* will hold the clocks frequencies.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_GetClocksFreq(RCC_ClocksTypeDef* RCC_Clocks)
-{
- u32 tmp = 0, pllmull = 0, pllsource = 0, presc = 0;
-
- /* Get SYSCLK source -------------------------------------------------------*/
- tmp = RCC->CFGR & CFGR_SWS_Mask;
-
- switch (tmp)
- {
- case 0x00: /* HSI used as system clock */
- RCC_Clocks->SYSCLK_Frequency = HSI_Value;
- break;
-
- case 0x04: /* HSE used as system clock */
- RCC_Clocks->SYSCLK_Frequency = HSE_Value;
- break;
-
- case 0x08: /* PLL used as system clock */
- /* Get PLL clock source and multiplication factor ----------------------*/
- pllmull = RCC->CFGR & CFGR_PLLMull_Mask;
- pllmull = ( pllmull >> 18) + 2;
-
- pllsource = RCC->CFGR & CFGR_PLLSRC_Mask;
-
- if (pllsource == 0x00)
- {/* HSI oscillator clock divided by 2 selected as PLL clock entry */
- RCC_Clocks->SYSCLK_Frequency = (HSI_Value >> 1) * pllmull;
- }
- else
- {/* HSE selected as PLL clock entry */
-
- if ((RCC->CFGR & CFGR_PLLXTPRE_Mask) != (u32)RESET)
- {/* HSE oscillator clock divided by 2 */
-
- RCC_Clocks->SYSCLK_Frequency = (HSE_Value >> 1) * pllmull;
- }
- else
- {
- RCC_Clocks->SYSCLK_Frequency = HSE_Value * pllmull;
- }
- }
- break;
-
- default:
- RCC_Clocks->SYSCLK_Frequency = HSI_Value;
- break;
- }
-
- /* Compute HCLK, PCLK1, PCLK2 and ADCCLK clocks frequencies ----------------*/
- /* Get HCLK prescaler */
- tmp = RCC->CFGR & CFGR_HPRE_Set_Mask;
- tmp = tmp >> 4;
- presc = APBAHBPrescTable[tmp];
-
- /* HCLK clock frequency */
- RCC_Clocks->HCLK_Frequency = RCC_Clocks->SYSCLK_Frequency >> presc;
-
- /* Get PCLK1 prescaler */
- tmp = RCC->CFGR & CFGR_PPRE1_Set_Mask;
- tmp = tmp >> 8;
- presc = APBAHBPrescTable[tmp];
-
- /* PCLK1 clock frequency */
- RCC_Clocks->PCLK1_Frequency = RCC_Clocks->HCLK_Frequency >> presc;
-
- /* Get PCLK2 prescaler */
- tmp = RCC->CFGR & CFGR_PPRE2_Set_Mask;
- tmp = tmp >> 11;
- presc = APBAHBPrescTable[tmp];
-
- /* PCLK2 clock frequency */
- RCC_Clocks->PCLK2_Frequency = RCC_Clocks->HCLK_Frequency >> presc;
-
- /* Get ADCCLK prescaler */
- tmp = RCC->CFGR & CFGR_ADCPRE_Set_Mask;
- tmp = tmp >> 14;
- presc = ADCPrescTable[tmp];
-
- /* ADCCLK clock frequency */
- RCC_Clocks->ADCCLK_Frequency = RCC_Clocks->PCLK2_Frequency / presc;
-}
-
-/*******************************************************************************
-* Function Name : RCC_AHBPeriphClockCmd
-* Description : Enables or disables the AHB peripheral clock.
-* Input : - RCC_AHBPeriph: specifies the AHB peripheral to gates its clock.
-* This parameter can be any combination of the following values:
-* - RCC_AHBPeriph_DMA1
-* - RCC_AHBPeriph_DMA2
-* - RCC_AHBPeriph_SRAM
-* - RCC_AHBPeriph_FLITF
-* - RCC_AHBPeriph_CRC
-* - RCC_AHBPeriph_FSMC
-* - RCC_AHBPeriph_SDIO
-* SRAM and FLITF clock can be disabled only during sleep mode.
-* - NewState: new state of the specified peripheral clock.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_AHBPeriphClockCmd(u32 RCC_AHBPeriph, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RCC_AHB_PERIPH(RCC_AHBPeriph));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- RCC->AHBENR |= RCC_AHBPeriph;
- }
- else
- {
- RCC->AHBENR &= ~RCC_AHBPeriph;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_APB2PeriphClockCmd
-* Description : Enables or disables the High Speed APB (APB2) peripheral clock.
-* Input : - RCC_APB2Periph: specifies the APB2 peripheral to gates its
-* clock.
-* This parameter can be any combination of the following values:
-* - RCC_APB2Periph_AFIO, RCC_APB2Periph_GPIOA, RCC_APB2Periph_GPIOB,
-* RCC_APB2Periph_GPIOC, RCC_APB2Periph_GPIOD, RCC_APB2Periph_GPIOE,
-* RCC_APB2Periph_GPIOF, RCC_APB2Periph_GPIOG, RCC_APB2Periph_ADC1,
-* RCC_APB2Periph_ADC2, RCC_APB2Periph_TIM1, RCC_APB2Periph_SPI1,
-* RCC_APB2Periph_TIM8, RCC_APB2Periph_USART1, RCC_APB2Periph_ADC3,
-* RCC_APB2Periph_ALL
-* - NewState: new state of the specified peripheral clock.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_APB2PeriphClockCmd(u32 RCC_APB2Periph, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RCC_APB2_PERIPH(RCC_APB2Periph));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- RCC->APB2ENR |= RCC_APB2Periph;
- }
- else
- {
- RCC->APB2ENR &= ~RCC_APB2Periph;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_APB1PeriphClockCmd
-* Description : Enables or disables the Low Speed APB (APB1) peripheral clock.
-* Input : - RCC_APB1Periph: specifies the APB1 peripheral to gates its
-* clock.
-* This parameter can be any combination of the following values:
-* - RCC_APB1Periph_TIM2, RCC_APB1Periph_TIM3, RCC_APB1Periph_TIM4,
-* RCC_APB1Periph_TIM5, RCC_APB1Periph_TIM6, RCC_APB1Periph_TIM7,
-* RCC_APB1Periph_WWDG, RCC_APB1Periph_SPI2, RCC_APB1Periph_SPI3,
-* RCC_APB1Periph_USART2, RCC_APB1Periph_USART3, RCC_APB1Periph_USART4,
-* RCC_APB1Periph_USART5, RCC_APB1Periph_I2C1, RCC_APB1Periph_I2C2,
-* RCC_APB1Periph_USB, RCC_APB1Periph_CAN, RCC_APB1Periph_BKP,
-* RCC_APB1Periph_PWR, RCC_APB1Periph_DAC, RCC_APB1Periph_ALL
-* - NewState: new state of the specified peripheral clock.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_APB1PeriphClockCmd(u32 RCC_APB1Periph, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RCC_APB1_PERIPH(RCC_APB1Periph));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- RCC->APB1ENR |= RCC_APB1Periph;
- }
- else
- {
- RCC->APB1ENR &= ~RCC_APB1Periph;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_APB2PeriphResetCmd
-* Description : Forces or releases High Speed APB (APB2) peripheral reset.
-* Input : - RCC_APB2Periph: specifies the APB2 peripheral to reset.
-* This parameter can be any combination of the following values:
-* - RCC_APB2Periph_AFIO, RCC_APB2Periph_GPIOA, RCC_APB2Periph_GPIOB,
-* RCC_APB2Periph_GPIOC, RCC_APB2Periph_GPIOD, RCC_APB2Periph_GPIOE,
-* RCC_APB2Periph_GPIOF, RCC_APB2Periph_GPIOG, RCC_APB2Periph_ADC1,
-* RCC_APB2Periph_ADC2, RCC_APB2Periph_TIM1, RCC_APB2Periph_SPI1,
-* RCC_APB2Periph_TIM8, RCC_APB2Periph_USART1, RCC_APB2Periph_ADC3,
-* RCC_APB2Periph_ALL
-* - NewState: new state of the specified peripheral reset.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_APB2PeriphResetCmd(u32 RCC_APB2Periph, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RCC_APB2_PERIPH(RCC_APB2Periph));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- RCC->APB2RSTR |= RCC_APB2Periph;
- }
- else
- {
- RCC->APB2RSTR &= ~RCC_APB2Periph;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_APB1PeriphResetCmd
-* Description : Forces or releases Low Speed APB (APB1) peripheral reset.
-* Input : - RCC_APB1Periph: specifies the APB1 peripheral to reset.
-* This parameter can be any combination of the following values:
-* - RCC_APB1Periph_TIM2, RCC_APB1Periph_TIM3, RCC_APB1Periph_TIM4,
-* RCC_APB1Periph_TIM5, RCC_APB1Periph_TIM6, RCC_APB1Periph_TIM7,
-* RCC_APB1Periph_WWDG, RCC_APB1Periph_SPI2, RCC_APB1Periph_SPI3,
-* RCC_APB1Periph_USART2, RCC_APB1Periph_USART3, RCC_APB1Periph_USART4,
-* RCC_APB1Periph_USART5, RCC_APB1Periph_I2C1, RCC_APB1Periph_I2C2,
-* RCC_APB1Periph_USB, RCC_APB1Periph_CAN, RCC_APB1Periph_BKP,
-* RCC_APB1Periph_PWR, RCC_APB1Periph_DAC, RCC_APB1Periph_ALL
-* - NewState: new state of the specified peripheral clock.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_APB1PeriphResetCmd(u32 RCC_APB1Periph, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RCC_APB1_PERIPH(RCC_APB1Periph));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- RCC->APB1RSTR |= RCC_APB1Periph;
- }
- else
- {
- RCC->APB1RSTR &= ~RCC_APB1Periph;
- }
-}
-
-/*******************************************************************************
-* Function Name : RCC_BackupResetCmd
-* Description : Forces or releases the Backup domain reset.
-* Input : - NewState: new state of the Backup domain reset.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_BackupResetCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) BDCR_BDRST_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : RCC_ClockSecuritySystemCmd
-* Description : Enables or disables the Clock Security System.
-* Input : - NewState: new state of the Clock Security System..
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_ClockSecuritySystemCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CR_CSSON_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : RCC_MCOConfig
-* Description : Selects the clock source to output on MCO pin.
-* Input : - RCC_MCO: specifies the clock source to output.
-* This parameter can be one of the following values:
-* - RCC_MCO_NoClock: No clock selected
-* - RCC_MCO_SYSCLK: System clock selected
-* - RCC_MCO_HSI: HSI oscillator clock selected
-* - RCC_MCO_HSE: HSE oscillator clock selected
-* - RCC_MCO_PLLCLK_Div2: PLL clock divided by 2 selected
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_MCOConfig(u8 RCC_MCO)
-{
- /* Check the parameters */
- assert_param(IS_RCC_MCO(RCC_MCO));
-
- /* Perform Byte access to MCO[2:0] bits to select the MCO source */
- *(vu8 *) CFGR_BYTE4_ADDRESS = RCC_MCO;
-}
-
-/*******************************************************************************
-* Function Name : RCC_GetFlagStatus
-* Description : Checks whether the specified RCC flag is set or not.
-* Input : - RCC_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - RCC_FLAG_HSIRDY: HSI oscillator clock ready
-* - RCC_FLAG_HSERDY: HSE oscillator clock ready
-* - RCC_FLAG_PLLRDY: PLL clock ready
-* - RCC_FLAG_LSERDY: LSE oscillator clock ready
-* - RCC_FLAG_LSIRDY: LSI oscillator clock ready
-* - RCC_FLAG_PINRST: Pin reset
-* - RCC_FLAG_PORRST: POR/PDR reset
-* - RCC_FLAG_SFTRST: Software reset
-* - RCC_FLAG_IWDGRST: Independent Watchdog reset
-* - RCC_FLAG_WWDGRST: Window Watchdog reset
-* - RCC_FLAG_LPWRRST: Low Power reset
-* Output : None
-* Return : The new state of RCC_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus RCC_GetFlagStatus(u8 RCC_FLAG)
-{
- u32 tmp = 0;
- u32 statusreg = 0;
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_RCC_FLAG(RCC_FLAG));
-
- /* Get the RCC register index */
- tmp = RCC_FLAG >> 5;
-
- if (tmp == 1) /* The flag to check is in CR register */
- {
- statusreg = RCC->CR;
- }
- else if (tmp == 2) /* The flag to check is in BDCR register */
- {
- statusreg = RCC->BDCR;
- }
- else /* The flag to check is in CSR register */
- {
- statusreg = RCC->CSR;
- }
-
- /* Get the flag position */
- tmp = RCC_FLAG & FLAG_Mask;
-
- if ((statusreg & ((u32)1 << tmp)) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
-
- /* Return the flag status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : RCC_ClearFlag
-* Description : Clears the RCC reset flags.
-* The reset flags are: RCC_FLAG_PINRST, RCC_FLAG_PORRST,
-* RCC_FLAG_SFTRST, RCC_FLAG_IWDGRST, RCC_FLAG_WWDGRST,
-* RCC_FLAG_LPWRRST
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_ClearFlag(void)
-{
- /* Set RMVF bit to clear the reset flags */
- RCC->CSR |= CSR_RMVF_Set;
-}
-
-/*******************************************************************************
-* Function Name : RCC_GetITStatus
-* Description : Checks whether the specified RCC interrupt has occurred or not.
-* Input : - RCC_IT: specifies the RCC interrupt source to check.
-* This parameter can be one of the following values:
-* - RCC_IT_LSIRDY: LSI ready interrupt
-* - RCC_IT_LSERDY: LSE ready interrupt
-* - RCC_IT_HSIRDY: HSI ready interrupt
-* - RCC_IT_HSERDY: HSE ready interrupt
-* - RCC_IT_PLLRDY: PLL ready interrupt
-* - RCC_IT_CSS: Clock Security System interrupt
-* Output : None
-* Return : The new state of RCC_IT (SET or RESET).
-*******************************************************************************/
-ITStatus RCC_GetITStatus(u8 RCC_IT)
-{
- ITStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_RCC_GET_IT(RCC_IT));
-
- /* Check the status of the specified RCC interrupt */
- if ((RCC->CIR & RCC_IT) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
-
- /* Return the RCC_IT status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : RCC_ClearITPendingBit
-* Description : Clears the RCC’s interrupt pending bits.
-* Input : - RCC_IT: specifies the interrupt pending bit to clear.
-* This parameter can be any combination of the following values:
-* - RCC_IT_LSIRDY: LSI ready interrupt
-* - RCC_IT_LSERDY: LSE ready interrupt
-* - RCC_IT_HSIRDY: HSI ready interrupt
-* - RCC_IT_HSERDY: HSE ready interrupt
-* - RCC_IT_PLLRDY: PLL ready interrupt
-* - RCC_IT_CSS: Clock Security System interrupt
-* Output : None
-* Return : None
-*******************************************************************************/
-void RCC_ClearITPendingBit(u8 RCC_IT)
-{
- /* Check the parameters */
- assert_param(IS_RCC_CLEAR_IT(RCC_IT));
-
- /* Perform Byte access to RCC_CIR[23:16] bits to clear the selected interrupt
- pending bits */
- *(vu8 *) CIR_BYTE3_ADDRESS = RCC_IT;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_rtc.c b/stm32lib/src/stm32f10x_rtc.c
deleted file mode 100644
index 55a8bea..0000000
--- a/stm32lib/src/stm32f10x_rtc.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_rtc.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the RTC firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_rtc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define CRL_CNF_Set ((u16)0x0010) /* Configuration Flag Enable Mask */
-#define CRL_CNF_Reset ((u16)0xFFEF) /* Configuration Flag Disable Mask */
-#define RTC_LSB_Mask ((u32)0x0000FFFF) /* RTC LSB Mask */
-#define PRLH_MSB_Mask ((u32)0x000F0000) /* RTC Prescaler MSB Mask */
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : RTC_ITConfig
-* Description : Enables or disables the specified RTC interrupts.
-* Input : - RTC_IT: specifies the RTC interrupts sources to be enabled
-* or disabled.
-* This parameter can be any combination of the following values:
-* - RTC_IT_OW: Overflow interrupt
-* - RTC_IT_ALR: Alarm interrupt
-* - RTC_IT_SEC: Second interrupt
-* - NewState: new state of the specified RTC interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_ITConfig(u16 RTC_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_RTC_IT(RTC_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- RTC->CRH |= RTC_IT;
- }
- else
- {
- RTC->CRH &= (u16)~RTC_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : RTC_EnterConfigMode
-* Description : Enters the RTC configuration mode.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_EnterConfigMode(void)
-{
- /* Set the CNF flag to enter in the Configuration Mode */
- RTC->CRL |= CRL_CNF_Set;
-}
-
-/*******************************************************************************
-* Function Name : RTC_ExitConfigMode
-* Description : Exits from the RTC configuration mode.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_ExitConfigMode(void)
-{
- /* Reset the CNF flag to exit from the Configuration Mode */
- RTC->CRL &= CRL_CNF_Reset;
-}
-
-/*******************************************************************************
-* Function Name : RTC_GetCounter
-* Description : Gets the RTC counter value.
-* Input : None
-* Output : None
-* Return : RTC counter value.
-*******************************************************************************/
-u32 RTC_GetCounter(void)
-{
- u16 tmp = 0;
- tmp = RTC->CNTL;
-
- return (((u32)RTC->CNTH << 16 ) | tmp) ;
-}
-
-/*******************************************************************************
-* Function Name : RTC_SetCounter
-* Description : Sets the RTC counter value.
-* Input : - CounterValue: RTC counter new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_SetCounter(u32 CounterValue)
-{
- RTC_EnterConfigMode();
-
- /* Set RTC COUNTER MSB word */
- RTC->CNTH = CounterValue >> 16;
- /* Set RTC COUNTER LSB word */
- RTC->CNTL = (CounterValue & RTC_LSB_Mask);
-
- RTC_ExitConfigMode();
-}
-
-/*******************************************************************************
-* Function Name : RTC_SetPrescaler
-* Description : Sets the RTC prescaler value.
-* Input : - PrescalerValue: RTC prescaler new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_SetPrescaler(u32 PrescalerValue)
-{
- /* Check the parameters */
- assert_param(IS_RTC_PRESCALER(PrescalerValue));
-
- RTC_EnterConfigMode();
-
- /* Set RTC PRESCALER MSB word */
- RTC->PRLH = (PrescalerValue & PRLH_MSB_Mask) >> 16;
- /* Set RTC PRESCALER LSB word */
- RTC->PRLL = (PrescalerValue & RTC_LSB_Mask);
-
- RTC_ExitConfigMode();
-}
-
-/*******************************************************************************
-* Function Name : RTC_SetAlarm
-* Description : Sets the RTC alarm value.
-* Input : - AlarmValue: RTC alarm new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_SetAlarm(u32 AlarmValue)
-{
- RTC_EnterConfigMode();
-
- /* Set the ALARM MSB word */
- RTC->ALRH = AlarmValue >> 16;
- /* Set the ALARM LSB word */
- RTC->ALRL = (AlarmValue & RTC_LSB_Mask);
-
- RTC_ExitConfigMode();
-}
-
-/*******************************************************************************
-* Function Name : RTC_GetDivider
-* Description : Gets the RTC divider value.
-* Input : None
-* Output : None
-* Return : RTC Divider value.
-*******************************************************************************/
-u32 RTC_GetDivider(void)
-{
- u32 tmp = 0x00;
-
- tmp = ((u32)RTC->DIVH & (u32)0x000F) << 16;
- tmp |= RTC->DIVL;
-
- return tmp;
-}
-
-/*******************************************************************************
-* Function Name : RTC_WaitForLastTask
-* Description : Waits until last write operation on RTC registers has finished.
-* This function must be called before any write to RTC registers.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_WaitForLastTask(void)
-{
- /* Loop until RTOFF flag is set */
- while ((RTC->CRL & RTC_FLAG_RTOFF) == (u16)RESET)
- {
- }
-}
-
-/*******************************************************************************
-* Function Name : RTC_WaitForSynchro
-* Description : Waits until the RTC registers (RTC_CNT, RTC_ALR and RTC_PRL)
-* are synchronized with RTC APB clock.
-* This function must be called before any read operation after
-* an APB reset or an APB clock stop.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_WaitForSynchro(void)
-{
- /* Clear RSF flag */
- RTC->CRL &= (u16)~RTC_FLAG_RSF;
-
- /* Loop until RSF flag is set */
- while ((RTC->CRL & RTC_FLAG_RSF) == (u16)RESET)
- {
- }
-}
-
-/*******************************************************************************
-* Function Name : RTC_GetFlagStatus
-* Description : Checks whether the specified RTC flag is set or not.
-* Input : - RTC_FLAG: specifies the flag to check.
-* This parameter can be one the following values:
-* - RTC_FLAG_RTOFF: RTC Operation OFF flag
-* - RTC_FLAG_RSF: Registers Synchronized flag
-* - RTC_FLAG_OW: Overflow flag
-* - RTC_FLAG_ALR: Alarm flag
-* - RTC_FLAG_SEC: Second flag
-* Output : None
-* Return : The new state of RTC_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus RTC_GetFlagStatus(u16 RTC_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_RTC_GET_FLAG(RTC_FLAG));
-
- if ((RTC->CRL & RTC_FLAG) != (u16)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : RTC_ClearFlag
-* Description : Clears the RTC’s pending flags.
-* Input : - RTC_FLAG: specifies the flag to clear.
-* This parameter can be any combination of the following values:
-* - RTC_FLAG_RSF: Registers Synchronized flag. This flag
-* is cleared only after an APB reset or an APB Clock stop.
-* - RTC_FLAG_OW: Overflow flag
-* - RTC_FLAG_ALR: Alarm flag
-* - RTC_FLAG_SEC: Second flag
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_ClearFlag(u16 RTC_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_RTC_CLEAR_FLAG(RTC_FLAG));
-
- /* Clear the coressponding RTC flag */
- RTC->CRL &= (u16)~RTC_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : RTC_GetITStatus
-* Description : Checks whether the specified RTC interrupt has occured or not.
-* Input : - RTC_IT: specifies the RTC interrupts sources to check.
-* This parameter can be one of the following values:
-* - RTC_IT_OW: Overflow interrupt
-* - RTC_IT_ALR: Alarm interrupt
-* - RTC_IT_SEC: Second interrupt
-* Output : None
-* Return : The new state of the RTC_IT (SET or RESET).
-*******************************************************************************/
-ITStatus RTC_GetITStatus(u16 RTC_IT)
-{
- ITStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_RTC_GET_IT(RTC_IT));
-
- bitstatus = (ITStatus)(RTC->CRL & RTC_IT);
-
- if (((RTC->CRH & RTC_IT) != (u16)RESET) && (bitstatus != (u16)RESET))
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : RTC_ClearITPendingBit
-* Description : Clears the RTC’s interrupt pending bits.
-* Input : - RTC_IT: specifies the interrupt pending bit to clear.
-* This parameter can be any combination of the following values:
-* - RTC_IT_OW: Overflow interrupt
-* - RTC_IT_ALR: Alarm interrupt
-* - RTC_IT_SEC: Second interrupt
-* Output : None
-* Return : None
-*******************************************************************************/
-void RTC_ClearITPendingBit(u16 RTC_IT)
-{
- /* Check the parameters */
- assert_param(IS_RTC_IT(RTC_IT));
-
- /* Clear the coressponding RTC pending bit */
- RTC->CRL &= (u16)~RTC_IT;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_sdio.c b/stm32lib/src/stm32f10x_sdio.c
deleted file mode 100644
index b7da816..0000000
--- a/stm32lib/src/stm32f10x_sdio.c
+++ /dev/null
@@ -1,832 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_sdio.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the SDIO firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_sdio.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* ------------ SDIO registers bit address in the alias region ----------- */
-#define SDIO_OFFSET (SDIO_BASE - PERIPH_BASE)
-
-/* --- CLKCR Register ---*/
-/* Alias word address of CLKEN bit */
-#define CLKCR_OFFSET (SDIO_OFFSET + 0x04)
-#define CLKEN_BitNumber 0x08
-#define CLKCR_CLKEN_BB (PERIPH_BB_BASE + (CLKCR_OFFSET * 32) + (CLKEN_BitNumber * 4))
-
-/* --- CMD Register ---*/
-/* Alias word address of SDIOSUSPEND bit */
-#define CMD_OFFSET (SDIO_OFFSET + 0x0C)
-#define SDIOSUSPEND_BitNumber 0x0B
-#define CMD_SDIOSUSPEND_BB (PERIPH_BB_BASE + (CMD_OFFSET * 32) + (SDIOSUSPEND_BitNumber * 4))
-
-/* Alias word address of ENCMDCOMPL bit */
-#define ENCMDCOMPL_BitNumber 0x0C
-#define CMD_ENCMDCOMPL_BB (PERIPH_BB_BASE + (CMD_OFFSET * 32) + (ENCMDCOMPL_BitNumber * 4))
-
-/* Alias word address of NIEN bit */
-#define NIEN_BitNumber 0x0D
-#define CMD_NIEN_BB (PERIPH_BB_BASE + (CMD_OFFSET * 32) + (NIEN_BitNumber * 4))
-
-/* Alias word address of ATACMD bit */
-#define ATACMD_BitNumber 0x0E
-#define CMD_ATACMD_BB (PERIPH_BB_BASE + (CMD_OFFSET * 32) + (ATACMD_BitNumber * 4))
-
-/* --- DCTRL Register ---*/
-/* Alias word address of DMAEN bit */
-#define DCTRL_OFFSET (SDIO_OFFSET + 0x2C)
-#define DMAEN_BitNumber 0x03
-#define DCTRL_DMAEN_BB (PERIPH_BB_BASE + (DCTRL_OFFSET * 32) + (DMAEN_BitNumber * 4))
-
-/* Alias word address of RWSTART bit */
-#define RWSTART_BitNumber 0x08
-#define DCTRL_RWSTART_BB (PERIPH_BB_BASE + (DCTRL_OFFSET * 32) + (RWSTART_BitNumber * 4))
-
-/* Alias word address of RWSTOP bit */
-#define RWSTOP_BitNumber 0x09
-#define DCTRL_RWSTOP_BB (PERIPH_BB_BASE + (DCTRL_OFFSET * 32) + (RWSTOP_BitNumber * 4))
-
-/* Alias word address of RWMOD bit */
-#define RWMOD_BitNumber 0x0A
-#define DCTRL_RWMOD_BB (PERIPH_BB_BASE + (DCTRL_OFFSET * 32) + (RWMOD_BitNumber * 4))
-
-/* Alias word address of SDIOEN bit */
-#define SDIOEN_BitNumber 0x0B
-#define DCTRL_SDIOEN_BB (PERIPH_BB_BASE + (DCTRL_OFFSET * 32) + (SDIOEN_BitNumber * 4))
-
-
-/* ---------------------- SDIO registers bit mask ------------------------ */
-/* --- CLKCR Register ---*/
-/* CLKCR register clear mask */
-#define CLKCR_CLEAR_MASK ((u32)0xFFFF8100)
-
-/* --- PWRCTRL Register ---*/
-/* SDIO PWRCTRL Mask */
-#define PWR_PWRCTRL_MASK ((u32)0xFFFFFFFC)
-
-/* --- DCTRL Register ---*/
-/* SDIO DCTRL Clear Mask */
-#define DCTRL_CLEAR_MASK ((u32)0xFFFFFF08)
-
-/* --- CMD Register ---*/
-/* CMD Register clear mask */
-#define CMD_CLEAR_MASK ((u32)0xFFFFF800)
-
-/* SDIO RESP Registers Address */
-#define SDIO_RESP_ADDR ((u32)(SDIO_BASE + 0x14))
-
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : SDIO_DeInit
-* Description : Deinitializes the SDIO peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_DeInit(void)
-{
- SDIO->POWER = 0x00000000;
- SDIO->CLKCR = 0x00000000;
- SDIO->ARG = 0x00000000;
- SDIO->CMD = 0x00000000;
- SDIO->DTIMER = 0x00000000;
- SDIO->DLEN = 0x00000000;
- SDIO->DCTRL = 0x00000000;
- SDIO->ICR = 0x00C007FF;
- SDIO->MASK = 0x00000000;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_Init
-* Description : Initializes the SDIO peripheral according to the specified
-* parameters in the SDIO_InitStruct.
-* Input : SDIO_InitStruct : pointer to a SDIO_InitTypeDef structure
-* that contains the configuration information for the SDIO
-* peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_Init(SDIO_InitTypeDef* SDIO_InitStruct)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_SDIO_CLOCK_EDGE(SDIO_InitStruct->SDIO_ClockEdge));
- assert_param(IS_SDIO_CLOCK_BYPASS(SDIO_InitStruct->SDIO_ClockBypass));
- assert_param(IS_SDIO_CLOCK_POWER_SAVE(SDIO_InitStruct->SDIO_ClockPowerSave));
- assert_param(IS_SDIO_BUS_WIDE(SDIO_InitStruct->SDIO_BusWide));
- assert_param(IS_SDIO_HARDWARE_FLOW_CONTROL(SDIO_InitStruct->SDIO_HardwareFlowControl));
-
-/*---------------------------- SDIO CLKCR Configuration ------------------------*/
- /* Get the SDIO CLKCR value */
- tmpreg = SDIO->CLKCR;
-
- /* Clear CLKDIV, PWRSAV, BYPASS, WIDBUS, NEGEDGE, HWFC_EN bits */
- tmpreg &= CLKCR_CLEAR_MASK;
-
- /* Set CLKDIV bits according to SDIO_ClockDiv value */
- /* Set PWRSAV bit according to SDIO_ClockPowerSave value */
- /* Set BYPASS bit according to SDIO_ClockBypass value */
- /* Set WIDBUS bits according to SDIO_BusWide value */
- /* Set NEGEDGE bits according to SDIO_ClockEdge value */
- /* Set HWFC_EN bits according to SDIO_HardwareFlowControl value */
- tmpreg |= (SDIO_InitStruct->SDIO_ClockDiv | SDIO_InitStruct->SDIO_ClockPowerSave |
- SDIO_InitStruct->SDIO_ClockBypass | SDIO_InitStruct->SDIO_BusWide |
- SDIO_InitStruct->SDIO_ClockEdge | SDIO_InitStruct->SDIO_HardwareFlowControl);
-
- /* Write to SDIO CLKCR */
- SDIO->CLKCR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_StructInit
-* Description : Fills each SDIO_InitStruct member with its default value.
-* Input : SDIO_InitStruct: pointer to an SDIO_InitTypeDef structure which
-* will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_StructInit(SDIO_InitTypeDef* SDIO_InitStruct)
-{
- /* SDIO_InitStruct members default value */
- SDIO_InitStruct->SDIO_ClockDiv = 0x00;
- SDIO_InitStruct->SDIO_ClockEdge = SDIO_ClockEdge_Rising;
- SDIO_InitStruct->SDIO_ClockBypass = SDIO_ClockBypass_Disable;
- SDIO_InitStruct->SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable;
- SDIO_InitStruct->SDIO_BusWide = SDIO_BusWide_1b;
- SDIO_InitStruct->SDIO_HardwareFlowControl = SDIO_HardwareFlowControl_Disable;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_ClockCmd
-* Description : Enables or disables the SDIO Clock.
-* Input : NewState: new state of the SDIO Clock.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_ClockCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CLKCR_CLKEN_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_SetPowerState
-* Description : Sets the power status of the controller.
-* Input : SDIO_PowerState: new state of the Power state.
-* This parameter can be one of the following values:
-* - SDIO_PowerState_OFF
-* - SDIO_PowerState_ON
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_SetPowerState(u32 SDIO_PowerState)
-{
- /* Check the parameters */
- assert_param(IS_SDIO_POWER_STATE(SDIO_PowerState));
-
- SDIO->POWER &= PWR_PWRCTRL_MASK;
- SDIO->POWER |= SDIO_PowerState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetPowerState
-* Description : Gets the power status of the controller.
-* Input : None
-* Output : None
-* Return : Power status of the controller. The returned value can
-* be one of the following:
-* - 0x00: Power OFF
-* - 0x02: Power UP
-* - 0x03: Power ON
-*******************************************************************************/
-u32 SDIO_GetPowerState(void)
-{
- return (SDIO->POWER & (~PWR_PWRCTRL_MASK));
-}
-
-/*******************************************************************************
-* Function Name : SDIO_ITConfig
-* Description : Enables or disables the SDIO interrupts.
-* Input : - SDIO_IT: specifies the SDIO interrupt sources to be
-* enabled or disabled.
-* This parameter can be one or a combination of the following
-* values:
-* - SDIO_IT_CCRCFAIL: Command response received (CRC check
-* failed) interrupt
-* - SDIO_IT_DCRCFAIL: Data block sent/received (CRC check
-* failed) interrupt
-* - SDIO_IT_CTIMEOUT: Command response timeout interrupt
-* - SDIO_IT_DTIMEOUT: Data timeout interrupt
-* - SDIO_IT_TXUNDERR: Transmit FIFO underrun error interrupt
-* - SDIO_IT_RXOVERR: Received FIFO overrun error interrupt
-* - SDIO_IT_CMDREND: Command response received (CRC check
-* passed) interrupt
-* - SDIO_IT_CMDSENT: Command sent (no response required)
-* interrupt
-* - SDIO_IT_DATAEND: Data end (data counter, SDIDCOUNT, is
-* zero) interrupt
-* - SDIO_IT_STBITERR: Start bit not detected on all data
-* signals in wide bus mode interrupt
-* - SDIO_IT_DBCKEND: Data block sent/received (CRC check
-* passed) interrupt
-* - SDIO_IT_CMDACT: Command transfer in progress interrupt
-* - SDIO_IT_TXACT: Data transmit in progress interrupt
-* - SDIO_IT_RXACT: Data receive in progress interrupt
-* - SDIO_IT_TXFIFOHE: Transmit FIFO Half Empty interrupt
-* - SDIO_IT_RXFIFOHF: Receive FIFO Half Full interrupt
-* - SDIO_IT_TXFIFOF: Transmit FIFO full interrupt
-* - SDIO_IT_RXFIFOF: Receive FIFO full interrupt
-* - SDIO_IT_TXFIFOE: Transmit FIFO empty interrupt
-* - SDIO_IT_RXFIFOE: Receive FIFO empty interrupt
-* - SDIO_IT_TXDAVL: Data available in transmit FIFO interrupt
-* - SDIO_IT_RXDAVL: Data available in receive FIFO interrupt
-* - SDIO_IT_SDIOIT: SD I/O interrupt received interrupt
-* - SDIO_IT_CEATAEND: CE-ATA command completion signal
-* received for CMD61 interrupt
-* - NewState: new state of the specified SDIO interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_ITConfig(u32 SDIO_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_SDIO_IT(SDIO_IT));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the SDIO interrupts */
- SDIO->MASK |= SDIO_IT;
- }
- else
- {
- /* Disable the SDIO interrupts */
- SDIO->MASK &= ~SDIO_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : SDIO_DMACmd
-* Description : Enables or disables the SDIO DMA request.
-* Input : NewState: new state of the selected SDIO DMA request.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_DMACmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) DCTRL_DMAEN_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_SendCommand
-* Description : Initializes the SDIO Command according to the specified
-* parameters in the SDIO_CmdInitStruct and send the command.
-* Input : SDIO_CmdInitStruct : pointer to a SDIO_CmdInitTypeDef
-* structure that contains the configuration information
-* for the SDIO command.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_SendCommand(SDIO_CmdInitTypeDef *SDIO_CmdInitStruct)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_SDIO_CMD_INDEX(SDIO_CmdInitStruct->SDIO_CmdIndex));
- assert_param(IS_SDIO_RESPONSE(SDIO_CmdInitStruct->SDIO_Response));
- assert_param(IS_SDIO_WAIT(SDIO_CmdInitStruct->SDIO_Wait));
- assert_param(IS_SDIO_CPSM(SDIO_CmdInitStruct->SDIO_CPSM));
-
-/*---------------------------- SDIO ARG Configuration ------------------------*/
- /* Set the SDIO Argument value */
- SDIO->ARG = SDIO_CmdInitStruct->SDIO_Argument;
-
-/*---------------------------- SDIO CMD Configuration ------------------------*/
- /* Get the SDIO CMD value */
- tmpreg = SDIO->CMD;
-
- /* Clear CMDINDEX, WAITRESP, WAITINT, WAITPEND, CPSMEN bits */
- tmpreg &= CMD_CLEAR_MASK;
- /* Set CMDINDEX bits according to SDIO_CmdIndex value */
- /* Set WAITRESP bits according to SDIO_Response value */
- /* Set WAITINT and WAITPEND bits according to SDIO_Wait value */
- /* Set CPSMEN bits according to SDIO_CPSM value */
- tmpreg |= (u32)SDIO_CmdInitStruct->SDIO_CmdIndex | SDIO_CmdInitStruct->SDIO_Response
- | SDIO_CmdInitStruct->SDIO_Wait | SDIO_CmdInitStruct->SDIO_CPSM;
-
- /* Write to SDIO CMD */
- SDIO->CMD = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_CmdStructInit
-* Description : Fills each SDIO_CmdInitStruct member with its default value.
-* Input : SDIO_CmdInitStruct: pointer to an SDIO_CmdInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_CmdStructInit(SDIO_CmdInitTypeDef* SDIO_CmdInitStruct)
-{
- /* SDIO_CmdInitStruct members default value */
- SDIO_CmdInitStruct->SDIO_Argument = 0x00;
- SDIO_CmdInitStruct->SDIO_CmdIndex = 0x00;
- SDIO_CmdInitStruct->SDIO_Response = SDIO_Response_No;
- SDIO_CmdInitStruct->SDIO_Wait = SDIO_Wait_No;
- SDIO_CmdInitStruct->SDIO_CPSM = SDIO_CPSM_Disable;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetCommandResponse
-* Description : Returns command index of last command for which response
-* received.
-* Input : None
-* Output : None
-* Return : Returns the command index of the last command response received.
-*******************************************************************************/
-u8 SDIO_GetCommandResponse(void)
-{
- return (u8)(SDIO->RESPCMD);
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetResponse
-* Description : Returns response received from the card for the last command.
-* Input : - SDIO_RESP: Specifies the SDIO response register.
-* This parameter can be one of the following values:
-* - SDIO_RESP1: Response Register 1
-* - SDIO_RESP2: Response Register 2
-* - SDIO_RESP3: Response Register 3
-* - SDIO_RESP4: Response Register 4
-* Output : None
-* Return : The Corresponding response register value.
-*******************************************************************************/
-u32 SDIO_GetResponse(u32 SDIO_RESP)
-{
- /* Check the parameters */
- assert_param(IS_SDIO_RESP(SDIO_RESP));
-
- return (*(vu32 *)(SDIO_RESP_ADDR + SDIO_RESP));
-}
-
-/*******************************************************************************
-* Function Name : SDIO_DataConfig
-* Description : Initializes the SDIO data path according to the specified
-* parameters in the SDIO_DataInitStruct.
-* Input : SDIO_DataInitStruct : pointer to a SDIO_DataInitTypeDef
-* structure that contains the configuration information
-* for the SDIO command.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_DataConfig(SDIO_DataInitTypeDef* SDIO_DataInitStruct)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_SDIO_DATA_LENGTH(SDIO_DataInitStruct->SDIO_DataLength));
- assert_param(IS_SDIO_BLOCK_SIZE(SDIO_DataInitStruct->SDIO_DataBlockSize));
- assert_param(IS_SDIO_TRANSFER_DIR(SDIO_DataInitStruct->SDIO_TransferDir));
- assert_param(IS_SDIO_TRANSFER_MODE(SDIO_DataInitStruct->SDIO_TransferMode));
- assert_param(IS_SDIO_DPSM(SDIO_DataInitStruct->SDIO_DPSM));
-
-/*---------------------------- SDIO DTIMER Configuration ---------------------*/
- /* Set the SDIO Data TimeOut value */
- SDIO->DTIMER = SDIO_DataInitStruct->SDIO_DataTimeOut;
-
-/*---------------------------- SDIO DLEN Configuration -----------------------*/
- /* Set the SDIO DataLength value */
- SDIO->DLEN = SDIO_DataInitStruct->SDIO_DataLength;
-
-/*---------------------------- SDIO DCTRL Configuration ----------------------*/
- /* Get the SDIO DCTRL value */
- tmpreg = SDIO->DCTRL;
-
- /* Clear DEN, DTMODE, DTDIR and DBCKSIZE bits */
- tmpreg &= DCTRL_CLEAR_MASK;
- /* Set DEN bit according to SDIO_DPSM value */
- /* Set DTMODE bit according to SDIO_TransferMode value */
- /* Set DTDIR bit according to SDIO_TransferDir value */
- /* Set DBCKSIZE bits according to SDIO_DataBlockSize value */
- tmpreg |= (u32)SDIO_DataInitStruct->SDIO_DataBlockSize | SDIO_DataInitStruct->SDIO_TransferDir
- | SDIO_DataInitStruct->SDIO_TransferMode | SDIO_DataInitStruct->SDIO_DPSM;
-
- /* Write to SDIO DCTRL */
- SDIO->DCTRL = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_DataStructInit
-* Description : Fills each SDIO_DataInitStruct member with its default value.
-* Input : SDIO_DataInitStruct: pointer to an SDIO_DataInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_DataStructInit(SDIO_DataInitTypeDef* SDIO_DataInitStruct)
-{
- /* SDIO_DataInitStruct members default value */
- SDIO_DataInitStruct->SDIO_DataTimeOut = 0xFFFFFFFF;
- SDIO_DataInitStruct->SDIO_DataLength = 0x00;
- SDIO_DataInitStruct->SDIO_DataBlockSize = SDIO_DataBlockSize_1b;
- SDIO_DataInitStruct->SDIO_TransferDir = SDIO_TransferDir_ToCard;
- SDIO_DataInitStruct->SDIO_TransferMode = SDIO_TransferMode_Block;
- SDIO_DataInitStruct->SDIO_DPSM = SDIO_DPSM_Disable;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetDataCounter
-* Description : Returns number of remaining data bytes to be transferred.
-* Input : None
-* Output : None
-* Return : Number of remaining data bytes to be transferred
-*******************************************************************************/
-u32 SDIO_GetDataCounter(void)
-{
- return SDIO->DCOUNT;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_ReadData
-* Description : Read one data word from Rx FIFO.
-* Input : None
-* Output : None
-* Return : Data received
-*******************************************************************************/
-u32 SDIO_ReadData(void)
-{
- return SDIO->FIFO;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_WriteData
-* Description : Write one data word to Tx FIFO.
-* Input : Data: 32-bit data word to write.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_WriteData(u32 Data)
-{
- SDIO->FIFO = Data;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetFIFOCount
-* Description : Returns the number of words left to be written to or read
-* from FIFO.
-* Input : None
-* Output : None
-* Return : Remaining number of words.
-*******************************************************************************/
-u32 SDIO_GetFIFOCount(void)
-{
- return SDIO->FIFOCNT;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_StartSDIOReadWait
-* Description : Starts the SD I/O Read Wait operation.
-* Input : NewState: new state of the Start SDIO Read Wait operation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_StartSDIOReadWait(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) DCTRL_RWSTART_BB = (u32) NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_StopSDIOReadWait
-* Description : Stops the SD I/O Read Wait operation.
-* Input : NewState: new state of the Stop SDIO Read Wait operation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_StopSDIOReadWait(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) DCTRL_RWSTOP_BB = (u32) NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_SetSDIOReadWaitMode
-* Description : Sets one of the two options of inserting read wait interval.
-* Input : SDIOReadWaitMode: SD I/O Read Wait operation mode.
-* This parametre can be:
-* - SDIO_ReadWaitMode_CLK: Read Wait control by stopping SDIOCLK
-* - SDIO_ReadWaitMode_DATA2: Read Wait control using SDIO_DATA2
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_SetSDIOReadWaitMode(u32 SDIO_ReadWaitMode)
-{
- /* Check the parameters */
- assert_param(IS_SDIO_READWAIT_MODE(SDIO_ReadWaitMode));
-
- *(vu32 *) DCTRL_RWMOD_BB = SDIO_ReadWaitMode;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_SetSDIOOperation
-* Description : Enables or disables the SD I/O Mode Operation.
-* Input : NewState: new state of SDIO specific operation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_SetSDIOOperation(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) DCTRL_SDIOEN_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_SendSDIOSuspendCmd
-* Description : Enables or disables the SD I/O Mode suspend command sending.
-* Input : NewState: new state of the SD I/O Mode suspend command.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_SendSDIOSuspendCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CMD_SDIOSUSPEND_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_CommandCompletionCmd
-* Description : Enables or disables the command completion signal.
-* Input : NewState: new state of command completion signal.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_CommandCompletionCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CMD_ENCMDCOMPL_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_CEATAITCmd
-* Description : Enables or disables the CE-ATA interrupt.
-* Input : NewState: new state of CE-ATA interrupt.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_CEATAITCmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CMD_NIEN_BB = (u32)((~((u32)NewState)) & ((u32)0x1));
-}
-
-/*******************************************************************************
-* Function Name : SDIO_SendCEATACmd
-* Description : Sends CE-ATA command (CMD61).
-* Input : NewState: new state of CE-ATA command.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_SendCEATACmd(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- *(vu32 *) CMD_ATACMD_BB = (u32)NewState;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetFlagStatus
-* Description : Checks whether the specified SDIO flag is set or not.
-* Input : SDIO_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - SDIO_FLAG_CCRCFAIL: Command response received (CRC check
-* failed)
-* - SDIO_FLAG_DCRCFAIL: Data block sent/received (CRC check
-* failed)
-* - SDIO_FLAG_CTIMEOUT: Command response timeout
-* - SDIO_FLAG_DTIMEOUT: Data timeou
-* - SDIO_FLAG_TXUNDERR: Transmit FIFO underrun error
-* - SDIO_FLAG_RXOVERR: Received FIFO overrun error
-* - SDIO_FLAG_CMDREND: Command response received (CRC check
-* passed)
-* - SDIO_FLAG_CMDSENT: Command sent (no response required)
-* - SDIO_FLAG_DATAEND: Data end (data counter, SDIDCOUNT, is
-* zero)
-* - SDIO_FLAG_STBITERR: Start bit not detected on all data
-* signals in wide bus mode
-* - SDIO_FLAG_DBCKEND: Data block sent/received (CRC check
-* passed)
-* - SDIO_FLAG_CMDACT: Command transfer in progress
-* - SDIO_FLAG_TXACT: Data transmit in progress
-* - SDIO_FLAG_RXACT: Data receive in progress
-* - SDIO_FLAG_TXFIFOHE: Transmit FIFO Half Empty
-* - SDIO_FLAG_RXFIFOHF: Receive FIFO Half Full
-* - SDIO_FLAG_TXFIFOF: Transmit FIFO full
-* - SDIO_FLAG_RXFIFOF: Receive FIFO full
-* - SDIO_FLAG_TXFIFOE: Transmit FIFO empty
-* - SDIO_FLAG_RXFIFOE: Receive FIFO empty
-* - SDIO_FLAG_TXDAVL: Data available in transmit FIFO
-* - SDIO_FLAG_RXDAVL: Data available in receive FIFO
-* - SDIO_FLAG_SDIOIT: SD I/O interrupt received
-* - SDIO_FLAG_CEATAEND: CE-ATA command completion signal
-* received for CMD61
-* Output : None
-* Return : The new state of SDIO_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus SDIO_GetFlagStatus(u32 SDIO_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_SDIO_FLAG(SDIO_FLAG));
-
- if ((SDIO->STA & SDIO_FLAG) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_ClearFlag
-* Description : Clears the SDIO's pending flags.
-* Input : SDIO_FLAG: specifies the flag to clear.
-* This parameter can be one or a combination of the following
-* values:
-* - SDIO_FLAG_CCRCFAIL: Command response received (CRC check
-* failed)
-* - SDIO_FLAG_DCRCFAIL: Data block sent/received (CRC check
-* failed)
-* - SDIO_FLAG_CTIMEOUT: Command response timeout
-* - SDIO_FLAG_DTIMEOUT: Data timeou
-* - SDIO_FLAG_TXUNDERR: Transmit FIFO underrun error
-* - SDIO_FLAG_RXOVERR: Received FIFO overrun error
-* - SDIO_FLAG_CMDREND: Command response received (CRC check
-* passed)
-* - SDIO_FLAG_CMDSENT: Command sent (no response required)
-* - SDIO_FLAG_DATAEND: Data end (data counter, SDIDCOUNT, is
-* zero)
-* - SDIO_FLAG_STBITERR: Start bit not detected on all data
-* signals in wide bus mode
-* - SDIO_FLAG_DBCKEND: Data block sent/received (CRC check
-* passed)
-* - SDIO_FLAG_SDIOIT: SD I/O interrupt received
-* - SDIO_FLAG_CEATAEND: CE-ATA command completion signal
-* received for CMD61
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_ClearFlag(u32 SDIO_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_SDIO_CLEAR_FLAG(SDIO_FLAG));
-
- SDIO->ICR = SDIO_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_GetITStatus
-* Description : Checks whether the specified SDIO interrupt has occurred or not.
-* Input : SDIO_IT: specifies the SDIO interrupt source to check.
-* This parameter can be one of the following values:
-* - SDIO_IT_CCRCFAIL: Command response received (CRC check
-* failed) interrupt
-* - SDIO_IT_DCRCFAIL: Data block sent/received (CRC check
-* failed) interrupt
-* - SDIO_IT_CTIMEOUT: Command response timeout interrupt
-* - SDIO_IT_DTIMEOUT: Data timeout interrupt
-* - SDIO_IT_TXUNDERR: Transmit FIFO underrun error interrupt
-* - SDIO_IT_RXOVERR: Received FIFO overrun error interrupt
-* - SDIO_IT_CMDREND: Command response received (CRC check
-* passed) interrupt
-* - SDIO_IT_CMDSENT: Command sent (no response required)
-* interrupt
-* - SDIO_IT_DATAEND: Data end (data counter, SDIDCOUNT, is
-* zero) interrupt
-* - SDIO_IT_STBITERR: Start bit not detected on all data
-* signals in wide bus mode interrupt
-* - SDIO_IT_DBCKEND: Data block sent/received (CRC check
-* passed) interrupt
-* - SDIO_IT_CMDACT: Command transfer in progress interrupt
-* - SDIO_IT_TXACT: Data transmit in progress interrupt
-* - SDIO_IT_RXACT: Data receive in progress interrupt
-* - SDIO_IT_TXFIFOHE: Transmit FIFO Half Empty interrupt
-* - SDIO_IT_RXFIFOHF: Receive FIFO Half Full interrupt
-* - SDIO_IT_TXFIFOF: Transmit FIFO full interrupt
-* - SDIO_IT_RXFIFOF: Receive FIFO full interrupt
-* - SDIO_IT_TXFIFOE: Transmit FIFO empty interrupt
-* - SDIO_IT_RXFIFOE: Receive FIFO empty interrupt
-* - SDIO_IT_TXDAVL: Data available in transmit FIFO interrupt
-* - SDIO_IT_RXDAVL: Data available in receive FIFO interrupt
-* - SDIO_IT_SDIOIT: SD I/O interrupt received interrupt
-* - SDIO_IT_CEATAEND: CE-ATA command completion signal
-* received for CMD61 interrupt
-* Output : None
-* Return : The new state of SDIO_IT (SET or RESET).
-*******************************************************************************/
-ITStatus SDIO_GetITStatus(u32 SDIO_IT)
-{
- ITStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_SDIO_GET_IT(SDIO_IT));
-
- if ((SDIO->STA & SDIO_IT) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : SDIO_ClearITPendingBit
-* Description : Clears the SDIO’s interrupt pending bits.
-* Input : SDIO_IT: specifies the interrupt pending bit to clear.
-* This parameter can be one or a combination of the following
-* values:
-* - SDIO_IT_CCRCFAIL: Command response received (CRC check
-* failed) interrupt
-* - SDIO_IT_DCRCFAIL: Data block sent/received (CRC check
-* failed) interrupt
-* - SDIO_IT_CTIMEOUT: Command response timeout interrupt
-* - SDIO_IT_DTIMEOUT: Data timeout interrupt
-* - SDIO_IT_TXUNDERR: Transmit FIFO underrun error interrupt
-* - SDIO_IT_RXOVERR: Received FIFO overrun error interrupt
-* - SDIO_IT_CMDREND: Command response received (CRC check
-* passed) interrupt
-* - SDIO_IT_CMDSENT: Command sent (no response required)
-* interrupt
-* - SDIO_IT_DATAEND: Data end (data counter, SDIDCOUNT, is
-* zero) interrupt
-* - SDIO_IT_STBITERR: Start bit not detected on all data
-* signals in wide bus mode interrupt
-* - SDIO_IT_SDIOIT: SD I/O interrupt received interrupt
-* - SDIO_IT_CEATAEND: CE-ATA command completion signal
-* received for CMD61
-* Output : None
-* Return : None
-*******************************************************************************/
-void SDIO_ClearITPendingBit(u32 SDIO_IT)
-{
- /* Check the parameters */
- assert_param(IS_SDIO_CLEAR_IT(SDIO_IT));
-
- SDIO->ICR = SDIO_IT;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_spi.c b/stm32lib/src/stm32f10x_spi.c
deleted file mode 100644
index d914c09..0000000
--- a/stm32lib/src/stm32f10x_spi.c
+++ /dev/null
@@ -1,863 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_spi.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the SPI firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_spi.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* SPI SPE mask */
-#define CR1_SPE_Set ((u16)0x0040)
-#define CR1_SPE_Reset ((u16)0xFFBF)
-
-/* I2S I2SE mask */
-#define I2SCFGR_I2SE_Set ((u16)0x0400)
-#define I2SCFGR_I2SE_Reset ((u16)0xFBFF)
-
-/* SPI CRCNext mask */
-#define CR1_CRCNext_Set ((u16)0x1000)
-
-/* SPI CRCEN mask */
-#define CR1_CRCEN_Set ((u16)0x2000)
-#define CR1_CRCEN_Reset ((u16)0xDFFF)
-
-/* SPI SSOE mask */
-#define CR2_SSOE_Set ((u16)0x0004)
-#define CR2_SSOE_Reset ((u16)0xFFFB)
-
-/* SPI registers Masks */
-#define CR1_CLEAR_Mask ((u16)0x3040)
-#define I2SCFGR_CLEAR_Mask ((u16)0xF040)
-
-/* SPI or I2S mode selection masks */
-#define SPI_Mode_Select ((u16)0xF7FF)
-#define I2S_Mode_Select ((u16)0x0800)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : SPI_I2S_DeInit
-* Description : Deinitializes the SPIx peripheral registers to their default
-* reset values (Affects also the I2Ss).
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_I2S_DeInit(SPI_TypeDef* SPIx)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
-
- switch (*(u32*)&SPIx)
- {
- case SPI1_BASE:
- /* Enable SPI1 reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_SPI1, ENABLE);
- /* Release SPI1 from reset state */
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_SPI1, DISABLE);
- break;
-
- case SPI2_BASE:
- /* Enable SPI2 reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_SPI2, ENABLE);
- /* Release SPI2 from reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_SPI2, DISABLE);
- break;
-
- case SPI3_BASE:
- /* Enable SPI3 reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_SPI3, ENABLE);
- /* Release SPI3 from reset state */
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_SPI3, DISABLE);
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_Init
-* Description : Initializes the SPIx peripheral according to the specified
-* parameters in the SPI_InitStruct.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - SPI_InitStruct: pointer to a SPI_InitTypeDef structure that
-* contains the configuration information for the specified
-* SPI peripheral.
-* Output : None
-* Return : None
-******************************************************************************/
-void SPI_Init(SPI_TypeDef* SPIx, SPI_InitTypeDef* SPI_InitStruct)
-{
- u16 tmpreg = 0;
-
- /* check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
-
- /* Check the SPI parameters */
- assert_param(IS_SPI_DIRECTION_MODE(SPI_InitStruct->SPI_Direction));
- assert_param(IS_SPI_MODE(SPI_InitStruct->SPI_Mode));
- assert_param(IS_SPI_DATASIZE(SPI_InitStruct->SPI_DataSize));
- assert_param(IS_SPI_CPOL(SPI_InitStruct->SPI_CPOL));
- assert_param(IS_SPI_CPHA(SPI_InitStruct->SPI_CPHA));
- assert_param(IS_SPI_NSS(SPI_InitStruct->SPI_NSS));
- assert_param(IS_SPI_BAUDRATE_PRESCALER(SPI_InitStruct->SPI_BaudRatePrescaler));
- assert_param(IS_SPI_FIRST_BIT(SPI_InitStruct->SPI_FirstBit));
- assert_param(IS_SPI_CRC_POLYNOMIAL(SPI_InitStruct->SPI_CRCPolynomial));
-
-/*---------------------------- SPIx CR1 Configuration ------------------------*/
- /* Get the SPIx CR1 value */
- tmpreg = SPIx->CR1;
- /* Clear BIDIMode, BIDIOE, RxONLY, SSM, SSI, LSBFirst, BR, MSTR, CPOL and CPHA bits */
- tmpreg &= CR1_CLEAR_Mask;
- /* Configure SPIx: direction, NSS management, first transmitted bit, BaudRate prescaler
- master/salve mode, CPOL and CPHA */
- /* Set BIDImode, BIDIOE and RxONLY bits according to SPI_Direction value */
- /* Set SSM, SSI and MSTR bits according to SPI_Mode and SPI_NSS values */
- /* Set LSBFirst bit according to SPI_FirstBit value */
- /* Set BR bits according to SPI_BaudRatePrescaler value */
- /* Set CPOL bit according to SPI_CPOL value */
- /* Set CPHA bit according to SPI_CPHA value */
- tmpreg |= (u16)((u32)SPI_InitStruct->SPI_Direction | SPI_InitStruct->SPI_Mode |
- SPI_InitStruct->SPI_DataSize | SPI_InitStruct->SPI_CPOL |
- SPI_InitStruct->SPI_CPHA | SPI_InitStruct->SPI_NSS |
- SPI_InitStruct->SPI_BaudRatePrescaler | SPI_InitStruct->SPI_FirstBit);
- /* Write to SPIx CR1 */
- SPIx->CR1 = tmpreg;
-
- /* Activate the SPI mode (Reset I2SMOD bit in I2SCFGR register) */
- SPIx->I2SCFGR &= SPI_Mode_Select;
-
-/*---------------------------- SPIx CRCPOLY Configuration --------------------*/
- /* Write to SPIx CRCPOLY */
- SPIx->CRCPR = SPI_InitStruct->SPI_CRCPolynomial;
-}
-
-/*******************************************************************************
-* Function Name : I2S_Init
-* Description : Initializes the SPIx peripheral according to the specified
-* parameters in the I2S_InitStruct.
-* Input : - SPIx: where x can be 2 or 3 to select the SPI peripheral
-* (configured in I2S mode).
-* - I2S_InitStruct: pointer to an I2S_InitTypeDef structure that
-* contains the configuration information for the specified
-* SPI peripheral configured in I2S mode.
-* Output : None
-* Return : None
-******************************************************************************/
-void I2S_Init(SPI_TypeDef* SPIx, I2S_InitTypeDef* I2S_InitStruct)
-{
- u16 tmpreg = 0, i2sdiv = 2, i2sodd = 0, packetlength = 1;
- u32 tmp = 0;
- RCC_ClocksTypeDef RCC_Clocks;
-
- /* Check the I2S parameters */
- assert_param(IS_SPI_23_PERIPH(SPIx));
- assert_param(IS_I2S_MODE(I2S_InitStruct->I2S_Mode));
- assert_param(IS_I2S_STANDARD(I2S_InitStruct->I2S_Standard));
- assert_param(IS_I2S_DATA_FORMAT(I2S_InitStruct->I2S_DataFormat));
- assert_param(IS_I2S_MCLK_OUTPUT(I2S_InitStruct->I2S_MCLKOutput));
- assert_param(IS_I2S_AUDIO_FREQ(I2S_InitStruct->I2S_AudioFreq));
- assert_param(IS_I2S_CPOL(I2S_InitStruct->I2S_CPOL));
-
-/*----------------------- SPIx I2SCFGR & I2SPR Configuration -----------------*/
-
- /* Clear I2SMOD, I2SE, I2SCFG, PCMSYNC, I2SSTD, CKPOL, DATLEN and CHLEN bits */
- SPIx->I2SCFGR &= I2SCFGR_CLEAR_Mask;
- SPIx->I2SPR = 0x0002;
-
- /* Get the I2SCFGR register value */
- tmpreg = SPIx->I2SCFGR;
-
- /* If the default value has to be written, reinitialize i2sdiv and i2sodd*/
- if(I2S_InitStruct->I2S_AudioFreq == I2S_AudioFreq_Default)
- {
- i2sodd = (u16)0;
- i2sdiv = (u16)2;
- }
- /* If the requested audio frequency is not the default, compute the prescaler */
- else
- {
- /* Check the frame length (For the Prescaler computing) */
- if(I2S_InitStruct->I2S_DataFormat == I2S_DataFormat_16b)
- {
- /* Packet length is 16 bits */
- packetlength = 1;
- }
- else
- {
- /* Packet length is 32 bits */
- packetlength = 2;
- }
- /* Get System Clock frequency */
- RCC_GetClocksFreq(&RCC_Clocks);
-
- /* Compute the Real divider depending on the MCLK output state with a flaoting point */
- if(I2S_InitStruct->I2S_MCLKOutput == I2S_MCLKOutput_Enable)
- {
- /* MCLK output is enabled */
- tmp = (u16)(((10 * RCC_Clocks.SYSCLK_Frequency) / (256 * I2S_InitStruct->I2S_AudioFreq)) + 5);
- }
- else
- {
- /* MCLK output is disabled */
- tmp = (u16)(((10 * RCC_Clocks.SYSCLK_Frequency) / (32 * packetlength * I2S_InitStruct->I2S_AudioFreq)) + 5);
- }
-
- /* Remove the flaoting point */
- tmp = tmp/10;
-
- /* Check the parity of the divider */
- i2sodd = (u16)(tmp & (u16)0x0001);
-
- /* Compute the i2sdiv prescaler */
- i2sdiv = (u16)((tmp - i2sodd) / 2);
-
- /* Get the Mask for the Odd bit (SPI_I2SPR[8]) register */
- i2sodd = (u16) (i2sodd << 8);
- }
-
- /* Test if the divider is 1 or 0 */
- if ((i2sdiv < 2) || (i2sdiv > 0xFF))
- {
- /* Set the default values */
- i2sdiv = 2;
- i2sodd = 0;
- }
-
- /* Write to SPIx I2SPR register the computed value */
- SPIx->I2SPR = (u16)(i2sdiv | i2sodd | I2S_InitStruct->I2S_MCLKOutput);
-
- /* Configure the I2S with the SPI_InitStruct values */
- tmpreg |= (u16)(I2S_Mode_Select | I2S_InitStruct->I2S_Mode | \
- I2S_InitStruct->I2S_Standard | I2S_InitStruct->I2S_DataFormat | \
- I2S_InitStruct->I2S_CPOL);
-
- /* Write to SPIx I2SCFGR */
- SPIx->I2SCFGR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : SPI_StructInit
-* Description : Fills each SPI_InitStruct member with its default value.
-* Input : - SPI_InitStruct : pointer to a SPI_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_StructInit(SPI_InitTypeDef* SPI_InitStruct)
-{
-/*--------------- Reset SPI init structure parameters values -----------------*/
- /* Initialize the SPI_Direction member */
- SPI_InitStruct->SPI_Direction = SPI_Direction_2Lines_FullDuplex;
-
- /* initialize the SPI_Mode member */
- SPI_InitStruct->SPI_Mode = SPI_Mode_Slave;
-
- /* initialize the SPI_DataSize member */
- SPI_InitStruct->SPI_DataSize = SPI_DataSize_8b;
-
- /* Initialize the SPI_CPOL member */
- SPI_InitStruct->SPI_CPOL = SPI_CPOL_Low;
-
- /* Initialize the SPI_CPHA member */
- SPI_InitStruct->SPI_CPHA = SPI_CPHA_1Edge;
-
- /* Initialize the SPI_NSS member */
- SPI_InitStruct->SPI_NSS = SPI_NSS_Hard;
-
- /* Initialize the SPI_BaudRatePrescaler member */
- SPI_InitStruct->SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_2;
-
- /* Initialize the SPI_FirstBit member */
- SPI_InitStruct->SPI_FirstBit = SPI_FirstBit_MSB;
-
- /* Initialize the SPI_CRCPolynomial member */
- SPI_InitStruct->SPI_CRCPolynomial = 7;
-}
-
-/*******************************************************************************
-* Function Name : I2S_StructInit
-* Description : Fills each I2S_InitStruct member with its default value.
-* Input : - I2S_InitStruct : pointer to a I2S_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2S_StructInit(I2S_InitTypeDef* I2S_InitStruct)
-{
-/*--------------- Reset I2S init structure parameters values -----------------*/
- /* Initialize the I2S_Mode member */
- I2S_InitStruct->I2S_Mode = I2S_Mode_SlaveTx;
-
- /* Initialize the I2S_Standard member */
- I2S_InitStruct->I2S_Standard = I2S_Standard_Phillips;
-
- /* Initialize the I2S_DataFormat member */
- I2S_InitStruct->I2S_DataFormat = I2S_DataFormat_16b;
-
- /* Initialize the I2S_MCLKOutput member */
- I2S_InitStruct->I2S_MCLKOutput = I2S_MCLKOutput_Disable;
-
- /* Initialize the I2S_AudioFreq member */
- I2S_InitStruct->I2S_AudioFreq = I2S_AudioFreq_Default;
-
- /* Initialize the I2S_CPOL member */
- I2S_InitStruct->I2S_CPOL = I2S_CPOL_Low;
-}
-
-/*******************************************************************************
-* Function Name : SPI_Cmd
-* Description : Enables or disables the specified SPI peripheral.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - NewState: new state of the SPIx peripheral.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_Cmd(SPI_TypeDef* SPIx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected SPI peripheral */
- SPIx->CR1 |= CR1_SPE_Set;
- }
- else
- {
- /* Disable the selected SPI peripheral */
- SPIx->CR1 &= CR1_SPE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : I2S_Cmd
-* Description : Enables or disables the specified SPI peripheral (in I2S mode).
-* Input : - SPIx: where x can be 2 or 3 to select the SPI peripheral.
-* - NewState: new state of the SPIx peripheral.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void I2S_Cmd(SPI_TypeDef* SPIx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_SPI_23_PERIPH(SPIx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected SPI peripheral (in I2S mode) */
- SPIx->I2SCFGR |= I2SCFGR_I2SE_Set;
- }
- else
- {
- /* Disable the selected SPI peripheral (in I2S mode) */
- SPIx->I2SCFGR &= I2SCFGR_I2SE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_ITConfig
-* Description : Enables or disables the specified SPI/I2S interrupts.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - 2 or 3 in I2S mode
-* - SPI_I2S_IT: specifies the SPI/I2S interrupt source to be
-* enabled or disabled.
-* This parameter can be one of the following values:
-* - SPI_I2S_IT_TXE: Tx buffer empty interrupt mask
-* - SPI_I2S_IT_RXNE: Rx buffer not empty interrupt mask
-* - SPI_I2S_IT_ERR: Error interrupt mask
-* - NewState: new state of the specified SPI/I2S interrupt.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_I2S_ITConfig(SPI_TypeDef* SPIx, u8 SPI_I2S_IT, FunctionalState NewState)
-{
- u16 itpos = 0, itmask = 0 ;
-
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
- assert_param(IS_SPI_I2S_CONFIG_IT(SPI_I2S_IT));
-
- /* Get the SPI/I2S IT index */
- itpos = SPI_I2S_IT >> 4;
- /* Set the IT mask */
- itmask = (u16)((u16)1 << itpos);
-
- if (NewState != DISABLE)
- {
- /* Enable the selected SPI/I2S interrupt */
- SPIx->CR2 |= itmask;
- }
- else
- {
- /* Disable the selected SPI/I2S interrupt */
- SPIx->CR2 &= (u16)~itmask;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_DMACmd
-* Description : Enables or disables the SPIx/I2Sx DMA interface.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - 2 or 3 in I2S mode
-* - SPI_I2S_DMAReq: specifies the SPI/I2S DMA transfer request
-* to be enabled or disabled.
-* This parameter can be any combination of the following values:
-* - SPI_I2S_DMAReq_Tx: Tx buffer DMA transfer request
-* - SPI_I2S_DMAReq_Rx: Rx buffer DMA transfer request
-* - NewState: new state of the selected SPI/I2S DMA transfer
-* request.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_I2S_DMACmd(SPI_TypeDef* SPIx, u16 SPI_I2S_DMAReq, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
- assert_param(IS_SPI_I2S_DMAREQ(SPI_I2S_DMAReq));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected SPI/I2S DMA requests */
- SPIx->CR2 |= SPI_I2S_DMAReq;
- }
- else
- {
- /* Disable the selected SPI/I2S DMA requests */
- SPIx->CR2 &= (u16)~SPI_I2S_DMAReq;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_SendData
-* Description : Transmits a Data through the SPIx/I2Sx peripheral.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - 2 or 3 in I2S mode
-* - Data : Data to be transmitted..
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_I2S_SendData(SPI_TypeDef* SPIx, u16 Data)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
-
- /* Write in the DR register the data to be sent */
- SPIx->DR = Data;
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_ReceiveData
-* Description : Returns the most recent received data by the SPIx/I2Sx peripheral.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - 2 or 3 in I2S mode
-* Output : None
-* Return : The value of the received data.
-*******************************************************************************/
-u16 SPI_I2S_ReceiveData(SPI_TypeDef* SPIx)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
-
- /* Return the data in the DR register */
- return SPIx->DR;
-}
-
-/*******************************************************************************
-* Function Name : SPI_NSSInternalSoftwareConfig
-* Description : Configures internally by software the NSS pin for the selected
-* SPI.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - SPI_NSSInternalSoft: specifies the SPI NSS internal state.
-* This parameter can be one of the following values:
-* - SPI_NSSInternalSoft_Set: Set NSS pin internally
-* - SPI_NSSInternalSoft_Reset: Reset NSS pin internally
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_NSSInternalSoftwareConfig(SPI_TypeDef* SPIx, u16 SPI_NSSInternalSoft)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_NSS_INTERNAL(SPI_NSSInternalSoft));
-
- if (SPI_NSSInternalSoft != SPI_NSSInternalSoft_Reset)
- {
- /* Set NSS pin internally by software */
- SPIx->CR1 |= SPI_NSSInternalSoft_Set;
- }
- else
- {
- /* Reset NSS pin internally by software */
- SPIx->CR1 &= SPI_NSSInternalSoft_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_SSOutputCmd
-* Description : Enables or disables the SS output for the selected SPI.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - NewState: new state of the SPIx SS output.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_SSOutputCmd(SPI_TypeDef* SPIx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected SPI SS output */
- SPIx->CR2 |= CR2_SSOE_Set;
- }
- else
- {
- /* Disable the selected SPI SS output */
- SPIx->CR2 &= CR2_SSOE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_DataSizeConfig
-* Description : Configures the data size for the selected SPI.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - SPI_DataSize: specifies the SPI data size.
-* This parameter can be one of the following values:
-* - SPI_DataSize_16b: Set data frame format to 16bit
-* - SPI_DataSize_8b: Set data frame format to 8bit
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_DataSizeConfig(SPI_TypeDef* SPIx, u16 SPI_DataSize)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_DATASIZE(SPI_DataSize));
-
- /* Clear DFF bit */
- SPIx->CR1 &= (u16)~SPI_DataSize_16b;
- /* Set new DFF bit value */
- SPIx->CR1 |= SPI_DataSize;
-}
-
-/*******************************************************************************
-* Function Name : SPI_TransmitCRC
-* Description : Transmit the SPIx CRC value.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_TransmitCRC(SPI_TypeDef* SPIx)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
-
- /* Enable the selected SPI CRC transmission */
- SPIx->CR1 |= CR1_CRCNext_Set;
-}
-
-/*******************************************************************************
-* Function Name : SPI_CalculateCRC
-* Description : Enables or disables the CRC value calculation of the
-* transfered bytes.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - NewState: new state of the SPIx CRC value calculation.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_CalculateCRC(SPI_TypeDef* SPIx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected SPI CRC calculation */
- SPIx->CR1 |= CR1_CRCEN_Set;
- }
- else
- {
- /* Disable the selected SPI CRC calculation */
- SPIx->CR1 &= CR1_CRCEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_GetCRC
-* Description : Returns the transmit or the receive CRC register value for
-* the specified SPI.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - SPI_CRC: specifies the CRC register to be read.
-* This parameter can be one of the following values:
-* - SPI_CRC_Tx: Selects Tx CRC register
-* - SPI_CRC_Rx: Selects Rx CRC register
-* Output : None
-* Return : The selected CRC register value..
-*******************************************************************************/
-u16 SPI_GetCRC(SPI_TypeDef* SPIx, u8 SPI_CRC)
-{
- u16 crcreg = 0;
-
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_CRC(SPI_CRC));
-
- if (SPI_CRC != SPI_CRC_Rx)
- {
- /* Get the Tx CRC register */
- crcreg = SPIx->TXCRCR;
- }
- else
- {
- /* Get the Rx CRC register */
- crcreg = SPIx->RXCRCR;
- }
-
- /* Return the selected CRC register */
- return crcreg;
-}
-
-/*******************************************************************************
-* Function Name : SPI_GetCRCPolynomial
-* Description : Returns the CRC Polynomial register value for the specified SPI.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* Output : None
-* Return : The CRC Polynomial register value.
-*******************************************************************************/
-u16 SPI_GetCRCPolynomial(SPI_TypeDef* SPIx)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
-
- /* Return the CRC polynomial register */
- return SPIx->CRCPR;
-}
-
-/*******************************************************************************
-* Function Name : SPI_BiDirectionalLineConfig
-* Description : Selects the data transfer direction in bi-directional mode
-* for the specified SPI.
-* Input : - SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.
-* - SPI_Direction: specifies the data transfer direction in
-* bi-directional mode.
-* This parameter can be one of the following values:
-* - SPI_Direction_Tx: Selects Tx transmission direction
-* - SPI_Direction_Rx: Selects Rx receive direction
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_BiDirectionalLineConfig(SPI_TypeDef* SPIx, u16 SPI_Direction)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_DIRECTION(SPI_Direction));
-
- if (SPI_Direction == SPI_Direction_Tx)
- {
- /* Set the Tx only mode */
- SPIx->CR1 |= SPI_Direction_Tx;
- }
- else
- {
- /* Set the Rx only mode */
- SPIx->CR1 &= SPI_Direction_Rx;
- }
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_GetFlagStatus
-* Description : Checks whether the specified SPI/I2S flag is set or not.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - 2 or 3 in I2S mode
-* - SPI_I2S_FLAG: specifies the SPI/I2S flag to check.
-* This parameter can be one of the following values:
-* - SPI_I2S_FLAG_TXE: Transmit buffer empty flag.
-* - SPI_I2S_FLAG_RXNE: Receive buffer not empty flag.
-* - SPI_I2S_FLAG_BSY: Busy flag.
-* - SPI_I2S_FLAG_OVR: Overrun flag.
-* - SPI_FLAG_MODF: Mode Fault flag.
-* - SPI_FLAG_CRCERR: CRC Error flag.
-* - I2S_FLAG_UDR: Underrun Error flag.
-* - I2S_FLAG_CHSIDE: Channel Side flag.
-* Output : None
-* Return : The new state of SPI_I2S_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus SPI_I2S_GetFlagStatus(SPI_TypeDef* SPIx, u16 SPI_I2S_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_I2S_GET_FLAG(SPI_I2S_FLAG));
-
- /* Check the status of the specified SPI/I2S flag */
- if ((SPIx->SR & SPI_I2S_FLAG) != (u16)RESET)
- {
- /* SPI_I2S_FLAG is set */
- bitstatus = SET;
- }
- else
- {
- /* SPI_I2S_FLAG is reset */
- bitstatus = RESET;
- }
- /* Return the SPI_I2S_FLAG status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_ClearFlag
-* Description : Clears the SPIx CRC Error (CRCERR) flag.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - SPI_I2S_FLAG: specifies the SPI flag to clear.
-* This function clears only CRCERR flag.
-* Notes:
-* - OVR (OverRun error) flag is cleared by software
-* sequence: a read operation to SPI_DR register
-* (SPI_I2S_ReceiveData()) followed by a read operation
-* to SPI_SR register (SPI_I2S_GetFlagStatus()).
-* - UDR (UnderRun error) flag is cleared by a read
-* operation to SPI_SR register (SPI_I2S_GetFlagStatus()).
-* - MODF (Mode Fault) flag is cleared by software sequence:
-* a read/write operation to SPI_SR register
-* (SPI_I2S_GetFlagStatus()) followed by a write
-* operation to SPI_CR1 register (SPI_Cmd() to enable
-* the SPI).
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_I2S_ClearFlag(SPI_TypeDef* SPIx, u16 SPI_I2S_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_I2S_CLEAR_FLAG(SPI_I2S_FLAG));
-
- /* Clear the selected SPI CRC Error (CRCERR) flag */
- SPIx->SR = (u16)~SPI_I2S_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_GetITStatus
-* Description : Checks whether the specified SPI/I2S interrupt has occurred or not.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - 2 or 3 in I2S mode
-* - SPI_I2S_IT: specifies the SPI/I2S interrupt source to check.
-* This parameter can be one of the following values:
-* - SPI_I2S_IT_TXE: Transmit buffer empty interrupt.
-* - SPI_I2S_IT_RXNE: Receive buffer not empty interrupt.
-* - SPI_I2S_IT_OVR: Overrun interrupt.
-* - SPI_IT_MODF: Mode Fault interrupt.
-* - SPI_IT_CRCERR: CRC Error interrupt.
-* - I2S_IT_UDR: Underrun Error interrupt.
-* Output : None
-* Return : The new state of SPI_I2S_IT (SET or RESET).
-*******************************************************************************/
-ITStatus SPI_I2S_GetITStatus(SPI_TypeDef* SPIx, u8 SPI_I2S_IT)
-{
- ITStatus bitstatus = RESET;
- u16 itpos = 0, itmask = 0, enablestatus = 0;
-
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_I2S_GET_IT(SPI_I2S_IT));
-
- /* Get the SPI/I2S IT index */
- itpos = (u16)((u16)0x01 << (SPI_I2S_IT & (u8)0x0F));
-
- /* Get the SPI/I2S IT mask */
- itmask = SPI_I2S_IT >> 4;
- /* Set the IT mask */
- itmask = (u16)((u16)0x01 << itmask);
- /* Get the SPI_I2S_IT enable bit status */
- enablestatus = (SPIx->CR2 & itmask) ;
-
- /* Check the status of the specified SPI/I2S interrupt */
- if (((SPIx->SR & itpos) != (u16)RESET) && enablestatus)
- {
- /* SPI_I2S_IT is set */
- bitstatus = SET;
- }
- else
- {
- /* SPI_I2S_IT is reset */
- bitstatus = RESET;
- }
- /* Return the SPI_I2S_IT status */
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : SPI_I2S_ClearITPendingBit
-* Description : Clears the SPIx CRC Error (CRCERR) interrupt pending bit.
-* Input : - SPIx: where x can be :
-* - 1, 2 or 3 in SPI mode
-* - SPI_I2S_IT: specifies the SPI interrupt pending bit to clear.
-* This function clears only CRCERR intetrrupt pending bit.
-* Notes:
-* - OVR (OverRun Error) interrupt pending bit is cleared
-* by software sequence: a read operation to SPI_DR
-* register (SPI_I2S_ReceiveData()) followed by a read
-* operation to SPI_SR register (SPI_I2S_GetITStatus()).
-* - UDR (UnderRun Error) interrupt pending bit is cleared
-* by a read operation to SPI_SR register
-* (SPI_I2S_GetITStatus()).
-* - MODF (Mode Fault) interrupt pending bit is cleared by
-* software sequence: a read/write operation to SPI_SR
-* register (SPI_I2S_GetITStatus()) followed by a write
-* operation to SPI_CR1 register (SPI_Cmd() to enable the
-* SPI).
-* Output : None
-* Return : None
-*******************************************************************************/
-void SPI_I2S_ClearITPendingBit(SPI_TypeDef* SPIx, u8 SPI_I2S_IT)
-{
- u16 itpos = 0;
-
- /* Check the parameters */
- assert_param(IS_SPI_ALL_PERIPH(SPIx));
- assert_param(IS_SPI_I2S_CLEAR_IT(SPI_I2S_IT));
-
- /* Get the SPI IT index */
- itpos = (u16)((u16)0x01 << (SPI_I2S_IT & (u8)0x0F));
- /* Clear the selected SPI CRC Error (CRCERR) interrupt pending bit */
- SPIx->SR = (u16)~itpos;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_systick.c b/stm32lib/src/stm32f10x_systick.c
deleted file mode 100644
index 53deb76..0000000
--- a/stm32lib/src/stm32f10x_systick.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_systick.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the SysTick firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_systick.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ---------------------- SysTick registers bit mask -------------------- */
-/* CTRL TICKINT Mask */
-#define CTRL_TICKINT_Set ((u32)0x00000002)
-#define CTRL_TICKINT_Reset ((u32)0xFFFFFFFD)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : SysTick_CLKSourceConfig
-* Description : Configures the SysTick clock source.
-* Input : - SysTick_CLKSource: specifies the SysTick clock source.
-* This parameter can be one of the following values:
-* - SysTick_CLKSource_HCLK_Div8: AHB clock divided by 8
-* selected as SysTick clock source.
-* - SysTick_CLKSource_HCLK: AHB clock selected as
-* SysTick clock source.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SysTick_CLKSourceConfig(u32 SysTick_CLKSource)
-{
- /* Check the parameters */
- assert_param(IS_SYSTICK_CLK_SOURCE(SysTick_CLKSource));
-
- if (SysTick_CLKSource == SysTick_CLKSource_HCLK)
- {
- SysTick->CTRL |= SysTick_CLKSource_HCLK;
- }
- else
- {
- SysTick->CTRL &= SysTick_CLKSource_HCLK_Div8;
- }
-}
-
-/*******************************************************************************
-* Function Name : SysTick_SetReload
-* Description : Sets SysTick Reload value.
-* Input : - Reload: SysTick Reload new value.
-* This parameter must be a number between 1 and 0xFFFFFF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SysTick_SetReload(u32 Reload)
-{
- /* Check the parameters */
- assert_param(IS_SYSTICK_RELOAD(Reload));
-
- SysTick->LOAD = Reload;
-}
-
-/*******************************************************************************
-* Function Name : SysTick_CounterCmd
-* Description : Enables or disables the SysTick counter.
-* Input : - SysTick_Counter: new state of the SysTick counter.
-* This parameter can be one of the following values:
-* - SysTick_Counter_Disable: Disable counter
-* - SysTick_Counter_Enable: Enable counter
-* - SysTick_Counter_Clear: Clear counter value to 0
-* Output : None
-* Return : None
-*******************************************************************************/
-void SysTick_CounterCmd(u32 SysTick_Counter)
-{
- /* Check the parameters */
- assert_param(IS_SYSTICK_COUNTER(SysTick_Counter));
-
- if (SysTick_Counter == SysTick_Counter_Enable)
- {
- SysTick->CTRL |= SysTick_Counter_Enable;
- }
- else if (SysTick_Counter == SysTick_Counter_Disable)
- {
- SysTick->CTRL &= SysTick_Counter_Disable;
- }
- else /* SysTick_Counter == SysTick_Counter_Clear */
- {
- SysTick->VAL = SysTick_Counter_Clear;
- }
-}
-
-/*******************************************************************************
-* Function Name : SysTick_ITConfig
-* Description : Enables or disables the SysTick Interrupt.
-* Input : - NewState: new state of the SysTick Interrupt.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void SysTick_ITConfig(FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- SysTick->CTRL |= CTRL_TICKINT_Set;
- }
- else
- {
- SysTick->CTRL &= CTRL_TICKINT_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : SysTick_GetCounter
-* Description : Gets SysTick counter value.
-* Input : None
-* Output : None
-* Return : SysTick current value
-*******************************************************************************/
-u32 SysTick_GetCounter(void)
-{
- return(SysTick->VAL);
-}
-
-/*******************************************************************************
-* Function Name : SysTick_GetFlagStatus
-* Description : Checks whether the specified SysTick flag is set or not.
-* Input : - SysTick_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - SysTick_FLAG_COUNT
-* - SysTick_FLAG_SKEW
-* - SysTick_FLAG_NOREF
-* Output : None
-* Return : None
-*******************************************************************************/
-FlagStatus SysTick_GetFlagStatus(u8 SysTick_FLAG)
-{
- u32 statusreg = 0, tmp = 0 ;
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_SYSTICK_FLAG(SysTick_FLAG));
-
- /* Get the SysTick register index */
- tmp = SysTick_FLAG >> 3;
-
- if (tmp == 2) /* The flag to check is in CTRL register */
- {
- statusreg = SysTick->CTRL;
- }
- else /* The flag to check is in CALIB register */
- {
- statusreg = SysTick->CALIB;
- }
-
- if ((statusreg & ((u32)1 << SysTick_FLAG)) != (u32)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_tim.c b/stm32lib/src/stm32f10x_tim.c
deleted file mode 100644
index ca971e2..0000000
--- a/stm32lib/src/stm32f10x_tim.c
+++ /dev/null
@@ -1,3219 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_tim.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the TIM firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_tim.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ---------------------- TIM registers bit mask ------------------------ */
-#define CR1_CEN_Set ((u16)0x0001)
-#define CR1_CEN_Reset ((u16)0x03FE)
-#define CR1_UDIS_Set ((u16)0x0002)
-#define CR1_UDIS_Reset ((u16)0x03FD)
-#define CR1_URS_Set ((u16)0x0004)
-#define CR1_URS_Reset ((u16)0x03FB)
-#define CR1_OPM_Reset ((u16)0x03F7)
-#define CR1_CounterMode_Mask ((u16)0x038F)
-#define CR1_ARPE_Set ((u16)0x0080)
-#define CR1_ARPE_Reset ((u16)0x037F)
-#define CR1_CKD_Mask ((u16)0x00FF)
-
-#define CR2_CCPC_Set ((u16)0x0001)
-#define CR2_CCPC_Reset ((u16)0xFFFE)
-#define CR2_CCUS_Set ((u16)0x0004)
-#define CR2_CCUS_Reset ((u16)0xFFFB)
-#define CR2_CCDS_Set ((u16)0x0008)
-#define CR2_CCDS_Reset ((u16)0xFFF7)
-#define CR2_MMS_Mask ((u16)0xFF8F)
-#define CR2_TI1S_Set ((u16)0x0080)
-#define CR2_TI1S_Reset ((u16)0xFF7F)
-#define CR2_OIS1_Reset ((u16)0x7EFF)
-#define CR2_OIS1N_Reset ((u16)0x7DFF)
-#define CR2_OIS2_Reset ((u16)0x7BFF)
-#define CR2_OIS2N_Reset ((u16)0x77FF)
-#define CR2_OIS3_Reset ((u16)0x6FFF)
-#define CR2_OIS3N_Reset ((u16)0x5FFF)
-#define CR2_OIS4_Reset ((u16)0x3FFF)
-
-#define SMCR_SMS_Mask ((u16)0xFFF8)
-#define SMCR_ETR_Mask ((u16)0x00FF)
-#define SMCR_TS_Mask ((u16)0xFF8F)
-#define SMCR_MSM_Reset ((u16)0xFF7F)
-#define SMCR_ECE_Set ((u16)0x4000)
-
-#define CCMR_CC13S_Mask ((u16)0xFFFC)
-#define CCMR_CC24S_Mask ((u16)0xFCFF)
-#define CCMR_TI13Direct_Set ((u16)0x0001)
-#define CCMR_TI24Direct_Set ((u16)0x0100)
-#define CCMR_OC13FE_Reset ((u16)0xFFFB)
-#define CCMR_OC24FE_Reset ((u16)0xFBFF)
-#define CCMR_OC13PE_Reset ((u16)0xFFF7)
-#define CCMR_OC24PE_Reset ((u16)0xF7FF)
-#define CCMR_OC13M_Mask ((u16)0xFF8F)
-#define CCMR_OC24M_Mask ((u16)0x8FFF)
-
-#define CCMR_OC13CE_Reset ((u16)0xFF7F)
-#define CCMR_OC24CE_Reset ((u16)0x7FFF)
-
-#define CCMR_IC13PSC_Mask ((u16)0xFFF3)
-#define CCMR_IC24PSC_Mask ((u16)0xF3FF)
-#define CCMR_IC13F_Mask ((u16)0xFF0F)
-#define CCMR_IC24F_Mask ((u16)0x0FFF)
-
-#define CCMR_Offset ((u16)0x0018)
-#define CCER_CCE_Set ((u16)0x0001)
-#define CCER_CCNE_Set ((u16)0x0004)
-
-#define CCER_CC1P_Reset ((u16)0xFFFD)
-#define CCER_CC2P_Reset ((u16)0xFFDF)
-#define CCER_CC3P_Reset ((u16)0xFDFF)
-#define CCER_CC4P_Reset ((u16)0xDFFF)
-
-#define CCER_CC1NP_Reset ((u16)0xFFF7)
-#define CCER_CC2NP_Reset ((u16)0xFF7F)
-#define CCER_CC3NP_Reset ((u16)0xF7FF)
-
-#define CCER_CC1E_Set ((u16)0x0001)
-#define CCER_CC1E_Reset ((u16)0xFFFE)
-
-#define CCER_CC1NE_Reset ((u16)0xFFFB)
-
-#define CCER_CC2E_Set ((u16)0x0010)
-#define CCER_CC2E_Reset ((u16)0xFFEF)
-
-#define CCER_CC2NE_Reset ((u16)0xFFBF)
-
-#define CCER_CC3E_Set ((u16)0x0100)
-#define CCER_CC3E_Reset ((u16)0xFEFF)
-
-#define CCER_CC3NE_Reset ((u16)0xFBFF)
-
-#define CCER_CC4E_Set ((u16)0x1000)
-#define CCER_CC4E_Reset ((u16)0xEFFF)
-
-#define BDTR_MOE_Set ((u16)0x8000)
-#define BDTR_MOE_Reset ((u16)0x7FFF)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-static void TI1_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter);
-static void TI2_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter);
-static void TI3_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter);
-static void TI4_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter);
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-/*******************************************************************************
-* Function Name : TIM_DeInit
-* Description : Deinitializes the TIMx peripheral registers to their default
-* reset values.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_DeInit(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
-
- switch (*(u32*)&TIMx)
- {
- case TIM1_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_TIM1, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_TIM1, DISABLE);
- break;
-
- case TIM2_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM2, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM2, DISABLE);
- break;
-
- case TIM3_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM3, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM3, DISABLE);
- break;
-
- case TIM4_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM4, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM4, DISABLE);
- break;
-
- case TIM5_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM5, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM5, DISABLE);
- break;
-
- case TIM6_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM6, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM6, DISABLE);
- break;
-
- case TIM7_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM7, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_TIM7, DISABLE);
- break;
-
- case TIM8_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_TIM8, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_TIM8, DISABLE);
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_TimeBaseInit
-* Description : Initializes the TIMx Time Base Unit peripheral according to
-* the specified parameters in the TIM_TimeBaseInitStruct.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_TimeBaseInitStruct: pointer to a TIM_TimeBaseInitTypeDef
-* structure that contains the configuration information for
-* the specified TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_TimeBaseInit(TIM_TypeDef* TIMx, TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_COUNTER_MODE(TIM_TimeBaseInitStruct->TIM_CounterMode));
- assert_param(IS_TIM_CKD_DIV(TIM_TimeBaseInitStruct->TIM_ClockDivision));
-
- /* Select the Counter Mode and set the clock division */
- TIMx->CR1 &= CR1_CKD_Mask & CR1_CounterMode_Mask;
- TIMx->CR1 |= (u32)TIM_TimeBaseInitStruct->TIM_ClockDivision |
- TIM_TimeBaseInitStruct->TIM_CounterMode;
- /* Set the Autoreload value */
- TIMx->ARR = TIM_TimeBaseInitStruct->TIM_Period ;
-
- /* Set the Prescaler value */
- TIMx->PSC = TIM_TimeBaseInitStruct->TIM_Prescaler;
-
- /* Generate an update event to reload the Prescaler value immediatly */
- TIMx->EGR = TIM_PSCReloadMode_Immediate;
-
- if (((*(u32*)&TIMx) == TIM1_BASE) || ((*(u32*)&TIMx) == TIM8_BASE))
- {
- /* Set the Repetition Counter value */
- TIMx->RCR = TIM_TimeBaseInitStruct->TIM_RepetitionCounter;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC1Init
-* Description : Initializes the TIMx Channel1 according to the specified
-* parameters in the TIM_OCInitStruct.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure
-* that contains the configuration information for the specified
-* TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC1Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
-{
- u16 tmpccmrx = 0, tmpccer = 0, tmpcr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_MODE(TIM_OCInitStruct->TIM_OCMode));
- assert_param(IS_TIM_OUTPUT_STATE(TIM_OCInitStruct->TIM_OutputState));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCInitStruct->TIM_OCPolarity));
-
- /* Disable the Channel 1: Reset the CC1E Bit */
- TIMx->CCER &= CCER_CC1E_Reset;
-
- /* Get the TIMx CCER register value */
- tmpccer = TIMx->CCER;
-
- /* Get the TIMx CR2 register value */
- tmpcr2 = TIMx->CR2;
-
- /* Get the TIMx CCMR1 register value */
- tmpccmrx = TIMx->CCMR1;
-
- /* Reset the Output Compare Mode Bits */
- tmpccmrx &= CCMR_OC13M_Mask;
-
- /* Select the Output Compare Mode */
- tmpccmrx |= TIM_OCInitStruct->TIM_OCMode;
-
- /* Reset the Output Polarity level */
- tmpccer &= CCER_CC1P_Reset;
-
- /* Set the Output Compare Polarity */
- tmpccer |= TIM_OCInitStruct->TIM_OCPolarity;
-
- /* Set the Output State */
- tmpccer |= TIM_OCInitStruct->TIM_OutputState;
-
- /* Set the Capture Compare Register value */
- TIMx->CCR1 = TIM_OCInitStruct->TIM_Pulse;
-
- if((*(u32*)&TIMx == TIM1_BASE) || (*(u32*)&TIMx == TIM8_BASE))
- {
- assert_param(IS_TIM_OUTPUTN_STATE(TIM_OCInitStruct->TIM_OutputNState));
- assert_param(IS_TIM_OCN_POLARITY(TIM_OCInitStruct->TIM_OCNPolarity));
- assert_param(IS_TIM_OCNIDLE_STATE(TIM_OCInitStruct->TIM_OCNIdleState));
- assert_param(IS_TIM_OCIDLE_STATE(TIM_OCInitStruct->TIM_OCIdleState));
-
- /* Reset the Output N Polarity level */
- tmpccer &= CCER_CC1NP_Reset;
-
- /* Set the Output N Polarity */
- tmpccer |= TIM_OCInitStruct->TIM_OCNPolarity;
-
- /* Reset the Output N State */
- tmpccer &= CCER_CC1NE_Reset;
-
- /* Set the Output N State */
- tmpccer |= TIM_OCInitStruct->TIM_OutputNState;
-
- /* Reset the Ouput Compare and Output Compare N IDLE State */
- tmpcr2 &= CR2_OIS1_Reset;
- tmpcr2 &= CR2_OIS1N_Reset;
-
- /* Set the Output Idle state */
- tmpcr2 |= TIM_OCInitStruct->TIM_OCIdleState;
-
- /* Set the Output N Idle state */
- tmpcr2 |= TIM_OCInitStruct->TIM_OCNIdleState;
- }
- /* Write to TIMx CR2 */
- TIMx->CR2 = tmpcr2;
-
- /* Write to TIMx CCMR1 */
- TIMx->CCMR1 = tmpccmrx;
-
- /* Write to TIMx CCER */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC2Init
-* Description : Initializes the TIMx Channel2 according to the specified
-* parameters in the TIM_OCInitStruct.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure
-* that contains the configuration information for the specified
-* TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC2Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
-{
- u16 tmpccmrx = 0, tmpccer = 0, tmpcr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_MODE(TIM_OCInitStruct->TIM_OCMode));
- assert_param(IS_TIM_OUTPUT_STATE(TIM_OCInitStruct->TIM_OutputState));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCInitStruct->TIM_OCPolarity));
-
- /* Disable the Channel 2: Reset the CC2E Bit */
- TIMx->CCER &= CCER_CC2E_Reset;
-
- /* Get the TIMx CCER register value */
- tmpccer = TIMx->CCER;
-
- /* Get the TIMx CR2 register value */
- tmpcr2 = TIMx->CR2;
-
- /* Get the TIMx CCMR1 register value */
- tmpccmrx = TIMx->CCMR1;
-
- /* Reset the Output Compare Mode Bits */
- tmpccmrx &= CCMR_OC24M_Mask;
-
- /* Select the Output Compare Mode */
- tmpccmrx |= (u16)(TIM_OCInitStruct->TIM_OCMode << 8);
-
- /* Reset the Output Polarity level */
- tmpccer &= CCER_CC2P_Reset;
-
- /* Set the Output Compare Polarity */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OCPolarity << 4);
-
- /* Set the Output State */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OutputState << 4);
-
- /* Set the Capture Compare Register value */
- TIMx->CCR2 = TIM_OCInitStruct->TIM_Pulse;
-
- if((*(u32*)&TIMx == TIM1_BASE) || (*(u32*)&TIMx == TIM8_BASE))
- {
- assert_param(IS_TIM_OUTPUTN_STATE(TIM_OCInitStruct->TIM_OutputNState));
- assert_param(IS_TIM_OCN_POLARITY(TIM_OCInitStruct->TIM_OCNPolarity));
- assert_param(IS_TIM_OCNIDLE_STATE(TIM_OCInitStruct->TIM_OCNIdleState));
- assert_param(IS_TIM_OCIDLE_STATE(TIM_OCInitStruct->TIM_OCIdleState));
-
- /* Reset the Output N Polarity level */
- tmpccer &= CCER_CC2NP_Reset;
-
- /* Set the Output N Polarity */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OCNPolarity << 4);
-
- /* Reset the Output N State */
- tmpccer &= CCER_CC2NE_Reset;
-
- /* Set the Output N State */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OutputNState << 4);
-
- /* Reset the Ouput Compare and Output Compare N IDLE State */
- tmpcr2 &= CR2_OIS2_Reset;
- tmpcr2 &= CR2_OIS2N_Reset;
-
- /* Set the Output Idle state */
- tmpcr2 |= (u16)(TIM_OCInitStruct->TIM_OCIdleState << 2);
-
- /* Set the Output N Idle state */
- tmpcr2 |= (u16)(TIM_OCInitStruct->TIM_OCNIdleState << 2);
- }
-
- /* Write to TIMx CR2 */
- TIMx->CR2 = tmpcr2;
-
- /* Write to TIMx CCMR1 */
- TIMx->CCMR1 = tmpccmrx;
-
- /* Write to TIMx CCER */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC3Init
-* Description : Initializes the TIMx Channel3 according to the specified
-* parameters in the TIM_OCInitStruct.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure
-* that contains the configuration information for the specified
-* TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC3Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
-{
- u16 tmpccmrx = 0, tmpccer = 0, tmpcr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_MODE(TIM_OCInitStruct->TIM_OCMode));
- assert_param(IS_TIM_OUTPUT_STATE(TIM_OCInitStruct->TIM_OutputState));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCInitStruct->TIM_OCPolarity));
-
- /* Disable the Channel 2: Reset the CC2E Bit */
- TIMx->CCER &= CCER_CC3E_Reset;
-
- /* Get the TIMx CCER register value */
- tmpccer = TIMx->CCER;
-
- /* Get the TIMx CR2 register value */
- tmpcr2 = TIMx->CR2;
-
- /* Get the TIMx CCMR2 register value */
- tmpccmrx = TIMx->CCMR2;
-
- /* Reset the Output Compare Mode Bits */
- tmpccmrx &= CCMR_OC13M_Mask;
-
- /* Select the Output Compare Mode */
- tmpccmrx |= TIM_OCInitStruct->TIM_OCMode;
-
- /* Reset the Output Polarity level */
- tmpccer &= CCER_CC3P_Reset;
-
- /* Set the Output Compare Polarity */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OCPolarity << 8);
-
- /* Set the Output State */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OutputState << 8);
-
- /* Set the Capture Compare Register value */
- TIMx->CCR3 = TIM_OCInitStruct->TIM_Pulse;
-
- if((*(u32*)&TIMx == TIM1_BASE) || (*(u32*)&TIMx == TIM8_BASE))
- {
- assert_param(IS_TIM_OUTPUTN_STATE(TIM_OCInitStruct->TIM_OutputNState));
- assert_param(IS_TIM_OCN_POLARITY(TIM_OCInitStruct->TIM_OCNPolarity));
- assert_param(IS_TIM_OCNIDLE_STATE(TIM_OCInitStruct->TIM_OCNIdleState));
- assert_param(IS_TIM_OCIDLE_STATE(TIM_OCInitStruct->TIM_OCIdleState));
-
- /* Reset the Output N Polarity level */
- tmpccer &= CCER_CC3NP_Reset;
-
- /* Set the Output N Polarity */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OCNPolarity << 8);
-
- /* Reset the Output N State */
- tmpccer &= CCER_CC3NE_Reset;
-
- /* Set the Output N State */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OutputNState << 8);
-
- /* Reset the Ouput Compare and Output Compare N IDLE State */
- tmpcr2 &= CR2_OIS3_Reset;
- tmpcr2 &= CR2_OIS3N_Reset;
-
- /* Set the Output Idle state */
- tmpcr2 |= (u16)(TIM_OCInitStruct->TIM_OCIdleState << 4);
-
- /* Set the Output N Idle state */
- tmpcr2 |= (u16)(TIM_OCInitStruct->TIM_OCNIdleState << 4);
- }
-
- /* Write to TIMx CR2 */
- TIMx->CR2 = tmpcr2;
-
- /* Write to TIMx CCMR2 */
- TIMx->CCMR2 = tmpccmrx;
-
- /* Write to TIMx CCER */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC4Init
-* Description : Initializes the TIMx Channel4 according to the specified
-* parameters in the TIM_OCInitStruct.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure
-* that contains the configuration information for the specified
-* TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC4Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
-{
- u16 tmpccmrx = 0, tmpccer = 0, tmpcr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_MODE(TIM_OCInitStruct->TIM_OCMode));
- assert_param(IS_TIM_OUTPUT_STATE(TIM_OCInitStruct->TIM_OutputState));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCInitStruct->TIM_OCPolarity));
-
- /* Disable the Channel 2: Reset the CC4E Bit */
- TIMx->CCER &= CCER_CC4E_Reset;
-
- /* Get the TIMx CCER register value */
- tmpccer = TIMx->CCER;
-
- /* Get the TIMx CR2 register value */
- tmpcr2 = TIMx->CR2;
-
- /* Get the TIMx CCMR2 register value */
- tmpccmrx = TIMx->CCMR2;
-
- /* Reset the Output Compare Mode Bits */
- tmpccmrx &= CCMR_OC24M_Mask;
-
- /* Select the Output Compare Mode */
- tmpccmrx |= (u16)(TIM_OCInitStruct->TIM_OCMode << 8);
-
- /* Reset the Output Polarity level */
- tmpccer &= CCER_CC4P_Reset;
-
- /* Set the Output Compare Polarity */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OCPolarity << 12);
-
- /* Set the Output State */
- tmpccer |= (u16)(TIM_OCInitStruct->TIM_OutputState << 12);
-
- /* Set the Capture Compare Register value */
- TIMx->CCR4 = TIM_OCInitStruct->TIM_Pulse;
-
- if((*(u32*)&TIMx == TIM1_BASE) || (*(u32*)&TIMx == TIM8_BASE))
- {
- assert_param(IS_TIM_OCIDLE_STATE(TIM_OCInitStruct->TIM_OCIdleState));
-
- /* Reset the Ouput Compare IDLE State */
- tmpcr2 &= CR2_OIS4_Reset;
-
- /* Set the Output Idle state */
- tmpcr2 |= (u16)(TIM_OCInitStruct->TIM_OCIdleState << 6);
- }
-
- /* Write to TIMx CR2 */
- TIMx->CR2 = tmpcr2;
-
- /* Write to TIMx CCMR2 */
- TIMx->CCMR2 = tmpccmrx;
-
- /* Write to TIMx CCER */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ICInit
-* Description : Initializes the TIM peripheral according to the specified
-* parameters in the TIM_ICInitStruct.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure
-* that contains the configuration information for the specified
-* TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ICInit(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_CHANNEL(TIM_ICInitStruct->TIM_Channel));
- assert_param(IS_TIM_IC_POLARITY(TIM_ICInitStruct->TIM_ICPolarity));
- assert_param(IS_TIM_IC_SELECTION(TIM_ICInitStruct->TIM_ICSelection));
- assert_param(IS_TIM_IC_PRESCALER(TIM_ICInitStruct->TIM_ICPrescaler));
- assert_param(IS_TIM_IC_FILTER(TIM_ICInitStruct->TIM_ICFilter));
-
- if (TIM_ICInitStruct->TIM_Channel == TIM_Channel_1)
- {
- /* TI1 Configuration */
- TI1_Config(TIMx, TIM_ICInitStruct->TIM_ICPolarity,
- TIM_ICInitStruct->TIM_ICSelection,
- TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC1Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
- }
- else if (TIM_ICInitStruct->TIM_Channel == TIM_Channel_2)
- {
- /* TI2 Configuration */
- TI2_Config(TIMx, TIM_ICInitStruct->TIM_ICPolarity,
- TIM_ICInitStruct->TIM_ICSelection,
- TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC2Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
- }
- else if (TIM_ICInitStruct->TIM_Channel == TIM_Channel_3)
- {
- /* TI3 Configuration */
- TI3_Config(TIMx, TIM_ICInitStruct->TIM_ICPolarity,
- TIM_ICInitStruct->TIM_ICSelection,
- TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC3Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
- }
- else
- {
- /* TI4 Configuration */
- TI4_Config(TIMx, TIM_ICInitStruct->TIM_ICPolarity,
- TIM_ICInitStruct->TIM_ICSelection,
- TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC4Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_PWMIConfig
-* Description : Configures the TIM peripheral according to the specified
-* parameters in the TIM_ICInitStruct to measure an external PWM
-* signal.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure
-* that contains the configuration information for the specified
-* TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_PWMIConfig(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)
-{
- u16 icoppositepolarity = TIM_ICPolarity_Rising;
- u16 icoppositeselection = TIM_ICSelection_DirectTI;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Select the Opposite Input Polarity */
- if (TIM_ICInitStruct->TIM_ICPolarity == TIM_ICPolarity_Rising)
- {
- icoppositepolarity = TIM_ICPolarity_Falling;
- }
- else
- {
- icoppositepolarity = TIM_ICPolarity_Rising;
- }
-
- /* Select the Opposite Input */
- if (TIM_ICInitStruct->TIM_ICSelection == TIM_ICSelection_DirectTI)
- {
- icoppositeselection = TIM_ICSelection_IndirectTI;
- }
- else
- {
- icoppositeselection = TIM_ICSelection_DirectTI;
- }
-
- if (TIM_ICInitStruct->TIM_Channel == TIM_Channel_1)
- {
- /* TI1 Configuration */
- TI1_Config(TIMx, TIM_ICInitStruct->TIM_ICPolarity, TIM_ICInitStruct->TIM_ICSelection,
- TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC1Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
-
- /* TI2 Configuration */
- TI2_Config(TIMx, icoppositepolarity, icoppositeselection, TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC2Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
- }
- else
- {
- /* TI2 Configuration */
- TI2_Config(TIMx, TIM_ICInitStruct->TIM_ICPolarity, TIM_ICInitStruct->TIM_ICSelection,
- TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC2Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
-
- /* TI1 Configuration */
- TI1_Config(TIMx, icoppositepolarity, icoppositeselection, TIM_ICInitStruct->TIM_ICFilter);
-
- /* Set the Input Capture Prescaler value */
- TIM_SetIC1Prescaler(TIMx, TIM_ICInitStruct->TIM_ICPrescaler);
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_BDTRConfig
-* Description : Configures the: Break feature, dead time, Lock level, the OSSI,
-* the OSSR State and the AOE(automatic output enable).
-* Input :- TIMx: where x can be 1 or 8 to select the TIM
-* - TIM_BDTRInitStruct: pointer to a TIM_BDTRInitTypeDef
-* structure that contains the BDTR Register configuration
-* information for the TIM peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_BDTRConfig(TIM_TypeDef* TIMx, TIM_BDTRInitTypeDef *TIM_BDTRInitStruct)
-{
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_TIM_OSSR_STATE(TIM_BDTRInitStruct->TIM_OSSRState));
- assert_param(IS_TIM_OSSI_STATE(TIM_BDTRInitStruct->TIM_OSSIState));
- assert_param(IS_TIM_LOCK_LEVEL(TIM_BDTRInitStruct->TIM_LOCKLevel));
- assert_param(IS_TIM_BREAK_STATE(TIM_BDTRInitStruct->TIM_Break));
- assert_param(IS_TIM_BREAK_POLARITY(TIM_BDTRInitStruct->TIM_BreakPolarity));
- assert_param(IS_TIM_AUTOMATIC_OUTPUT_STATE(TIM_BDTRInitStruct->TIM_AutomaticOutput));
-
- /* Set the Lock level, the Break enable Bit and the Ploarity, the OSSR State,
- the OSSI State, the dead time value and the Automatic Output Enable Bit */
-
- TIMx->BDTR = (u32)TIM_BDTRInitStruct->TIM_OSSRState | TIM_BDTRInitStruct->TIM_OSSIState |
- TIM_BDTRInitStruct->TIM_LOCKLevel | TIM_BDTRInitStruct->TIM_DeadTime |
- TIM_BDTRInitStruct->TIM_Break | TIM_BDTRInitStruct->TIM_BreakPolarity |
- TIM_BDTRInitStruct->TIM_AutomaticOutput;
-
-}
-
-/*******************************************************************************
-* Function Name : TIM_TimeBaseStructInit
-* Description : Fills each TIM_TimeBaseInitStruct member with its default value.
-* Input : - TIM_TimeBaseInitStruct : pointer to a TIM_TimeBaseInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_TimeBaseStructInit(TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)
-{
- /* Set the default configuration */
- TIM_TimeBaseInitStruct->TIM_Period = 0xFFFF;
- TIM_TimeBaseInitStruct->TIM_Prescaler = 0x0000;
- TIM_TimeBaseInitStruct->TIM_ClockDivision = TIM_CKD_DIV1;
- TIM_TimeBaseInitStruct->TIM_CounterMode = TIM_CounterMode_Up;
- TIM_TimeBaseInitStruct->TIM_RepetitionCounter = 0x0000;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OCStructInit
-* Description : Fills each TIM_OCInitStruct member with its default value.
-* Input : - TIM_OCInitStruct : pointer to a TIM_OCInitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OCStructInit(TIM_OCInitTypeDef* TIM_OCInitStruct)
-{
- /* Set the default configuration */
- TIM_OCInitStruct->TIM_OCMode = TIM_OCMode_Timing;
- TIM_OCInitStruct->TIM_OutputState = TIM_OutputState_Disable;
- TIM_OCInitStruct->TIM_OutputNState = TIM_OutputNState_Disable;
- TIM_OCInitStruct->TIM_Pulse = 0x0000;
- TIM_OCInitStruct->TIM_OCPolarity = TIM_OCPolarity_High;
- TIM_OCInitStruct->TIM_OCNPolarity = TIM_OCPolarity_High;
- TIM_OCInitStruct->TIM_OCIdleState = TIM_OCIdleState_Reset;
- TIM_OCInitStruct->TIM_OCNIdleState = TIM_OCNIdleState_Reset;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ICStructInit
-* Description : Fills each TIM_ICInitStruct member with its default value.
-* Input : - TIM_ICInitStruct : pointer to a TIM_ICInitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ICStructInit(TIM_ICInitTypeDef* TIM_ICInitStruct)
-{
- /* Set the default configuration */
- TIM_ICInitStruct->TIM_Channel = TIM_Channel_1;
- TIM_ICInitStruct->TIM_ICPolarity = TIM_ICPolarity_Rising;
- TIM_ICInitStruct->TIM_ICSelection = TIM_ICSelection_DirectTI;
- TIM_ICInitStruct->TIM_ICPrescaler = TIM_ICPSC_DIV1;
- TIM_ICInitStruct->TIM_ICFilter = 0x00;
-}
-
-/*******************************************************************************
-* Function Name : TIM_BDTRStructInit
-* Description : Fills each TIM_BDTRInitStruct member with its default value.
-* Input : - TIM_BDTRInitStruct : pointer to a TIM_BDTRInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_BDTRStructInit(TIM_BDTRInitTypeDef* TIM_BDTRInitStruct)
-{
- /* Set the default configuration */
- TIM_BDTRInitStruct->TIM_OSSRState = TIM_OSSRState_Disable;
- TIM_BDTRInitStruct->TIM_OSSIState = TIM_OSSIState_Disable;
- TIM_BDTRInitStruct->TIM_LOCKLevel = TIM_LOCKLevel_OFF;
- TIM_BDTRInitStruct->TIM_DeadTime = 0x00;
- TIM_BDTRInitStruct->TIM_Break = TIM_Break_Disable;
- TIM_BDTRInitStruct->TIM_BreakPolarity = TIM_BreakPolarity_Low;
- TIM_BDTRInitStruct->TIM_AutomaticOutput = TIM_AutomaticOutput_Disable;
-}
-
-/*******************************************************************************
-* Function Name : TIM_Cmd
-* Description : Enables or disables the specified TIM peripheral.
-* Input : - TIMx: where x can be 1 to 8 to select the TIMx peripheral.
-* - NewState: new state of the TIMx peripheral.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_Cmd(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the TIM Counter */
- TIMx->CR1 |= CR1_CEN_Set;
- }
- else
- {
- /* Disable the TIM Counter */
- TIMx->CR1 &= CR1_CEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_CtrlPWMOutputs
-* Description : Enables or disables the TIM peripheral Main Outputs.
-* Input :- TIMx: where x can be 1 or 8 to select the TIMx peripheral.
-* - NewState: new state of the TIM peripheral Main Outputs.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_CtrlPWMOutputs(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the TIM Main Output */
- TIMx->BDTR |= BDTR_MOE_Set;
- }
- else
- {
- /* Disable the TIM Main Output */
- TIMx->BDTR &= BDTR_MOE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_ITConfig
-* Description : Enables or disables the specified TIM interrupts.
-* Input : - TIMx: where x can be 1 to 8 to select the TIMx peripheral.
-* - TIM_IT: specifies the TIM interrupts sources to be enabled
-* or disabled.
-* This parameter can be any combination of the following values:
-* - TIM_IT_Update: TIM update Interrupt source
-* - TIM_IT_CC1: TIM Capture Compare 1 Interrupt source
-* - TIM_IT_CC2: TIM Capture Compare 2 Interrupt source
-* - TIM_IT_CC3: TIM Capture Compare 3 Interrupt source
-* - TIM_IT_CC4: TIM Capture Compare 4 Interrupt source
-* - TIM_IT_COM: TIM Commutation Interrupt source
-* - TIM_IT_Trigger: TIM Trigger Interrupt source
-* - TIM_IT_Break: TIM Break Interrupt source
-* - NewState: new state of the TIM interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ITConfig(TIM_TypeDef* TIMx, u16 TIM_IT, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_IT(TIM_IT));
- assert_param(IS_TIM_PERIPH_IT((TIMx), (TIM_IT)));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the Interrupt sources */
- TIMx->DIER |= TIM_IT;
- }
- else
- {
- /* Disable the Interrupt sources */
- TIMx->DIER &= (u16)~TIM_IT;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_GenerateEvent
-* Description : Configures the TIMx event to be generate by software.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_EventSource: specifies the event source.
-* This parameter can be one or more of the following values:
-* - TIM_EventSource_Update: Timer update Event source
-* - TIM_EventSource_CC1: Timer Capture Compare 1 Event source
-* - TIM_EventSource_CC2: Timer Capture Compare 2 Event source
-* - TIM_EventSource_CC3: Timer Capture Compare 3 Event source
-* - TIM_EventSource_CC4: Timer Capture Compare 4 Event source
-* - TIM_EventSource_Trigger: Timer Trigger Event source
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_GenerateEvent(TIM_TypeDef* TIMx, u16 TIM_EventSource)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_EVENT_SOURCE(TIM_EventSource));
- assert_param(IS_TIM_PERIPH_EVENT((TIMx), (TIM_EventSource)));
-
- /* Set the event sources */
- TIMx->EGR = TIM_EventSource;
-}
-
-/*******************************************************************************
-* Function Name : TIM_DMAConfig
-* Description : Configures the TIMx’s DMA interface.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_DMABase: DMA Base address.
-* This parameter can be one of the following values:
-* - TIM_DMABase_CR, TIM_DMABase_CR2, TIM_DMABase_SMCR,
-* TIM_DMABase_DIER, TIM1_DMABase_SR, TIM_DMABase_EGR,
-* TIM_DMABase_CCMR1, TIM_DMABase_CCMR2, TIM_DMABase_CCER,
-* TIM_DMABase_CNT, TIM_DMABase_PSC, TIM_DMABase_ARR,
-* TIM_DMABase_RCR, TIM_DMABase_CCR1, TIM_DMABase_CCR2,
-* TIM_DMABase_CCR3, TIM_DMABase_CCR4, TIM_DMABase_BDTR,
-* TIM_DMABase_DCR.
-* - TIM_DMABurstLength: DMA Burst length.
-* This parameter can be one value between:
-* TIM_DMABurstLength_1Byte and TIM_DMABurstLength_18Bytes.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_DMAConfig(TIM_TypeDef* TIMx, u16 TIM_DMABase, u16 TIM_DMABurstLength)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_DMA_BASE(TIM_DMABase));
- assert_param(IS_TIM_DMA_LENGTH(TIM_DMABurstLength));
-
- /* Set the DMA Base and the DMA Burst Length */
- TIMx->DCR = TIM_DMABase | TIM_DMABurstLength;
-}
-
-/*******************************************************************************
-* Function Name : TIM_DMACmd
-* Description : Enables or disables the TIMx’s DMA Requests.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_DMASources: specifies the DMA Request sources.
-* This parameter can be any combination of the following values:
-* - TIM_DMA_Update: TIM update Interrupt source
-* - TIM_DMA_CC1: TIM Capture Compare 1 DMA source
-* - TIM_DMA_CC2: TIM Capture Compare 2 DMA source
-* - TIM_DMA_CC3: TIM Capture Compare 3 DMA source
-* - TIM_DMA_CC4: TIM Capture Compare 4 DMA source
-* - TIM_DMA_COM: TIM Commutation DMA source
-* - TIM_DMA_Trigger: TIM Trigger DMA source
-* - NewState: new state of the DMA Request sources.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_DMACmd(TIM_TypeDef* TIMx, u16 TIM_DMASource, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_DMA_SOURCE(TIM_DMASource));
- assert_param(IS_TIM_PERIPH_DMA(TIMx, TIM_DMASource));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the DMA sources */
- TIMx->DIER |= TIM_DMASource;
- }
- else
- {
- /* Disable the DMA sources */
- TIMx->DIER &= (u16)~TIM_DMASource;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_InternalClockConfig
-* Description : Configures the TIMx interrnal Clock
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_InternalClockConfig(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Disable slave mode to clock the prescaler directly with the internal clock */
- TIMx->SMCR &= SMCR_SMS_Mask;
-}
-/*******************************************************************************
-* Function Name : TIM_ITRxExternalClockConfig
-* Description : Configures the TIMx Internal Trigger as External Clock
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ITRSource: Trigger source.
-* This parameter can be one of the following values:
-* - TIM_TS_ITR0: Internal Trigger 0
-* - TIM_TS_ITR1: Internal Trigger 1
-* - TIM_TS_ITR2: Internal Trigger 2
-* - TIM_TS_ITR3: Internal Trigger 3
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ITRxExternalClockConfig(TIM_TypeDef* TIMx, u16 TIM_InputTriggerSource)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_INTERNAL_TRIGGER_SELECTION(TIM_InputTriggerSource));
-
- /* Select the Internal Trigger */
- TIM_SelectInputTrigger(TIMx, TIM_InputTriggerSource);
-
- /* Select the External clock mode1 */
- TIMx->SMCR |= TIM_SlaveMode_External1;
-}
-/*******************************************************************************
-* Function Name : TIM_TIxExternalClockConfig
-* Description : Configures the TIMx Trigger as External Clock
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_TIxExternalCLKSource: Trigger source.
-* This parameter can be one of the following values:
-* - TIM_TIxExternalCLK1Source_TI1ED: TI1 Edge Detector
-* - TIM_TIxExternalCLK1Source_TI1: Filtered Timer Input 1
-* - TIM_TIxExternalCLK1Source_TI2: Filtered Timer Input 2
-* - TIM_ICPolarity: specifies the TIx Polarity.
-* This parameter can be:
-* - TIM_ICPolarity_Rising
-* - TIM_ICPolarity_Falling
-* - ICFilter : specifies the filter value.
-* This parameter must be a value between 0x0 and 0xF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_TIxExternalClockConfig(TIM_TypeDef* TIMx, u16 TIM_TIxExternalCLKSource,
- u16 TIM_ICPolarity, u16 ICFilter)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_TIXCLK_SOURCE(TIM_TIxExternalCLKSource));
- assert_param(IS_TIM_IC_POLARITY(TIM_ICPolarity));
- assert_param(IS_TIM_IC_FILTER(ICFilter));
-
- /* Configure the Timer Input Clock Source */
- if (TIM_TIxExternalCLKSource == TIM_TIxExternalCLK1Source_TI2)
- {
- TI2_Config(TIMx, TIM_ICPolarity, TIM_ICSelection_DirectTI, ICFilter);
- }
- else
- {
- TI1_Config(TIMx, TIM_ICPolarity, TIM_ICSelection_DirectTI, ICFilter);
- }
-
- /* Select the Trigger source */
- TIM_SelectInputTrigger(TIMx, TIM_TIxExternalCLKSource);
-
- /* Select the External clock mode1 */
- TIMx->SMCR |= TIM_SlaveMode_External1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ETRClockMode1Config
-* Description : Configures the External clock Mode1
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ExtTRGPrescaler: The external Trigger Prescaler.
-* It can be one of the following values:
-* - TIM_ExtTRGPSC_OFF
-* - TIM_ExtTRGPSC_DIV2
-* - TIM_ExtTRGPSC_DIV4
-* - TIM_ExtTRGPSC_DIV8.
-* - TIM_ExtTRGPolarity: The external Trigger Polarity.
-* It can be one of the following values:
-* - TIM_ExtTRGPolarity_Inverted
-* - TIM_ExtTRGPolarity_NonInverted
-* - ExtTRGFilter: External Trigger Filter.
-* This parameter must be a value between 0x00 and 0x0F
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ETRClockMode1Config(TIM_TypeDef* TIMx, u16 TIM_ExtTRGPrescaler, u16 TIM_ExtTRGPolarity,
- u16 ExtTRGFilter)
-{
- u16 tmpsmcr = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_EXT_PRESCALER(TIM_ExtTRGPrescaler));
- assert_param(IS_TIM_EXT_POLARITY(TIM_ExtTRGPolarity));
- assert_param(IS_TIM_EXT_FILTER(ExtTRGFilter));
-
- /* Configure the ETR Clock source */
- TIM_ETRConfig(TIMx, TIM_ExtTRGPrescaler, TIM_ExtTRGPolarity, ExtTRGFilter);
-
- /* Get the TIMx SMCR register value */
- tmpsmcr = TIMx->SMCR;
-
- /* Reset the SMS Bits */
- tmpsmcr &= SMCR_SMS_Mask;
- /* Select the External clock mode1 */
- tmpsmcr |= TIM_SlaveMode_External1;
-
- /* Select the Trigger selection : ETRF */
- tmpsmcr &= SMCR_TS_Mask;
- tmpsmcr |= TIM_TS_ETRF;
-
- /* Write to TIMx SMCR */
- TIMx->SMCR = tmpsmcr;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ETRClockMode2Config
-* Description : Configures the External clock Mode2
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ExtTRGPrescaler: The external Trigger Prescaler.
-* It can be one of the following values:
-* - TIM_ExtTRGPSC_OFF
-* - TIM_ExtTRGPSC_DIV2
-* - TIM_ExtTRGPSC_DIV4
-* - TIM_ExtTRGPSC_DIV8
-* - TIM_ExtTRGPolarity: The external Trigger Polarity.
-* It can be one of the following values:
-* - TIM_ExtTRGPolarity_Inverted
-* - TIM_ExtTRGPolarity_NonInverted
-* - ExtTRGFilter: External Trigger Filter.
-* This parameter must be a value between 0x00 and 0x0F
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ETRClockMode2Config(TIM_TypeDef* TIMx, u16 TIM_ExtTRGPrescaler,
- u16 TIM_ExtTRGPolarity, u16 ExtTRGFilter)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_EXT_PRESCALER(TIM_ExtTRGPrescaler));
- assert_param(IS_TIM_EXT_POLARITY(TIM_ExtTRGPolarity));
- assert_param(IS_TIM_EXT_FILTER(ExtTRGFilter));
-
- /* Configure the ETR Clock source */
- TIM_ETRConfig(TIMx, TIM_ExtTRGPrescaler, TIM_ExtTRGPolarity, ExtTRGFilter);
-
- /* Enable the External clock mode2 */
- TIMx->SMCR |= SMCR_ECE_Set;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ETRConfig
-* Description : Configures the TIMx External Trigger (ETR).
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ExtTRGPrescaler: The external Trigger Prescaler.
-* This parameter can be one of the following values:
-* - TIM_ExtTRGPSC_OFF
-* - TIM_ExtTRGPSC_DIV2
-* - TIM_ExtTRGPSC_DIV4
-* - TIM_ExtTRGPSC_DIV8
-* - TIM_ExtTRGPolarity: The external Trigger Polarity.
-* This parameter can be one of the following values:
-* - TIM_ExtTRGPolarity_Inverted
-* - TIM_ExtTRGPolarity_NonInverted
-* - ExtTRGFilter: External Trigger Filter.
-* This parameter must be a value between 0x00 and 0x0F.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ETRConfig(TIM_TypeDef* TIMx, u16 TIM_ExtTRGPrescaler, u16 TIM_ExtTRGPolarity,
- u16 ExtTRGFilter)
-{
- u16 tmpsmcr = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_EXT_PRESCALER(TIM_ExtTRGPrescaler));
- assert_param(IS_TIM_EXT_POLARITY(TIM_ExtTRGPolarity));
- assert_param(IS_TIM_EXT_FILTER(ExtTRGFilter));
-
- tmpsmcr = TIMx->SMCR;
-
- /* Reset the ETR Bits */
- tmpsmcr &= SMCR_ETR_Mask;
-
- /* Set the Prescaler, the Filter value and the Polarity */
- tmpsmcr |= TIM_ExtTRGPrescaler | TIM_ExtTRGPolarity | (u16)(ExtTRGFilter << 8);
-
- /* Write to TIMx SMCR */
- TIMx->SMCR = tmpsmcr;
-}
-
-/*******************************************************************************
-* Function Name : TIM_PrescalerConfig
-* Description : Configures the TIMx Prescaler.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - Prescaler: specifies the Prescaler Register value
-* - TIM_PSCReloadMode: specifies the TIM Prescaler Reload mode
-* This parameter can be one of the following values:
-* - TIM_PSCReloadMode_Update: The Prescaler is loaded at
-* the update event.
-* - TIM_PSCReloadMode_Immediate: The Prescaler is loaded
-* immediatly.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_PrescalerConfig(TIM_TypeDef* TIMx, u16 Prescaler, u16 TIM_PSCReloadMode)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_PRESCALER_RELOAD(TIM_PSCReloadMode));
-
- /* Set the Prescaler value */
- TIMx->PSC = Prescaler;
-
- /* Set or reset the UG Bit */
- TIMx->EGR = TIM_PSCReloadMode;
-}
-
-/*******************************************************************************
-* Function Name : TIM_CounterModeConfig
-* Description : Specifies the TIMx Counter Mode to be used.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_CounterMode: specifies the Counter Mode to be used
-* This parameter can be one of the following values:
-* - TIM_CounterMode_Up: TIM Up Counting Mode
-* - TIM_CounterMode_Down: TIM Down Counting Mode
-* - TIM_CounterMode_CenterAligned1: TIM Center Aligned Mode1
-* - TIM_CounterMode_CenterAligned2: TIM Center Aligned Mode2
-* - TIM_CounterMode_CenterAligned3: TIM Center Aligned Mode3
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_CounterModeConfig(TIM_TypeDef* TIMx, u16 TIM_CounterMode)
-{
- u16 tmpcr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_COUNTER_MODE(TIM_CounterMode));
-
- tmpcr1 = TIMx->CR1;
-
- /* Reset the CMS and DIR Bits */
- tmpcr1 &= CR1_CounterMode_Mask;
-
- /* Set the Counter Mode */
- tmpcr1 |= TIM_CounterMode;
-
- /* Write to TIMx CR1 register */
- TIMx->CR1 = tmpcr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectInputTrigger
-* Description : Selects the Input Trigger source
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_InputTriggerSource: The Input Trigger source.
-* This parameter can be one of the following values:
-* - TIM_TS_ITR0: Internal Trigger 0
-* - TIM_TS_ITR1: Internal Trigger 1
-* - TIM_TS_ITR2: Internal Trigger 2
-* - TIM_TS_ITR3: Internal Trigger 3
-* - TIM_TS_TI1F_ED: TI1 Edge Detector
-* - TIM_TS_TI1FP1: Filtered Timer Input 1
-* - TIM_TS_TI2FP2: Filtered Timer Input 2
-* - TIM_TS_ETRF: External Trigger input
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectInputTrigger(TIM_TypeDef* TIMx, u16 TIM_InputTriggerSource)
-{
- u16 tmpsmcr = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_TRIGGER_SELECTION(TIM_InputTriggerSource));
-
- /* Get the TIMx SMCR register value */
- tmpsmcr = TIMx->SMCR;
-
- /* Reset the TS Bits */
- tmpsmcr &= SMCR_TS_Mask;
-
- /* Set the Input Trigger source */
- tmpsmcr |= TIM_InputTriggerSource;
-
- /* Write to TIMx SMCR */
- TIMx->SMCR = tmpsmcr;
-}
-
-/*******************************************************************************
-* Function Name : TIM_EncoderInterfaceConfig
-* Description : Configures the TIMx Encoder Interface.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_EncoderMode: specifies the TIMx Encoder Mode.
-* This parameter can be one of the following values:
-* - TIM_EncoderMode_TI1: Counter counts on TI1FP1 edge
-* depending on TI2FP2 level.
-* - TIM_EncoderMode_TI2: Counter counts on TI2FP2 edge
-* depending on TI1FP1 level.
-* - TIM_EncoderMode_TI12: Counter counts on both TI1FP1 and
-* TI2FP2 edges depending on the level of the other input.
-* - TIM_IC1Polarity: specifies the IC1 Polarity
-* This parmeter can be one of the following values:
-* - TIM_ICPolarity_Falling: IC Falling edge.
-* - TIM_ICPolarity_Rising: IC Rising edge.
-* - TIM_IC2Polarity: specifies the IC2 Polarity
-* This parmeter can be one of the following values:
-* - TIM_ICPolarity_Falling: IC Falling edge.
-* - TIM_ICPolarity_Rising: IC Rising edge.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_EncoderInterfaceConfig(TIM_TypeDef* TIMx, u16 TIM_EncoderMode,
- u16 TIM_IC1Polarity, u16 TIM_IC2Polarity)
-{
- u16 tmpsmcr = 0;
- u16 tmpccmr1 = 0;
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_ENCODER_MODE(TIM_EncoderMode));
- assert_param(IS_TIM_IC_POLARITY(TIM_IC1Polarity));
- assert_param(IS_TIM_IC_POLARITY(TIM_IC2Polarity));
-
- /* Get the TIMx SMCR register value */
- tmpsmcr = TIMx->SMCR;
-
- /* Get the TIMx CCMR1 register value */
- tmpccmr1 = TIMx->CCMR1;
-
- /* Get the TIMx CCER register value */
- tmpccer = TIMx->CCER;
-
- /* Set the encoder Mode */
- tmpsmcr &= SMCR_SMS_Mask;
- tmpsmcr |= TIM_EncoderMode;
-
- /* Select the Capture Compare 1 and the Capture Compare 2 as input */
- tmpccmr1 &= CCMR_CC13S_Mask & CCMR_CC24S_Mask;
- tmpccmr1 |= CCMR_TI13Direct_Set | CCMR_TI24Direct_Set;
-
- /* Set the TI1 and the TI2 Polarities */
- tmpccer &= CCER_CC1P_Reset & CCER_CC2P_Reset;
- tmpccer |= (TIM_IC1Polarity | (u16)(TIM_IC2Polarity << 4));
-
- /* Write to TIMx SMCR */
- TIMx->SMCR = tmpsmcr;
-
- /* Write to TIMx CCMR1 */
- TIMx->CCMR1 = tmpccmr1;
-
- /* Write to TIMx CCER */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ForcedOC1Config
-* Description : Forces the TIMx output 1 waveform to active or inactive level.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ForcedAction: specifies the forced Action to be set to
-* the output waveform.
-* This parameter can be one of the following values:
-* - TIM_ForcedAction_Active: Force active level on OC1REF
-* - TIM_ForcedAction_InActive: Force inactive level on
-* OC1REF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ForcedOC1Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_FORCED_ACTION(TIM_ForcedAction));
-
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC1M Bits */
- tmpccmr1 &= CCMR_OC13M_Mask;
-
- /* Configure The Forced output Mode */
- tmpccmr1 |= TIM_ForcedAction;
-
- /* Write to TIMx CCMR1 register */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ForcedOC2Config
-* Description : Forces the TIMx output 2 waveform to active or inactive level.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ForcedAction: specifies the forced Action to be set to
-* the output waveform.
-* This parameter can be one of the following values:
-* - TIM_ForcedAction_Active: Force active level on OC2REF
-* - TIM_ForcedAction_InActive: Force inactive level on
-* OC2REF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ForcedOC2Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_FORCED_ACTION(TIM_ForcedAction));
-
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC2M Bits */
- tmpccmr1 &= CCMR_OC24M_Mask;
-
- /* Configure The Forced output Mode */
- tmpccmr1 |= (u16)(TIM_ForcedAction << 8);
-
- /* Write to TIMx CCMR1 register */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ForcedOC3Config
-* Description : Forces the TIMx output 3 waveform to active or inactive level.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ForcedAction: specifies the forced Action to be set to
-* the output waveform.
-* This parameter can be one of the following values:
-* - TIM_ForcedAction_Active: Force active level on OC3REF
-* - TIM_ForcedAction_InActive: Force inactive level on
-* OC3REF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ForcedOC3Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_FORCED_ACTION(TIM_ForcedAction));
-
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC1M Bits */
- tmpccmr2 &= CCMR_OC13M_Mask;
-
- /* Configure The Forced output Mode */
- tmpccmr2 |= TIM_ForcedAction;
-
- /* Write to TIMx CCMR2 register */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ForcedOC4Config
-* Description : Forces the TIMx output 4 waveform to active or inactive level.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ForcedAction: specifies the forced Action to be set to
-* the output waveform.
-* This parameter can be one of the following values:
-* - TIM_ForcedAction_Active: Force active level on OC4REF
-* - TIM_ForcedAction_InActive: Force inactive level on
-* OC4REF.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ForcedOC4Config(TIM_TypeDef* TIMx, u16 TIM_ForcedAction)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_FORCED_ACTION(TIM_ForcedAction));
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC2M Bits */
- tmpccmr2 &= CCMR_OC24M_Mask;
-
- /* Configure The Forced output Mode */
- tmpccmr2 |= (u16)(TIM_ForcedAction << 8);
-
- /* Write to TIMx CCMR2 register */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ARRPreloadConfig
-* Description : Enables or disables TIMx peripheral Preload register on ARR.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - NewState: new state of the TIMx peripheral Preload register
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ARRPreloadConfig(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the ARR Preload Bit */
- TIMx->CR1 |= CR1_ARPE_Set;
- }
- else
- {
- /* Reset the ARR Preload Bit */
- TIMx->CR1 &= CR1_ARPE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectCOM
-* Description : Selects the TIM peripheral Commutation event.
-* Input :- TIMx: where x can be 1 or 8 to select the TIMx peripheral
-* - NewState: new state of the Commutation event.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectCOM(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the COM Bit */
- TIMx->CR2 |= CR2_CCUS_Set;
- }
- else
- {
- /* Reset the COM Bit */
- TIMx->CR2 &= CR2_CCUS_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectCCDMA
-* Description : Selects the TIMx peripheral Capture Compare DMA source.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - NewState: new state of the Capture Compare DMA source
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectCCDMA(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the CCDS Bit */
- TIMx->CR2 |= CR2_CCDS_Set;
- }
- else
- {
- /* Reset the CCDS Bit */
- TIMx->CR2 &= CR2_CCDS_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_CCPreloadControl
-* Description : Sets or Resets the TIM peripheral Capture Compare Preload
-* Control bit.
-* Input :- TIMx: where x can be 1 or 8 to select the TIMx peripheral
-* - NewState: new state of the Capture Compare Preload Control bit
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_CCPreloadControl(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the CCPC Bit */
- TIMx->CR2 |= CR2_CCPC_Set;
- }
- else
- {
- /* Reset the CCPC Bit */
- TIMx->CR2 &= CR2_CCPC_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC1PreloadConfig
-* Description : Enables or disables the TIMx peripheral Preload register on CCR1.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPreload: new state of the TIMx peripheral Preload
-* register
-* This parameter can be one of the following values:
-* - TIM_OCPreload_Enable
-* - TIM_OCPreload_Disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC1PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCPRELOAD_STATE(TIM_OCPreload));
-
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC1PE Bit */
- tmpccmr1 &= CCMR_OC13PE_Reset;
-
- /* Enable or Disable the Output Compare Preload feature */
- tmpccmr1 |= TIM_OCPreload;
-
- /* Write to TIMx CCMR1 register */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC2PreloadConfig
-* Description : Enables or disables the TIMx peripheral Preload register on CCR2.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPreload: new state of the TIMx peripheral Preload
-* register
-* This parameter can be one of the following values:
-* - TIM_OCPreload_Enable
-* - TIM_OCPreload_Disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC2PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCPRELOAD_STATE(TIM_OCPreload));
-
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC2PE Bit */
- tmpccmr1 &= CCMR_OC24PE_Reset;
-
- /* Enable or Disable the Output Compare Preload feature */
- tmpccmr1 |= (u16)(TIM_OCPreload << 8);
-
- /* Write to TIMx CCMR1 register */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC3PreloadConfig
-* Description : Enables or disables the TIMx peripheral Preload register on CCR3.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPreload: new state of the TIMx peripheral Preload
-* register
-* This parameter can be one of the following values:
-* - TIM_OCPreload_Enable
-* - TIM_OCPreload_Disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC3PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCPRELOAD_STATE(TIM_OCPreload));
-
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC3PE Bit */
- tmpccmr2 &= CCMR_OC13PE_Reset;
-
- /* Enable or Disable the Output Compare Preload feature */
- tmpccmr2 |= TIM_OCPreload;
-
- /* Write to TIMx CCMR2 register */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC4PreloadConfig
-* Description : Enables or disables the TIMx peripheral Preload register on CCR4.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPreload: new state of the TIMx peripheral Preload
-* register
-* This parameter can be one of the following values:
-* - TIM_OCPreload_Enable
-* - TIM_OCPreload_Disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC4PreloadConfig(TIM_TypeDef* TIMx, u16 TIM_OCPreload)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCPRELOAD_STATE(TIM_OCPreload));
-
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC4PE Bit */
- tmpccmr2 &= CCMR_OC24PE_Reset;
-
- /* Enable or Disable the Output Compare Preload feature */
- tmpccmr2 |= (u16)(TIM_OCPreload << 8);
-
- /* Write to TIMx CCMR2 register */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC1FastConfig
-* Description : Configures the TIMx Output Compare 1 Fast feature.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCFast: new state of the Output Compare Fast Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCFast_Enable: TIM output compare fast enable
-* - TIM_OCFast_Disable: TIM output compare fast disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC1FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCFAST_STATE(TIM_OCFast));
-
- /* Get the TIMx CCMR1 register value */
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC1FE Bit */
- tmpccmr1 &= CCMR_OC13FE_Reset;
-
- /* Enable or Disable the Output Compare Fast Bit */
- tmpccmr1 |= TIM_OCFast;
-
- /* Write to TIMx CCMR1 */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC2FastConfig
-* Description : Configures the TIMx Output Compare 2 Fast feature.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCFast: new state of the Output Compare Fast Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCFast_Enable: TIM output compare fast enable
-* - TIM_OCFast_Disable: TIM output compare fast disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC2FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCFAST_STATE(TIM_OCFast));
-
- /* Get the TIMx CCMR1 register value */
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC2FE Bit */
- tmpccmr1 &= CCMR_OC24FE_Reset;
-
- /* Enable or Disable the Output Compare Fast Bit */
- tmpccmr1 |= (u16)(TIM_OCFast << 8);
-
- /* Write to TIMx CCMR1 */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC3FastConfig
-* Description : Configures the TIMx Output Compare 3 Fast feature.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCFast: new state of the Output Compare Fast Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCFast_Enable: TIM output compare fast enable
-* - TIM_OCFast_Disable: TIM output compare fast disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC3FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCFAST_STATE(TIM_OCFast));
-
- /* Get the TIMx CCMR2 register value */
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC3FE Bit */
- tmpccmr2 &= CCMR_OC13FE_Reset;
-
- /* Enable or Disable the Output Compare Fast Bit */
- tmpccmr2 |= TIM_OCFast;
-
- /* Write to TIMx CCMR2 */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC4FastConfig
-* Description : Configures the TIMx Output Compare 4 Fast feature.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCFast: new state of the Output Compare Fast Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCFast_Enable: TIM output compare fast enable
-* - TIM_OCFast_Disable: TIM output compare fast disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC4FastConfig(TIM_TypeDef* TIMx, u16 TIM_OCFast)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCFAST_STATE(TIM_OCFast));
-
- /* Get the TIMx CCMR2 register value */
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC4FE Bit */
- tmpccmr2 &= CCMR_OC24FE_Reset;
-
- /* Enable or Disable the Output Compare Fast Bit */
- tmpccmr2 |= (u16)(TIM_OCFast << 8);
-
- /* Write to TIMx CCMR2 */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ClearOC1Ref
-* Description : Clears or safeguards the OCREF1 signal on an external event
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCClear: new state of the Output Compare Clear Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCClear_Enable: TIM Output clear enable
-* - TIM_OCClear_Disable: TIM Output clear disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ClearOC1Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCCLEAR_STATE(TIM_OCClear));
-
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC1CE Bit */
- tmpccmr1 &= CCMR_OC13CE_Reset;
-
- /* Enable or Disable the Output Compare Clear Bit */
- tmpccmr1 |= TIM_OCClear;
-
- /* Write to TIMx CCMR1 register */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ClearOC2Ref
-* Description : Clears or safeguards the OCREF2 signal on an external event
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCClear: new state of the Output Compare Clear Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCClear_Enable: TIM Output clear enable
-* - TIM_OCClear_Disable: TIM Output clear disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ClearOC2Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear)
-{
- u16 tmpccmr1 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCCLEAR_STATE(TIM_OCClear));
-
- tmpccmr1 = TIMx->CCMR1;
-
- /* Reset the OC2CE Bit */
- tmpccmr1 &= CCMR_OC24CE_Reset;
-
- /* Enable or Disable the Output Compare Clear Bit */
- tmpccmr1 |= (u16)(TIM_OCClear << 8);
-
- /* Write to TIMx CCMR1 register */
- TIMx->CCMR1 = tmpccmr1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ClearOC3Ref
-* Description : Clears or safeguards the OCREF3 signal on an external event
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCClear: new state of the Output Compare Clear Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCClear_Enable: TIM Output clear enable
-* - TIM_OCClear_Disable: TIM Output clear disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ClearOC3Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCCLEAR_STATE(TIM_OCClear));
-
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC3CE Bit */
- tmpccmr2 &= CCMR_OC13CE_Reset;
-
- /* Enable or Disable the Output Compare Clear Bit */
- tmpccmr2 |= TIM_OCClear;
-
- /* Write to TIMx CCMR2 register */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ClearOC4Ref
-* Description : Clears or safeguards the OCREF4 signal on an external event
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCClear: new state of the Output Compare Clear Enable Bit.
-* This parameter can be one of the following values:
-* - TIM_OCClear_Enable: TIM Output clear enable
-* - TIM_OCClear_Disable: TIM Output clear disable
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ClearOC4Ref(TIM_TypeDef* TIMx, u16 TIM_OCClear)
-{
- u16 tmpccmr2 = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OCCLEAR_STATE(TIM_OCClear));
-
- tmpccmr2 = TIMx->CCMR2;
-
- /* Reset the OC4CE Bit */
- tmpccmr2 &= CCMR_OC24CE_Reset;
-
- /* Enable or Disable the Output Compare Clear Bit */
- tmpccmr2 |= (u16)(TIM_OCClear << 8);
-
- /* Write to TIMx CCMR2 register */
- TIMx->CCMR2 = tmpccmr2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC1PolarityConfig
-* Description : Configures the TIMx channel 1 polarity.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPolarity: specifies the OC1 Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCPolarity_High: Output Compare active high
-* - TIM_OCPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC1PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC1P Bit */
- tmpccer &= CCER_CC1P_Reset;
- tmpccer |= TIM_OCPolarity;
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC1NPolarityConfig
-* Description : Configures the TIMx Channel 1N polarity.
-* Input : - TIMx: where x can be 1 or 8 to select the TIM peripheral.
-* - TIM_OCNPolarity: specifies the OC1N Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCNPolarity_High: Output Compare active high
-* - TIM_OCNPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC1NPolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCNPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_TIM_OCN_POLARITY(TIM_OCNPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC1NP Bit */
- tmpccer &= CCER_CC1NP_Reset;
- tmpccer |= TIM_OCNPolarity;
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC2PolarityConfig
-* Description : Configures the TIMx channel 2 polarity.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPolarity: specifies the OC2 Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCPolarity_High: Output Compare active high
-* - TIM_OCPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC2PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC2P Bit */
- tmpccer &= CCER_CC2P_Reset;
- tmpccer |= (u16)(TIM_OCPolarity << 4);
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC2NPolarityConfig
-* Description : Configures the TIMx Channel 2N polarity.
-* Input : - TIMx: where x can be 1 or 8 to select the TIM peripheral.
-* - TIM_OCNPolarity: specifies the OC2N Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCNPolarity_High: Output Compare active high
-* - TIM_OCNPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC2NPolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCNPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_TIM_OCN_POLARITY(TIM_OCNPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC2NP Bit */
- tmpccer &= CCER_CC2NP_Reset;
- tmpccer |= (u16)(TIM_OCNPolarity << 4);
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC3PolarityConfig
-* Description : Configures the TIMx channel 3 polarity.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPolarity: specifies the OC3 Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCPolarity_High: Output Compare active high
-* - TIM_OCPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC3PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC3P Bit */
- tmpccer &= CCER_CC3P_Reset;
- tmpccer |= (u16)(TIM_OCPolarity << 8);
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC3NPolarityConfig
-* Description : Configures the TIMx Channel 3N polarity.
-* Input : - TIMx: where x can be 1 or 8 to select the TIM peripheral.
-* - TIM_OCNPolarity: specifies the OC3N Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCNPolarity_High: Output Compare active high
-* - TIM_OCNPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC3NPolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCNPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_TIM_OCN_POLARITY(TIM_OCNPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC3NP Bit */
- tmpccer &= CCER_CC3NP_Reset;
- tmpccer |= (u16)(TIM_OCNPolarity << 8);
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_OC4PolarityConfig
-* Description : Configures the TIMx channel 4 polarity.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_OCPolarity: specifies the OC4 Polarity
-* This parmeter can be one of the following values:
-* - TIM_OCPolarity_High: Output Compare active high
-* - TIM_OCPolarity_Low: Output Compare active low
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_OC4PolarityConfig(TIM_TypeDef* TIMx, u16 TIM_OCPolarity)
-{
- u16 tmpccer = 0;
-
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_OC_POLARITY(TIM_OCPolarity));
-
- tmpccer = TIMx->CCER;
-
- /* Set or Reset the CC4P Bit */
- tmpccer &= CCER_CC4P_Reset;
- tmpccer |= (u16)(TIM_OCPolarity << 12);
-
- /* Write to TIMx CCER register */
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TIM_CCxCmd
-* Description : Enables or disables the TIM Capture Compare Channel x.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_Channel: specifies the TIM Channel
-* This parmeter can be one of the following values:
-* - TIM_Channel_1: TIM Channel 1
-* - TIM_Channel_2: TIM Channel 2
-* - TIM_Channel_3: TIM Channel 3
-* - TIM_Channel_4: TIM Channel 4
-* - TIM_CCx: specifies the TIM Channel CCxE bit new state.
-* This parameter can be: TIM_CCx_Enable or TIM_CCx_Disable.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_CCxCmd(TIM_TypeDef* TIMx, u16 TIM_Channel, u16 TIM_CCx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_CHANNEL(TIM_Channel));
- assert_param(IS_TIM_CCX(TIM_CCx));
-
- /* Reset the CCxE Bit */
- TIMx->CCER &= (u16)(~((u16)(CCER_CCE_Set << TIM_Channel)));
-
- /* Set or reset the CCxE Bit */
- TIMx->CCER |= (u16)(TIM_CCx << TIM_Channel);
-}
-
-/*******************************************************************************
-* Function Name : TIM_CCxNCmd
-* Description : Enables or disables the TIM Capture Compare Channel xN.
-* Input :- TIMx: where x can be 1 or 8 to select the TIM peripheral.
-* - TIM_Channel: specifies the TIM Channel
-* This parmeter can be one of the following values:
-* - TIM_Channel_1: TIM Channel 1
-* - TIM_Channel_2: TIM Channel 2
-* - TIM_Channel_3: TIM Channel 3
-* - TIM_CCx: specifies the TIM Channel CCxNE bit new state.
-* This parameter can be: TIM_CCxN_Enable or TIM_CCxN_Disable.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_CCxNCmd(TIM_TypeDef* TIMx, u16 TIM_Channel, u16 TIM_CCxN)
-{
- /* Check the parameters */
- assert_param(IS_TIM_18_PERIPH(TIMx));
- assert_param(IS_TIM_COMPLEMENTARY_CHANNEL(TIM_Channel));
- assert_param(IS_TIM_CCXN(TIM_CCxN));
-
- /* Reset the CCxNE Bit */
- TIMx->CCER &= (u16)(~((u16)(CCER_CCNE_Set << TIM_Channel)));
-
- /* Set or reset the CCxNE Bit */
- TIMx->CCER |= (u16)(TIM_CCxN << TIM_Channel);
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectOCxM
-* Description : Selects the TIM Ouput Compare Mode.
-* This function disables the selected channel before changing
-* the Ouput Compare Mode. User has to enable this channel using
-* TIM_CCxCmd and TIM_CCxNCmd functions.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_Channel: specifies the TIM Channel
-* This parmeter can be one of the following values:
-* - TIM_Channel_1: TIM Channel 1
-* - TIM_Channel_2: TIM Channel 2
-* - TIM_Channel_3: TIM Channel 3
-* - TIM_Channel_4: TIM Channel 4
-* - TIM_OCMode: specifies the TIM Output Compare Mode.
-* This paramter can be one of the following values:
-* - TIM_OCMode_Timing
-* - TIM_OCMode_Active
-* - TIM_OCMode_Toggle
-* - TIM_OCMode_PWM1
-* - TIM_OCMode_PWM2
-* - TIM_ForcedAction_Active
-* - TIM_ForcedAction_InActive
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectOCxM(TIM_TypeDef* TIMx, u16 TIM_Channel, u16 TIM_OCMode)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_CHANNEL(TIM_Channel));
- assert_param(IS_TIM_OCM(TIM_OCMode));
-
- /* Disable the Channel: Reset the CCxE Bit */
- TIMx->CCER &= (u16)(~((u16)(CCER_CCE_Set << TIM_Channel)));
-
- if((TIM_Channel == TIM_Channel_1) ||(TIM_Channel == TIM_Channel_3))
- {
- /* Reset the OCxM bits in the CCMRx register */
- *((vu32 *)((*(u32*)&TIMx) + CCMR_Offset + (TIM_Channel>>1))) &= CCMR_OC13M_Mask;
-
- /* Configure the OCxM bits in the CCMRx register */
- *((vu32 *)((*(u32*)&TIMx) + CCMR_Offset + (TIM_Channel>>1))) = TIM_OCMode;
-
- }
- else
- {
- /* Reset the OCxM bits in the CCMRx register */
- *((vu32 *)((*(u32*)&TIMx) + CCMR_Offset + ((u16)(TIM_Channel - 4)>> 1))) &= CCMR_OC24M_Mask;
-
- /* Configure the OCxM bits in the CCMRx register */
- *((vu32 *)((*(u32*)&TIMx) + CCMR_Offset + ((u16)(TIM_Channel - 4)>> 1))) = (u16)(TIM_OCMode << 8);
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_UpdateDisableConfig
-* Description : Enables or Disables the TIMx Update event.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - NewState: new state of the TIMx UDIS bit
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_UpdateDisableConfig(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the Update Disable Bit */
- TIMx->CR1 |= CR1_UDIS_Set;
- }
- else
- {
- /* Reset the Update Disable Bit */
- TIMx->CR1 &= CR1_UDIS_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_UpdateRequestConfig
-* Description : Configures the TIMx Update Request Interrupt source.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_UpdateSource: specifies the Update source.
-* This parameter can be one of the following values:
-* - TIM_UpdateSource_Regular
-* - TIM_UpdateSource_Global
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_UpdateRequestConfig(TIM_TypeDef* TIMx, u16 TIM_UpdateSource)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_UPDATE_SOURCE(TIM_UpdateSource));
-
- if (TIM_UpdateSource != TIM_UpdateSource_Global)
- {
- /* Set the URS Bit */
- TIMx->CR1 |= CR1_URS_Set;
- }
- else
- {
- /* Reset the URS Bit */
- TIMx->CR1 &= CR1_URS_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectHallSensor
-* Description : Enables or disables the TIMx’s Hall sensor interface.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.
-* - NewState: new state of the TIMx Hall sensor interface.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectHallSensor(TIM_TypeDef* TIMx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Set the TI1S Bit */
- TIMx->CR2 |= CR2_TI1S_Set;
- }
- else
- {
- /* Reset the TI1S Bit */
- TIMx->CR2 &= CR2_TI1S_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectOnePulseMode
-* Description : Selects the TIMx’s One Pulse Mode.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_OPMode: specifies the OPM Mode to be used.
-* This parameter can be one of the following values:
-* - TIM_OPMode_Single
-* - TIM_OPMode_Repetitive
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectOnePulseMode(TIM_TypeDef* TIMx, u16 TIM_OPMode)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_OPM_MODE(TIM_OPMode));
-
- /* Reset the OPM Bit */
- TIMx->CR1 &= CR1_OPM_Reset;
-
- /* Configure the OPM Mode */
- TIMx->CR1 |= TIM_OPMode;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectOutputTrigger
-* Description : Selects the TIMx Trigger Output Mode.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_TRGOSource: specifies the Trigger Output source.
-* This paramter can be as follow:
-* 1/ For TIM1 to TIM8:
-* - TIM_TRGOSource_Reset
-* - TIM_TRGOSource_Enable
-* - TIM_TRGOSource_Update
-* 2/ These parameters are available for all TIMx except
-* TIM6 and TIM7:
-* - TIM_TRGOSource_OC1
-* - TIM_TRGOSource_OC1Ref
-* - TIM_TRGOSource_OC2Ref
-* - TIM_TRGOSource_OC3Ref
-* - TIM_TRGOSource_OC4Ref
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectOutputTrigger(TIM_TypeDef* TIMx, u16 TIM_TRGOSource)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_TRGO_SOURCE(TIM_TRGOSource));
- assert_param(IS_TIM_PERIPH_TRGO(TIMx, TIM_TRGOSource));
-
- /* Reset the MMS Bits */
- TIMx->CR2 &= CR2_MMS_Mask;
-
- /* Select the TRGO source */
- TIMx->CR2 |= TIM_TRGOSource;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectSlaveMode
-* Description : Selects the TIMx Slave Mode.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_SlaveMode: specifies the Timer Slave Mode.
-* This paramter can be one of the following values:
-* - TIM_SlaveMode_Reset
-* - TIM_SlaveMode_Gated
-* - TIM_SlaveMode_Trigger
-* - TIM_SlaveMode_External1
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectSlaveMode(TIM_TypeDef* TIMx, u16 TIM_SlaveMode)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_SLAVE_MODE(TIM_SlaveMode));
-
- /* Reset the SMS Bits */
- TIMx->SMCR &= SMCR_SMS_Mask;
-
- /* Select the Slave Mode */
- TIMx->SMCR |= TIM_SlaveMode;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SelectMasterSlaveMode
-* Description : Sets or Resets the TIMx Master/Slave Mode.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_MasterSlaveMode: specifies the Timer Master Slave Mode.
-* This paramter can be one of the following values:
-* - TIM_MasterSlaveMode_Enable: synchronization between the
-* current timer and its slaves (through TRGO).
-* - TIM_MasterSlaveMode_Disable: No action
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SelectMasterSlaveMode(TIM_TypeDef* TIMx, u16 TIM_MasterSlaveMode)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_MSM_STATE(TIM_MasterSlaveMode));
-
- /* Reset the MSM Bit */
- TIMx->SMCR &= SMCR_MSM_Reset;
-
- /* Set or Reset the MSM Bit */
- TIMx->SMCR |= TIM_MasterSlaveMode;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetCounter
-* Description : Sets the TIMx Counter Register value
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - Counter: specifies the Counter register new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetCounter(TIM_TypeDef* TIMx, u16 Counter)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
-
- /* Set the Counter Register value */
- TIMx->CNT = Counter;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetAutoreload
-* Description : Sets the TIMx Autoreload Register value
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - Autoreload: specifies the Autoreload register new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetAutoreload(TIM_TypeDef* TIMx, u16 Autoreload)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
-
- /* Set the Autoreload Register value */
- TIMx->ARR = Autoreload;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetCompare1
-* Description : Sets the TIMx Capture Compare1 Register value
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - Compare1: specifies the Capture Compare1 register new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetCompare1(TIM_TypeDef* TIMx, u16 Compare1)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Set the Capture Compare1 Register value */
- TIMx->CCR1 = Compare1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetCompare2
-* Description : Sets the TIMx Capture Compare2 Register value
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - Compare2: specifies the Capture Compare2 register new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetCompare2(TIM_TypeDef* TIMx, u16 Compare2)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Set the Capture Compare2 Register value */
- TIMx->CCR2 = Compare2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetCompare3
-* Description : Sets the TIMx Capture Compare3 Register value
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - Compare3: specifies the Capture Compare3 register new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetCompare3(TIM_TypeDef* TIMx, u16 Compare3)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Set the Capture Compare3 Register value */
- TIMx->CCR3 = Compare3;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetCompare4
-* Description : Sets the TIMx Capture Compare4 Register value
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - Compare4: specifies the Capture Compare4 register new value.
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetCompare4(TIM_TypeDef* TIMx, u16 Compare4)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Set the Capture Compare4 Register value */
- TIMx->CCR4 = Compare4;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetIC1Prescaler
-* Description : Sets the TIMx Input Capture 1 prescaler.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPSC: specifies the Input Capture1 prescaler
-* new value.
-* This parameter can be one of the following values:
-* - TIM_ICPSC_DIV1: no prescaler
-* - TIM_ICPSC_DIV2: capture is done once every 2 events
-* - TIM_ICPSC_DIV4: capture is done once every 4 events
-* - TIM_ICPSC_DIV8: capture is done once every 8 events
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetIC1Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_IC_PRESCALER(TIM_ICPSC));
-
- /* Reset the IC1PSC Bits */
- TIMx->CCMR1 &= CCMR_IC13PSC_Mask;
-
- /* Set the IC1PSC value */
- TIMx->CCMR1 |= TIM_ICPSC;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetIC2Prescaler
-* Description : Sets the TIMx Input Capture 2 prescaler.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPSC: specifies the Input Capture2 prescaler
-* new value.
-* This parameter can be one of the following values:
-* - TIM_ICPSC_DIV1: no prescaler
-* - TIM_ICPSC_DIV2: capture is done once every 2 events
-* - TIM_ICPSC_DIV4: capture is done once every 4 events
-* - TIM_ICPSC_DIV8: capture is done once every 8 events
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetIC2Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_IC_PRESCALER(TIM_ICPSC));
-
- /* Reset the IC2PSC Bits */
- TIMx->CCMR1 &= CCMR_IC24PSC_Mask;
-
- /* Set the IC2PSC value */
- TIMx->CCMR1 |= (u16)(TIM_ICPSC << 8);
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetIC3Prescaler
-* Description : Sets the TIMx Input Capture 3 prescaler.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPSC: specifies the Input Capture3 prescaler
-* new value.
-* This parameter can be one of the following values:
-* - TIM_ICPSC_DIV1: no prescaler
-* - TIM_ICPSC_DIV2: capture is done once every 2 events
-* - TIM_ICPSC_DIV4: capture is done once every 4 events
-* - TIM_ICPSC_DIV8: capture is done once every 8 events
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetIC3Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_IC_PRESCALER(TIM_ICPSC));
-
- /* Reset the IC3PSC Bits */
- TIMx->CCMR2 &= CCMR_IC13PSC_Mask;
-
- /* Set the IC3PSC value */
- TIMx->CCMR2 |= TIM_ICPSC;
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetIC4Prescaler
-* Description : Sets the TIMx Input Capture 4 prescaler.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPSC: specifies the Input Capture4 prescaler
-* new value.
-* This parameter can be one of the following values:
-* - TIM_ICPSC_DIV1: no prescaler
-* - TIM_ICPSC_DIV2: capture is done once every 2 events
-* - TIM_ICPSC_DIV4: capture is done once every 4 events
-* - TIM_ICPSC_DIV8: capture is done once every 8 events
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetIC4Prescaler(TIM_TypeDef* TIMx, u16 TIM_ICPSC)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_IC_PRESCALER(TIM_ICPSC));
-
- /* Reset the IC4PSC Bits */
- TIMx->CCMR2 &= CCMR_IC24PSC_Mask;
-
- /* Set the IC4PSC value */
- TIMx->CCMR2 |= (u16)(TIM_ICPSC << 8);
-}
-
-/*******************************************************************************
-* Function Name : TIM_SetClockDivision
-* Description : Sets the TIMx Clock Division value.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_CKD: specifies the clock division value.
-* This parameter can be one of the following value:
-* - TIM_CKD_DIV1: TDTS = Tck_tim
-* - TIM_CKD_DIV2: TDTS = 2*Tck_tim
-* - TIM_CKD_DIV4: TDTS = 4*Tck_tim
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_SetClockDivision(TIM_TypeDef* TIMx, u16 TIM_CKD)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
- assert_param(IS_TIM_CKD_DIV(TIM_CKD));
-
- /* Reset the CKD Bits */
- TIMx->CR1 &= CR1_CKD_Mask;
-
- /* Set the CKD value */
- TIMx->CR1 |= TIM_CKD;
-}
-/*******************************************************************************
-* Function Name : TIM_GetCapture1
-* Description : Gets the TIMx Input Capture 1 value.
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* Output : None
-* Return : Capture Compare 1 Register value.
-*******************************************************************************/
-u16 TIM_GetCapture1(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Get the Capture 1 Register value */
- return TIMx->CCR1;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetCapture2
-* Description : Gets the TIMx Input Capture 2 value.
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* Output : None
-* Return : Capture Compare 2 Register value.
-*******************************************************************************/
-u16 TIM_GetCapture2(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Get the Capture 2 Register value */
- return TIMx->CCR2;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetCapture3
-* Description : Gets the TIMx Input Capture 3 value.
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* Output : None
-* Return : Capture Compare 3 Register value.
-*******************************************************************************/
-u16 TIM_GetCapture3(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Get the Capture 3 Register value */
- return TIMx->CCR3;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetCapture4
-* Description : Gets the TIMx Input Capture 4 value.
-* Input : TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* Output : None
-* Return : Capture Compare 4 Register value.
-*******************************************************************************/
-u16 TIM_GetCapture4(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_123458_PERIPH(TIMx));
-
- /* Get the Capture 4 Register value */
- return TIMx->CCR4;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetCounter
-* Description : Gets the TIMx Counter value.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* Output : None
-* Return : Counter Register value.
-*******************************************************************************/
-u16 TIM_GetCounter(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
-
- /* Get the Counter Register value */
- return TIMx->CNT;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetPrescaler
-* Description : Gets the TIMx Prescaler value.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* Output : None
-* Return : Prescaler Register value.
-*******************************************************************************/
-u16 TIM_GetPrescaler(TIM_TypeDef* TIMx)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
-
- /* Get the Prescaler Register value */
- return TIMx->PSC;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetFlagStatus
-* Description : Checks whether the specified TIM flag is set or not.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - TIM_FLAG_Update: TIM update Flag
-* - TIM_FLAG_CC1: TIM Capture Compare 1 Flag
-* - TIM_FLAG_CC2: TIM Capture Compare 2 Flag
-* - TIM_FLAG_CC3: TIM Capture Compare 3 Flag
-* - TIM_FLAG_CC4: TIM Capture Compare 4 Flag
-* - TIM_FLAG_COM: TIM Commutation Flag
-* - TIM_FLAG_Trigger: TIM Trigger Flag
-* - TIM_FLAG_Break: TIM Break Flag
-* - TIM_FLAG_CC1OF: TIM Capture Compare 1 overcapture Flag
-* - TIM_FLAG_CC2OF: TIM Capture Compare 2 overcapture Flag
-* - TIM_FLAG_CC3OF: TIM Capture Compare 3 overcapture Flag
-* - TIM_FLAG_CC4OF: TIM Capture Compare 4 overcapture Flag
-* Output : None
-* Return : The new state of TIM_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus TIM_GetFlagStatus(TIM_TypeDef* TIMx, u16 TIM_FLAG)
-{
- ITStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_GET_FLAG(TIM_FLAG));
- assert_param(IS_TIM_PERIPH_FLAG(TIMx, TIM_FLAG));
-
- if ((TIMx->SR & TIM_FLAG) != (u16)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ClearFlag
-* Description : Clears the TIMx's pending flags.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_FLAG: specifies the flag bit to clear.
-* This parameter can be any combination of the following values:
-* - TIM_FLAG_Update: TIM update Flag
-* - TIM_FLAG_CC1: TIM Capture Compare 1 Flag
-* - TIM_FLAG_CC2: TIM Capture Compare 2 Flag
-* - TIM_FLAG_CC3: TIM Capture Compare 3 Flag
-* - TIM_FLAG_CC4: TIM Capture Compare 4 Flag
-* - TIM_FLAG_COM: TIM Commutation Flag
-* - TIM_FLAG_Trigger: TIM Trigger Flag
-* - TIM_FLAG_Break: TIM Break Flag
-* - TIM_FLAG_CC1OF: TIM Capture Compare 1 overcapture Flag
-* - TIM_FLAG_CC2OF: TIM Capture Compare 2 overcapture Flag
-* - TIM_FLAG_CC3OF: TIM Capture Compare 3 overcapture Flag
-* - TIM_FLAG_CC4OF: TIM Capture Compare 4 overcapture Flag
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ClearFlag(TIM_TypeDef* TIMx, u16 TIM_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_CLEAR_FLAG(TIMx, TIM_FLAG));
-
- /* Clear the flags */
- TIMx->SR = (u16)~TIM_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : TIM_GetITStatus
-* Description : Checks whether the TIM interrupt has occurred or not.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_IT: specifies the TIM interrupt source to check.
-* This parameter can be one of the following values:
-* - TIM_IT_Update: TIM update Interrupt source
-* - TIM_IT_CC1: TIM Capture Compare 1 Interrupt source
-* - TIM_IT_CC2: TIM Capture Compare 2 Interrupt source
-* - TIM_IT_CC3: TIM Capture Compare 3 Interrupt source
-* - TIM_IT_CC4: TIM Capture Compare 4 Interrupt source
-* - TIM_IT_COM: TIM Commutation Interrupt
-* source
-* - TIM_IT_Trigger: TIM Trigger Interrupt source
-* - TIM_IT_Break: TIM Break Interrupt source
-* Output : None
-* Return : The new state of the TIM_IT(SET or RESET).
-*******************************************************************************/
-ITStatus TIM_GetITStatus(TIM_TypeDef* TIMx, u16 TIM_IT)
-{
- ITStatus bitstatus = RESET;
- u16 itstatus = 0x0, itenable = 0x0;
-
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_GET_IT(TIM_IT));
- assert_param(IS_TIM_PERIPH_IT(TIMx, TIM_IT));
-
- itstatus = TIMx->SR & TIM_IT;
-
- itenable = TIMx->DIER & TIM_IT;
-
- if ((itstatus != (u16)RESET) && (itenable != (u16)RESET))
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : TIM_ClearITPendingBit
-* Description : Clears the TIMx's interrupt pending bits.
-* Input : - TIMx: where x can be 1 to 8 to select the TIM peripheral.
-* - TIM_IT: specifies the pending bit to clear.
-* This parameter can be any combination of the following values:
-* - TIM_IT_Update: TIM1 update Interrupt source
-* - TIM_IT_CC1: TIM Capture Compare 1 Interrupt source
-* - TIM_IT_CC2: TIM Capture Compare 2 Interrupt source
-* - TIM_IT_CC3: TIM Capture Compare 3 Interrupt source
-* - TIM_IT_CC4: TIM Capture Compare 4 Interrupt source
-* - TIM_IT_COM: TIM Commutation Interrupt
-* source
-* - TIM_IT_Trigger: TIM Trigger Interrupt source
-* - TIM_IT_Break: TIM Break Interrupt source
-* Output : None
-* Return : None
-*******************************************************************************/
-void TIM_ClearITPendingBit(TIM_TypeDef* TIMx, u16 TIM_IT)
-{
- /* Check the parameters */
- assert_param(IS_TIM_ALL_PERIPH(TIMx));
- assert_param(IS_TIM_PERIPH_IT(TIMx, TIM_IT));
-
- /* Clear the IT pending Bit */
- TIMx->SR = (u16)~TIM_IT;
-}
-
-/*******************************************************************************
-* Function Name : TI1_Config
-* Description : Configure the TI1 as Input.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPolarity : The Input Polarity.
-* This parameter can be one of the following values:
-* - TIM_ICPolarity_Rising
-* - TIM_ICPolarity_Falling
-* - TIM_ICSelection: specifies the input to be used.
-* This parameter can be one of the following values:
-* - TIM_ICSelection_DirectTI: TIM Input 1 is selected to
-* be connected to IC1.
-* - TIM_ICSelection_IndirectTI: TIM Input 1 is selected to
-* be connected to IC2.
-* - TIM_ICSelection_TRC: TIM Input 1 is selected to be
-* connected to TRC.
-* - TIM_ICFilter: Specifies the Input Capture Filter.
-* This parameter must be a value between 0x00 and 0x0F.
-* Output : None
-* Return : None
-*******************************************************************************/
-static void TI1_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter)
-{
- u16 tmpccmr1 = 0, tmpccer = 0;
-
- /* Disable the Channel 1: Reset the CC1E Bit */
- TIMx->CCER &= CCER_CC1E_Reset;
-
- tmpccmr1 = TIMx->CCMR1;
- tmpccer = TIMx->CCER;
-
- /* Select the Input and set the filter */
- tmpccmr1 &= CCMR_CC13S_Mask & CCMR_IC13F_Mask;
- tmpccmr1 |= TIM_ICSelection | (u16)(TIM_ICFilter << 4);
-
- /* Select the Polarity and set the CC1E Bit */
- tmpccer &= CCER_CC1P_Reset;
- tmpccer |= TIM_ICPolarity | CCER_CC1E_Set;
-
- /* Write to TIMx CCMR1 and CCER registers */
- TIMx->CCMR1 = tmpccmr1;
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TI2_Config
-* Description : Configure the TI2 as Input.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPolarity : The Input Polarity.
-* This parameter can be one of the following values:
-* - TIM_ICPolarity_Rising
-* - TIM_ICPolarity_Falling
-* - TIM_ICSelection: specifies the input to be used.
-* This parameter can be one of the following values:
-* - TIM_ICSelection_DirectTI: TIM Input 2 is selected to
-* be connected to IC2.
-* - TIM_ICSelection_IndirectTI: TIM Input 2 is selected to
-* be connected to IC1.
-* - TIM_ICSelection_TRC: TIM Input 2 is selected to be
-* connected to TRC.
-* - TIM_ICFilter: Specifies the Input Capture Filter.
-* This parameter must be a value between 0x00 and 0x0F.
-* Output : None
-* Return : None
-*******************************************************************************/
-static void TI2_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter)
-{
- u16 tmpccmr1 = 0, tmpccer = 0, tmp = 0;
-
- /* Disable the Channel 2: Reset the CC2E Bit */
- TIMx->CCER &= CCER_CC2E_Reset;
-
- tmpccmr1 = TIMx->CCMR1;
- tmpccer = TIMx->CCER;
- tmp = (u16)(TIM_ICPolarity << 4);
-
- /* Select the Input and set the filter */
- tmpccmr1 &= CCMR_CC24S_Mask & CCMR_IC24F_Mask;
- tmpccmr1 |= (u16)(TIM_ICFilter << 12);
- tmpccmr1 |= (u16)(TIM_ICSelection << 8);
-
- /* Select the Polarity and set the CC2E Bit */
- tmpccer &= CCER_CC2P_Reset;
- tmpccer |= tmp | CCER_CC2E_Set;
-
- /* Write to TIMx CCMR1 and CCER registers */
- TIMx->CCMR1 = tmpccmr1 ;
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TI3_Config
-* Description : Configure the TI3 as Input.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPolarity : The Input Polarity.
-* This parameter can be one of the following values:
-* - TIM_ICPolarity_Rising
-* - TIM_ICPolarity_Falling
-* - TIM_ICSelection: specifies the input to be used.
-* This parameter can be one of the following values:
-* - TIM_ICSelection_DirectTI: TIM Input 3 is selected to
-* be connected to IC3.
-* - TIM_ICSelection_IndirectTI: TIM Input 3 is selected to
-* be connected to IC4.
-* - TIM_ICSelection_TRC: TIM Input 3 is selected to be
-* connected to TRC.
-* - TIM_ICFilter: Specifies the Input Capture Filter.
-* This parameter must be a value between 0x00 and 0x0F.
-* Output : None
-* Return : None
-*******************************************************************************/
-static void TI3_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter)
-{
- u16 tmpccmr2 = 0, tmpccer = 0, tmp = 0;
-
- /* Disable the Channel 3: Reset the CC3E Bit */
- TIMx->CCER &= CCER_CC3E_Reset;
-
- tmpccmr2 = TIMx->CCMR2;
- tmpccer = TIMx->CCER;
- tmp = (u16)(TIM_ICPolarity << 8);
-
- /* Select the Input and set the filter */
- tmpccmr2 &= CCMR_CC13S_Mask & CCMR_IC13F_Mask;
- tmpccmr2 |= TIM_ICSelection | (u16)(TIM_ICFilter << 4);
-
- /* Select the Polarity and set the CC3E Bit */
- tmpccer &= CCER_CC3P_Reset;
- tmpccer |= tmp | CCER_CC3E_Set;
-
- /* Write to TIMx CCMR2 and CCER registers */
- TIMx->CCMR2 = tmpccmr2;
- TIMx->CCER = tmpccer;
-}
-
-/*******************************************************************************
-* Function Name : TI4_Config
-* Description : Configure the TI1 as Input.
-* Input : - TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM
-* peripheral.
-* - TIM_ICPolarity : The Input Polarity.
-* This parameter can be one of the following values:
-* - TIM_ICPolarity_Rising
-* - TIM_ICPolarity_Falling
-* - TIM_ICSelection: specifies the input to be used.
-* This parameter can be one of the following values:
-* - TIM_ICSelection_DirectTI: TIM Input 4 is selected to
-* be connected to IC4.
-* - TIM_ICSelection_IndirectTI: TIM Input 4 is selected to
-* be connected to IC3.
-* - TIM_ICSelection_TRC: TIM Input 4 is selected to be
-* connected to TRC.
-* - TIM_ICFilter: Specifies the Input Capture Filter.
-* This parameter must be a value between 0x00 and 0x0F.
-* Output : None
-* Return : None
-*******************************************************************************/
-static void TI4_Config(TIM_TypeDef* TIMx, u16 TIM_ICPolarity, u16 TIM_ICSelection,
- u16 TIM_ICFilter)
-{
- u16 tmpccmr2 = 0, tmpccer = 0, tmp = 0;
-
- /* Disable the Channel 4: Reset the CC4E Bit */
- TIMx->CCER &= CCER_CC4E_Reset;
-
- tmpccmr2 = TIMx->CCMR2;
- tmpccer = TIMx->CCER;
- tmp = (u16)(TIM_ICPolarity << 12);
-
- /* Select the Input and set the filter */
- tmpccmr2 &= CCMR_CC24S_Mask & CCMR_IC24F_Mask;
- tmpccmr2 |= (u16)(TIM_ICSelection << 8) | (u16)(TIM_ICFilter << 12);
-
- /* Select the Polarity and set the CC4E Bit */
- tmpccer &= CCER_CC4P_Reset;
- tmpccer |= tmp | CCER_CC4E_Set;
-
- /* Write to TIMx CCMR2 and CCER registers */
- TIMx->CCMR2 = tmpccmr2;
- TIMx->CCER = tmpccer ;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_usart.c b/stm32lib/src/stm32f10x_usart.c
deleted file mode 100644
index baf9c47..0000000
--- a/stm32lib/src/stm32f10x_usart.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_usart.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the USART firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_usart.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* USART UE Mask */
-#define CR1_UE_Set ((u16)0x2000) /* USART Enable Mask */
-#define CR1_UE_Reset ((u16)0xDFFF) /* USART Disable Mask */
-
-/* USART WakeUp Method */
-#define CR1_WAKE_Mask ((u16)0xF7FF) /* USART WakeUp Method Mask */
-
-/* USART RWU Mask */
-#define CR1_RWU_Set ((u16)0x0002) /* USART mute mode Enable Mask */
-#define CR1_RWU_Reset ((u16)0xFFFD) /* USART mute mode Enable Mask */
-
-#define CR1_SBK_Set ((u16)0x0001) /* USART Break Character send Mask */
-
-#define CR1_CLEAR_Mask ((u16)0xE9F3) /* USART CR1 Mask */
-
-#define CR2_Address_Mask ((u16)0xFFF0) /* USART address Mask */
-
-/* USART LIN Mask */
-#define CR2_LINEN_Set ((u16)0x4000) /* USART LIN Enable Mask */
-#define CR2_LINEN_Reset ((u16)0xBFFF) /* USART LIN Disable Mask */
-
-/* USART LIN Break detection */
-#define CR2_LBDL_Mask ((u16)0xFFDF) /* USART LIN Break detection Mask */
-
-#define CR2_STOP_CLEAR_Mask ((u16)0xCFFF) /* USART CR2 STOP Bits Mask */
-#define CR2_CLOCK_CLEAR_Mask ((u16)0xF0FF) /* USART CR2 Clock Mask */
-
-/* USART SC Mask */
-#define CR3_SCEN_Set ((u16)0x0020) /* USART SC Enable Mask */
-#define CR3_SCEN_Reset ((u16)0xFFDF) /* USART SC Disable Mask */
-
-/* USART SC NACK Mask */
-#define CR3_NACK_Set ((u16)0x0010) /* USART SC NACK Enable Mask */
-#define CR3_NACK_Reset ((u16)0xFFEF) /* USART SC NACK Disable Mask */
-
-/* USART Half-Duplex Mask */
-#define CR3_HDSEL_Set ((u16)0x0008) /* USART Half-Duplex Enable Mask */
-#define CR3_HDSEL_Reset ((u16)0xFFF7) /* USART Half-Duplex Disable Mask */
-
-/* USART IrDA Mask */
-#define CR3_IRLP_Mask ((u16)0xFFFB) /* USART IrDA LowPower mode Mask */
-
-#define CR3_CLEAR_Mask ((u16)0xFCFF) /* USART CR3 Mask */
-
-/* USART IrDA Mask */
-#define CR3_IREN_Set ((u16)0x0002) /* USART IrDA Enable Mask */
-#define CR3_IREN_Reset ((u16)0xFFFD) /* USART IrDA Disable Mask */
-
-#define GTPR_LSB_Mask ((u16)0x00FF) /* Guard Time Register LSB Mask */
-#define GTPR_MSB_Mask ((u16)0xFF00) /* Guard Time Register MSB Mask */
-
-#define IT_Mask ((u16)0x001F) /* USART Interrupt Mask */
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : USART_DeInit
-* Description : Deinitializes the USARTx peripheral registers to their
-* default reset values.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_DeInit(USART_TypeDef* USARTx)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
-
- switch (*(u32*)&USARTx)
- {
- case USART1_BASE:
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_USART1, ENABLE);
- RCC_APB2PeriphResetCmd(RCC_APB2Periph_USART1, DISABLE);
- break;
-
- case USART2_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_USART2, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_USART2, DISABLE);
- break;
-
- case USART3_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_USART3, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_USART3, DISABLE);
- break;
-
- case UART4_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_UART4, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_UART4, DISABLE);
- break;
-
- case UART5_BASE:
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_UART5, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_UART5, DISABLE);
- break;
-
- default:
- break;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_Init
-* Description : Initializes the USARTx peripheral according to the specified
-* parameters in the USART_InitStruct .
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_InitStruct: pointer to a USART_InitTypeDef structure
-* that contains the configuration information for the
-* specified USART peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct)
-{
- u32 tmpreg = 0x00, apbclock = 0x00;
- u32 integerdivider = 0x00;
- u32 fractionaldivider = 0x00;
- u32 usartxbase = 0;
- RCC_ClocksTypeDef RCC_ClocksStatus;
-
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_BAUDRATE(USART_InitStruct->USART_BaudRate));
- assert_param(IS_USART_WORD_LENGTH(USART_InitStruct->USART_WordLength));
- assert_param(IS_USART_STOPBITS(USART_InitStruct->USART_StopBits));
- assert_param(IS_USART_PARITY(USART_InitStruct->USART_Parity));
- assert_param(IS_USART_MODE(USART_InitStruct->USART_Mode));
- assert_param(IS_USART_HARDWARE_FLOW_CONTROL(USART_InitStruct->USART_HardwareFlowControl));
- /* The hardware flow control is available only for USART1, USART2 and USART3 */
- assert_param(IS_USART_PERIPH_HFC(USARTx, USART_InitStruct->USART_HardwareFlowControl));
-
- usartxbase = (*(u32*)&USARTx);
-
-/*---------------------------- USART CR2 Configuration -----------------------*/
- tmpreg = USARTx->CR2;
- /* Clear STOP[13:12] bits */
- tmpreg &= CR2_STOP_CLEAR_Mask;
-
- /* Configure the USART Stop Bits, Clock, CPOL, CPHA and LastBit ------------*/
- /* Set STOP[13:12] bits according to USART_StopBits value */
- tmpreg |= (u32)USART_InitStruct->USART_StopBits;
-
- /* Write to USART CR2 */
- USARTx->CR2 = (u16)tmpreg;
-
-/*---------------------------- USART CR1 Configuration -----------------------*/
- tmpreg = USARTx->CR1;
- /* Clear M, PCE, PS, TE and RE bits */
- tmpreg &= CR1_CLEAR_Mask;
-
- /* Configure the USART Word Length, Parity and mode ----------------------- */
- /* Set the M bits according to USART_WordLength value */
- /* Set PCE and PS bits according to USART_Parity value */
- /* Set TE and RE bits according to USART_Mode value */
- tmpreg |= (u32)USART_InitStruct->USART_WordLength | USART_InitStruct->USART_Parity |
- USART_InitStruct->USART_Mode;
-
- /* Write to USART CR1 */
- USARTx->CR1 = (u16)tmpreg;
-
-/*---------------------------- USART CR3 Configuration -----------------------*/
- tmpreg = USARTx->CR3;
- /* Clear CTSE and RTSE bits */
- tmpreg &= CR3_CLEAR_Mask;
-
- /* Configure the USART HFC -------------------------------------------------*/
- /* Set CTSE and RTSE bits according to USART_HardwareFlowControl value */
- tmpreg |= USART_InitStruct->USART_HardwareFlowControl;
-
- /* Write to USART CR3 */
- USARTx->CR3 = (u16)tmpreg;
-
-/*---------------------------- USART BRR Configuration -----------------------*/
- /* Configure the USART Baud Rate -------------------------------------------*/
- RCC_GetClocksFreq(&RCC_ClocksStatus);
- if (usartxbase == USART1_BASE)
- {
- apbclock = RCC_ClocksStatus.PCLK2_Frequency;
- }
- else
- {
- apbclock = RCC_ClocksStatus.PCLK1_Frequency;
- }
-
- /* Determine the integer part */
- integerdivider = ((0x19 * apbclock) / (0x04 * (USART_InitStruct->USART_BaudRate)));
- tmpreg = (integerdivider / 0x64) << 0x04;
-
- /* Determine the fractional part */
- fractionaldivider = integerdivider - (0x64 * (tmpreg >> 0x04));
- tmpreg |= ((((fractionaldivider * 0x10) + 0x32) / 0x64)) & ((u8)0x0F);
-
- /* Write to USART BRR */
- USARTx->BRR = (u16)tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : USART_StructInit
-* Description : Fills each USART_InitStruct member with its default value.
-* Input : - USART_InitStruct: pointer to a USART_InitTypeDef structure
-* which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_StructInit(USART_InitTypeDef* USART_InitStruct)
-{
- /* USART_InitStruct members default value */
- USART_InitStruct->USART_BaudRate = 9600;
- USART_InitStruct->USART_WordLength = USART_WordLength_8b;
- USART_InitStruct->USART_StopBits = USART_StopBits_1;
- USART_InitStruct->USART_Parity = USART_Parity_No ;
- USART_InitStruct->USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
- USART_InitStruct->USART_HardwareFlowControl = USART_HardwareFlowControl_None;
-}
-
-/*******************************************************************************
-* Function Name : USART_ClockInit
-* Description : Initializes the USARTx peripheral Clock according to the
-* specified parameters in the USART_ClockInitStruct .
-* Input : - USARTx: where x can be 1, 2, 3 to select the USART peripheral.
-* Note: The Smart Card mode is not available for UART4 and UART5.
-* - USART_ClockInitStruct: pointer to a USART_ClockInitTypeDef
-* structure that contains the configuration information for
-* the specified USART peripheral.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_ClockInit(USART_TypeDef* USARTx, USART_ClockInitTypeDef* USART_ClockInitStruct)
-{
- u32 tmpreg = 0x00;
-
- /* Check the parameters */
- assert_param(IS_USART_123_PERIPH(USARTx));
- assert_param(IS_USART_CLOCK(USART_ClockInitStruct->USART_Clock));
- assert_param(IS_USART_CPOL(USART_ClockInitStruct->USART_CPOL));
- assert_param(IS_USART_CPHA(USART_ClockInitStruct->USART_CPHA));
- assert_param(IS_USART_LASTBIT(USART_ClockInitStruct->USART_LastBit));
-
-/*---------------------------- USART CR2 Configuration -----------------------*/
- tmpreg = USARTx->CR2;
- /* Clear CLKEN, CPOL, CPHA and LBCL bits */
- tmpreg &= CR2_CLOCK_CLEAR_Mask;
-
- /* Configure the USART Clock, CPOL, CPHA and LastBit ------------*/
- /* Set CLKEN bit according to USART_Clock value */
- /* Set CPOL bit according to USART_CPOL value */
- /* Set CPHA bit according to USART_CPHA value */
- /* Set LBCL bit according to USART_LastBit value */
- tmpreg |= (u32)USART_ClockInitStruct->USART_Clock | USART_ClockInitStruct->USART_CPOL |
- USART_ClockInitStruct->USART_CPHA | USART_ClockInitStruct->USART_LastBit;
-
- /* Write to USART CR2 */
- USARTx->CR2 = (u16)tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : USART_ClockStructInit
-* Description : Fills each USART_ClockInitStruct member with its default value.
-* Input : - USART_ClockInitStruct: pointer to a USART_ClockInitTypeDef
-* structure which will be initialized.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_ClockStructInit(USART_ClockInitTypeDef* USART_ClockInitStruct)
-{
- /* USART_ClockInitStruct members default value */
- USART_ClockInitStruct->USART_Clock = USART_Clock_Disable;
- USART_ClockInitStruct->USART_CPOL = USART_CPOL_Low;
- USART_ClockInitStruct->USART_CPHA = USART_CPHA_1Edge;
- USART_ClockInitStruct->USART_LastBit = USART_LastBit_Disable;
-}
-
-/*******************************************************************************
-* Function Name : USART_Cmd
-* Description : Enables or disables the specified USART peripheral.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* : - NewState: new state of the USARTx peripheral.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_Cmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the selected USART by setting the UE bit in the CR1 register */
- USARTx->CR1 |= CR1_UE_Set;
- }
- else
- {
- /* Disable the selected USART by clearing the UE bit in the CR1 register */
- USARTx->CR1 &= CR1_UE_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_ITConfig
-* Description : Enables or disables the specified USART interrupts.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_IT: specifies the USART interrupt sources to be
-* enabled or disabled.
-* This parameter can be one of the following values:
-* - USART_IT_CTS: CTS change interrupt (not available for
-* UART4 and UART5)
-* - USART_IT_LBD: LIN Break detection interrupt
-* - USART_IT_TXE: Tansmit Data Register empty interrupt
-* - USART_IT_TC: Transmission complete interrupt
-* - USART_IT_RXNE: Receive Data register not empty
-* interrupt
-* - USART_IT_IDLE: Idle line detection interrupt
-* - USART_IT_PE: Parity Error interrupt
-* - USART_IT_ERR: Error interrupt(Frame error, noise
-* error, overrun error)
-* - NewState: new state of the specified USARTx interrupts.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_ITConfig(USART_TypeDef* USARTx, u16 USART_IT, FunctionalState NewState)
-{
- u32 usartreg = 0x00, itpos = 0x00, itmask = 0x00;
- u32 usartxbase = 0x00;
-
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_CONFIG_IT(USART_IT));
- assert_param(IS_USART_PERIPH_IT(USARTx, USART_IT)); /* The CTS interrupt is not available for UART4 and UART5 */
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- usartxbase = (*(u32*)&(USARTx));
-
- /* Get the USART register index */
- usartreg = (((u8)USART_IT) >> 0x05);
-
- /* Get the interrupt position */
- itpos = USART_IT & IT_Mask;
-
- itmask = (((u32)0x01) << itpos);
-
- if (usartreg == 0x01) /* The IT is in CR1 register */
- {
- usartxbase += 0x0C;
- }
- else if (usartreg == 0x02) /* The IT is in CR2 register */
- {
- usartxbase += 0x10;
- }
- else /* The IT is in CR3 register */
- {
- usartxbase += 0x14;
- }
- if (NewState != DISABLE)
- {
- *(vu32*)usartxbase |= itmask;
- }
- else
- {
- *(vu32*)usartxbase &= ~itmask;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_DMACmd
-* Description : Enables or disables the USART’s DMA interface.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3 or UART4.
-* Note: The DMA mode is not available for UART5.
-* - USART_DMAReq: specifies the DMA request.
-* This parameter can be any combination of the following values:
-* - USART_DMAReq_Tx: USART DMA transmit request
-* - USART_DMAReq_Rx: USART DMA receive request
-* - NewState: new state of the DMA Request sources.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_DMACmd(USART_TypeDef* USARTx, u16 USART_DMAReq, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_1234_PERIPH(USARTx));
- assert_param(IS_USART_DMAREQ(USART_DMAReq));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the DMA transfer for selected requests by setting the DMAT and/or
- DMAR bits in the USART CR3 register */
- USARTx->CR3 |= USART_DMAReq;
- }
- else
- {
- /* Disable the DMA transfer for selected requests by clearing the DMAT and/or
- DMAR bits in the USART CR3 register */
- USARTx->CR3 &= (u16)~USART_DMAReq;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_SetAddress
-* Description : Sets the address of the USART node.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_Address: Indicates the address of the USART node.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SetAddress(USART_TypeDef* USARTx, u8 USART_Address)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_ADDRESS(USART_Address));
-
- /* Clear the USART address */
- USARTx->CR2 &= CR2_Address_Mask;
- /* Set the USART address node */
- USARTx->CR2 |= USART_Address;
-}
-
-/*******************************************************************************
-* Function Name : USART_WakeUpConfig
-* Description : Selects the USART WakeUp method.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_WakeUp: specifies the USART wakeup method.
-* This parameter can be one of the following values:
-* - USART_WakeUp_IdleLine: WakeUp by an idle line detection
-* - USART_WakeUp_AddressMark: WakeUp by an address mark
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_WakeUpConfig(USART_TypeDef* USARTx, u16 USART_WakeUp)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_WAKEUP(USART_WakeUp));
-
- USARTx->CR1 &= CR1_WAKE_Mask;
- USARTx->CR1 |= USART_WakeUp;
-}
-
-/*******************************************************************************
-* Function Name : USART_ReceiverWakeUpCmd
-* Description : Determines if the USART is in mute mode or not.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - NewState: new state of the USART mute mode.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_ReceiverWakeUpCmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the USART mute mode by setting the RWU bit in the CR1 register */
- USARTx->CR1 |= CR1_RWU_Set;
- }
- else
- {
- /* Disable the USART mute mode by clearing the RWU bit in the CR1 register */
- USARTx->CR1 &= CR1_RWU_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_LINBreakDetectLengthConfig
-* Description : Sets the USART LIN Break detection length.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_LINBreakDetectLength: specifies the LIN break
-* detection length.
-* This parameter can be one of the following values:
-* - USART_LINBreakDetectLength_10b: 10-bit break detection
-* - USART_LINBreakDetectLength_11b: 11-bit break detection
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_LINBreakDetectLengthConfig(USART_TypeDef* USARTx, u16 USART_LINBreakDetectLength)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_LIN_BREAK_DETECT_LENGTH(USART_LINBreakDetectLength));
-
- USARTx->CR2 &= CR2_LBDL_Mask;
- USARTx->CR2 |= USART_LINBreakDetectLength;
-}
-
-/*******************************************************************************
-* Function Name : USART_LINCmd
-* Description : Enables or disables the USART’s LIN mode.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - NewState: new state of the USART LIN mode.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_LINCmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the LIN mode by setting the LINEN bit in the CR2 register */
- USARTx->CR2 |= CR2_LINEN_Set;
- }
- else
- {
- /* Disable the LIN mode by clearing the LINEN bit in the CR2 register */
- USARTx->CR2 &= CR2_LINEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_SendData
-* Description : Transmits single data through the USARTx peripheral.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - Data: the data to transmit.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SendData(USART_TypeDef* USARTx, u16 Data)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_DATA(Data));
-
- /* Transmit Data */
- USARTx->DR = (Data & (u16)0x01FF);
-}
-
-/*******************************************************************************
-* Function Name : USART_ReceiveData
-* Description : Returns the most recent received data by the USARTx peripheral.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* Output : None
-* Return : The received data.
-*******************************************************************************/
-u16 USART_ReceiveData(USART_TypeDef* USARTx)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
-
- /* Receive Data */
- return (u16)(USARTx->DR & (u16)0x01FF);
-}
-
-/*******************************************************************************
-* Function Name : USART_SendBreak
-* Description : Transmits break characters.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SendBreak(USART_TypeDef* USARTx)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
-
- /* Send break characters */
- USARTx->CR1 |= CR1_SBK_Set;
-}
-
-/*******************************************************************************
-* Function Name : USART_SetGuardTime
-* Description : Sets the specified USART guard time.
-* Input : - USARTx: where x can be 1, 2 or 3 to select the USART
-* peripheral.
-* Note: The guard time bits are not available for UART4 and UART5.
-* - USART_GuardTime: specifies the guard time.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SetGuardTime(USART_TypeDef* USARTx, u8 USART_GuardTime)
-{
- /* Check the parameters */
- assert_param(IS_USART_123_PERIPH(USARTx));
-
- /* Clear the USART Guard time */
- USARTx->GTPR &= GTPR_LSB_Mask;
- /* Set the USART guard time */
- USARTx->GTPR |= (u16)((u16)USART_GuardTime << 0x08);
-}
-
-/*******************************************************************************
-* Function Name : USART_SetPrescaler
-* Description : Sets the system clock prescaler.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* Note: The function is used for IrDA mode with UART4 and UART5.
-* - USART_Prescaler: specifies the prescaler clock.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SetPrescaler(USART_TypeDef* USARTx, u8 USART_Prescaler)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
-
- /* Clear the USART prescaler */
- USARTx->GTPR &= GTPR_MSB_Mask;
- /* Set the USART prescaler */
- USARTx->GTPR |= USART_Prescaler;
-}
-
-/*******************************************************************************
-* Function Name : USART_SmartCardCmd
-* Description : Enables or disables the USART’s Smart Card mode.
-* Input : - USARTx: where x can be 1, 2 or 3 to select the USART
-* peripheral.
-* Note: The Smart Card mode is not available for UART4 and UART5.
-* - NewState: new state of the Smart Card mode.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SmartCardCmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_123_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the SC mode by setting the SCEN bit in the CR3 register */
- USARTx->CR3 |= CR3_SCEN_Set;
- }
- else
- {
- /* Disable the SC mode by clearing the SCEN bit in the CR3 register */
- USARTx->CR3 &= CR3_SCEN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_SmartCardNACKCmd
-* Description : Enables or disables NACK transmission.
-* Input : - USARTx: where x can be 1, 2 or 3 to select the USART
-* peripheral.
-* Note: The Smart Card mode is not available for UART4 and UART5.
-* - NewState: new state of the NACK transmission.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_SmartCardNACKCmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_123_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the NACK transmission by setting the NACK bit in the CR3 register */
- USARTx->CR3 |= CR3_NACK_Set;
- }
- else
- {
- /* Disable the NACK transmission by clearing the NACK bit in the CR3 register */
- USARTx->CR3 &= CR3_NACK_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_HalfDuplexCmd
-* Description : Enables or disables the USART’s Half Duplex communication.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - NewState: new state of the USART Communication.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_HalfDuplexCmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the Half-Duplex mode by setting the HDSEL bit in the CR3 register */
- USARTx->CR3 |= CR3_HDSEL_Set;
- }
- else
- {
- /* Disable the Half-Duplex mode by clearing the HDSEL bit in the CR3 register */
- USARTx->CR3 &= CR3_HDSEL_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_IrDAConfig
-* Description : Configures the USART’s IrDA interface.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_IrDAMode: specifies the IrDA mode.
-* This parameter can be one of the following values:
-* - USART_IrDAMode_LowPower
-* - USART_IrDAMode_Normal
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_IrDAConfig(USART_TypeDef* USARTx, u16 USART_IrDAMode)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_IRDA_MODE(USART_IrDAMode));
-
- USARTx->CR3 &= CR3_IRLP_Mask;
- USARTx->CR3 |= USART_IrDAMode;
-}
-
-/*******************************************************************************
-* Function Name : USART_IrDACmd
-* Description : Enables or disables the USART’s IrDA interface.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - NewState: new state of the IrDA mode.
-* This parameter can be: ENABLE or DISABLE.
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_IrDACmd(USART_TypeDef* USARTx, FunctionalState NewState)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_FUNCTIONAL_STATE(NewState));
-
- if (NewState != DISABLE)
- {
- /* Enable the IrDA mode by setting the IREN bit in the CR3 register */
- USARTx->CR3 |= CR3_IREN_Set;
- }
- else
- {
- /* Disable the IrDA mode by clearing the IREN bit in the CR3 register */
- USARTx->CR3 &= CR3_IREN_Reset;
- }
-}
-
-/*******************************************************************************
-* Function Name : USART_GetFlagStatus
-* Description : Checks whether the specified USART flag is set or not.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_FLAG: specifies the flag to check.
-* This parameter can be one of the following values:
-* - USART_FLAG_CTS: CTS Change flag (not available for
-* UART4 and UART5)
-* - USART_FLAG_LBD: LIN Break detection flag
-* - USART_FLAG_TXE: Transmit data register empty flag
-* - USART_FLAG_TC: Transmission Complete flag
-* - USART_FLAG_RXNE: Receive data register not empty flag
-* - USART_FLAG_IDLE: Idle Line detection flag
-* - USART_FLAG_ORE: OverRun Error flag
-* - USART_FLAG_NE: Noise Error flag
-* - USART_FLAG_FE: Framing Error flag
-* - USART_FLAG_PE: Parity Error flag
-* Output : None
-* Return : The new state of USART_FLAG (SET or RESET).
-*******************************************************************************/
-FlagStatus USART_GetFlagStatus(USART_TypeDef* USARTx, u16 USART_FLAG)
-{
- FlagStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_FLAG(USART_FLAG));
- assert_param(IS_USART_PERIPH_FLAG(USARTx, USART_FLAG)); /* The CTS flag is not available for UART4 and UART5 */
-
- if ((USARTx->SR & USART_FLAG) != (u16)RESET)
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : USART_ClearFlag
-* Description : Clears the USARTx's pending flags.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_FLAG: specifies the flag to clear.
-* This parameter can be any combination of the following values:
-* - USART_FLAG_CTS: CTS Change flag (not available for
-* UART4 and UART5).
-* - USART_FLAG_LBD: LIN Break detection flag.
-* - USART_FLAG_TC: Transmission Complete flag.
-* - USART_FLAG_RXNE: Receive data register not empty flag.
-*
-* Notes:
-* - PE (Parity error), FE (Framing error), NE (Noise error),
-* ORE (OverRun error) and IDLE (Idle line detected)
-* flags are cleared by software sequence: a read
-* operation to USART_SR register (USART_GetFlagStatus())
-* followed by a read operation to USART_DR register
-* (USART_ReceiveData()).
-* - RXNE flag can be also cleared by a read to the
-* USART_DR register (USART_ReceiveData()).
-* - TC flag can be also cleared by software sequence: a
-* read operation to USART_SR register
-* (USART_GetFlagStatus()) followed by a write operation
-* to USART_DR register (USART_SendData()).
-* - TXE flag is cleared only by a write to the USART_DR
-* register (USART_SendData()).
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_ClearFlag(USART_TypeDef* USARTx, u16 USART_FLAG)
-{
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_CLEAR_FLAG(USART_FLAG));
- assert_param(IS_USART_PERIPH_FLAG(USARTx, USART_FLAG)); /* The CTS flag is not available for UART4 and UART5 */
-
- USARTx->SR = (u16)~USART_FLAG;
-}
-
-/*******************************************************************************
-* Function Name : USART_GetITStatus
-* Description : Checks whether the specified USART interrupt has occurred or not.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_IT: specifies the USART interrupt source to check.
-* This parameter can be one of the following values:
-* - USART_IT_CTS: CTS change interrupt (not available for
-* UART4 and UART5)
-* - USART_IT_LBD: LIN Break detection interrupt
-* - USART_IT_TXE: Tansmit Data Register empty interrupt
-* - USART_IT_TC: Transmission complete interrupt
-* - USART_IT_RXNE: Receive Data register not empty
-* interrupt
-* - USART_IT_IDLE: Idle line detection interrupt
-* - USART_IT_ORE: OverRun Error interrupt
-* - USART_IT_NE: Noise Error interrupt
-* - USART_IT_FE: Framing Error interrupt
-* - USART_IT_PE: Parity Error interrupt
-* Output : None
-* Return : The new state of USART_IT (SET or RESET).
-*******************************************************************************/
-ITStatus USART_GetITStatus(USART_TypeDef* USARTx, u16 USART_IT)
-{
- u32 bitpos = 0x00, itmask = 0x00, usartreg = 0x00;
- ITStatus bitstatus = RESET;
-
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_GET_IT(USART_IT));
- assert_param(IS_USART_PERIPH_IT(USARTx, USART_IT)); /* The CTS interrupt is not available for UART4 and UART5 */
-
- /* Get the USART register index */
- usartreg = (((u8)USART_IT) >> 0x05);
-
- /* Get the interrupt position */
- itmask = USART_IT & IT_Mask;
-
- itmask = (u32)0x01 << itmask;
-
- if (usartreg == 0x01) /* The IT is in CR1 register */
- {
- itmask &= USARTx->CR1;
- }
- else if (usartreg == 0x02) /* The IT is in CR2 register */
- {
- itmask &= USARTx->CR2;
- }
- else /* The IT is in CR3 register */
- {
- itmask &= USARTx->CR3;
- }
-
- bitpos = USART_IT >> 0x08;
-
- bitpos = (u32)0x01 << bitpos;
- bitpos &= USARTx->SR;
-
- if ((itmask != (u16)RESET)&&(bitpos != (u16)RESET))
- {
- bitstatus = SET;
- }
- else
- {
- bitstatus = RESET;
- }
-
- return bitstatus;
-}
-
-/*******************************************************************************
-* Function Name : USART_ClearITPendingBit
-* Description : Clears the USARTx’s interrupt pending bits.
-* Input : - USARTx: Select the USART or the UART peripheral.
-* This parameter can be one of the following values:
-* - USART1, USART2, USART3, UART4 or UART5.
-* - USART_IT: specifies the interrupt pending bit to clear.
-* This parameter can be one of the following values:
-* - USART_IT_CTS: CTS change interrupt (not available for
-* UART4 and UART5)
-* - USART_IT_LBD: LIN Break detection interrupt
-* - USART_IT_TC: Transmission complete interrupt.
-* - USART_IT_RXNE: Receive Data register not empty interrupt.
-*
-* Notes:
-* - PE (Parity error), FE (Framing error), NE (Noise error),
-* ORE (OverRun error) and IDLE (Idle line detected)
-* pending bits are cleared by software sequence: a read
-* operation to USART_SR register (USART_GetITStatus())
-* followed by a read operation to USART_DR register
-* (USART_ReceiveData()).
-* - RXNE pending bit can be also cleared by a read to the
-* USART_DR register (USART_ReceiveData()).
-* - TC pending bit can be also cleared by software
-* sequence: a read operation to USART_SR register
-* (USART_GetITStatus()) followed by a write operation
-* to USART_DR register (USART_SendData()).
-* - TXE pending bit is cleared only by a write to the
-* USART_DR register (USART_SendData()).
-* Output : None
-* Return : None
-*******************************************************************************/
-void USART_ClearITPendingBit(USART_TypeDef* USARTx, u16 USART_IT)
-{
- u16 bitpos = 0x00, itmask = 0x00;
-
- /* Check the parameters */
- assert_param(IS_USART_ALL_PERIPH(USARTx));
- assert_param(IS_USART_CLEAR_IT(USART_IT));
- assert_param(IS_USART_PERIPH_IT(USARTx, USART_IT)); /* The CTS interrupt is not available for UART4 and UART5 */
-
- bitpos = USART_IT >> 0x08;
-
- itmask = (u16)((u16)0x01 << bitpos);
- USARTx->SR = (u16)~itmask;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/
diff --git a/stm32lib/src/stm32f10x_wwdg.c b/stm32lib/src/stm32f10x_wwdg.c
deleted file mode 100644
index ac9882f..0000000
--- a/stm32lib/src/stm32f10x_wwdg.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
-* File Name : stm32f10x_wwdg.c
-* Author : MCD Application Team
-* Version : V2.0.2
-* Date : 07/11/2008
-* Description : This file provides all the WWDG firmware functions.
-********************************************************************************
-* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
-* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY 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 CODING
-* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-*******************************************************************************/
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f10x_wwdg.h"
-#include "stm32f10x_rcc.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* ----------- WWDG registers bit address in the alias region ----------- */
-#define WWDG_OFFSET (WWDG_BASE - PERIPH_BASE)
-
-/* Alias word address of EWI bit */
-#define CFR_OFFSET (WWDG_OFFSET + 0x04)
-#define EWI_BitNumber 0x09
-#define CFR_EWI_BB (PERIPH_BB_BASE + (CFR_OFFSET * 32) + (EWI_BitNumber * 4))
-
-/* --------------------- WWDG registers bit mask ------------------------ */
-/* CR register bit mask */
-#define CR_WDGA_Set ((u32)0x00000080)
-
-/* CFR register bit mask */
-#define CFR_WDGTB_Mask ((u32)0xFFFFFE7F)
-#define CFR_W_Mask ((u32)0xFFFFFF80)
-
-#define BIT_Mask ((u8)0x7F)
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/*******************************************************************************
-* Function Name : WWDG_DeInit
-* Description : Deinitializes the WWDG peripheral registers to their default
-* reset values.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_DeInit(void)
-{
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_WWDG, ENABLE);
- RCC_APB1PeriphResetCmd(RCC_APB1Periph_WWDG, DISABLE);
-}
-
-/*******************************************************************************
-* Function Name : WWDG_SetPrescaler
-* Description : Sets the WWDG Prescaler.
-* Input : - WWDG_Prescaler: specifies the WWDG Prescaler.
-* This parameter can be one of the following values:
-* - WWDG_Prescaler_1: WWDG counter clock = (PCLK1/4096)/1
-* - WWDG_Prescaler_2: WWDG counter clock = (PCLK1/4096)/2
-* - WWDG_Prescaler_4: WWDG counter clock = (PCLK1/4096)/4
-* - WWDG_Prescaler_8: WWDG counter clock = (PCLK1/4096)/8
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_SetPrescaler(u32 WWDG_Prescaler)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_WWDG_PRESCALER(WWDG_Prescaler));
-
- /* Clear WDGTB[1:0] bits */
- tmpreg = WWDG->CFR & CFR_WDGTB_Mask;
-
- /* Set WDGTB[1:0] bits according to WWDG_Prescaler value */
- tmpreg |= WWDG_Prescaler;
-
- /* Store the new value */
- WWDG->CFR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : WWDG_SetWindowValue
-* Description : Sets the WWDG window value.
-* Input : - WindowValue: specifies the window value to be compared to
-* the downcounter.
-* This parameter value must be lower than 0x80.
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_SetWindowValue(u8 WindowValue)
-{
- u32 tmpreg = 0;
-
- /* Check the parameters */
- assert_param(IS_WWDG_WINDOW_VALUE(WindowValue));
-
- /* Clear W[6:0] bits */
- tmpreg = WWDG->CFR & CFR_W_Mask;
-
- /* Set W[6:0] bits according to WindowValue value */
- tmpreg |= WindowValue & BIT_Mask;
-
- /* Store the new value */
- WWDG->CFR = tmpreg;
-}
-
-/*******************************************************************************
-* Function Name : WWDG_EnableIT
-* Description : Enables the WWDG Early Wakeup interrupt(EWI).
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_EnableIT(void)
-{
- *(vu32 *) CFR_EWI_BB = (u32)ENABLE;
-}
-
-/*******************************************************************************
-* Function Name : WWDG_SetCounter
-* Description : Sets the WWDG counter value.
-* Input : - Counter: specifies the watchdog counter value.
-* This parameter must be a number between 0x40 and 0x7F.
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_SetCounter(u8 Counter)
-{
- /* Check the parameters */
- assert_param(IS_WWDG_COUNTER(Counter));
-
- /* Write to T[6:0] bits to configure the counter value, no need to do
- a read-modify-write; writing a 0 to WDGA bit does nothing */
- WWDG->CR = Counter & BIT_Mask;
-}
-
-/*******************************************************************************
-* Function Name : WWDG_Enable
-* Description : Enables WWDG and load the counter value.
-* - Counter: specifies the watchdog counter value.
-* This parameter must be a number between 0x40 and 0x7F.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_Enable(u8 Counter)
-{
- /* Check the parameters */
- assert_param(IS_WWDG_COUNTER(Counter));
-
- WWDG->CR = CR_WDGA_Set | Counter;
-}
-
-/*******************************************************************************
-* Function Name : WWDG_GetFlagStatus
-* Description : Checks whether the Early Wakeup interrupt flag is set or not.
-* Input : None
-* Output : None
-* Return : The new state of the Early Wakeup interrupt flag (SET or RESET)
-*******************************************************************************/
-FlagStatus WWDG_GetFlagStatus(void)
-{
- return (FlagStatus)(WWDG->SR);
-}
-
-/*******************************************************************************
-* Function Name : WWDG_ClearFlag
-* Description : Clears Early Wakeup interrupt flag.
-* Input : None
-* Output : None
-* Return : None
-*******************************************************************************/
-void WWDG_ClearFlag(void)
-{
- WWDG->SR = (u32)RESET;
-}
-
-/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/