From ead754141bfec4604d4268554eb44b291006ee67 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 30 Jun 2012 08:41:09 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4361 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM8L/stm8l15x.h | 296 ++- os/hal/platforms/STM8S/stm8s.h | 3140 +++++++++++++++-------------- readme.txt | 1 + 3 files changed, 1865 insertions(+), 1572 deletions(-) diff --git a/os/hal/platforms/STM8L/stm8l15x.h b/os/hal/platforms/STM8L/stm8l15x.h index aaea0763f..6971a9da5 100644 --- a/os/hal/platforms/STM8L/stm8l15x.h +++ b/os/hal/platforms/STM8L/stm8l15x.h @@ -2,12 +2,12 @@ ****************************************************************************** * @file stm8l15x.h * @author MCD Application Team - * @version V1.4.0 - * @date 09/24/2010 + * @version V1.5.0 + * @date 13-May-2011 * @brief This file contains all the peripheral register's definitions, bits * definitions and memory mapping for STM8L15x devices. ****************************************************************************** - * @copy + * @attention * * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE @@ -16,7 +16,8 @@ * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * - *

© COPYRIGHT 2010 STMicroelectronics

+ *

© COPYRIGHT 2011 STMicroelectronics

+ ****************************************************************************** */ /* Define to prevent recursive inclusion -------------------------------------*/ @@ -26,16 +27,20 @@ /** @addtogroup STM8L15x_StdPeriph_Driver * @{ */ -/* Uncomment the line below according to the target STM8L device used in your +/* Uncomment the line below according to the target STM8L15x device used in your application */ +/* #define STM8L15X_LD */ /*!< STM8L15X_LD: STM8L15x Low density devices */ /* #define STM8L15X_MD */ /*!< STM8L15X_MD: STM8L15x Medium density devices */ -/* #define STM8L15X_MDP */ /*!< STM8L15X_MDP: STM8L15x Medium density plus devices */ +/* #define STM8L15X_MDP */ /*!< STM8L15X_MDP: STM8L15x Medium density plus devices */ /* #define STM8L15X_HD */ /*!< STM8L15X_HD: STM8L15x/16x High density devices */ /* Tip: To avoid modifying this file each time you need to switch between these devices, you can define the device in your toolchain compiler preprocessor. + - Low density STM8L15x devices are STM8L151C3, STM8L151K3, STM8L151G3, STM8L151F3, + STM8L151C2, STM8L151K2, STM8L151G2 and STM8L151F2 microcontrollers where the + Flash memory density ranges between 4 and 8 Kbytes. - Medium density STM8L15x devices are STM8L151C4, STM8L151C6, STM8L152C4, STM8L152C6, STM8L151K4, STM8L151K6, STM8L152K4, STM8L152K6, STM8L151G4, STM8L151G6, STM8L152G4 and STM8L152G6 microcontrollers where the Flash memory @@ -49,7 +54,7 @@ */ -#if !defined (STM8L15X_MD) && !defined (STM8L15X_MDP) && !defined (STM8L15X_HD) +#if !defined (STM8L15X_MD) && !defined (STM8L15X_MDP) && !defined (STM8L15X_HD) && !defined (STM8L15X_LD) #error "Please select first the target STM8L device used in your application (in stm8l15x.h file)" #endif @@ -71,6 +76,7 @@ /* Comment the line below if you will not use the peripherals drivers. In this case, these drivers will not be included and the application code will be based on direct access to peripherals registers */ +/* CHIBIOS FIX */ /* #define USE_STDPERIPH_DRIVER*/ #endif @@ -101,15 +107,13 @@ #define NEAR @near #define TINY @tiny #define EEPROM @eeprom - #define __CONST const - #define IN_RAM + #define CONST const #elif defined (_RAISONANCE_) /* __RCST7__ */ #define FAR far #define NEAR data #define TINY page0 #define EEPROM eeprom - #define __CONST code - #define IN_RAM inram + #define CONST code #if defined (STM8L15X_MD) || defined (STM8L15X_MDP) /*!< Used with memory Models for code less than 64K */ #define MEMCPY memcpy @@ -122,52 +126,54 @@ #define NEAR __near #define TINY __tiny #define EEPROM __eeprom - #define __CONST const - #define IN_RAM + #define CONST const #endif /* __CSMC__ */ -#if defined (STM8L15X_MD) || defined (STM8L15X_MDP) +/** + * @brief Legacy definition + */ +#define __CONST CONST + +#if defined (STM8L15X_MD) || defined (STM8L15X_MDP) || defined (STM8L15X_LD) /*!< Used with memory Models for code smaller than 64K */ #define PointerAttr NEAR #else /* STM8L15X_HD */ /*!< Used with memory Models for code higher than 64K */ #define PointerAttr FAR -#endif /* STM8L15X_MD or STM8L15X_MDP */ +#endif /* STM8L15X_MD or STM8L15X_MDP or STM8L15X_LD*/ /* Uncomment the line below to enable the FLASH functions execution from RAM */ -#if defined(_COSMIC_) - #if !defined (COSMIC_RAM_EXECUTION) - /* #define COSMIC_RAM_EXECUTION (1) */ - #endif +#if !defined (RAM_EXECUTION) +/* #define RAM_EXECUTION (1) */ +#endif /* RAM_EXECUTION */ -/* Uncomment the line below to enable the FLASH functions execution from RAM */ -#elif defined (_RAISONANCE_) /* __RCST7__ */ - #if !defined (RAISONANCE_RAM_EXECUTION) - /* #define RAISONANCE_RAM_EXECUTION (1) */ - #endif -/* Uncomment the line below to enable the FLASH functions execution from RAM */ -#elif defined (_IAR_) /* __RCST7__ */ - #if !defined (IAR_RAM_EXECUTION) - /* #define IAR_RAM_EXECUTION (1) */ - #endif -#endif /* __CSMC__ */ +#ifdef RAM_EXECUTION + #ifdef _COSMIC_ + #define IN_RAM(a) a + #elif defined (_RAISONANCE_) /* __RCST7__ */ + #define IN_RAM(a) a inram + #else /*_IAR_*/ + #define IN_RAM(a) __ramfunc a + #endif /* _COSMIC_ */ +#else + #define IN_RAM(a) a +#endif /* RAM_EXECUTION */ -/*!< [31:16] STM8L15x Standard Peripheral Library main version */ -#define __STM8L15X_STDPERIPH_VERSION_MAIN ((uint8_t)0x01) -/*!< [15:8] STM8L15x Standard Peripheral Library sub1 version */ -#define __STM8L15X_STDPERIPH_VERSION_SUB1 ((uint8_t)0x04) -/*!< [7:0] STM8L15x Standard Peripheral Library sub2 version */ -#define __STM8L15X_STDPERIPH_VERSION_SUB2 ((uint8_t)0x00) -/*!< STM8L15x Standard Peripheral Library version number */ -#define __STM8L15X_STDPERIPH_VERSION ((uint32_t)(__STM8L15X_STDPERIPH_VERSION_MAIN <<(uint32_t)16)\ - | (__STM8L15X_STDPERIPH_VERSION_SUB1 <<(uint32_t) 8)\ - | __STM8L15X_STDPERIPH_VERSION_SUB2) +/*!< [31:16] STM8L15X Standard Peripheral Library main version */ +#define __STM8L15X_STDPERIPH_VERSION_MAIN ((uint8_t)0x01) /*!< [31:24] main version */ +#define __STM8L15X_STDPERIPH_VERSION_SUB1 ((uint8_t)0x05) /*!< [23:16] sub1 version */ +#define __STM8L15X_STDPERIPH_VERSION_SUB2 ((uint8_t)0x00) /*!< [15:8] sub2 version */ +#define __STM8L15X_STDPERIPH_VERSION_RC ((uint8_t)0x00) /*!< [7:0] release candidate */ +#define __STM8L15X_STDPERIPH_VERSION ( (__STM8L15X_STDPERIPH_VERSION_MAIN << 24)\ + |(__STM8L15X_STDPERIPH_VERSION_SUB1 << 16)\ + |(__STM8L15X_STDPERIPH_VERSION_SUB2 << 8)\ + |(__STM8L15X_STDPERIPH_VERSION_RC)) /******************************************************************************/ /* Includes ------------------------------------------------------------------*/ -/* Exported types and constants-----------------------------------------------*/ +/* Exported types and constants ----------------------------------------------*/ /** @addtogroup Exported_types * @{ @@ -182,7 +188,7 @@ #define __O volatile /*!< defines 'write only' permissions */ #define __IO volatile /*!< defines 'read / write' permissions */ -/* Stupid thing to do...*/ +/* CHIBIOS FIX */ #if 0 /*!< Signed integer types */ typedef signed char int8_t; @@ -272,36 +278,36 @@ typedef struct RTC_struct __IO uint8_t TR2; /*!< Time Register 2*/ __IO uint8_t TR3; /*!< Time Register 3*/ - __IO uint8_t RESERVED0; + uint8_t RESERVED0; __IO uint8_t DR1; /*!< Date Register 1*/ __IO uint8_t DR2; /*!< Date Register 2*/ __IO uint8_t DR3; /*!< Date Register 3*/ - __IO uint8_t RESERVED1; + uint8_t RESERVED1; __IO uint8_t CR1; /*!< Control Register 1*/ __IO uint8_t CR2; /*!< Control Register 2*/ __IO uint8_t CR3; /*!< Control Register 3*/ - __IO uint8_t RESERVED2; + uint8_t RESERVED2; __IO uint8_t ISR1; /*!< Initialisation and Status Register 1 */ __IO uint8_t ISR2; /*!< Initialisation and Status Register 2 */ - __IO uint8_t RESERVED3; - __IO uint8_t RESERVED4; + uint8_t RESERVED3; + uint8_t RESERVED4; __IO uint8_t SPRERH; /*!< Synchronous Prediv high Register */ __IO uint8_t SPRERL; /*!< Synchronous Prediv Low Register */ __IO uint8_t APRER; /*!< Asynchronous Prediv Register */ - __IO uint8_t RESERVED5; + uint8_t RESERVED5; __IO uint8_t WUTRH; /*!< Wake-Up Timer High Register */ __IO uint8_t WUTRL; /*!< Wake-Up Timer Low Register */ - __IO uint8_t RESERVED6; + uint8_t RESERVED6; __IO uint8_t SSRH; /*!< Sub Second High Register */ __IO uint8_t SSRL; /*!< Sub Second Low Register */ @@ -316,13 +322,13 @@ typedef struct RTC_struct __IO uint8_t ALRMAR3; /*!< ALARM A Register 3 */ __IO uint8_t ALRMAR4; /*!< ALARM A Register 4 */ - __IO uint8_t RESERVED7[4]; + uint8_t RESERVED7[4]; __IO uint8_t ALRMASSRH; /*!< ALARM A Subsecond Register High */ __IO uint8_t ALRMASSRL; /*!< ALARM A Subsecond Register Low */ __IO uint8_t ALRMASSMSKR; /*!< ALARM A Subsecond Mask Register */ - __IO uint8_t RESERVED8[3]; + uint8_t RESERVED8[3]; __IO uint8_t CALRH; /*!< Calibration register high */ __IO uint8_t CALRL; /*!< Calibration register low */ @@ -909,7 +915,7 @@ typedef struct EXTI_struct __IO uint8_t SR1; /*!< Pins Status flag register 1 */ __IO uint8_t SR2; /*!< Ports Status flage register 2 */ __IO uint8_t CONF1; /*!< Port interrupt selector */ - __IO uint8_t RESERVED[4]; /*!< reserved area */ + uint8_t RESERVED[4]; /*!< reserved area */ __IO uint8_t CR4; /*!< EXTI port G & port H sensitivity */ __IO uint8_t CONF2; /*!< Port interrupt selector */ } @@ -1429,7 +1435,7 @@ PWR_TypeDef; */ typedef struct RI_struct { - __IO uint8_t RESERVED; + uint8_t RESERVED; __IO uint8_t ICR1; /*!< Timer input capture routing register 1 */ __IO uint8_t ICR2; /*!< Timer input capture routing register 2 */ __IO uint8_t IOIR1; /*!< I/O input register 1 */ @@ -1442,11 +1448,19 @@ typedef struct RI_struct __IO uint8_t IOSR2; /*!< I/O switch register 2*/ __IO uint8_t IOSR3; /*!< I/O switch register 3*/ __IO uint8_t IOGCR; /*!< I/O group control register */ - __IO uint8_t ASCR1; /*!< Analog switch register 1 */ - __IO uint8_t ASCR2; /*!< Analog switch register 2 */ + __IO uint8_t ASCR1; /*!< Analog Switch Control register 1 */ + __IO uint8_t ASCR2; /*!< Analog Switch Control register 2 */ __IO uint8_t RCR; /*!< Resistor control register */ -} -RI_TypeDef; + uint8_t RESERVED1[16]; + __IO uint8_t CR; /*!< Control Register */ + __IO uint8_t IOMR1; /*!< IO Mask Register 1 */ + __IO uint8_t IOMR2; /*!< IO Mask Register 2 */ + __IO uint8_t IOMR3; /*!< IO Mask Register 3 */ + __IO uint8_t IOMR4; /*!< IO Mask Register 4*/ + __IO uint8_t IOIR4; /*!< I/O input register 4 */ + __IO uint8_t IOCMR4; /*!< I/O control mode register 4 */ + __IO uint8_t IOSR4; /*!< I/O switch register 4 */ +}RI_TypeDef; /** * @} */ @@ -1455,14 +1469,26 @@ RI_TypeDef; * @{ */ -#define RI_ICR1_RESET_VALUE ((uint8_t)0x00) /*!< Timer input capture routing register 1 reset value */ -#define RI_ICR2_RESET_VALUE ((uint8_t)0x00) /*!< Timer input capture routing register 2 reset value */ -#define RI_IOSR1_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 1 reset value */ -#define RI_IOSR2_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 2 reset value */ -#define RI_IOSR3_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 3 reset value */ -#define RI_ASCR1_RESET_VALUE ((uint8_t)0x00) /*!< Analog switch register 1 reset value */ -#define RI_ASCR2_RESET_VALUE ((uint8_t)0x00) /*!< Analog switch register 2 reset value */ -#define RI_RCR_RESET_VALUE ((uint8_t)0x00) /*!< Resistor control register reset value */ +#define RI_ICR1_RESET_VALUE ((uint8_t)0x00) /*!< Timer input capture routing register 1 reset value */ +#define RI_ICR2_RESET_VALUE ((uint8_t)0x00) /*!< Timer input capture routing register 2 reset value */ + +#define RI_IOCMR1_RESET_VALUE ((uint8_t)0x00) /*!< I/O control mode register 1 reset value */ +#define RI_IOCMR2_RESET_VALUE ((uint8_t)0x00) /*!< I/O control mode register 2 reset value */ +#define RI_IOCMR3_RESET_VALUE ((uint8_t)0x00) /*!< I/O control mode register 3 reset value */ + +#define RI_IOSR1_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 1 reset value */ +#define RI_IOSR2_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 2 reset value */ +#define RI_IOSR3_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 3 reset value */ + +#define RI_IOGCR_RESET_VALUE ((uint8_t)0xFF) /*!< IO group control register reset value */ + +#define RI_ASCR1_RESET_VALUE ((uint8_t)0x00) /*!< Analog switch register 1 reset value */ +#define RI_ASCR2_RESET_VALUE ((uint8_t)0x00) /*!< Analog switch register 2 reset value */ +#define RI_RCR_RESET_VALUE ((uint8_t)0x00) /*!< Resistor control register reset value */ + +#define RI_IOCMR4_RESET_VALUE ((uint8_t)0x00) /*!< I/O control mode register 4 reset value */ +#define RI_IOSR4_RESET_VALUE ((uint8_t)0x00) /*!< I/O switch register 4 reset value */ + /** * @} */ @@ -1471,12 +1497,120 @@ RI_TypeDef; * @{ */ #define RI_ICR1_IC2CS ((uint8_t)0x1F) /*!< TIM1 Input Capture 2 I/O selection mask */ + #define RI_ICR2_IC3CS ((uint8_t)0x1F) /*!< TIM1 Input Capture 3 I/O selection mask */ -/* RCR*/ -#define RI_RCR_400KPD ((uint8_t)0x08) /*!< 400K pull-down resistor Mask. */ -#define RI_RCR_10KPD ((uint8_t)0x04) /*!< 10K pull-down resistor Mask. */ -#define RI_RCR_400KPU ((uint8_t)0x02) /*!< 400K pull-up resistor Mask. */ -#define RI_RCR_10KPU ((uint8_t)0x01) /*!< 10K pull-up resistor Mask. */ + +#define RI_IOIR1_CH1I ((uint8_t)0x01) /*!< Channel 1 I/O pin input value */ +#define RI_IOIR1_CH4I ((uint8_t)0x02) /*!< Channel 4 I/O pin input value */ +#define RI_IOIR1_CH7I ((uint8_t)0x04) /*!< Channel 7 I/O pin input value */ +#define RI_IOIR1_CH10I ((uint8_t)0x08) /*!< Channel 10 I/O pin input value */ +#define RI_IOIR1_CH13I ((uint8_t)0x10) /*!< Channel 13 I/O pin input value */ +#define RI_IOIR1_CH16I ((uint8_t)0x20) /*!< Channel 16 I/O pin input value */ +#define RI_IOIR1_CH19I ((uint8_t)0x40) /*!< Channel 19 I/O pin input value */ +#define RI_IOIR1_CH22I ((uint8_t)0x80) /*!< Channel 22 I/O pin input value */ + +#define RI_IOIR2_CH2I ((uint8_t)0x01) /*!< Channel 2 I/O pin input value */ +#define RI_IOIR2_CH5I ((uint8_t)0x02) /*!< Channel 5 I/O pin input value */ +#define RI_IOIR2_CH8I ((uint8_t)0x04) /*!< Channel 8 I/O pin input value */ +#define RI_IOIR2_CH11I ((uint8_t)0x08) /*!< Channel 11 I/O pin input value */ +#define RI_IOIR2_CH14I ((uint8_t)0x10) /*!< Channel 14 I/O pin input value */ +#define RI_IOIR2_CH17I ((uint8_t)0x20) /*!< Channel 17 I/O pin input value */ +#define RI_IOIR2_CH20I ((uint8_t)0x40) /*!< Channel 20 I/O pin input value */ +#define RI_IOIR2_CH23I ((uint8_t)0x80) /*!< Channel 23 I/O pin input value */ + +#define RI_IOIR3_CH3I ((uint8_t)0x01) /*!< Channel 3 I/O pin input value */ +#define RI_IOIR3_CH6I ((uint8_t)0x02) /*!< Channel 6 I/O pin input value */ +#define RI_IOIR3_CH9I ((uint8_t)0x04) /*!< Channel 9 I/O pin input value */ +#define RI_IOIR3_CH12I ((uint8_t)0x08) /*!< Channel 12 I/O pin input value */ +#define RI_IOIR3_CH15I ((uint8_t)0x10) /*!< Channel 15 I/O pin input value */ +#define RI_IOIR3_CH18I ((uint8_t)0x20) /*!< Channel 18 I/O pin input value */ +#define RI_IOIR3_CH21I ((uint8_t)0x40) /*!< Channel 21 I/O pin input value */ +#define RI_IOIR3_CH24I ((uint8_t)0x80) /*!< Channel 24 I/O pin input value */ + +#define RI_IOCMR1_CH1M ((uint8_t)0x01) /*!< Channel 1 I/O control mode */ +#define RI_IOCMR1_CH4M ((uint8_t)0x02) /*!< Channel 4 I/O control mode */ +#define RI_IOCMR1_CH7M ((uint8_t)0x04) /*!< Channel 7 I/O control mode */ +#define RI_IOCMR1_CH10M ((uint8_t)0x08) /*!< Channel 10 I/O control mode */ +#define RI_IOCMR1_CH13M ((uint8_t)0x10) /*!< Channel 13 I/O control mode */ +#define RI_IOCMR1_CH16M ((uint8_t)0x20) /*!< Channel 16 I/O control mode */ +#define RI_IOCMR1_CH19M ((uint8_t)0x40) /*!< Channel 19 I/O control mode */ +#define RI_IOCMR1_CH22M ((uint8_t)0x80) /*!< Channel 22 I/O control mode */ + +#define RI_IOCMR2_CH2M ((uint8_t)0x01) /*!< Channel 2 I/O control mode */ +#define RI_IOCMR2_CH5M ((uint8_t)0x02) /*!< Channel 5 I/O control mode */ +#define RI_IOCMR2_CH8M ((uint8_t)0x04) /*!< Channel 8 I/O control mode */ +#define RI_IOCMR2_CH11M ((uint8_t)0x08) /*!< Channel 11 I/O control mode */ +#define RI_IOCMR2_CH14M ((uint8_t)0x10) /*!< Channel 14 I/O control mode */ +#define RI_IOCMR2_CH17M ((uint8_t)0x20) /*!< Channel 17 I/O control mode */ +#define RI_IOCMR2_CH20M ((uint8_t)0x40) /*!< Channel 20 I/O control mode */ +#define RI_IOCMR2_CH23M ((uint8_t)0x80) /*!< Channel 23 I/O control mode */ + +#define RI_IOCMR3_CH3M ((uint8_t)0x01) /*!< Channel 3 I/O control mode */ +#define RI_IOCMR3_CH6M ((uint8_t)0x02) /*!< Channel 6 I/O control mode */ +#define RI_IOCMR3_CH9M ((uint8_t)0x04) /*!< Channel 9 I/O control mode */ +#define RI_IOCMR3_CH12M ((uint8_t)0x08) /*!< Channel 12 I/O control mode */ +#define RI_IOCMR3_CH15M ((uint8_t)0x10) /*!< Channel 15 I/O control mode */ +#define RI_IOCMR3_CH18M ((uint8_t)0x20) /*!< Channel 18 I/O control mode */ +#define RI_IOCMR3_CH21M ((uint8_t)0x40) /*!< Channel 21 I/O control mode */ +#define RI_IOCMR3_CH24M ((uint8_t)0x80) /*!< Channel 24 I/O control mode */ + +#define RI_IOSR1_CH1E ((uint8_t)0x01) /*!< Channel 1 I/O switch control */ +#define RI_IOSR1_CH4E ((uint8_t)0x02) /*!< Channel 4 I/O switch control */ +#define RI_IOSR1_CH7E ((uint8_t)0x04) /*!< Channel 7 I/O switch control */ +#define RI_IOSR1_CH10E ((uint8_t)0x08) /*!< Channel 10 I/O switch control */ +#define RI_IOSR1_CH13E ((uint8_t)0x10) /*!< Channel 13 I/O switch control */ +#define RI_IOSR1_CH16E ((uint8_t)0x20) /*!< Channel 16 I/O switch control */ +#define RI_IOSR1_CH19E ((uint8_t)0x40) /*!< Channel 19 I/O switch control */ +#define RI_IOSR1_CH22E ((uint8_t)0x80) /*!< Channel 22 I/O switch control */ + +#define RI_IOSR2_CH2E ((uint8_t)0x01) /*!< Channel 2 I/O switch control */ +#define RI_IOSR2_CH5E ((uint8_t)0x02) /*!< Channel 5 I/O switch control */ +#define RI_IOSR2_CH8E ((uint8_t)0x04) /*!< Channel 8 I/O switch control */ +#define RI_IOSR2_CH11E ((uint8_t)0x08) /*!< Channel 11 I/O switch control */ +#define RI_IOSR2_CH14E ((uint8_t)0x10) /*!< Channel 14 I/O switch control */ +#define RI_IOSR2_CH17E ((uint8_t)0x20) /*!< Channel 17 I/O switch control */ +#define RI_IOSR2_CH20E ((uint8_t)0x40) /*!< Channel 20 I/O switch control */ +#define RI_IOSR2_CH23E ((uint8_t)0x80) /*!< Channel 23 I/O switch control */ + +#define RI_IOSR3_CH3E ((uint8_t)0x01) /*!< Channel 3 I/O switch control */ +#define RI_IOSR3_CH6E ((uint8_t)0x02) /*!< Channel 6 I/O switch control */ +#define RI_IOSR3_CH9E ((uint8_t)0x04) /*!< Channel 9 I/O switch control */ +#define RI_IOSR3_CH12E ((uint8_t)0x08) /*!< Channel 12 I/O switch control */ +#define RI_IOSR3_CH15E ((uint8_t)0x10) /*!< Channel 15 I/O switch control */ +#define RI_IOSR3_CH18E ((uint8_t)0x20) /*!< Channel 18 I/O switch control */ +#define RI_IOSR3_CH21E ((uint8_t)0x40) /*!< Channel 21 I/O switch control */ +#define RI_IOSR3_CH24E ((uint8_t)0x80) /*!< Channel 24 I/O switch control */ + +#define RI_IOGCR_IOM1 ((uint8_t)0x03) /*!< I/O mode 1 */ +#define RI_IOGCR_IOM2 ((uint8_t)0x0C) /*!< I/O mode 2 */ +#define RI_IOGCR_IOM3 ((uint8_t)0x30) /*!< I/O mode 3 */ +#define RI_IOGCR_IOM4 ((uint8_t)0xC0) /*!< I/O mode 4 */ + +#define RI_ASCR1_AS0 ((uint8_t)0x01) /*!< Analog switch AS0 control */ +#define RI_ASCR1_AS1 ((uint8_t)0x02) /*!< Analog switch AS1 control */ +#define RI_ASCR1_AS2 ((uint8_t)0x04) /*!< Analog switch AS2 control */ +#define RI_ASCR1_AS3 ((uint8_t)0x08) /*!< Analog switch AS3 control */ +#define RI_ASCR1_AS4 ((uint8_t)0x10) /*!< Analog switch AS4 control */ +#define RI_ASCR1_AS5 ((uint8_t)0x20) /*!< Analog switch AS5 control */ +#define RI_ASCR1_AS6 ((uint8_t)0x40) /*!< Analog switch AS6 control */ +#define RI_ASCR1_AS7 ((uint8_t)0x80) /*!< Analog switch AS7 control */ + +#define RI_ASCR2_AS8 ((uint8_t)0x01) /*!< Analog switch AS8 control */ +#define RI_ASCR2_AS9 ((uint8_t)0x02) /*!< Analog switch AS9 control */ +#define RI_ASCR2_AS10 ((uint8_t)0x04) /*!< Analog switch AS10 control */ +#define RI_ASCR2_AS11 ((uint8_t)0x08) /*!< Analog switch AS11 control */ +#define RI_ASCR2_AS14 ((uint8_t)0x40) /*!< Analog switch AS14 control */ + +#define RI_RCR_400KPD ((uint8_t)0x08) /*!< 400K pull-down resistor Mask. */ +#define RI_RCR_10KPD ((uint8_t)0x04) /*!< 10K pull-down resistor Mask. */ +#define RI_RCR_400KPU ((uint8_t)0x02) /*!< 400K pull-up resistor Mask. */ +#define RI_RCR_10KPU ((uint8_t)0x01) /*!< 10K pull-up resistor Mask. */ + +#define RI_IOSR4_CH29E ((uint8_t)0x01) /*!< Channel 29 I/O switch control */ +#define RI_IOSR4_CH26E ((uint8_t)0x02) /*!< Channel 26 I/O switch control */ +#define RI_IOSR4_CH27E ((uint8_t)0x40) /*!< Channel 27 I/O switch control */ +#define RI_IOSR4_CH28E ((uint8_t)0x80) /*!< Channel 28 I/O switch control */ + /** * @} */ @@ -2761,16 +2895,16 @@ AES_TypeDef; #define halt() {_asm("halt\n");} /*! - #define enableInterrupts() {asm("rim\n");} /* enable interrupts */ - #define disableInterrupts() {asm("sim\n");} /* disable interrupts */ - #define rim() {asm("rim\n");} /* enable interrupts */ - #define sim() {asm("sim\n");} /* disable interrupts */ - #define nop() {asm("nop\n");} /* No Operation */ - #define trap() {asm("trap\n");} /* Trap (soft IT) */ - #define wfi() {asm("wfi\n");} /* Wait For Interrupt */ - #define wfe() {asm("wfe\n");} /* Wait for event */ - #define halt() {asm("halt\n");} /* Halt */ -#endif + #define enableInterrupts() __enable_interrupt() /* enable interrupts */ + #define disableInterrupts() __disable_interrupt() /* disable interrupts */ + #define rim() __enable_interrupt() /* enable interrupts */ + #define sim() __disable_interrupt() /* disable interrupts */ + #define nop() __no_operation() /* No Operation */ + #define trap() __trap() /* Trap (soft IT) */ + #define wfi() __wait_for_interrupt() /* Wait For Interrupt */ + #define wfe() __wait_for_event(); /* Wait for event */ + #define halt() __halt() /* Halt */ +#endif /* _RAISONANCE_ */ /*============================== Interrupt vector Handling ========================*/ @@ -2863,4 +2997,4 @@ Comments : The idea is to handle directly with the bit name. For that, it is * @} */ -/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ +/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/ diff --git a/os/hal/platforms/STM8S/stm8s.h b/os/hal/platforms/STM8S/stm8s.h index c210092c3..07a8362d3 100644 --- a/os/hal/platforms/STM8S/stm8s.h +++ b/os/hal/platforms/STM8S/stm8s.h @@ -1,11 +1,12 @@ /** ****************************************************************************** - * @file stm8s.h - * @brief This file contains all HW registers definitions and memory mapping. - * @author STMicroelectronics - MCD Application Team - * @version V1.1.1 - * @date 06/05/2009 + * @file stm8s.h + * @author MCD Application Team + * @version V2.1.0 + * @date 18-November-2011 + * @brief This file contains all HW registers definitions and memory mapping. ****************************************************************************** + * @attention * * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE @@ -14,8 +15,7 @@ * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. * - *

© COPYRIGHT 2009 STMicroelectronics

- * @image html logo.bmp + *

© COPYRIGHT 2011 STMicroelectronics

****************************************************************************** */ @@ -23,75 +23,226 @@ #ifndef __STM8S_H #define __STM8S_H +/** @addtogroup STM8S_StdPeriph_Driver + * @{ + */ + +/* Uncomment the line below according to the target STM8S or STM8A device used in your + application. */ + + /* #define STM8S208 */ /*!< STM8S High density devices with CAN */ + /* #define STM8S207 */ /*!< STM8S High density devices without CAN */ + /* #define STM8S007 */ /*!< STM8S Value Line High density devices */ + /* #define STM8AF52Ax */ /*!< STM8A High density devices with CAN */ + /* #define STM8AF62Ax */ /*!< STM8A High density devices without CAN */ + /* #define STM8S105 */ /*!< STM8S Medium density devices */ + /* #define STM8S005 */ /*!< STM8S Value Line Medium density devices */ + /* #define STM8AF626x */ /*!< STM8A Medium density devices */ + /* #define STM8S103 */ /*!< STM8S Low density devices */ + /* #define STM8S003 */ /*!< STM8S Value Line Low density devices */ + /* #define STM8S903 */ /*!< STM8S Low density devices */ + +/* Tip: To avoid modifying this file each time you need to switch between these + devices, you can define the device in your toolchain compiler preprocessor. + + - High-Density STM8A devices are the STM8AF52xx STM8AF6269/8x/Ax, + STM8AF51xx, and STM8AF6169/7x/8x/9x/Ax microcontrollers where the Flash memory + density ranges between 32 to 128 Kbytes + - Medium-Density STM8A devices are the STM8AF622x/4x, STM8AF6266/68, + STM8AF612x/4x, and STM8AF6166/68 microcontrollers where the Flash memory + density ranges between 8 to 32 Kbytes + - High-Density STM8S devices are the STM8S207xx, STM8S007 and STM8S208xx microcontrollers + where the Flash memory density ranges between 32 to 128 Kbytes. + - Medium-Density STM8S devices are the STM8S105x and STM8S005 microcontrollers + where the Flash memory density ranges between 16 to 32-Kbytes. + - Low-Density STM8S devices are the STM8S103xx, STM8S003 and STM8S903xx microcontrollers + where the Flash density is 8 Kbytes. */ + +#if !defined (STM8S208) && !defined (STM8S207) && !defined (STM8S105) && \ + !defined (STM8S103) && !defined (STM8S903) && !defined (STM8AF52Ax) && \ + !defined (STM8AF62Ax) && !defined (STM8AF626x) && !defined (STM8S007) && \ + !defined (STM8S003)&& !defined (STM8S005) + #error "Please select first the target STM8S/A device used in your application (in stm8s.h file)" +#endif + /******************************************************************************/ /* Library configuration section */ /******************************************************************************/ /* Check the used compiler */ #if defined(__CSMC__) - #undef _RAISONANCE_ #define _COSMIC_ #elif defined(__RCST7__) - #undef _COSMIC_ #define _RAISONANCE_ +#elif defined(__ICCSTM8__) + #define _IAR_ #else #error "Unsupported Compiler!" /* Compiler defines not found */ #endif -/* Uncomment the line below according to the target STM8S device used in your - application. - Tip: To avoid modifying this file each time you need to switch between these - devices, you can define the device in your toolchain compiler preprocessor. */ -#if !defined (STM8S208) && !defined (STM8S207) && !defined (STM8S105) && !defined (STM8S103) && !defined (STM8S903) - #define STM8S208 - /* #define STM8S207 */ - /* #define STM8S105 */ - /* #define STM8S103 */ - /* #define STM8S903 */ -#endif - - #if !defined USE_STDPERIPH_DRIVER /* Comment the line below if you will not use the peripherals drivers. In this case, these drivers will not be included and the application code will be based on direct access to peripherals registers */ -/* #define USE_STDPERIPH_DRIVER*/ +/* CHIBIOS FIX */ +/* #define USE_STDPERIPH_DRIVER*/ #endif -/* For FLASH routines, select whether pointer will be declared as near (2 bytes, handle - code smaller than 64KB) or far (3 bytes, handle code larger than 64K) */ -/*#define PointerAttr_Near 1 */ /*!< Used with memory Models for code smaller than 64K */ -#define PointerAttr_Far 2 /*!< Used with memory Models for code larger than 64K */ +/** + * @brief In the following line adjust the value of External High Speed oscillator (HSE) + used in your application + + Tip: To avoid modifying this file each time you need to use different HSE, you + can define the HSE value in your toolchain compiler preprocessor. + */ +#if !defined HSE_Value + #if defined (STM8S208) || defined (STM8S207) || defined (STM8S007) || defined (STM8AF52Ax) || \ + defined (STM8AF62Ax) + #define HSE_VALUE ((u32)24000000) /* Value of the External oscillator in Hz*/ + #else + #define HSE_VALUE ((u32)16000000) /* Value of the External oscillator in Hz*/ + #endif /* STM8S208 || STM8S207 || STM8S007 || STM8AF62Ax || STM8AF52Ax */ +#endif /* HSE_Value */ + +/** + * @brief Definition of Device on-chip RC oscillator frequencies + */ +#define HSI_VALUE ((uint32_t)16000000) /*!< Typical Value of the HSI in Hz */ +#define LSI_VALUE ((uint32_t)128000) /*!< Typical Value of the LSI in Hz */ #ifdef _COSMIC_ #define FAR @far #define NEAR @near #define TINY @tiny - #define __CONST const -#else /* __RCST7__ */ + #define EEPROM @eeprom + #define CONST const +#elif defined (_RAISONANCE_) /* __RCST7__ */ #define FAR far #define NEAR data #define TINY page0 - #define __CONST code + #define EEPROM eeprom + #define CONST code + #if defined (STM8S208) || defined (STM8S207) || defined (STM8S007) || defined (STM8AF52Ax) || \ + defined (STM8AF62Ax) + /*!< Used with memory Models for code higher than 64K */ + #define MEMCPY fmemcpy + #else /* STM8S903, STM8S103, STM8S003, STM8S105, STM8AF626x */ + /*!< Used with memory Models for code less than 64K */ + #define MEMCPY memcpy + #endif /* STM8S208 or STM8S207 or STM8S007 or STM8AF62Ax or STM8AF52Ax */ +#else /*_IAR_*/ + #define FAR __far + #define NEAR __near + #define TINY __tiny + #define EEPROM __eeprom + #define CONST const #endif /* __CSMC__ */ -#ifdef PointerAttr_Far - #define PointerAttr FAR -#else /* PointerAttr_Near */ +/* For FLASH routines, select whether pointer will be declared as near (2 bytes, + to handle code smaller than 64KB) or far (3 bytes, to handle code larger + than 64K) */ + +#if defined (STM8S105) || defined (STM8S005) || defined (STM8S103) || defined (STM8S003) || \ + defined (STM8S903) || defined (STM8AF626x) +/*!< Used with memory Models for code smaller than 64K */ #define PointerAttr NEAR -#endif /* PointerAttr_Far */ +#else /* STM8S208 or STM8S207 or STM8AF62Ax or STM8AF52Ax */ +/*!< Used with memory Models for code higher than 64K */ + #define PointerAttr FAR +#endif /* STM8S105 or STM8S103 or STM8S003 or STM8S903 or STM8AF626x */ +/* Uncomment the line below to enable the FLASH functions execution from RAM */ +#if !defined (RAM_EXECUTION) +/* #define RAM_EXECUTION (1) */ +#endif /* RAM_EXECUTION */ -/* Uncomment the line below to use the cosmic section */ -#if defined(_COSMIC_) -/* #define USE_COSMIC_SECTIONS (1)*/ -#endif +#ifdef RAM_EXECUTION + #ifdef _COSMIC_ + #define IN_RAM(a) a + #elif defined (_RAISONANCE_) /* __RCST7__ */ + #define IN_RAM(a) a inram + #else /*_IAR_*/ + #define IN_RAM(a) __ramfunc a + #endif /* _COSMIC_ */ +#else + #define IN_RAM(a) a +#endif /* RAM_EXECUTION */ + +/*!< [31:16] STM8S Standard Peripheral Library main version V2.1.0*/ +#define __STM8S_STDPERIPH_VERSION_MAIN ((uint8_t)0x02) /*!< [31:24] main version */ +#define __STM8S_STDPERIPH_VERSION_SUB1 ((uint8_t)0x01) /*!< [23:16] sub1 version */ +#define __STM8S_STDPERIPH_VERSION_SUB2 ((uint8_t)0x00) /*!< [15:8] sub2 version */ +#define __STM8S_STDPERIPH_VERSION_RC ((uint8_t)0x00) /*!< [7:0] release candidate */ +#define __STM8S_STDPERIPH_VERSION ( (__STM8S_STDPERIPH_VERSION_MAIN << 24)\ + |(__STM8S_STDPERIPH_VERSION_SUB1 << 16)\ + |(__STM8S_STDPERIPH_VERSION_SUB2 << 8)\ + |(__STM8S_STDPERIPH_VERSION_RC)) /******************************************************************************/ /* Includes ------------------------------------------------------------------*/ -#include "stm8s_type.h" -/* Exported types and constants-----------------------------------------------*/ +/* Exported types and constants ----------------------------------------------*/ + +/** @addtogroup Exported_types + * @{ + */ + +/** + * IO definitions + * + * define access restrictions to peripheral registers + */ +#define __I volatile const /*!< defines 'read only' permissions */ +#define __O volatile /*!< defines 'write only' permissions */ +#define __IO volatile /*!< defines 'read / write' permissions */ + +/*!< Signed integer types */ +/* CHIBIOS FIX */ +#if 0 +typedef signed char int8_t; +typedef signed short int16_t; +typedef signed long int32_t; + +/*!< Unsigned integer types */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +#endif + +/*!< STM8 Standard Peripheral Library old types (maintained for legacy purpose) */ + +typedef int32_t s32; +typedef int16_t s16; +typedef int8_t s8; + +typedef uint32_t u32; +typedef uint16_t u16; +typedef uint8_t u8; + + +typedef enum {FALSE = 0, TRUE = !FALSE} bool; + +typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus, BitStatus, BitAction; + +typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState; +#define IS_FUNCTIONALSTATE_OK(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) + +typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrorStatus; + +#define U8_MAX (255) +#define S8_MAX (127) +#define S8_MIN (-128) +#define U16_MAX (65535u) +#define S16_MAX (32767) +#define S16_MIN (-32768) +#define U32_MAX (4294967295uL) +#define S32_MAX (2147483647) +#define S32_MIN (-2147483648uL) + +/** + * @} + */ + /** @addtogroup MAP_FILE_Exported_Types_and_Constants * @{ */ @@ -99,18 +250,17 @@ /******************************************************************************/ /* IP registers structures */ /******************************************************************************/ -/*----------------------------------------------------------------------------*/ -/** - * @brief General Purpose I/Os (GPIO) - */ +/** + * @brief General Purpose I/Os (GPIO) + */ typedef struct GPIO_struct { - vu8 ODR; /*!< Output Data Register */ - vu8 IDR; /*!< Input Data Register */ - vu8 DDR; /*!< Data Direction Register */ - vu8 CR1; /*!< Configuration Register 1 */ - vu8 CR2; /*!< Configuration Register 2 */ + __IO uint8_t ODR; /*!< Output Data Register */ + __IO uint8_t IDR; /*!< Input Data Register */ + __IO uint8_t DDR; /*!< Data Direction Register */ + __IO uint8_t CR1; /*!< Configuration Register 1 */ + __IO uint8_t CR2; /*!< Configuration Register 2 */ } GPIO_TypeDef; @@ -118,79 +268,78 @@ GPIO_TypeDef; * @{ */ -#define GPIO_ODR_RESET_VALUE ((u8)0x00) -#define GPIO_DDR_RESET_VALUE ((u8)0x00) -#define GPIO_CR1_RESET_VALUE ((u8)0x00) -#define GPIO_CR2_RESET_VALUE ((u8)0x00) +#define GPIO_ODR_RESET_VALUE ((uint8_t)0x00) +#define GPIO_DDR_RESET_VALUE ((uint8_t)0x00) +#define GPIO_CR1_RESET_VALUE ((uint8_t)0x00) +#define GPIO_CR2_RESET_VALUE ((uint8_t)0x00) /** * @} */ /*----------------------------------------------------------------------------*/ -#if defined(STM8S105) || defined(STM8S103) || defined(STM8S903) +#if defined(STM8S105) || defined(STM8S005) || defined(STM8S103) || defined(STM8S003) || \ + defined(STM8S903) || defined(STM8AF626x) /** - * @brief Analog to Digital Converter (ADC1) + * @brief Analog to Digital Converter (ADC1) */ -typedef struct ADC1_struct -{ - vu8 DB0RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB0RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB1RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB1RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB2RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB2RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB3RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB3RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB4RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB4RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB5RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB5RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB6RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB6RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB7RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB7RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB8RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB8RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 DB9RH; /*!< ADC1 Data Buffer Register (MSB) */ - vu8 DB9RL; /*!< ADC1 Data Buffer Register (LSB) */ - vu8 RESERVED[12]; /*!< Reserved byte */ - vu8 CSR; /*!< ADC1 control status register */ - vu8 CR1; /*!< ADC1 configuration register 1 */ - vu8 CR2; /*!< ADC1 configuration register 2 */ - vu8 CR3; /*!< ADC1 configuration register 3 */ - vu8 DRH; /*!< ADC1 Data high */ - vu8 DRL; /*!< ADC1 Data low */ - vu8 TDRH; /*!< ADC1 Schmitt trigger disable register high */ - vu8 TDRL; /*!< ADC1 Schmitt trigger disable register low */ - vu8 HTRH; /*!< ADC1 high threshold register High*/ - vu8 HTRL; /*!< ADC1 high threshold register Low*/ - vu8 LTRH; /*!< ADC1 low threshold register high */ - vu8 LTRL; /*!< ADC1 low threshold register low */ - vu8 AWSRH; /*!< ADC1 watchdog status register high */ - vu8 AWSRL; /*!< ADC1 watchdog status register low */ - vu8 AWCRH; /*!< ADC1 watchdog control register high */ - vu8 AWCRL; /*!< ADC1 watchdog control register low */ -} -ADC1_TypeDef; + typedef struct ADC1_struct + { + __IO uint8_t DB0RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB0RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB1RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB1RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB2RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB2RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB3RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB3RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB4RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB4RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB5RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB5RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB6RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB6RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB7RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB7RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB8RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB8RL; /*!< ADC1 Data Buffer Register (LSB) */ + __IO uint8_t DB9RH; /*!< ADC1 Data Buffer Register (MSB) */ + __IO uint8_t DB9RL; /*!< ADC1 Data Buffer Register (LSB) */ + uint8_t RESERVED[12]; /*!< Reserved byte */ + __IO uint8_t CSR; /*!< ADC1 control status register */ + __IO uint8_t CR1; /*!< ADC1 configuration register 1 */ + __IO uint8_t CR2; /*!< ADC1 configuration register 2 */ + __IO uint8_t CR3; /*!< ADC1 configuration register 3 */ + __IO uint8_t DRH; /*!< ADC1 Data high */ + __IO uint8_t DRL; /*!< ADC1 Data low */ + __IO uint8_t TDRH; /*!< ADC1 Schmitt trigger disable register high */ + __IO uint8_t TDRL; /*!< ADC1 Schmitt trigger disable register low */ + __IO uint8_t HTRH; /*!< ADC1 high threshold register High*/ + __IO uint8_t HTRL; /*!< ADC1 high threshold register Low*/ + __IO uint8_t LTRH; /*!< ADC1 low threshold register high */ + __IO uint8_t LTRL; /*!< ADC1 low threshold register low */ + __IO uint8_t AWSRH; /*!< ADC1 watchdog status register high */ + __IO uint8_t AWSRL; /*!< ADC1 watchdog status register low */ + __IO uint8_t AWCRH; /*!< ADC1 watchdog control register high */ + __IO uint8_t AWCRL; /*!< ADC1 watchdog control register low */ + } + ADC1_TypeDef; /** @addtogroup ADC1_Registers_Reset_Value * @{ */ - -#define ADC1_CSR_RESET_VALUE ((u8)0x00) -#define ADC1_CR1_RESET_VALUE ((u8)0x00) -#define ADC1_CR2_RESET_VALUE ((u8)0x00) -#define ADC1_CR3_RESET_VALUE ((u8)0x00) -#define ADC1_TDRL_RESET_VALUE ((u8)0x00) -#define ADC1_TDRH_RESET_VALUE ((u8)0x00) -#define ADC1_HTRL_RESET_VALUE ((u8)0x03) -#define ADC1_HTRH_RESET_VALUE ((u8)0xFF) -#define ADC1_LTRH_RESET_VALUE ((u8)0x00) -#define ADC1_LTRL_RESET_VALUE ((u8)0x00) -#define ADC1_AWCRH_RESET_VALUE ((u8)0x00) -#define ADC1_AWCRL_RESET_VALUE ((u8)0x00) - + #define ADC1_CSR_RESET_VALUE ((uint8_t)0x00) + #define ADC1_CR1_RESET_VALUE ((uint8_t)0x00) + #define ADC1_CR2_RESET_VALUE ((uint8_t)0x00) + #define ADC1_CR3_RESET_VALUE ((uint8_t)0x00) + #define ADC1_TDRL_RESET_VALUE ((uint8_t)0x00) + #define ADC1_TDRH_RESET_VALUE ((uint8_t)0x00) + #define ADC1_HTRL_RESET_VALUE ((uint8_t)0x03) + #define ADC1_HTRH_RESET_VALUE ((uint8_t)0xFF) + #define ADC1_LTRH_RESET_VALUE ((uint8_t)0x00) + #define ADC1_LTRL_RESET_VALUE ((uint8_t)0x00) + #define ADC1_AWCRH_RESET_VALUE ((uint8_t)0x00) + #define ADC1_AWCRL_RESET_VALUE ((uint8_t)0x00) /** * @} */ @@ -198,58 +347,55 @@ ADC1_TypeDef; /** @addtogroup ADC1_Registers_Bits_Definition * @{ */ + #define ADC1_CSR_EOC ((uint8_t)0x80) /*!< End of Conversion mask */ + #define ADC1_CSR_AWD ((uint8_t)0x40) /*!< Analog Watch Dog Status mask */ + #define ADC1_CSR_EOCIE ((uint8_t)0x20) /*!< Interrupt Enable for EOC mask */ + #define ADC1_CSR_AWDIE ((uint8_t)0x10) /*!< Analog Watchdog interrupt enable mask */ + #define ADC1_CSR_CH ((uint8_t)0x0F) /*!< Channel selection bits mask */ -#define ADC1_CSR_EOC ((u8)0x80) /*!< End of Conversion mask */ -#define ADC1_CSR_AWD ((u8)0x40) /*!< Analog Watch Dog Status mask */ -#define ADC1_CSR_EOCIE ((u8)0x20) /*!< Interrupt Enable for EOC mask */ -#define ADC1_CSR_AWDIE ((u8)0x10) /*!< Analog Watchdog interrupt enable mask */ -#define ADC1_CSR_CH ((u8)0x0F) /*!< Channel selection bits mask */ + #define ADC1_CR1_SPSEL ((uint8_t)0x70) /*!< Prescaler selection mask */ + #define ADC1_CR1_CONT ((uint8_t)0x02) /*!< Continuous conversion mask */ + #define ADC1_CR1_ADON ((uint8_t)0x01) /*!< A/D Converter on/off mask */ -#define ADC1_CR1_SPSEL ((u8)0x70) /*!< Prescaler selectiont mask */ -#define ADC1_CR1_CONT ((u8)0x02) /*!< Continuous conversion mask */ -#define ADC1_CR1_ADON ((u8)0x01) /*!< A/D Converter on/off mask */ + #define ADC1_CR2_EXTTRIG ((uint8_t)0x40) /*!< External trigger enable mask */ + #define ADC1_CR2_EXTSEL ((uint8_t)0x30) /*!< External event selection mask */ + #define ADC1_CR2_ALIGN ((uint8_t)0x08) /*!< Data Alignment mask */ + #define ADC1_CR2_SCAN ((uint8_t)0x02) /*!< Scan mode mask */ -#define ADC1_CR2_EXTTRIG ((u8)0x40) /*!< External trigger enable mask */ -#define ADC1_CR2_EXTSEL ((u8)0x30) /*!< External event selection mask */ -#define ADC1_CR2_ALIGN ((u8)0x08) /*!< Data Alignment mask */ -#define ADC1_CR2_SCAN ((u8)0x02) /*!< Scan mode mask */ + #define ADC1_CR3_DBUF ((uint8_t)0x80) /*!< Data Buffer Enable mask */ + #define ADC1_CR3_OVR ((uint8_t)0x40) /*!< Overrun Status Flag mask */ -#define ADC1_CR3_DBUF ((u8)0x80) /*!< Data Buffer Enable mask */ -#define ADC1_CR3_OVR ((u8)0x40) /*!< Overrun Status Flag mask */ - -#endif /* (STM8S105) ||(STM8S103) || (STM8S903) */ +#endif /* (STM8S105) ||(STM8S103) || (STM8S005) ||(STM8S003) || (STM8S903) || (STM8AF626x) */ /** * @} */ /*----------------------------------------------------------------------------*/ /** - * @brief Analog to Digital Converter (ADC2) + * @brief Analog to Digital Converter (ADC2) */ -#if defined(STM8S208) || defined(STM8S207) -typedef struct ADC2_struct -{ - vu8 CSR; /*!< ADC2 control status register */ - vu8 CR1; /*!< ADC2 configuration register 1 */ - vu8 CR2; /*!< ADC2 configuration register 2 */ - vu8 RESERVED; /*!< Reserved byte */ - vu8 DRH; /*!< ADC2 Data high */ - vu8 DRL; /*!< ADC2 Data low */ - vu8 TDRH; /*!< ADC2 Schmitt trigger disable register high */ - vu8 TDRL; /*!< ADC2 Schmitt trigger disable register low */ -} -ADC2_TypeDef; +#if defined(STM8S208) || defined(STM8S207) || defined (STM8S007) || defined (STM8AF52Ax) || defined (STM8AF62Ax) + typedef struct ADC2_struct + { + __IO uint8_t CSR; /*!< ADC2 control status register */ + __IO uint8_t CR1; /*!< ADC2 configuration register 1 */ + __IO uint8_t CR2; /*!< ADC2 configuration register 2 */ + uint8_t RESERVED; /*!< Reserved byte */ + __IO uint8_t DRH; /*!< ADC2 Data high */ + __IO uint8_t DRL; /*!< ADC2 Data low */ + __IO uint8_t TDRH; /*!< ADC2 Schmitt trigger disable register high */ + __IO uint8_t TDRL; /*!< ADC2 Schmitt trigger disable register low */ + } + ADC2_TypeDef; /** @addtogroup ADC2_Registers_Reset_Value * @{ */ - -#define ADC2_CSR_RESET_VALUE ((u8)0x00) -#define ADC2_CR1_RESET_VALUE ((u8)0x00) -#define ADC2_CR2_RESET_VALUE ((u8)0x00) -#define ADC2_TDRL_RESET_VALUE ((u8)0x00) -#define ADC2_TDRH_RESET_VALUE ((u8)0x00) - + #define ADC2_CSR_RESET_VALUE ((uint8_t)0x00) + #define ADC2_CR1_RESET_VALUE ((uint8_t)0x00) + #define ADC2_CR2_RESET_VALUE ((uint8_t)0x00) + #define ADC2_TDRL_RESET_VALUE ((uint8_t)0x00) + #define ADC2_TDRH_RESET_VALUE ((uint8_t)0x00) /** * @} */ @@ -257,43 +403,42 @@ ADC2_TypeDef; /** @addtogroup ADC2_Registers_Bits_Definition * @{ */ + #define ADC2_CSR_EOC ((uint8_t)0x80) /*!< End of Conversion mask */ + #define ADC2_CSR_EOCIE ((uint8_t)0x20) /*!< Interrupt Enable for EOC mask */ + #define ADC2_CSR_CH ((uint8_t)0x0F) /*!< Channel selection bits mask */ -#define ADC2_CSR_EOC ((u8)0x80) /*!< End of Conversion mask */ -#define ADC2_CSR_EOCIE ((u8)0x20) /*!< Interrupt Enable for EOC mask */ -#define ADC2_CSR_CH ((u8)0x0F) /*!< Channel selection bits mask */ + #define ADC2_CR1_SPSEL ((uint8_t)0x70) /*!< Prescaler selection mask */ + #define ADC2_CR1_CONT ((uint8_t)0x02) /*!< Continuous conversion mask */ + #define ADC2_CR1_ADON ((uint8_t)0x01) /*!< A/D Converter on/off mask */ -#define ADC2_CR1_SPSEL ((u8)0x70) /*!< Prescaler selectiont mask */ -#define ADC2_CR1_CONT ((u8)0x02) /*!< Continuous conversion mask */ -#define ADC2_CR1_ADON ((u8)0x01) /*!< A/D Converter on/off mask */ + #define ADC2_CR2_EXTTRIG ((uint8_t)0x40) /*!< External trigger enable mask */ + #define ADC2_CR2_EXTSEL ((uint8_t)0x30) /*!< External event selection mask */ + #define ADC2_CR2_ALIGN ((uint8_t)0x08) /*!< Data Alignment mask */ -#define ADC2_CR2_EXTTRIG ((u8)0x40) /*!< External trigger enable mask */ -#define ADC2_CR2_EXTSEL ((u8)0x30) /*!< External event selection mask */ -#define ADC2_CR2_ALIGN ((u8)0x08) /*!< Data Alignment mask */ - -#endif /* (STM8S208) ||(STM8S207) */ +#endif /* (STM8S208) ||(STM8S207) || defined (STM8S007) || (STM8AF62Ax) || (STM8AF52Ax) */ /** * @} */ -/*----------------------------------------------------------------------------*/ -/** - * @brief Auto Wake Up (AWU) peripheral registers. - */ +/*----------------------------------------------------------------------------*/ + +/** + * @brief Auto Wake Up (AWU) peripheral registers. + */ typedef struct AWU_struct { - vu8 CSR; /*!< AWU Control status register */ - vu8 APR; /*!< AWU Asynchronous prescalar buffer */ - vu8 TBR; /*!< AWU Time base selection register */ + __IO uint8_t CSR; /*!< AWU Control status register */ + __IO uint8_t APR; /*!< AWU Asynchronous prescaler buffer */ + __IO uint8_t TBR; /*!< AWU Time base selection register */ } AWU_TypeDef; /** @addtogroup AWU_Registers_Reset_Value * @{ */ - -#define AWU_CSR_RESET_VALUE ((u8)0x00) -#define AWU_APR_RESET_VALUE ((u8)0x3F) -#define AWU_TBR_RESET_VALUE ((u8)0x00) +#define AWU_CSR_RESET_VALUE ((uint8_t)0x00) +#define AWU_APR_RESET_VALUE ((uint8_t)0x3F) +#define AWU_TBR_RESET_VALUE ((uint8_t)0x00) /** * @} @@ -303,14 +448,13 @@ AWU_TypeDef; * @{ */ -#define AWU_CSR_AWUF ((u8)0x20) /*!< Interrupt flag mask */ -#define AWU_CSR_AWUEN ((u8)0x10) /*!< Auto Wake-up enable mask */ -#define AWU_CSR_MR ((u8)0x02) /*!< Master Reset mask */ -#define AWU_CSR_MSR ((u8)0x01) /*!< Measurement enable mask */ +#define AWU_CSR_AWUF ((uint8_t)0x20) /*!< Interrupt flag mask */ +#define AWU_CSR_AWUEN ((uint8_t)0x10) /*!< Auto Wake-up enable mask */ +#define AWU_CSR_MSR ((uint8_t)0x01) /*!< LSI Measurement enable mask */ -#define AWU_APR_APR ((u8)0x3F) /*!< Asynchronous Prescaler divider mask */ +#define AWU_APR_APR ((uint8_t)0x3F) /*!< Asynchronous Prescaler divider mask */ -#define AWU_TBR_AWUTB ((u8)0x0F) /*!< Timebase selection mask */ +#define AWU_TBR_AWUTB ((uint8_t)0x0F) /*!< Timebase selection mask */ /** * @} @@ -318,21 +462,19 @@ AWU_TypeDef; /*----------------------------------------------------------------------------*/ /** - * @brief Beeper (BEEP) peripheral registers. + * @brief Beeper (BEEP) peripheral registers. */ typedef struct BEEP_struct { - vu8 CSR; /*!< BEEP Control status register */ + __IO uint8_t CSR; /*!< BEEP Control status register */ } BEEP_TypeDef; /** @addtogroup BEEP_Registers_Reset_Value * @{ */ - -#define BEEP_CSR_RESET_VALUE ((u8)0x1F) - +#define BEEP_CSR_RESET_VALUE ((uint8_t)0x1F) /** * @} */ @@ -340,36 +482,33 @@ BEEP_TypeDef; /** @addtogroup BEEP_Registers_Bits_Definition * @{ */ - -#define BEEP_CSR_BEEPSEL ((u8)0xC0) /*!< Beeper frequency selection mask */ -#define BEEP_CSR_BEEPEN ((u8)0x20) /*!< Beeper enable mask */ -#define BEEP_CSR_BEEPDIV ((u8)0x1F) /*!< Beeper Divider prescalar mask */ - +#define BEEP_CSR_BEEPSEL ((uint8_t)0xC0) /*!< Beeper frequency selection mask */ +#define BEEP_CSR_BEEPEN ((uint8_t)0x20) /*!< Beeper enable mask */ +#define BEEP_CSR_BEEPDIV ((uint8_t)0x1F) /*!< Beeper Divider prescalar mask */ /** * @} */ /*----------------------------------------------------------------------------*/ /** - * @brief Clock Controller (CLK) + * @brief Clock Controller (CLK) */ - typedef struct CLK_struct { - vu8 ICKR; /*!< Internal Clocks Control Register */ - vu8 ECKR; /*!< External Clocks Control Register */ - u8 RESERVED; /*!< Reserved byte */ - vu8 CMSR; /*!< Clock Master Status Register */ - vu8 SWR; /*!< Clock Master Switch Register */ - vu8 SWCR; /*!< Switch Control Register */ - vu8 CKDIVR; /*!< Clock Divider Register */ - vu8 PCKENR1; /*!< Peripheral Clock Gating Register 1 */ - vu8 CSSR; /*!< Clock Security Sytem Register */ - vu8 CCOR; /*!< Configurable Clock Output Register */ - vu8 PCKENR2; /*!< Peripheral Clock Gating Register 2 */ - vu8 CANCCR; /*!< CAN external clock control Register (exist only in STM8S208 otherwise it is reserved) */ - vu8 HSITRIMR; /*!< HSI Calibration Trimmer Register */ - vu8 SWIMCCR; /*!< SWIM clock control register */ + __IO uint8_t ICKR; /*!< Internal Clocks Control Register */ + __IO uint8_t ECKR; /*!< External Clocks Control Register */ + uint8_t RESERVED; /*!< Reserved byte */ + __IO uint8_t CMSR; /*!< Clock Master Status Register */ + __IO uint8_t SWR; /*!< Clock Master Switch Register */ + __IO uint8_t SWCR; /*!< Switch Control Register */ + __IO uint8_t CKDIVR; /*!< Clock Divider Register */ + __IO uint8_t PCKENR1; /*!< Peripheral Clock Gating Register 1 */ + __IO uint8_t CSSR; /*!< Clock Security System Register */ + __IO uint8_t CCOR; /*!< Configurable Clock Output Register */ + __IO uint8_t PCKENR2; /*!< Peripheral Clock Gating Register 2 */ + uint8_t RESERVED1; /*!< Reserved byte */ + __IO uint8_t HSITRIMR; /*!< HSI Calibration Trimmer Register */ + __IO uint8_t SWIMCCR; /*!< SWIM clock control register */ } CLK_TypeDef; @@ -377,19 +516,18 @@ CLK_TypeDef; * @{ */ -#define CLK_ICKR_RESET_VALUE ((u8)0x01) -#define CLK_ECKR_RESET_VALUE ((u8)0x00) -#define CLK_CMSR_RESET_VALUE ((u8)0xE1) -#define CLK_SWR_RESET_VALUE ((u8)0xE1) -#define CLK_SWCR_RESET_VALUE ((u8)0x00) -#define CLK_CKDIVR_RESET_VALUE ((u8)0x18) -#define CLK_PCKENR1_RESET_VALUE ((u8)0xFF) -#define CLK_PCKENR2_RESET_VALUE ((u8)0xFF) -#define CLK_CSSR_RESET_VALUE ((u8)0x00) -#define CLK_CCOR_RESET_VALUE ((u8)0x00) -#define CLK_CANCCR_RESET_VALUE ((u8)0x00) -#define CLK_HSITRIMR_RESET_VALUE ((u8)0x00) -#define CLK_SWIMCCR_RESET_VALUE ((u8)0x00) +#define CLK_ICKR_RESET_VALUE ((uint8_t)0x01) +#define CLK_ECKR_RESET_VALUE ((uint8_t)0x00) +#define CLK_CMSR_RESET_VALUE ((uint8_t)0xE1) +#define CLK_SWR_RESET_VALUE ((uint8_t)0xE1) +#define CLK_SWCR_RESET_VALUE ((uint8_t)0x00) +#define CLK_CKDIVR_RESET_VALUE ((uint8_t)0x18) +#define CLK_PCKENR1_RESET_VALUE ((uint8_t)0xFF) +#define CLK_PCKENR2_RESET_VALUE ((uint8_t)0xFF) +#define CLK_CSSR_RESET_VALUE ((uint8_t)0x00) +#define CLK_CCOR_RESET_VALUE ((uint8_t)0x00) +#define CLK_HSITRIMR_RESET_VALUE ((uint8_t)0x00) +#define CLK_SWIMCCR_RESET_VALUE ((uint8_t)0x00) /** * @} @@ -398,60 +536,57 @@ CLK_TypeDef; /** @addtogroup CLK_Registers_Bits_Definition * @{ */ +#define CLK_ICKR_SWUAH ((uint8_t)0x20) /*!< Slow Wake-up from Active Halt/Halt modes */ +#define CLK_ICKR_LSIRDY ((uint8_t)0x10) /*!< Low speed internal oscillator ready */ +#define CLK_ICKR_LSIEN ((uint8_t)0x08) /*!< Low speed internal RC oscillator enable */ +#define CLK_ICKR_FHWU ((uint8_t)0x04) /*!< Fast Wake-up from Active Halt/Halt mode */ +#define CLK_ICKR_HSIRDY ((uint8_t)0x02) /*!< High speed internal RC oscillator ready */ +#define CLK_ICKR_HSIEN ((uint8_t)0x01) /*!< High speed internal RC oscillator enable */ -#define CLK_ICKR_SWUAH ((u8)0x20) /*!< Slow Wake-up from Active Halt/Halt modes */ -#define CLK_ICKR_LSIRDY ((u8)0x10) /*!< Low speed internal oscillator ready */ -#define CLK_ICKR_LSIEN ((u8)0x08) /*!< Low speed internal RC oscillator enable */ -#define CLK_ICKR_FHWU ((u8)0x04) /*!< Fast Wake-up from Active Halt/Halt mode */ -#define CLK_ICKR_HSIRDY ((u8)0x02) /*!< High speed internal RC oscillator ready */ -#define CLK_ICKR_HSIEN ((u8)0x01) /*!< High speed internal RC oscillator enable */ +#define CLK_ECKR_HSERDY ((uint8_t)0x02) /*!< High speed external crystal oscillator ready */ +#define CLK_ECKR_HSEEN ((uint8_t)0x01) /*!< High speed external crystal oscillator enable */ -#define CLK_ECKR_HSERDY ((u8)0x02) /*!< High speed external crystal oscillator ready */ -#define CLK_ECKR_HSEEN ((u8)0x01) /*!< High speed external crystal oscillator enable */ +#define CLK_CMSR_CKM ((uint8_t)0xFF) /*!< Clock master status bits */ -#define CLK_CMSR_CKM ((u8)0xFF) /*!< Clock master status bits */ +#define CLK_SWR_SWI ((uint8_t)0xFF) /*!< Clock master selection bits */ -#define CLK_SWR_SWI ((u8)0xFF) /*!< Clock master selection bits */ +#define CLK_SWCR_SWIF ((uint8_t)0x08) /*!< Clock switch interrupt flag */ +#define CLK_SWCR_SWIEN ((uint8_t)0x04) /*!< Clock switch interrupt enable */ +#define CLK_SWCR_SWEN ((uint8_t)0x02) /*!< Switch start/stop */ +#define CLK_SWCR_SWBSY ((uint8_t)0x01) /*!< Switch busy flag*/ -#define CLK_SWCR_SWIF ((u8)0x08) /*!< Clock switch interrupt flag */ -#define CLK_SWCR_SWIEN ((u8)0x04) /*!< Clock switch interrupt enable */ -#define CLK_SWCR_SWEN ((u8)0x02) /*!< Switch start/stop */ -#define CLK_SWCR_SWBSY ((u8)0x01) /*!< Switch busy */ +#define CLK_CKDIVR_HSIDIV ((uint8_t)0x18) /*!< High speed internal clock prescaler */ +#define CLK_CKDIVR_CPUDIV ((uint8_t)0x07) /*!< CPU clock prescaler */ -#define CLK_CKDIVR_HSIDIV ((u8)0x18) /*!< High speed internal clock prescaler */ -#define CLK_CKDIVR_CPUDIV ((u8)0x07) /*!< CPU clock prescaler */ +#define CLK_PCKENR1_TIM1 ((uint8_t)0x80) /*!< Timer 1 clock enable */ +#define CLK_PCKENR1_TIM3 ((uint8_t)0x40) /*!< Timer 3 clock enable */ +#define CLK_PCKENR1_TIM2 ((uint8_t)0x20) /*!< Timer 2 clock enable */ +#define CLK_PCKENR1_TIM5 ((uint8_t)0x20) /*!< Timer 5 clock enable */ +#define CLK_PCKENR1_TIM4 ((uint8_t)0x10) /*!< Timer 4 clock enable */ +#define CLK_PCKENR1_TIM6 ((uint8_t)0x10) /*!< Timer 6 clock enable */ +#define CLK_PCKENR1_UART3 ((uint8_t)0x08) /*!< UART3 clock enable */ +#define CLK_PCKENR1_UART2 ((uint8_t)0x08) /*!< UART2 clock enable */ +#define CLK_PCKENR1_UART1 ((uint8_t)0x04) /*!< UART1 clock enable */ +#define CLK_PCKENR1_SPI ((uint8_t)0x02) /*!< SPI clock enable */ +#define CLK_PCKENR1_I2C ((uint8_t)0x01) /*!< I2C clock enable */ -#define CLK_PCKENR1_TIM1 ((u8)0x80) /*!< Timer 1 clock enable */ -#define CLK_PCKENR1_TIM3 ((u8)0x40) /*!< Timer 3 clock enable */ -#define CLK_PCKENR1_TIM2 ((u8)0x20) /*!< Timer 2 clock enable */ -#define CLK_PCKENR1_TIM5 ((u8)0x20) /*!< Timer 5 clock enable */ -#define CLK_PCKENR1_TIM4 ((u8)0x10) /*!< Timer 4 clock enable */ -#define CLK_PCKENR1_TIM6 ((u8)0x10) /*!< Timer 6 clock enable */ -#define CLK_PCKENR1_UART3 ((u8)0x08) /*!< UART3 clock enable */ -#define CLK_PCKENR1_UART2 ((u8)0x08) /*!< UART2 clock enable */ -#define CLK_PCKENR1_UART1 ((u8)0x04) /*!< UART1 clock enable */ -#define CLK_PCKENR1_SPI ((u8)0x02) /*!< SPI clock enable */ -#define CLK_PCKENR1_I2C ((u8)0x01) /*!< I2C clock enable */ +#define CLK_PCKENR2_CAN ((uint8_t)0x80) /*!< CAN clock enable */ +#define CLK_PCKENR2_ADC ((uint8_t)0x08) /*!< ADC clock enable */ +#define CLK_PCKENR2_AWU ((uint8_t)0x04) /*!< AWU clock enable */ -#define CLK_PCKENR2_CAN ((u8)0x80) /*!< CAN clock enable */ -#define CLK_PCKENR2_ADC ((u8)0x08) /*!< ADC clock enable */ -#define CLK_PCKENR2_AWU ((u8)0x04) /*!< AWU clock enable */ +#define CLK_CSSR_CSSD ((uint8_t)0x08) /*!< Clock security system detection */ +#define CLK_CSSR_CSSDIE ((uint8_t)0x04) /*!< Clock security system detection interrupt enable */ +#define CLK_CSSR_AUX ((uint8_t)0x02) /*!< Auxiliary oscillator connected to master clock */ +#define CLK_CSSR_CSSEN ((uint8_t)0x01) /*!< Clock security system enable */ -#define CLK_CSSR_CSSD ((u8)0x08) /*!< Clock security sytem detection */ -#define CLK_CSSR_CSSDIE ((u8)0x04) /*!< Clock security system detection interrupt enable */ -#define CLK_CSSR_AUX ((u8)0x02) /*!< Auxiliary oscillator connected to master clock */ -#define CLK_CSSR_CSSEN ((u8)0x01) /*!< Clock security system enable */ +#define CLK_CCOR_CCOBSY ((uint8_t)0x40) /*!< Configurable clock output busy */ +#define CLK_CCOR_CCORDY ((uint8_t)0x20) /*!< Configurable clock output ready */ +#define CLK_CCOR_CCOSEL ((uint8_t)0x1E) /*!< Configurable clock output selection */ +#define CLK_CCOR_CCOEN ((uint8_t)0x01) /*!< Configurable clock output enable */ -#define CLK_CCOR_CCOBSY ((u8)0x40) /*!< Configurable clock output busy */ -#define CLK_CCOR_CCORDY ((u8)0x20) /*!< Configurable clock output ready */ -#define CLK_CCOR_CCOSEL ((u8)0x1E) /*!< Configurable clock output selection */ -#define CLK_CCOR_CCOEN ((u8)0x01) /*!< Configurable clock output enable */ +#define CLK_HSITRIMR_HSITRIM ((uint8_t)0x07) /*!< High speed internal oscillator trimmer */ -#define CLK_CANCCR_CANDIV ((u8)0x07) /*!< External CAN clock divider */ - -#define CLK_HSITRIMR_HSITRIM ((u8)0x07) /*!< High speed internal oscillator trimmer */ - -#define CLK_SWIMCCR_SWIMDIV ((u8)0x01) /*!< SWIM Clock Dividing Factor */ +#define CLK_SWIMCCR_SWIMDIV ((uint8_t)0x01) /*!< SWIM Clock Dividing Factor */ /** * @} @@ -459,43 +594,43 @@ CLK_TypeDef; /*----------------------------------------------------------------------------*/ /** - * @brief 16-bit timer with complementary PWM outputs (TIM1) + * @brief 16-bit timer with complementary PWM outputs (TIM1) */ typedef struct TIM1_struct { - vu8 CR1; /*!< control register 1 */ - vu8 CR2; /*!< control register 2 */ - vu8 SMCR; /*!< Synchro mode control register */ - vu8 ETR; /*!< external trigger register */ - vu8 IER; /*!< interrupt enable register*/ - vu8 SR1; /*!< status register 1 */ - vu8 SR2; /*!< status register 2 */ - vu8 EGR; /*!< event generation register */ - vu8 CCMR1; /*!< CC mode register 1 */ - vu8 CCMR2; /*!< CC mode register 2 */ - vu8 CCMR3; /*!< CC mode register 3 */ - vu8 CCMR4; /*!< CC mode register 4 */ - vu8 CCER1; /*!< CC enable register 1 */ - vu8 CCER2; /*!< CC enable register 2 */ - vu8 CNTRH; /*!< counter high */ - vu8 CNTRL; /*!< counter low */ - vu8 PSCRH; /*!< prescaler high */ - vu8 PSCRL; /*!< prescaler low */ - vu8 ARRH; /*!< auto-reload register high */ - vu8 ARRL; /*!< auto-reload register low */ - vu8 RCR; /*!< Repetition Counter register */ - vu8 CCR1H; /*!< capture/compare register 1 high */ - vu8 CCR1L; /*!< capture/compare register 1 low */ - vu8 CCR2H; /*!< capture/compare register 2 high */ - vu8 CCR2L; /*!< capture/compare register 2 low */ - vu8 CCR3H; /*!< capture/compare register 3 high */ - vu8 CCR3L; /*!< capture/compare register 3 low */ - vu8 CCR4H; /*!< capture/compare register 3 high */ - vu8 CCR4L; /*!< capture/compare register 3 low */ - vu8 BKR; /*!< Break Register */ - vu8 DTR; /*!< dead-time register */ - vu8 OISR; /*!< Output idle register */ + __IO uint8_t CR1; /*!< control register 1 */ + __IO uint8_t CR2; /*!< control register 2 */ + __IO uint8_t SMCR; /*!< Synchro mode control register */ + __IO uint8_t ETR; /*!< external trigger register */ + __IO uint8_t IER; /*!< interrupt enable register*/ + __IO uint8_t SR1; /*!< status register 1 */ + __IO uint8_t SR2; /*!< status register 2 */ + __IO uint8_t EGR; /*!< event generation register */ + __IO uint8_t CCMR1; /*!< CC mode register 1 */ + __IO uint8_t CCMR2; /*!< CC mode register 2 */ + __IO uint8_t CCMR3; /*!< CC mode register 3 */ + __IO uint8_t CCMR4; /*!< CC mode register 4 */ + __IO uint8_t CCER1; /*!< CC enable register 1 */ + __IO uint8_t CCER2; /*!< CC enable register 2 */ + __IO uint8_t CNTRH; /*!< counter high */ + __IO uint8_t CNTRL; /*!< counter low */ + __IO uint8_t PSCRH; /*!< prescaler high */ + __IO uint8_t PSCRL; /*!< prescaler low */ + __IO uint8_t ARRH; /*!< auto-reload register high */ + __IO uint8_t ARRL; /*!< auto-reload register low */ + __IO uint8_t RCR; /*!< Repetition Counter register */ + __IO uint8_t CCR1H; /*!< capture/compare register 1 high */ + __IO uint8_t CCR1L; /*!< capture/compare register 1 low */ + __IO uint8_t CCR2H; /*!< capture/compare register 2 high */ + __IO uint8_t CCR2L; /*!< capture/compare register 2 low */ + __IO uint8_t CCR3H; /*!< capture/compare register 3 high */ + __IO uint8_t CCR3L; /*!< capture/compare register 3 low */ + __IO uint8_t CCR4H; /*!< capture/compare register 3 high */ + __IO uint8_t CCR4L; /*!< capture/compare register 3 low */ + __IO uint8_t BKR; /*!< Break Register */ + __IO uint8_t DTR; /*!< dead-time register */ + __IO uint8_t OISR; /*!< Output idle register */ } TIM1_TypeDef; @@ -503,38 +638,38 @@ TIM1_TypeDef; * @{ */ -#define TIM1_CR1_RESET_VALUE ((u8)0x00) -#define TIM1_CR2_RESET_VALUE ((u8)0x00) -#define TIM1_SMCR_RESET_VALUE ((u8)0x00) -#define TIM1_ETR_RESET_VALUE ((u8)0x00) -#define TIM1_IER_RESET_VALUE ((u8)0x00) -#define TIM1_SR1_RESET_VALUE ((u8)0x00) -#define TIM1_SR2_RESET_VALUE ((u8)0x00) -#define TIM1_EGR_RESET_VALUE ((u8)0x00) -#define TIM1_CCMR1_RESET_VALUE ((u8)0x00) -#define TIM1_CCMR2_RESET_VALUE ((u8)0x00) -#define TIM1_CCMR3_RESET_VALUE ((u8)0x00) -#define TIM1_CCMR4_RESET_VALUE ((u8)0x00) -#define TIM1_CCER1_RESET_VALUE ((u8)0x00) -#define TIM1_CCER2_RESET_VALUE ((u8)0x00) -#define TIM1_CNTRH_RESET_VALUE ((u8)0x00) -#define TIM1_CNTRL_RESET_VALUE ((u8)0x00) -#define TIM1_PSCRH_RESET_VALUE ((u8)0x00) -#define TIM1_PSCRL_RESET_VALUE ((u8)0x00) -#define TIM1_ARRH_RESET_VALUE ((u8)0xFF) -#define TIM1_ARRL_RESET_VALUE ((u8)0xFF) -#define TIM1_RCR_RESET_VALUE ((u8)0x00) -#define TIM1_CCR1H_RESET_VALUE ((u8)0x00) -#define TIM1_CCR1L_RESET_VALUE ((u8)0x00) -#define TIM1_CCR2H_RESET_VALUE ((u8)0x00) -#define TIM1_CCR2L_RESET_VALUE ((u8)0x00) -#define TIM1_CCR3H_RESET_VALUE ((u8)0x00) -#define TIM1_CCR3L_RESET_VALUE ((u8)0x00) -#define TIM1_CCR4H_RESET_VALUE ((u8)0x00) -#define TIM1_CCR4L_RESET_VALUE ((u8)0x00) -#define TIM1_BKR_RESET_VALUE ((u8)0x00) -#define TIM1_DTR_RESET_VALUE ((u8)0x00) -#define TIM1_OISR_RESET_VALUE ((u8)0x00) +#define TIM1_CR1_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CR2_RESET_VALUE ((uint8_t)0x00) +#define TIM1_SMCR_RESET_VALUE ((uint8_t)0x00) +#define TIM1_ETR_RESET_VALUE ((uint8_t)0x00) +#define TIM1_IER_RESET_VALUE ((uint8_t)0x00) +#define TIM1_SR1_RESET_VALUE ((uint8_t)0x00) +#define TIM1_SR2_RESET_VALUE ((uint8_t)0x00) +#define TIM1_EGR_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCMR1_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCMR2_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCMR3_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCMR4_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCER1_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCER2_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CNTRH_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CNTRL_RESET_VALUE ((uint8_t)0x00) +#define TIM1_PSCRH_RESET_VALUE ((uint8_t)0x00) +#define TIM1_PSCRL_RESET_VALUE ((uint8_t)0x00) +#define TIM1_ARRH_RESET_VALUE ((uint8_t)0xFF) +#define TIM1_ARRL_RESET_VALUE ((uint8_t)0xFF) +#define TIM1_RCR_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR1H_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR1L_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR2H_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR2L_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR3H_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR3L_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR4H_RESET_VALUE ((uint8_t)0x00) +#define TIM1_CCR4L_RESET_VALUE ((uint8_t)0x00) +#define TIM1_BKR_RESET_VALUE ((uint8_t)0x00) +#define TIM1_DTR_RESET_VALUE ((uint8_t)0x00) +#define TIM1_OISR_RESET_VALUE ((uint8_t)0x00) /** * @} @@ -544,164 +679,163 @@ TIM1_TypeDef; * @{ */ /* CR1*/ -#define TIM1_CR1_ARPE ((u8)0x80) /*!< Auto-Reload Preload Enable mask. */ -#define TIM1_CR1_CMS ((u8)0x60) /*!< Center-aligned Mode Selection mask. */ -#define TIM1_CR1_DIR ((u8)0x10) /*!< Direction mask. */ -#define TIM1_CR1_OPM ((u8)0x08) /*!< One Pulse Mode mask. */ -#define TIM1_CR1_URS ((u8)0x04) /*!< Update Request Source mask. */ -#define TIM1_CR1_UDIS ((u8)0x02) /*!< Update DIsable mask. */ -#define TIM1_CR1_CEN ((u8)0x01) /*!< Counter Enable mask. */ +#define TIM1_CR1_ARPE ((uint8_t)0x80) /*!< Auto-Reload Preload Enable mask. */ +#define TIM1_CR1_CMS ((uint8_t)0x60) /*!< Center-aligned Mode Selection mask. */ +#define TIM1_CR1_DIR ((uint8_t)0x10) /*!< Direction mask. */ +#define TIM1_CR1_OPM ((uint8_t)0x08) /*!< One Pulse Mode mask. */ +#define TIM1_CR1_URS ((uint8_t)0x04) /*!< Update Request Source mask. */ +#define TIM1_CR1_UDIS ((uint8_t)0x02) /*!< Update DIsable mask. */ +#define TIM1_CR1_CEN ((uint8_t)0x01) /*!< Counter Enable mask. */ /* CR2*/ -#define TIM1_CR2_TI1S ((u8)0x80) /*!< TI1S Selection mask. */ -#define TIM1_CR2_MMS ((u8)0x70) /*!< MMS Selection mask. */ -#define TIM1_CR2_COMS ((u8)0x04) /*!< Capture/Compare Control Update Selection mask. */ -#define TIM1_CR2_CCPC ((u8)0x01) /*!< Capture/Compare Preloaded Control mask. */ +#define TIM1_CR2_TI1S ((uint8_t)0x80) /*!< TI1S Selection mask. */ +#define TIM1_CR2_MMS ((uint8_t)0x70) /*!< MMS Selection mask. */ +#define TIM1_CR2_COMS ((uint8_t)0x04) /*!< Capture/Compare Control Update Selection mask. */ +#define TIM1_CR2_CCPC ((uint8_t)0x01) /*!< Capture/Compare Preloaded Control mask. */ /* SMCR*/ -#define TIM1_SMCR_MSM ((u8)0x80) /*!< Master/Slave Mode mask. */ -#define TIM1_SMCR_TS ((u8)0x70) /*!< Trigger Selection mask. */ -#define TIM1_SMCR_SMS ((u8)0x07) /*!< Slave Mode Selection mask. */ +#define TIM1_SMCR_MSM ((uint8_t)0x80) /*!< Master/Slave Mode mask. */ +#define TIM1_SMCR_TS ((uint8_t)0x70) /*!< Trigger Selection mask. */ +#define TIM1_SMCR_SMS ((uint8_t)0x07) /*!< Slave Mode Selection mask. */ /*ETR*/ -#define TIM1_ETR_ETP ((u8)0x80) /*!< External Trigger Polarity mask. */ -#define TIM1_ETR_ECE ((u8)0x40)/*!< External Clock mask. */ -#define TIM1_ETR_ETPS ((u8)0x30) /*!< External Trigger Prescaler mask. */ -#define TIM1_ETR_ETF ((u8)0x0F) /*!< External Trigger Filter mask. */ +#define TIM1_ETR_ETP ((uint8_t)0x80) /*!< External Trigger Polarity mask. */ +#define TIM1_ETR_ECE ((uint8_t)0x40)/*!< External Clock mask. */ +#define TIM1_ETR_ETPS ((uint8_t)0x30) /*!< External Trigger Prescaler mask. */ +#define TIM1_ETR_ETF ((uint8_t)0x0F) /*!< External Trigger Filter mask. */ /*IER*/ -#define TIM1_IER_BIE ((u8)0x80) /*!< Break Interrupt Enable mask. */ -#define TIM1_IER_TIE ((u8)0x40) /*!< Trigger Interrupt Enable mask. */ -#define TIM1_IER_COMIE ((u8)0x20) /*!< Commutation Interrupt Enable mask.*/ -#define TIM1_IER_CC4IE ((u8)0x10) /*!< Capture/Compare 4 Interrupt Enable mask. */ -#define TIM1_IER_CC3IE ((u8)0x08) /*!< Capture/Compare 3 Interrupt Enable mask. */ -#define TIM1_IER_CC2IE ((u8)0x04) /*!< Capture/Compare 2 Interrupt Enable mask. */ -#define TIM1_IER_CC1IE ((u8)0x02) /*!< Capture/Compare 1 Interrupt Enable mask. */ -#define TIM1_IER_UIE ((u8)0x01) /*!< Update Interrupt Enable mask. */ +#define TIM1_IER_BIE ((uint8_t)0x80) /*!< Break Interrupt Enable mask. */ +#define TIM1_IER_TIE ((uint8_t)0x40) /*!< Trigger Interrupt Enable mask. */ +#define TIM1_IER_COMIE ((uint8_t)0x20) /*!< Commutation Interrupt Enable mask.*/ +#define TIM1_IER_CC4IE ((uint8_t)0x10) /*!< Capture/Compare 4 Interrupt Enable mask. */ +#define TIM1_IER_CC3IE ((uint8_t)0x08) /*!< Capture/Compare 3 Interrupt Enable mask. */ +#define TIM1_IER_CC2IE ((uint8_t)0x04) /*!< Capture/Compare 2 Interrupt Enable mask. */ +#define TIM1_IER_CC1IE ((uint8_t)0x02) /*!< Capture/Compare 1 Interrupt Enable mask. */ +#define TIM1_IER_UIE ((uint8_t)0x01) /*!< Update Interrupt Enable mask. */ /*SR1*/ -#define TIM1_SR1_BIF ((u8)0x80) /*!< Break Interrupt Flag mask. */ -#define TIM1_SR1_TIF ((u8)0x40) /*!< Trigger Interrupt Flag mask. */ -#define TIM1_SR1_COMIF ((u8)0x20) /*!< Commutation Interrupt Flag mask. */ -#define TIM1_SR1_CC4IF ((u8)0x10) /*!< Capture/Compare 4 Interrupt Flag mask. */ -#define TIM1_SR1_CC3IF ((u8)0x08) /*!< Capture/Compare 3 Interrupt Flag mask. */ -#define TIM1_SR1_CC2IF ((u8)0x04) /*!< Capture/Compare 2 Interrupt Flag mask. */ -#define TIM1_SR1_CC1IF ((u8)0x02) /*!< Capture/Compare 1 Interrupt Flag mask. */ -#define TIM1_SR1_UIF ((u8)0x01) /*!< Update Interrupt Flag mask. */ +#define TIM1_SR1_BIF ((uint8_t)0x80) /*!< Break Interrupt Flag mask. */ +#define TIM1_SR1_TIF ((uint8_t)0x40) /*!< Trigger Interrupt Flag mask. */ +#define TIM1_SR1_COMIF ((uint8_t)0x20) /*!< Commutation Interrupt Flag mask. */ +#define TIM1_SR1_CC4IF ((uint8_t)0x10) /*!< Capture/Compare 4 Interrupt Flag mask. */ +#define TIM1_SR1_CC3IF ((uint8_t)0x08) /*!< Capture/Compare 3 Interrupt Flag mask. */ +#define TIM1_SR1_CC2IF ((uint8_t)0x04) /*!< Capture/Compare 2 Interrupt Flag mask. */ +#define TIM1_SR1_CC1IF ((uint8_t)0x02) /*!< Capture/Compare 1 Interrupt Flag mask. */ +#define TIM1_SR1_UIF ((uint8_t)0x01) /*!< Update Interrupt Flag mask. */ /*SR2*/ -#define TIM1_SR2_CC4OF ((u8)0x10) /*!< Capture/Compare 4 Overcapture Flag mask. */ -#define TIM1_SR2_CC3OF ((u8)0x08) /*!< Capture/Compare 3 Overcapture Flag mask. */ -#define TIM1_SR2_CC2OF ((u8)0x04) /*!< Capture/Compare 2 Overcapture Flag mask. */ -#define TIM1_SR2_CC1OF ((u8)0x02) /*!< Capture/Compare 1 Overcapture Flag mask. */ +#define TIM1_SR2_CC4OF ((uint8_t)0x10) /*!< Capture/Compare 4 Overcapture Flag mask. */ +#define TIM1_SR2_CC3OF ((uint8_t)0x08) /*!< Capture/Compare 3 Overcapture Flag mask. */ +#define TIM1_SR2_CC2OF ((uint8_t)0x04) /*!< Capture/Compare 2 Overcapture Flag mask. */ +#define TIM1_SR2_CC1OF ((uint8_t)0x02) /*!< Capture/Compare 1 Overcapture Flag mask. */ /*EGR*/ -#define TIM1_EGR_BG ((u8)0x80) /*!< Break Generation mask. */ -#define TIM1_EGR_TG ((u8)0x40) /*!< Trigger Generation mask. */ -#define TIM1_EGR_COMG ((u8)0x20) /*!< Capture/Compare Control Update Generation mask. */ -#define TIM1_EGR_CC4G ((u8)0x10) /*!< Capture/Compare 4 Generation mask. */ -#define TIM1_EGR_CC3G ((u8)0x08) /*!< Capture/Compare 3 Generation mask. */ -#define TIM1_EGR_CC2G ((u8)0x04) /*!< Capture/Compare 2 Generation mask. */ -#define TIM1_EGR_CC1G ((u8)0x02) /*!< Capture/Compare 1 Generation mask. */ -#define TIM1_EGR_UG ((u8)0x01) /*!< Update Generation mask. */ +#define TIM1_EGR_BG ((uint8_t)0x80) /*!< Break Generation mask. */ +#define TIM1_EGR_TG ((uint8_t)0x40) /*!< Trigger Generation mask. */ +#define TIM1_EGR_COMG ((uint8_t)0x20) /*!< Capture/Compare Control Update Generation mask. */ +#define TIM1_EGR_CC4G ((uint8_t)0x10) /*!< Capture/Compare 4 Generation mask. */ +#define TIM1_EGR_CC3G ((uint8_t)0x08) /*!< Capture/Compare 3 Generation mask. */ +#define TIM1_EGR_CC2G ((uint8_t)0x04) /*!< Capture/Compare 2 Generation mask. */ +#define TIM1_EGR_CC1G ((uint8_t)0x02) /*!< Capture/Compare 1 Generation mask. */ +#define TIM1_EGR_UG ((uint8_t)0x01) /*!< Update Generation mask. */ /*CCMR*/ -#define TIM1_CCMR_ICxPSC ((u8)0x0C) /*!< Input Capture x Prescaler mask. */ -#define TIM1_CCMR_ICxF ((u8)0xF0) /*!< Input Capture x Filter mask. */ -#define TIM1_CCMR_OCM ((u8)0x70) /*!< Output Compare x Mode mask. */ -#define TIM1_CCMR_OCxPE ((u8)0x08) /*!< Output Compare x Preload Enable mask. */ -#define TIM1_CCMR_OCxFE ((u8)0x04) /*!< Output Compare x Fast Enable mask. */ -#define TIM1_CCMR_CCxS ((u8)0x03) /*!< Capture/Compare x Selection mask. */ +#define TIM1_CCMR_ICxPSC ((uint8_t)0x0C) /*!< Input Capture x Prescaler mask. */ +#define TIM1_CCMR_ICxF ((uint8_t)0xF0) /*!< Input Capture x Filter mask. */ +#define TIM1_CCMR_OCM ((uint8_t)0x70) /*!< Output Compare x Mode mask. */ +#define TIM1_CCMR_OCxPE ((uint8_t)0x08) /*!< Output Compare x Preload Enable mask. */ +#define TIM1_CCMR_OCxFE ((uint8_t)0x04) /*!< Output Compare x Fast Enable mask. */ +#define TIM1_CCMR_CCxS ((uint8_t)0x03) /*!< Capture/Compare x Selection mask. */ -#define CCMR_TIxDirect_Set ((u8)0x01) +#define CCMR_TIxDirect_Set ((uint8_t)0x01) /*CCER1*/ -#define TIM1_CCER1_CC2NP ((u8)0x80) /*!< Capture/Compare 2 Complementary output Polarity mask. */ -#define TIM1_CCER1_CC2NE ((u8)0x40) /*!< Capture/Compare 2 Complementary output enable mask. */ -#define TIM1_CCER1_CC2P ((u8)0x20) /*!< Capture/Compare 2 output Polarity mask. */ -#define TIM1_CCER1_CC2E ((u8)0x10) /*!< Capture/Compare 2 output enable mask. */ -#define TIM1_CCER1_CC1NP ((u8)0x08) /*!< Capture/Compare 1 Complementary output Polarity mask. */ -#define TIM1_CCER1_CC1NE ((u8)0x04) /*!< Capture/Compare 1 Complementary output enable mask. */ -#define TIM1_CCER1_CC1P ((u8)0x02) /*!< Capture/Compare 1 output Polarity mask. */ -#define TIM1_CCER1_CC1E ((u8)0x01) /*!< Capture/Compare 1 output enable mask. */ +#define TIM1_CCER1_CC2NP ((uint8_t)0x80) /*!< Capture/Compare 2 Complementary output Polarity mask. */ +#define TIM1_CCER1_CC2NE ((uint8_t)0x40) /*!< Capture/Compare 2 Complementary output enable mask. */ +#define TIM1_CCER1_CC2P ((uint8_t)0x20) /*!< Capture/Compare 2 output Polarity mask. */ +#define TIM1_CCER1_CC2E ((uint8_t)0x10) /*!< Capture/Compare 2 output enable mask. */ +#define TIM1_CCER1_CC1NP ((uint8_t)0x08) /*!< Capture/Compare 1 Complementary output Polarity mask. */ +#define TIM1_CCER1_CC1NE ((uint8_t)0x04) /*!< Capture/Compare 1 Complementary output enable mask. */ +#define TIM1_CCER1_CC1P ((uint8_t)0x02) /*!< Capture/Compare 1 output Polarity mask. */ +#define TIM1_CCER1_CC1E ((uint8_t)0x01) /*!< Capture/Compare 1 output enable mask. */ /*CCER2*/ -#define TIM1_CCER2_CC4P ((u8)0x20) /*!< Capture/Compare 4 output Polarity mask. */ -#define TIM1_CCER2_CC4E ((u8)0x10) /*!< Capture/Compare 4 output enable mask. */ -#define TIM1_CCER2_CC3NP ((u8)0x08) /*!< Capture/Compare 3 Complementary output Polarity mask. */ -#define TIM1_CCER2_CC3NE ((u8)0x04) /*!< Capture/Compare 3 Complementary output enable mask. */ -#define TIM1_CCER2_CC3P ((u8)0x02) /*!< Capture/Compare 3 output Polarity mask. */ -#define TIM1_CCER2_CC3E ((u8)0x01) /*!< Capture/Compare 3 output enable mask. */ +#define TIM1_CCER2_CC4P ((uint8_t)0x20) /*!< Capture/Compare 4 output Polarity mask. */ +#define TIM1_CCER2_CC4E ((uint8_t)0x10) /*!< Capture/Compare 4 output enable mask. */ +#define TIM1_CCER2_CC3NP ((uint8_t)0x08) /*!< Capture/Compare 3 Complementary output Polarity mask. */ +#define TIM1_CCER2_CC3NE ((uint8_t)0x04) /*!< Capture/Compare 3 Complementary output enable mask. */ +#define TIM1_CCER2_CC3P ((uint8_t)0x02) /*!< Capture/Compare 3 output Polarity mask. */ +#define TIM1_CCER2_CC3E ((uint8_t)0x01) /*!< Capture/Compare 3 output enable mask. */ /*CNTRH*/ -#define TIM1_CNTRH_CNT ((u8)0xFF) /*!< Counter Value (MSB) mask. */ +#define TIM1_CNTRH_CNT ((uint8_t)0xFF) /*!< Counter Value (MSB) mask. */ /*CNTRL*/ -#define TIM1_CNTRL_CNT ((u8)0xFF) /*!< Counter Value (LSB) mask. */ +#define TIM1_CNTRL_CNT ((uint8_t)0xFF) /*!< Counter Value (LSB) mask. */ /*PSCH*/ -#define TIM1_PSCH_PSC ((u8)0xFF) /*!< Prescaler Value (MSB) mask. */ +#define TIM1_PSCH_PSC ((uint8_t)0xFF) /*!< Prescaler Value (MSB) mask. */ /*PSCL*/ -#define TIM1_PSCL_PSC ((u8)0xFF) /*!< Prescaler Value (LSB) mask. */ +#define TIM1_PSCL_PSC ((uint8_t)0xFF) /*!< Prescaler Value (LSB) mask. */ /*ARR*/ -#define TIM1_ARRH_ARR ((u8)0xFF) /*!< Autoreload Value (MSB) mask. */ -#define TIM1_ARRL_ARR ((u8)0xFF) /*!< Autoreload Value (LSB) mask. */ +#define TIM1_ARRH_ARR ((uint8_t)0xFF) /*!< Autoreload Value (MSB) mask. */ +#define TIM1_ARRL_ARR ((uint8_t)0xFF) /*!< Autoreload Value (LSB) mask. */ /*RCR*/ -#define TIM1_RCR_REP ((u8)0xFF) /*!< Repetition Counter Value mask. */ +#define TIM1_RCR_REP ((uint8_t)0xFF) /*!< Repetition Counter Value mask. */ /*CCR1*/ -#define TIM1_CCR1H_CCR1 ((u8)0xFF) /*!< Capture/Compare 1 Value (MSB) mask. */ -#define TIM1_CCR1L_CCR1 ((u8)0xFF) /*!< Capture/Compare 1 Value (LSB) mask. */ +#define TIM1_CCR1H_CCR1 ((uint8_t)0xFF) /*!< Capture/Compare 1 Value (MSB) mask. */ +#define TIM1_CCR1L_CCR1 ((uint8_t)0xFF) /*!< Capture/Compare 1 Value (LSB) mask. */ /*CCR2*/ -#define TIM1_CCR2H_CCR2 ((u8)0xFF) /*!< Capture/Compare 2 Value (MSB) mask. */ -#define TIM1_CCR2L_CCR2 ((u8)0xFF) /*!< Capture/Compare 2 Value (LSB) mask. */ +#define TIM1_CCR2H_CCR2 ((uint8_t)0xFF) /*!< Capture/Compare 2 Value (MSB) mask. */ +#define TIM1_CCR2L_CCR2 ((uint8_t)0xFF) /*!< Capture/Compare 2 Value (LSB) mask. */ /*CCR3*/ -#define TIM1_CCR3H_CCR3 ((u8)0xFF) /*!< Capture/Compare 3 Value (MSB) mask. */ -#define TIM1_CCR3L_CCR3 ((u8)0xFF) /*!< Capture/Compare 3 Value (LSB) mask. */ +#define TIM1_CCR3H_CCR3 ((uint8_t)0xFF) /*!< Capture/Compare 3 Value (MSB) mask. */ +#define TIM1_CCR3L_CCR3 ((uint8_t)0xFF) /*!< Capture/Compare 3 Value (LSB) mask. */ /*CCR4*/ -#define TIM1_CCR4H_CCR4 ((u8)0xFF) /*!< Capture/Compare 4 Value (MSB) mask. */ -#define TIM1_CCR4L_CCR4 ((u8)0xFF) /*!< Capture/Compare 4 Value (LSB) mask. */ +#define TIM1_CCR4H_CCR4 ((uint8_t)0xFF) /*!< Capture/Compare 4 Value (MSB) mask. */ +#define TIM1_CCR4L_CCR4 ((uint8_t)0xFF) /*!< Capture/Compare 4 Value (LSB) mask. */ /*BKR*/ -#define TIM1_BKR_MOE ((u8)0x80) /*!< Main Output Enable mask. */ -#define TIM1_BKR_AOE ((u8)0x40) /*!< Automatic Output Enable mask. */ -#define TIM1_BKR_BKP ((u8)0x20) /*!< Break Polarity mask. */ -#define TIM1_BKR_BKE ((u8)0x10) /*!< Break Enable mask. */ -#define TIM1_BKR_OSSR ((u8)0x08) /*!< Off-State Selection for Run mode mask. */ -#define TIM1_BKR_OSSI ((u8)0x04) /*!< Off-State Selection for Idle mode mask. */ -#define TIM1_BKR_LOCK ((u8)0x03) /*!< Lock Configuration mask. */ +#define TIM1_BKR_MOE ((uint8_t)0x80) /*!< Main Output Enable mask. */ +#define TIM1_BKR_AOE ((uint8_t)0x40) /*!< Automatic Output Enable mask. */ +#define TIM1_BKR_BKP ((uint8_t)0x20) /*!< Break Polarity mask. */ +#define TIM1_BKR_BKE ((uint8_t)0x10) /*!< Break Enable mask. */ +#define TIM1_BKR_OSSR ((uint8_t)0x08) /*!< Off-State Selection for Run mode mask. */ +#define TIM1_BKR_OSSI ((uint8_t)0x04) /*!< Off-State Selection for Idle mode mask. */ +#define TIM1_BKR_LOCK ((uint8_t)0x03) /*!< Lock Configuration mask. */ /*DTR*/ -#define TIM1_DTR_DTG ((u8)0xFF) /*!< Dead-Time Generator set-up mask. */ +#define TIM1_DTR_DTG ((uint8_t)0xFF) /*!< Dead-Time Generator set-up mask. */ /*OISR*/ -#define TIM1_OISR_OIS4 ((u8)0x40) /*!< Output Idle state 4 (OC4 output) mask. */ -#define TIM1_OISR_OIS3N ((u8)0x20) /*!< Output Idle state 3 (OC3N output) mask. */ -#define TIM1_OISR_OIS3 ((u8)0x10) /*!< Output Idle state 3 (OC3 output) mask. */ -#define TIM1_OISR_OIS2N ((u8)0x08) /*!< Output Idle state 2 (OC2N output) mask. */ -#define TIM1_OISR_OIS2 ((u8)0x04) /*!< Output Idle state 2 (OC2 output) mask. */ -#define TIM1_OISR_OIS1N ((u8)0x02) /*!< Output Idle state 1 (OC1N output) mask. */ -#define TIM1_OISR_OIS1 ((u8)0x01) /*!< Output Idle state 1 (OC1 output) mask. */ - +#define TIM1_OISR_OIS4 ((uint8_t)0x40) /*!< Output Idle state 4 (OC4 output) mask. */ +#define TIM1_OISR_OIS3N ((uint8_t)0x20) /*!< Output Idle state 3 (OC3N output) mask. */ +#define TIM1_OISR_OIS3 ((uint8_t)0x10) /*!< Output Idle state 3 (OC3 output) mask. */ +#define TIM1_OISR_OIS2N ((uint8_t)0x08) /*!< Output Idle state 2 (OC2N output) mask. */ +#define TIM1_OISR_OIS2 ((uint8_t)0x04) /*!< Output Idle state 2 (OC2 output) mask. */ +#define TIM1_OISR_OIS1N ((uint8_t)0x02) /*!< Output Idle state 1 (OC1N output) mask. */ +#define TIM1_OISR_OIS1 ((uint8_t)0x01) /*!< Output Idle state 1 (OC1 output) mask. */ /** * @} */ /*----------------------------------------------------------------------------*/ /** - * @brief 16-bit timer (TIM2) + * @brief 16-bit timer (TIM2) */ typedef struct TIM2_struct { - vu8 CR1; /*!< control register 1 */ -#if defined STM8S103 - vu8 RESERVED1; /*!< Reserved register */ - vu8 RESERVED2; /*!< Reserved register */ + __IO uint8_t CR1; /*!< control register 1 */ +#if defined(STM8S103) || defined(STM8S003) + uint8_t RESERVED1; /*!< Reserved register */ + uint8_t RESERVED2; /*!< Reserved register */ #endif - vu8 IER; /*!< interrupt enable register */ - vu8 SR1; /*!< status register 1 */ - vu8 SR2; /*!< status register 2 */ - vu8 EGR; /*!< event generation register */ - vu8 CCMR1; /*!< CC mode register 1 */ - vu8 CCMR2; /*!< CC mode register 2 */ - vu8 CCMR3; /*!< CC mode register 3 */ - vu8 CCER1; /*!< CC enable register 1 */ - vu8 CCER2; /*!< CC enable register 2 */ - vu8 CNTRH; /*!< counter high */ - vu8 CNTRL; /*!< counter low */ - vu8 PSCR; /*!< prescaler register */ - vu8 ARRH; /*!< auto-reload register high */ - vu8 ARRL; /*!< auto-reload register low */ - vu8 CCR1H; /*!< capture/compare register 1 high */ - vu8 CCR1L; /*!< capture/compare register 1 low */ - vu8 CCR2H; /*!< capture/compare register 2 high */ - vu8 CCR2L; /*!< capture/compare register 2 low */ - vu8 CCR3H; /*!< capture/compare register 3 high */ - vu8 CCR3L; /*!< capture/compare register 3 low */ + __IO uint8_t IER; /*!< interrupt enable register */ + __IO uint8_t SR1; /*!< status register 1 */ + __IO uint8_t SR2; /*!< status register 2 */ + __IO uint8_t EGR; /*!< event generation register */ + __IO uint8_t CCMR1; /*!< CC mode register 1 */ + __IO uint8_t CCMR2; /*!< CC mode register 2 */ + __IO uint8_t CCMR3; /*!< CC mode register 3 */ + __IO uint8_t CCER1; /*!< CC enable register 1 */ + __IO uint8_t CCER2; /*!< CC enable register 2 */ + __IO uint8_t CNTRH; /*!< counter high */ + __IO uint8_t CNTRL; /*!< counter low */ + __IO uint8_t PSCR; /*!< prescaler register */ + __IO uint8_t ARRH; /*!< auto-reload register high */ + __IO uint8_t ARRL; /*!< auto-reload register low */ + __IO uint8_t CCR1H; /*!< capture/compare register 1 high */ + __IO uint8_t CCR1L; /*!< capture/compare register 1 low */ + __IO uint8_t CCR2H; /*!< capture/compare register 2 high */ + __IO uint8_t CCR2L; /*!< capture/compare register 2 low */ + __IO uint8_t CCR3H; /*!< capture/compare register 3 high */ + __IO uint8_t CCR3L; /*!< capture/compare register 3 low */ } TIM2_TypeDef; @@ -709,27 +843,27 @@ TIM2_TypeDef; * @{ */ -#define TIM2_CR1_RESET_VALUE ((u8)0x00) -#define TIM2_IER_RESET_VALUE ((u8)0x00) -#define TIM2_SR1_RESET_VALUE ((u8)0x00) -#define TIM2_SR2_RESET_VALUE ((u8)0x00) -#define TIM2_EGR_RESET_VALUE ((u8)0x00) -#define TIM2_CCMR1_RESET_VALUE ((u8)0x00) -#define TIM2_CCMR2_RESET_VALUE ((u8)0x00) -#define TIM2_CCMR3_RESET_VALUE ((u8)0x00) -#define TIM2_CCER1_RESET_VALUE ((u8)0x00) -#define TIM2_CCER2_RESET_VALUE ((u8)0x00) -#define TIM2_CNTRH_RESET_VALUE ((u8)0x00) -#define TIM2_CNTRL_RESET_VALUE ((u8)0x00) -#define TIM2_PSCR_RESET_VALUE ((u8)0x00) -#define TIM2_ARRH_RESET_VALUE ((u8)0xFF) -#define TIM2_ARRL_RESET_VALUE ((u8)0xFF) -#define TIM2_CCR1H_RESET_VALUE ((u8)0x00) -#define TIM2_CCR1L_RESET_VALUE ((u8)0x00) -#define TIM2_CCR2H_RESET_VALUE ((u8)0x00) -#define TIM2_CCR2L_RESET_VALUE ((u8)0x00) -#define TIM2_CCR3H_RESET_VALUE ((u8)0x00) -#define TIM2_CCR3L_RESET_VALUE ((u8)0x00) +#define TIM2_CR1_RESET_VALUE ((uint8_t)0x00) +#define TIM2_IER_RESET_VALUE ((uint8_t)0x00) +#define TIM2_SR1_RESET_VALUE ((uint8_t)0x00) +#define TIM2_SR2_RESET_VALUE ((uint8_t)0x00) +#define TIM2_EGR_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCMR1_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCMR2_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCMR3_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCER1_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCER2_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CNTRH_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CNTRL_RESET_VALUE ((uint8_t)0x00) +#define TIM2_PSCR_RESET_VALUE ((uint8_t)0x00) +#define TIM2_ARRH_RESET_VALUE ((uint8_t)0xFF) +#define TIM2_ARRL_RESET_VALUE ((uint8_t)0xFF) +#define TIM2_CCR1H_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCR1L_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCR2H_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCR2L_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCR3H_RESET_VALUE ((uint8_t)0x00) +#define TIM2_CCR3L_RESET_VALUE ((uint8_t)0x00) /** * @} @@ -739,61 +873,61 @@ TIM2_TypeDef; * @{ */ /*CR1*/ -#define TIM2_CR1_ARPE ((u8)0x80) /*!< Auto-Reload Preload Enable mask. */ -#define TIM2_CR1_OPM ((u8)0x08) /*!< One Pulse Mode mask. */ -#define TIM2_CR1_URS ((u8)0x04) /*!< Update Request Source mask. */ -#define TIM2_CR1_UDIS ((u8)0x02) /*!< Update DIsable mask. */ -#define TIM2_CR1_CEN ((u8)0x01) /*!< Counter Enable mask. */ +#define TIM2_CR1_ARPE ((uint8_t)0x80) /*!< Auto-Reload Preload Enable mask. */ +#define TIM2_CR1_OPM ((uint8_t)0x08) /*!< One Pulse Mode mask. */ +#define TIM2_CR1_URS ((uint8_t)0x04) /*!< Update Request Source mask. */ +#define TIM2_CR1_UDIS ((uint8_t)0x02) /*!< Update DIsable mask. */ +#define TIM2_CR1_CEN ((uint8_t)0x01) /*!< Counter Enable mask. */ /*IER*/ -#define TIM2_IER_CC3IE ((u8)0x08) /*!< Capture/Compare 3 Interrupt Enable mask. */ -#define TIM2_IER_CC2IE ((u8)0x04) /*!< Capture/Compare 2 Interrupt Enable mask. */ -#define TIM2_IER_CC1IE ((u8)0x02) /*!< Capture/Compare 1 Interrupt Enable mask. */ -#define TIM2_IER_UIE ((u8)0x01) /*!< Update Interrupt Enable mask. */ +#define TIM2_IER_CC3IE ((uint8_t)0x08) /*!< Capture/Compare 3 Interrupt Enable mask. */ +#define TIM2_IER_CC2IE ((uint8_t)0x04) /*!< Capture/Compare 2 Interrupt Enable mask. */ +#define TIM2_IER_CC1IE ((uint8_t)0x02) /*!< Capture/Compare 1 Interrupt Enable mask. */ +#define TIM2_IER_UIE ((uint8_t)0x01) /*!< Update Interrupt Enable mask. */ /*SR1*/ -#define TIM2_SR1_CC3IF ((u8)0x08) /*!< Capture/Compare 3 Interrupt Flag mask. */ -#define TIM2_SR1_CC2IF ((u8)0x04) /*!< Capture/Compare 2 Interrupt Flag mask. */ -#define TIM2_SR1_CC1IF ((u8)0x02) /*!< Capture/Compare 1 Interrupt Flag mask. */ -#define TIM2_SR1_UIF ((u8)0x01) /*!< Update Interrupt Flag mask. */ +#define TIM2_SR1_CC3IF ((uint8_t)0x08) /*!< Capture/Compare 3 Interrupt Flag mask. */ +#define TIM2_SR1_CC2IF ((uint8_t)0x04) /*!< Capture/Compare 2 Interrupt Flag mask. */ +#define TIM2_SR1_CC1IF ((uint8_t)0x02) /*!< Capture/Compare 1 Interrupt Flag mask. */ +#define TIM2_SR1_UIF ((uint8_t)0x01) /*!< Update Interrupt Flag mask. */ /*SR2*/ -#define TIM2_SR2_CC3OF ((u8)0x08) /*!< Capture/Compare 3 Overcapture Flag mask. */ -#define TIM2_SR2_CC2OF ((u8)0x04) /*!< Capture/Compare 2 Overcapture Flag mask. */ -#define TIM2_SR2_CC1OF ((u8)0x02) /*!< Capture/Compare 1 Overcapture Flag mask. */ +#define TIM2_SR2_CC3OF ((uint8_t)0x08) /*!< Capture/Compare 3 Overcapture Flag mask. */ +#define TIM2_SR2_CC2OF ((uint8_t)0x04) /*!< Capture/Compare 2 Overcapture Flag mask. */ +#define TIM2_SR2_CC1OF ((uint8_t)0x02) /*!< Capture/Compare 1 Overcapture Flag mask. */ /*EGR*/ -#define TIM2_EGR_CC3G ((u8)0x08) /*!< Capture/Compare 3 Generation mask. */ -#define TIM2_EGR_CC2G ((u8)0x04) /*!< Capture/Compare 2 Generation mask. */ -#define TIM2_EGR_CC1G ((u8)0x02) /*!< Capture/Compare 1 Generation mask. */ -#define TIM2_EGR_UG ((u8)0x01) /*!< Update Generation mask. */ +#define TIM2_EGR_CC3G ((uint8_t)0x08) /*!< Capture/Compare 3 Generation mask. */ +#define TIM2_EGR_CC2G ((uint8_t)0x04) /*!< Capture/Compare 2 Generation mask. */ +#define TIM2_EGR_CC1G ((uint8_t)0x02) /*!< Capture/Compare 1 Generation mask. */ +#define TIM2_EGR_UG ((uint8_t)0x01) /*!< Update Generation mask. */ /*CCMR*/ -#define TIM2_CCMR_ICxPSC ((u8)0x0C) /*!< Input Capture x Prescaler mask. */ -#define TIM2_CCMR_ICxF ((u8)0xF0) /*!< Input Capture x Filter mask. */ -#define TIM2_CCMR_OCM ((u8)0x70) /*!< Output Compare x Mode mask. */ -#define TIM2_CCMR_OCxPE ((u8)0x08) /*!< Output Compare x Preload Enable mask. */ -#define TIM2_CCMR_CCxS ((u8)0x03) /*!< Capture/Compare x Selection mask. */ +#define TIM2_CCMR_ICxPSC ((uint8_t)0x0C) /*!< Input Capture x Prescaler mask. */ +#define TIM2_CCMR_ICxF ((uint8_t)0xF0) /*!< Input Capture x Filter mask. */ +#define TIM2_CCMR_OCM ((uint8_t)0x70) /*!< Output Compare x Mode mask. */ +#define TIM2_CCMR_OCxPE ((uint8_t)0x08) /*!< Output Compare x Preload Enable mask. */ +#define TIM2_CCMR_CCxS ((uint8_t)0x03) /*!< Capture/Compare x Selection mask. */ /*CCER1*/ -#define TIM2_CCER1_CC2P ((u8)0x20) /*!< Capture/Compare 2 output Polarity mask. */ -#define TIM2_CCER1_CC2E ((u8)0x10) /*!< Capture/Compare 2 output enable mask. */ -#define TIM2_CCER1_CC1P ((u8)0x02) /*!< Capture/Compare 1 output Polarity mask. */ -#define TIM2_CCER1_CC1E ((u8)0x01) /*!< Capture/Compare 1 output enable mask. */ +#define TIM2_CCER1_CC2P ((uint8_t)0x20) /*!< Capture/Compare 2 output Polarity mask. */ +#define TIM2_CCER1_CC2E ((uint8_t)0x10) /*!< Capture/Compare 2 output enable mask. */ +#define TIM2_CCER1_CC1P ((uint8_t)0x02) /*!< Capture/Compare 1 output Polarity mask. */ +#define TIM2_CCER1_CC1E ((uint8_t)0x01) /*!< Capture/Compare 1 output enable mask. */ /*CCER2*/ -#define TIM2_CCER2_CC3P ((u8)0x02) /*!< Capture/Compare 3 output Polarity mask. */ -#define TIM2_CCER2_CC3E ((u8)0x01) /*!< Capture/Compare 3 output enable mask. */ +#define TIM2_CCER2_CC3P ((uint8_t)0x02) /*!< Capture/Compare 3 output Polarity mask. */ +#define TIM2_CCER2_CC3E ((uint8_t)0x01) /*!< Capture/Compare 3 output enable mask. */ /*CNTR*/ -#define TIM2_CNTRH_CNT ((u8)0xFF) /*!< Counter Value (MSB) mask. */ -#define TIM2_CNTRL_CNT ((u8)0xFF) /*!< Counter Value (LSB) mask. */ +#define TIM2_CNTRH_CNT ((uint8_t)0xFF) /*!< Counter Value (MSB) mask. */ +#define TIM2_CNTRL_CNT ((uint8_t)0xFF) /*!< Counter Value (LSB) mask. */ /*PSCR*/ -#define TIM2_PSCR_PSC ((u8)0xFF) /*!< Prescaler Value (MSB) mask. */ +#define TIM2_PSCR_PSC ((uint8_t)0xFF) /*!< Prescaler Value (MSB) mask. */ /*ARR*/ -#define TIM2_ARRH_ARR ((u8)0xFF) /*!< Autoreload Value (MSB) mask. */ -#define TIM2_ARRL_ARR ((u8)0xFF) /*!< Autoreload Value (LSB) mask. */ +#define TIM2_ARRH_ARR ((uint8_t)0xFF) /*!< Autoreload Value (MSB) mask. */ +#define TIM2_ARRL_ARR ((uint8_t)0xFF) /*!< Autoreload Value (LSB) mask. */ /*CCR1*/ -#define TIM2_CCR1H_CCR1 ((u8)0xFF) /*!< Capture/Compare 1 Value (MSB) mask. */ -#define TIM2_CCR1L_CCR1 ((u8)0xFF) /*!< Capture/Compare 1 Value (LSB) mask. */ +#define TIM2_CCR1H_CCR1 ((uint8_t)0xFF) /*!< Capture/Compare 1 Value (MSB) mask. */ +#define TIM2_CCR1L_CCR1 ((uint8_t)0xFF) /*!< Capture/Compare 1 Value (LSB) mask. */ /*CCR2*/ -#define TIM2_CCR2H_CCR2 ((u8)0xFF) /*!< Capture/Compare 2 Value (MSB) mask. */ -#define TIM2_CCR2L_CCR2 ((u8)0xFF) /*!< Capture/Compare 2 Value (LSB) mask. */ +#define TIM2_CCR2H_CCR2 ((uint8_t)0xFF) /*!< Capture/Compare 2 Value (MSB) mask. */ +#define TIM2_CCR2L_CCR2 ((uint8_t)0xFF) /*!< Capture/Compare 2 Value (LSB) mask. */ /*CCR3*/ -#define TIM2_CCR3H_CCR3 ((u8)0xFF) /*!< Capture/Compare 3 Value (MSB) mask. */ -#define TIM2_CCR3L_CCR3 ((u8)0xFF) /*!< Capture/Compare 3 Value (LSB) mask. */ +#define TIM2_CCR3H_CCR3 ((uint8_t)0xFF) /*!< Capture/Compare 3 Value (MSB) mask. */ +#define TIM2_CCR3L_CCR3 ((uint8_t)0xFF) /*!< Capture/Compare 3 Value (LSB) mask. */ /** * @} @@ -801,27 +935,27 @@ TIM2_TypeDef; /*----------------------------------------------------------------------------*/ /** - * @brief 16-bit timer (TIM3) + * @brief 16-bit timer (TIM3) */ typedef struct TIM3_struct { - vu8 CR1; /*!< control register 1 */ - vu8 IER; /*!< interrupt enable register */ - vu8 SR1; /*!< status register 1 */ - vu8 SR2; /*!< status register 2 */ - vu8 EGR; /*!< event generation register */ - vu8 CCMR1; /*!< CC mode register 1 */ - vu8 CCMR2; /*!< CC mode register 2 */ - vu8 CCER1; /*!< CC enable register 1 */ - vu8 CNTRH; /*!< counter high */ - vu8 CNTRL; /*!< counter low */ - vu8 PSCR; /*!< prescaler register */ - vu8 ARRH; /*!< auto-reload register high */ - vu8 ARRL; /*!< auto-reload register low */ - vu8 CCR1H; /*!< capture/compare register 1 high */ - vu8 CCR1L; /*!< capture/compare register 1 low */ - vu8 CCR2H; /*!< capture/compare register 2 high */ - vu8 CCR2L; /*!< capture/compare register 2 low */ + __IO uint8_t CR1; /*!< control register 1 */ + __IO uint8_t IER; /*!< interrupt enable register */ + __IO uint8_t SR1; /*!< status register 1 */ + __IO uint8_t SR2; /*!< status register 2 */ + __IO uint8_t EGR; /*!< event generation register */ + __IO uint8_t CCMR1; /*!< CC mode register 1 */ + __IO uint8_t CCMR2; /*!< CC mode register 2 */ + __IO uint8_t CCER1; /*!< CC enable register 1 */ + __IO uint8_t CNTRH; /*!< counter high */ + __IO uint8_t CNTRL; /*!< counter low */ + __IO uint8_t PSCR; /*!< prescaler register */ + __IO uint8_t ARRH; /*!< auto-reload register high */ + __IO uint8_t ARRL; /*!< auto-reload register low */ + __IO uint8_t CCR1H; /*!< capture/compare register 1 high */ + __IO uint8_t CCR1L; /*!< capture/compare register 1 low */ + __IO uint8_t CCR2H; /*!< capture/compare register 2 high */ + __IO uint8_t CCR2L; /*!< capture/compare register 2 low */ } TIM3_TypeDef; @@ -829,23 +963,23 @@ TIM3_TypeDef; * @{ */ -#define TIM3_CR1_RESET_VALUE ((u8)0x00) -#define TIM3_IER_RESET_VALUE ((u8)0x00) -#define TIM3_SR1_RESET_VALUE ((u8)0x00) -#define TIM3_SR2_RESET_VALUE ((u8)0x00) -#define TIM3_EGR_RESET_VALUE ((u8)0x00) -#define TIM3_CCMR1_RESET_VALUE ((u8)0x00) -#define TIM3_CCMR2_RESET_VALUE ((u8)0x00) -#define TIM3_CCER1_RESET_VALUE ((u8)0x00) -#define TIM3_CNTRH_RESET_VALUE ((u8)0x00) -#define TIM3_CNTRL_RESET_VALUE ((u8)0x00) -#define TIM3_PSCR_RESET_VALUE ((u8)0x00) -#define TIM3_ARRH_RESET_VALUE ((u8)0xFF) -#define TIM3_ARRL_RESET_VALUE ((u8)0xFF) -#define TIM3_CCR1H_RESET_VALUE ((u8)0x00) -#define TIM3_CCR1L_RESET_VALUE ((u8)0x00) -#define TIM3_CCR2H_RESET_VALUE ((u8)0x00) -#define TIM3_CCR2L_RESET_VALUE ((u8)0x00) +#define TIM3_CR1_RESET_VALUE ((uint8_t)0x00) +#define TIM3_IER_RESET_VALUE ((uint8_t)0x00) +#define TIM3_SR1_RESET_VALUE ((uint8_t)0x00) +#define TIM3_SR2_RESET_VALUE ((uint8_t)0x00) +#define TIM3_EGR_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CCMR1_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CCMR2_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CCER1_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CNTRH_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CNTRL_RESET_VALUE ((uint8_t)0x00) +#define TIM3_PSCR_RESET_VALUE ((uint8_t)0x00) +#define TIM3_ARRH_RESET_VALUE ((uint8_t)0xFF) +#define TIM3_ARRL_RESET_VALUE ((uint8_t)0xFF) +#define TIM3_CCR1H_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CCR1L_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CCR2H_RESET_VALUE ((uint8_t)0x00) +#define TIM3_CCR2L_RESET_VALUE ((uint8_t)0x00) /** * @} @@ -855,74 +989,73 @@ TIM3_TypeDef; * @{ */ /*CR1*/ -#define TIM3_CR1_ARPE ((u8)0x80) /*!< Auto-Reload Preload Enable mask. */ -#define TIM3_CR1_OPM ((u8)0x08) /*!< One Pulse Mode mask. */ -#define TIM3_CR1_URS ((u8)0x04) /*!< Update Request Source mask. */ -#define TIM3_CR1_UDIS ((u8)0x02) /*!< Update DIsable mask. */ -#define TIM3_CR1_CEN ((u8)0x01) /*!< Counter Enable mask. */ +#define TIM3_CR1_ARPE ((uint8_t)0x80) /*!< Auto-Reload Preload Enable mask. */ +#define TIM3_CR1_OPM ((uint8_t)0x08) /*!< One Pulse Mode mask. */ +#define TIM3_CR1_URS ((uint8_t)0x04) /*!< Update Request Source mask. */ +#define TIM3_CR1_UDIS ((uint8_t)0x02) /*!< Update DIsable mask. */ +#define TIM3_CR1_CEN ((uint8_t)0x01) /*!< Counter Enable mask. */ /*IER*/ -#define TIM3_IER_CC2IE ((u8)0x04) /*!< Capture/Compare 2 Interrupt Enable mask. */ -#define TIM3_IER_CC1IE ((u8)0x02) /*!< Capture/Compare 1 Interrupt Enable mask. */ -#define TIM3_IER_UIE ((u8)0x01) /*!< Update Interrupt Enable mask. */ +#define TIM3_IER_CC2IE ((uint8_t)0x04) /*!< Capture/Compare 2 Interrupt Enable mask. */ +#define TIM3_IER_CC1IE ((uint8_t)0x02) /*!< Capture/Compare 1 Interrupt Enable mask. */ +#define TIM3_IER_UIE ((uint8_t)0x01) /*!< Update Interrupt Enable mask. */ /*SR1*/ -#define TIM3_SR1_CC2IF ((u8)0x04) /*!< Capture/Compare 2 Interrupt Flag mask. */ -#define TIM3_SR1_CC1IF ((u8)0x02) /*!< Capture/Compare 1 Interrupt Flag mask. */ -#define TIM3_SR1_UIF ((u8)0x01) /*!< Update Interrupt Flag mask. */ +#define TIM3_SR1_CC2IF ((uint8_t)0x04) /*!< Capture/Compare 2 Interrupt Flag mask. */ +#define TIM3_SR1_CC1IF ((uint8_t)0x02) /*!< Capture/Compare 1 Interrupt Flag mask. */ +#define TIM3_SR1_UIF ((uint8_t)0x01) /*!< Update Interrupt Flag mask. */ /*SR2*/ -#define TIM3_SR2_CC2OF ((u8)0x04) /*!< Capture/Compare 2 Overcapture Flag mask. */ -#define TIM3_SR2_CC1OF ((u8)0x02) /*!< Capture/Compare 1 Overcapture Flag mask. */ +#define TIM3_SR2_CC2OF ((uint8_t)0x04) /*!< Capture/Compare 2 Overcapture Flag mask. */ +#define TIM3_SR2_CC1OF ((uint8_t)0x02) /*!< Capture/Compare 1 Overcapture Flag mask. */ /*EGR*/ -#define TIM3_EGR_CC2G ((u8)0x04) /*!< Capture/Compare 2 Generation mask. */ -#define TIM3_EGR_CC1G ((u8)0x02) /*!< Capture/Compare 1 Generation mask. */ -#define TIM3_EGR_UG ((u8)0x01) /*!< Update Generation mask. */ +#define TIM3_EGR_CC2G ((uint8_t)0x04) /*!< Capture/Compare 2 Generation mask. */ +#define TIM3_EGR_CC1G ((uint8_t)0x02) /*!< Capture/Compare 1 Generation mask. */ +#define TIM3_EGR_UG ((uint8_t)0x01) /*!< Update Generation mask. */ /*CCMR*/ -#define TIM3_CCMR_ICxPSC ((u8)0x0C) /*!< Input Capture x Prescaler mask. */ -#define TIM3_CCMR_ICxF ((u8)0xF0) /*!< Input Capture x Filter mask. */ -#define TIM3_CCMR_OCM ((u8)0x70) /*!< Output Compare x Mode mask. */ -#define TIM3_CCMR_OCxPE ((u8)0x08) /*!< Output Compare x Preload Enable mask. */ -#define TIM3_CCMR_CCxS ((u8)0x03) /*!< Capture/Compare x Selection mask. */ +#define TIM3_CCMR_ICxPSC ((uint8_t)0x0C) /*!< Input Capture x Prescaler mask. */ +#define TIM3_CCMR_ICxF ((uint8_t)0xF0) /*!< Input Capture x Filter mask. */ +#define TIM3_CCMR_OCM ((uint8_t)0x70) /*!< Output Compare x Mode mask. */ +#define TIM3_CCMR_OCxPE ((uint8_t)0x08) /*!< Output Compare x Preload Enable mask. */ +#define TIM3_CCMR_CCxS ((uint8_t)0x03) /*!< Capture/Compare x Selection mask. */ /*CCER1*/ -#define TIM3_CCER1_CC2P ((u8)0x20) /*!< Capture/Compare 2 output Polarity mask. */ -#define TIM3_CCER1_CC2E ((u8)0x10) /*!< Capture/Compare 2 output enable mask. */ -#define TIM3_CCER1_CC1P ((u8)0x02) /*!< Capture/Compare 1 output Polarity mask. */ -#define TIM3_CCER1_CC1E ((u8)0x01) /*!< Capture/Compare 1 output enable mask. */ +#define TIM3_CCER1_CC2P ((uint8_t)0x20) /*!< Capture/Compare 2 output Polarity mask. */ +#define TIM3_CCER1_CC2E ((uint8_t)0x10) /*!< Capture/Compare 2 output enable mask. */ +#define TIM3_CCER1_CC1P ((uint8_t)0x02) /*!< Capture/Compare 1 output Polarity mask. */ +#define TIM3_CCER1_CC1E ((uint8_t)0x01) /*!< Capture/Compare 1 output enable mask. */ /*CNTR*/ -#define TIM3_CNTRH_CNT ((u8)0xFF) /*!< Counter Value (MSB) mask. */ -#define TIM3_CNTRL_CNT ((u8)0xFF) /*!< Counter Value (LSB) mask. */ +#define TIM3_CNTRH_CNT ((uint8_t)0xFF) /*!< Counter Value (MSB) mask. */ +#define TIM3_CNTRL_CNT ((uint8_t)0xFF) /*!< Counter Value (LSB) mask. */ /*PSCR*/ -#define TIM3_PSCR_PSC ((u8)0xFF) /*!< Prescaler Value (MSB) mask. */ +#define TIM3_PSCR_PSC ((uint8_t)0xFF) /*!< Prescaler Value (MSB) mask. */ /*ARR*/ -#define TIM3_ARRH_ARR ((u8)0xFF) /*!< Autoreload Value (MSB) mask. */ -#define TIM3_ARRL_ARR ((u8)0xFF) /*!< Autoreload Value (LSB) mask. */ +#define TIM3_ARRH_ARR ((uint8_t)0xFF) /*!< Autoreload Value (MSB) mask. */ +#define TIM3_ARRL_ARR ((uint8_t)0xFF) /*!< Autoreload Value (LSB) mask. */ /*CCR1*/ -#define TIM3_CCR1H_CCR1 ((u8)0xFF) /*!< Capture/Compare 1 Value (MSB) mask. */ -#define TIM3_CCR1L_CCR1 ((u8)0xFF) /*!< Capture/Compare 1 Value (LSB) mask. */ +#define TIM3_CCR1H_CCR1 ((uint8_t)0xFF) /*!< Capture/Compare 1 Value (MSB) mask. */ +#define TIM3_CCR1L_CCR1 ((uint8_t)0xFF) /*!< Capture/Compare 1 Value (LSB) mask. */ /*CCR2*/ -#define TIM3_CCR2H_CCR2 ((u8)0xFF) /*!< Capture/Compare 2 Value (MSB) mask. */ -#define TIM3_CCR2L_CCR2 ((u8)0xFF) /*!< Capture/Compare 2 Value (LSB) mask. */ - +#define TIM3_CCR2H_CCR2 ((uint8_t)0xFF) /*!< Capture/Compare 2 Value (MSB) mask. */ +#define TIM3_CCR2L_CCR2 ((uint8_t)0xFF) /*!< Capture/Compare 2 Value (LSB) mask. */ /** * @} */ /*----------------------------------------------------------------------------*/ /** - * @brief 8-bit system timer (TIM4) + * @brief 8-bit system timer (TIM4) */ typedef struct TIM4_struct { - vu8 CR1; /*!< control register 1 */ -#if defined STM8S103 - vu8 RESERVED1; /*!< Reserved register */ - vu8 RESERVED2; /*!< Reserved register */ + __IO uint8_t CR1; /*!< control register 1 */ +#if defined(STM8S103) || defined(STM8S003) + uint8_t RESERVED1; /*!< Reserved register */ + uint8_t RESERVED2; /*!< Reserved register */ #endif - vu8 IER; /*!< interrupt enable register */ - vu8 SR1; /*!< status register 1 */ - vu8 EGR; /*!< event generation register */ - vu8 CNTR; /*!< counter register */ - vu8 PSCR; /*!< prescaler register */ - vu8 ARR; /*!< auto-reload register */ + __IO uint8_t IER; /*!< interrupt enable register */ + __IO uint8_t SR1; /*!< status register 1 */ + __IO uint8_t EGR; /*!< event generation register */ + __IO uint8_t CNTR; /*!< counter register */ + __IO uint8_t PSCR; /*!< prescaler register */ + __IO uint8_t ARR; /*!< auto-reload register */ } TIM4_TypeDef; @@ -930,13 +1063,13 @@ TIM4_TypeDef; * @{ */ -#define TIM4_CR1_RESET_VALUE ((u8)0x00) -#define TIM4_IER_RESET_VALUE ((u8)0x00) -#define TIM4_SR1_RESET_VALUE ((u8)0x00) -#define TIM4_EGR_RESET_VALUE ((u8)0x00) -#define TIM4_CNTR_RESET_VALUE ((u8)0x00) -#define TIM4_PSCR_RESET_VALUE ((u8)0x00) -#define TIM4_ARR_RESET_VALUE ((u8)0xFF) +#define TIM4_CR1_RESET_VALUE ((uint8_t)0x00) +#define TIM4_IER_RESET_VALUE ((uint8_t)0x00) +#define TIM4_SR1_RESET_VALUE ((uint8_t)0x00) +#define TIM4_EGR_RESET_VALUE ((uint8_t)0x00) +#define TIM4_CNTR_RESET_VALUE ((uint8_t)0x00) +#define TIM4_PSCR_RESET_VALUE ((uint8_t)0x00) +#define TIM4_ARR_RESET_VALUE ((uint8_t)0xFF) /** * @} @@ -946,23 +1079,23 @@ TIM4_TypeDef; * @{ */ /*CR1*/ -#define TIM4_CR1_ARPE ((u8)0x80) /*!< Auto-Reload Preload Enable mask. */ -#define TIM4_CR1_OPM ((u8)0x08) /*!< One Pulse Mode mask. */ -#define TIM4_CR1_URS ((u8)0x04) /*!< Update Request Source mask. */ -#define TIM4_CR1_UDIS ((u8)0x02) /*!< Update DIsable mask. */ -#define TIM4_CR1_CEN ((u8)0x01) /*!< Counter Enable mask. */ +#define TIM4_CR1_ARPE ((uint8_t)0x80) /*!< Auto-Reload Preload Enable mask. */ +#define TIM4_CR1_OPM ((uint8_t)0x08) /*!< One Pulse Mode mask. */ +#define TIM4_CR1_URS ((uint8_t)0x04) /*!< Update Request Source mask. */ +#define TIM4_CR1_UDIS ((uint8_t)0x02) /*!< Update DIsable mask. */ +#define TIM4_CR1_CEN ((uint8_t)0x01) /*!< Counter Enable mask. */ /*IER*/ -#define TIM4_IER_UIE ((u8)0x01) /*!< Update Interrupt Enable mask. */ +#define TIM4_IER_UIE ((uint8_t)0x01) /*!< Update Interrupt Enable mask. */ /*SR1*/ -#define TIM4_SR1_UIF ((u8)0x01) /*!< Update Interrupt Flag mask. */ +#define TIM4_SR1_UIF ((uint8_t)0x01) /*!< Update Interrupt Flag mask. */ /*EGR*/ -#define TIM4_EGR_UG ((u8)0x01) /*!< Update Generation mask. */ +#define TIM4_EGR_UG ((uint8_t)0x01) /*!< Update Generation mask. */ /*CNTR*/ -#define TIM4_CNTR_CNT ((u8)0xFF) /*!< Counter Value (LSB) mask. */ +#define TIM4_CNTR_CNT ((uint8_t)0xFF) /*!< Counter Value (LSB) mask. */ /*PSCR*/ -#define TIM4_PSCR_PSC ((u8)0x07) /*!< Prescaler Value mask. */ +#define TIM4_PSCR_PSC ((uint8_t)0x07) /*!< Prescaler Value mask. */ /*ARR*/ -#define TIM4_ARR_ARR ((u8)0xFF) /*!< Autoreload Value mask. */ +#define TIM4_ARR_ARR ((uint8_t)0xFF) /*!< Autoreload Value mask. */ /** * @} @@ -970,63 +1103,63 @@ TIM4_TypeDef; /*----------------------------------------------------------------------------*/ /** - * @brief 16-bit timer with synchro module (TIM5) + * @brief 16-bit timer with synchro module (TIM5) */ typedef struct TIM5_struct { - vu8 CR1; /*! - #define enableInterrupts() _rim_() /* enable interrupts */ - #define disableInterrupts() _sim_() /* disable interrupts */ - #define rim() _rim_() /* enable interrupts */ - #define sim() _sim_() /* disable interrupts */ - #define nop() _nop_() /* No Operation */ - #define trap() _trap_() /* Trap (soft IT) */ - #define wfi() _wfi_() /* Wait For Interrupt */ - #define halt() _halt_() /* Halt */ -#else /* COSMIC */ - #define enableInterrupts() {_asm("rim\n");} /* enable interrupts */ - #define disableInterrupts() {_asm("sim\n");} /* disable interrupts */ - #define rim() {_asm("rim\n");} /* enable interrupts */ - #define sim() {_asm("sim\n");} /* disable interrupts */ - #define nop() {_asm("nop\n");} /* No Operation */ - #define trap() {_asm("trap\n");} /* Trap (soft IT) */ - #define wfi() {_asm("wfi\n");} /* Wait For Interrupt */ - #define halt() {_asm("halt\n");} /* Halt */ -#endif + #include + #define enableInterrupts() _rim_() /* enable interrupts */ + #define disableInterrupts() _sim_() /* disable interrupts */ + #define rim() _rim_() /* enable interrupts */ + #define sim() _sim_() /* disable interrupts */ + #define nop() _nop_() /* No Operation */ + #define trap() _trap_() /* Trap (soft IT) */ + #define wfi() _wfi_() /* Wait For Interrupt */ + #define halt() _halt_() /* Halt */ +#elif defined(_COSMIC_) + #define enableInterrupts() {_asm("rim\n");} /* enable interrupts */ + #define disableInterrupts() {_asm("sim\n");} /* disable interrupts */ + #define rim() {_asm("rim\n");} /* enable interrupts */ + #define sim() {_asm("sim\n");} /* disable interrupts */ + #define nop() {_asm("nop\n");} /* No Operation */ + #define trap() {_asm("trap\n");} /* Trap (soft IT) */ + #define wfi() {_asm("wfi\n");} /* Wait For Interrupt */ + #define halt() {_asm("halt\n");} /* Halt */ +#else /*_IAR_*/ + #include + #define enableInterrupts() __enable_interrupt() /* enable interrupts */ + #define disableInterrupts() __disable_interrupt() /* disable interrupts */ + #define rim() __enable_interrupt() /* enable interrupts */ + #define sim() __disable_interrupt() /* disable interrupts */ + #define nop() __no_operation() /* No Operation */ + #define trap() __trap() /* Trap (soft IT) */ + #define wfi() __wait_for_interrupt() /* Wait For Interrupt */ + #define halt() __halt() /* Halt */ +#endif /*_RAISONANCE_*/ + +/*============================== Interrupt vector Handling ========================*/ + +#ifdef _COSMIC_ + #define INTERRUPT_HANDLER(a,b) @far @interrupt void a(void) + #define INTERRUPT_HANDLER_TRAP(a) void @far @interrupt a(void) +#endif /* _COSMIC_ */ + +#ifdef _RAISONANCE_ + #define INTERRUPT_HANDLER(a,b) void a(void) interrupt b + #define INTERRUPT_HANDLER_TRAP(a) void a(void) trap +#endif /* _RAISONANCE_ */ + +#ifdef _IAR_ + #define STRINGVECTOR(x) #x + #define VECTOR_ID(x) STRINGVECTOR( vector = (x) ) + #define INTERRUPT_HANDLER( a, b ) \ + _Pragma( VECTOR_ID( (b)+2 ) ) \ + __interrupt void (a)( void ) + #define INTERRUPT_HANDLER_TRAP(a) \ + _Pragma( VECTOR_ID( 1 ) ) \ + __interrupt void (a) (void) +#endif /* _IAR_ */ + +/*============================== Interrupt Handler declaration ========================*/ +#ifdef _COSMIC_ + #define INTERRUPT @far @interrupt +#elif defined(_IAR_) + #define INTERRUPT __interrupt +#endif /* _COSMIC_ */ /*============================== Handling bits ====================================*/ /*----------------------------------------------------------------------------- @@ -2517,24 +2672,24 @@ Comments : The different parameters of commands are The "MskBit" command allows to select some bits in a source variables and copy it in a destination var (return the value). The "ValBit" command returns the value of a bit in a char - variable: the bit is reseted if it returns 0 else the bit is set. + variable: the bit is reset if it returns 0 else the bit is set. This method generates not an optimised code yet. -----------------------------------------------------------------------------*/ -#define SetBit(VAR,Place) ( (VAR) |= (u8)((u8)1<<(u8)(Place)) ) -#define ClrBit(VAR,Place) ( (VAR) &= (u8)((u8)((u8)1<<(u8)(Place))^(u8)255) ) +#define SetBit(VAR,Place) ( (VAR) |= (uint8_t)((uint8_t)1<<(uint8_t)(Place)) ) +#define ClrBit(VAR,Place) ( (VAR) &= (uint8_t)((uint8_t)((uint8_t)1<<(uint8_t)(Place))^(uint8_t)255) ) -#define ChgBit(VAR,Place) ( (VAR) ^= (u8)((u8)1<<(u8)(Place)) ) +#define ChgBit(VAR,Place) ( (VAR) ^= (uint8_t)((uint8_t)1<<(uint8_t)(Place)) ) #define AffBit(VAR,Place,Value) ((Value) ? \ - ((VAR) |= ((u8)1<<(Place))) : \ - ((VAR) &= (((u8)1<<(Place))^(u8)255))) + ((VAR) |= ((uint8_t)1<<(Place))) : \ + ((VAR) &= (((uint8_t)1<<(Place))^(uint8_t)255))) #define MskBit(Dest,Msk,Src) ( (Dest) = ((Msk) & (Src)) | ((~(Msk)) & (Dest)) ) -#define ValBit(VAR,Place) ((u8)(VAR) & (u8)((u8)1<<(u8)(Place))) +#define ValBit(VAR,Place) ((uint8_t)(VAR) & (uint8_t)((uint8_t)1<<(uint8_t)(Place))) -#define BYTE_0(n) ((u8)((n) & (u8)0xFF)) /*!< Returns the low byte of the 32-bit value */ -#define BYTE_1(n) ((u8)(BYTE_0((n) >> (u8)8))) /*!< Returns the second byte of the 32-bit value */ -#define BYTE_2(n) ((u8)(BYTE_0((n) >> (u8)16))) /*!< Returns the third byte of the 32-bit value */ -#define BYTE_3(n) ((u8)(BYTE_0((n) >> (u8)24))) /*!< Returns the high byte of the 32-bit value */ +#define BYTE_0(n) ((uint8_t)((n) & (uint8_t)0xFF)) /*!< Returns the low byte of the 32-bit value */ +#define BYTE_1(n) ((uint8_t)(BYTE_0((n) >> (uint8_t)8))) /*!< Returns the second byte of the 32-bit value */ +#define BYTE_2(n) ((uint8_t)(BYTE_0((n) >> (uint8_t)16))) /*!< Returns the third byte of the 32-bit value */ +#define BYTE_3(n) ((uint8_t)(BYTE_0((n) >> (uint8_t)24))) /*!< Returns the high byte of the 32-bit value */ /*============================== Assert Macros ====================================*/ #define IS_STATE_VALUE_OK(SensitivityValue) \ @@ -2564,4 +2719,7 @@ Comments : The idea is to handle directly with the bit name. For that, it is * @} */ -/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/ +/** + * @} + */ +/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/ diff --git a/readme.txt b/readme.txt index 4c5b9d719..cbb5fdf1b 100644 --- a/readme.txt +++ b/readme.txt @@ -161,6 +161,7 @@ 3484947)(backported to 2.4.1). - FIX: Fixed various minor documentation errors (bug 3484942)(backported to 2.4.1). +- NEW: Updated STM8 header files to latest versions from ST. - NEW: Reorganized the STM32 EXT driver to have a sub-platform specific part containing all the ISR related code, this has been necessary because the significant differences among the various sub-families.