stm321l1/vendor: migrate to new v2.3.0 vendor files

- remove old header files
- fix new DMA header file macro definitions
- remove old cpu type groups (STM32L1XX_MD, STM32L1XX_MDP,
  STM32L1XX_HD, STM32L1XX_XL)
This commit is contained in:
francisco 2019-05-13 09:59:40 +02:00 committed by Francisco Molina
parent 0adb36e5ef
commit e4a49f023e
4 changed files with 8 additions and 6709 deletions

View File

@ -62,13 +62,7 @@
#define MEM_ADDR CMAR #define MEM_ADDR CMAR
#define NDTR_REG CNDTR #define NDTR_REG CNDTR
#define CONTROL_REG CCR #define CONTROL_REG CCR
#if CPU_FAM_STM32L1
#define DMA_CCR_TCIE DMA_CCR1_TCIE
#define DMA_CCR_TEIE DMA_CCR1_TEIE
#define DMA_EN DMA_CCR1_EN
#else /* CPU_FAM_STM32L1 */
#define DMA_EN DMA_CCR_EN #define DMA_EN DMA_CCR_EN
#endif /* CPU_FAM_STM32L1 */
#define DMA_STREAM_IT_MASK (DMA_IFCR_CGIF1 | DMA_IFCR_CTCIF1 | \ #define DMA_STREAM_IT_MASK (DMA_IFCR_CGIF1 | DMA_IFCR_CTCIF1 | \
DMA_IFCR_CHTIF1 | DMA_IFCR_CTEIF1) DMA_IFCR_CHTIF1 | DMA_IFCR_CTEIF1)
#ifndef DMA_CCR_MSIZE_Pos #ifndef DMA_CCR_MSIZE_Pos

View File

@ -23,38 +23,15 @@
#include "cpu_conf_common.h" #include "cpu_conf_common.h"
/** #if defined(CPU_MODEL_STM32L151RB_A) || defined(CPU_MODEL_STM32L151CB_A)
* @brief STM32 L1 cpu type #include "vendor/stm32l151xba.h"
* #elif defined(CPU_MODEL_STM32L151CB)
* From CMSIS header file, allowed values for L1 cpu types are: #include "vendor/stm32l151xb.h"
* * STM32L1XX_MD:
* * Ultra Low Power Medium-density devices: STM32L151x6xx, STM32L151x8xx,
* STM32L151xBxx, STM32L152x6xx, STM32L152x8xx, STM32L152xBxx,
* STM32L151x6xxA, STM32L151x8xxA, STM32L151xBxxA, STM32L152x6xxA,
* SM32L152x8xxA and STM32L152xBxxA.
* * Ultra Low Power Medium-density Value Line devices: STM32L100x6xx,
* STM32L100x8xx and STM32L100xBxx.
*
* * STM32L1XX_MDP:
* * Ultra Low Power Medium-density Plus devices: STM32L151xCxx,
* STM32L152xCxx and STM32L162xCxx
* * Ultra Low Power Medium-density Plus Value Line devices: STM32L100xCxx
*
* * STM32L1XX_HD: Ultra Low Power High-density devices: STM32L151xDxx,
* STM32L152xDxx and STM32L162xDxx
*
* * STM32L1XX_XL: Ultra Low Power XL-density devices: STM32L151xExx,
* STM32L152xExx and STM32L162xExx
*/
#if defined(CPU_MODEL_STM32L151RB_A) || defined(CPU_MODEL_STM32L151CB) || \
defined(CPU_MODEL_STM32L151CB_A)
#define STM32L1XX_MD (1U)
#elif defined(CPU_MODEL_STM32L151RC) #elif defined(CPU_MODEL_STM32L151RC)
#define STM32L1XX_MDP (1U) #include "vendor/stm32l151xc.h"
#else #elif defined(CPU_MODEL_STM32L152RE)
#define STM32L1XX_XL (1U) #include "vendor/stm32l152xe.h"
#endif #endif
#include "vendor/stm32l1xx.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

File diff suppressed because it is too large Load Diff

View File

@ -93,7 +93,7 @@ static void adc_set_sample_time(uint8_t time)
reg32 |= (time << (i * 3)); reg32 |= (time << (i * 3));
} }
#if !defined STM32L1XX_MD #if defined(CPU_MODEL_STM32L152RE)
ADC1->SMPR0 = reg32; ADC1->SMPR0 = reg32;
#endif #endif
ADC1->SMPR1 = reg32; ADC1->SMPR1 = reg32;