diff --git a/include/libopencm3/stm32/common/flash_common_f24.h b/include/libopencm3/stm32/common/flash_common_f24.h index 27b1ee16..138ba6e1 100644 --- a/include/libopencm3/stm32/common/flash_common_f24.h +++ b/include/libopencm3/stm32/common/flash_common_f24.h @@ -59,7 +59,7 @@ #define FLASH_OPTCR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x14) /** Flash Option Control register 1 (bank 2) */ #define FLASH_OPTCR1 MMIO32(FLASH_MEM_INTERFACE_BASE + 0x18) -/*@}*/ +/**@}*/ /** @defgroup flash_latency FLASH Wait States @ingroup flash_defines @@ -73,7 +73,7 @@ #define FLASH_ACR_LATENCY_5WS 0x05 #define FLASH_ACR_LATENCY_6WS 0x06 #define FLASH_ACR_LATENCY_7WS 0x07 -/*@}*/ +/**@}*/ #define FLASH_ACR_LATENCY_SHIFT 0 #define FLASH_ACR_LATENCY_MASK 0x0f diff --git a/include/libopencm3/stm32/f0/crs.h b/include/libopencm3/stm32/f0/crs.h index 4e6e2592..21e106cd 100644 --- a/include/libopencm3/stm32/f0/crs.h +++ b/include/libopencm3/stm32/f0/crs.h @@ -1,6 +1,6 @@ /** @defgroup crs_defines CRS Defines * - * @brief Defined Constants and Types for the Clock Recovery System. + * @brief Defined Constants and Types for the Clock Recovery System * * @ingroup STM32F0xx_defines * diff --git a/include/libopencm3/stm32/f1/bkp.h b/include/libopencm3/stm32/f1/bkp.h index 577c6c20..fff9c7f7 100644 --- a/include/libopencm3/stm32/f1/bkp.h +++ b/include/libopencm3/stm32/f1/bkp.h @@ -161,7 +161,7 @@ /* Backup data register 42 (BKP_DR42) */ #define BKP_DR42 MMIO32(BACKUP_REGS_BASE + 0xBC) -/*@}*/ +/**@}*/ /** @defgroup BKP_RTCCR_Values BKP_RTCCR Values * @ingroup bkp_defines @@ -177,7 +177,7 @@ /** CAL[6:0]: Calibration value */ #define BKP_RTCCR_CAL_LSB 0 -/*@}*/ +/**@}*/ /** @defgroup BKP_CR_Values BKP_CR Values * @ingroup bkp_defines @@ -187,7 +187,7 @@ /** TPE: TAMPER pin enable */ #define BKP_CR_TPE (1 << 0) -/*@}*/ +/**@}*/ /** @defgroup BKP_CSR_Values BKP_CSR Values * @ingroup bkp_defines @@ -206,6 +206,6 @@ /** CTE: Clear tamper event */ #define BKP_CSR_CTE (1 << 0) -/*@}*/ +/**@}*/ #endif diff --git a/include/libopencm3/stm32/f7/flash.h b/include/libopencm3/stm32/f7/flash.h index 0047da88..79abbbff 100644 --- a/include/libopencm3/stm32/f7/flash.h +++ b/include/libopencm3/stm32/f7/flash.h @@ -59,7 +59,7 @@ #define FLASH_ACR_ARTRST (1 << 11) #define FLASH_ACR_ARTEN (1 << 9) #define FLASH_ACR_PRFTEN (1 << 8) -/*@}*/ +/**@}*/ #define FLASH_SR_ERSERR (1 << 7) diff --git a/include/libopencm3/stm32/f7/pwr.h b/include/libopencm3/stm32/f7/pwr.h index 46055710..1b3ac759 100644 --- a/include/libopencm3/stm32/f7/pwr.h +++ b/include/libopencm3/stm32/f7/pwr.h @@ -50,7 +50,7 @@ LGPL License Terms @ref lgpl_license /** Power control/status register 2 (PWR_CSR2) */ #define PWR_CSR2 MMIO32(POWER_CONTROL_BASE + 0x0c) -/*@}*/ +/**@}*/ /** @defgroup pwr_cr1_defines PWR_CR1 values * @ingroup STM32F_pwr_defines @@ -134,7 +134,7 @@ LGPL License Terms @ref lgpl_license /** LPDS: Low-power deepsleep */ #define PWR_CR1_LPDS (1 << 0) -/*@}*/ +/**@}*/ /** @defgroup pwr_csr1_defines PWR_CSR1 values * @ingroup STM32F_pwr_defines @@ -185,7 +185,7 @@ LGPL License Terms @ref lgpl_license /** WUIF: Wakeup internal flag */ #define PWR_CSR1_WUIF (1 << 0) -/*@}*/ +/**@}*/ /** @defgroup pwr_cr2_defines PWR_CR2 values * @ingroup STM32F_pwr_defines @@ -230,7 +230,7 @@ LGPL License Terms @ref lgpl_license /** CWUPF1: Clear Wakeup Pin flag for PA0 */ #define PWR_CR2_CWUPF1 (1 << 0) -/*@}*/ +/**@}*/ /** @defgroup pwr_csr2_defines PWR_CSR2 values * @ingroup STM32F_pwr_defines @@ -275,7 +275,7 @@ LGPL License Terms @ref lgpl_license /** WUPF1: Wakeup Pin flag for PA0 */ #define PWR_CSR2_WUPF1 (1 << 0) -/*@}*/ +/**@}*/ /* --- Function prototypes ------------------------------------------------- */ enum pwr_vos_scale { diff --git a/include/libopencm3/stm32/l0/crs.h b/include/libopencm3/stm32/l0/crs.h index 5bfc4cfb..76d259c6 100644 --- a/include/libopencm3/stm32/l0/crs.h +++ b/include/libopencm3/stm32/l0/crs.h @@ -1,6 +1,6 @@ /** @defgroup crs_defines CRS Defines * - * @brief Defined Constants and Types for the Clock Recovery System. + * @brief Defined Constants and Types for the Clock Recovery System * * @ingroup STM32L0xx_defines * diff --git a/include/libopencm3/stm32/l0/timer.h b/include/libopencm3/stm32/l0/timer.h index 98772811..1c6eb524 100644 --- a/include/libopencm3/stm32/l0/timer.h +++ b/include/libopencm3/stm32/l0/timer.h @@ -32,8 +32,7 @@ LGPL License Terms @ref lgpl_license * along with this library. If not, see . */ -#ifndef LIBOPENCM3_TIMER_H -#define LIBOPENCM3_TIMER_H +#pragma once #include @@ -98,6 +97,3 @@ LGPL License Terms @ref lgpl_license /**@}*/ -#endif - -/**@}*/ diff --git a/include/libopencm3/stm32/l4/crs.h b/include/libopencm3/stm32/l4/crs.h index 21b120f0..19e5a434 100644 --- a/include/libopencm3/stm32/l4/crs.h +++ b/include/libopencm3/stm32/l4/crs.h @@ -1,6 +1,6 @@ /** @defgroup crs_defines CRS Defines * - * @brief Defined Constants and Types for the Clock Recovery System. + * @brief Defined Constants and Types for the Clock Recovery System * * @ingroup STM32L4xx_defines * diff --git a/include/libopencm3/stm32/l4/rcc.h b/include/libopencm3/stm32/l4/rcc.h index 24f9b391..09edc71e 100644 --- a/include/libopencm3/stm32/l4/rcc.h +++ b/include/libopencm3/stm32/l4/rcc.h @@ -128,7 +128,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_CR_MSIRANGE_24MHZ 9 #define RCC_CR_MSIRANGE_32MHZ 10 #define RCC_CR_MSIRANGE_48MHZ 11 -/*@}*/ +/**@}*/ #define RCC_CR_MSIRGSEL (1 << 3) #define RCC_CR_MSIPLLEN (1 << 2) #define RCC_CR_MSIRDY (1 << 1) @@ -255,7 +255,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, @{*/ #define RCC_PLLCFGR_PLLN_SHIFT 0x8 #define RCC_PLLCFGR_PLLN_MASK 0x7f -/*@}*/ +/**@}*/ /** @defgroup rcc_pllcfgr_pllm RCC_PLLCFGR PLLM values @ingroup STM32L4xx_rcc_defines @@ -264,7 +264,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_PLLCFGR_PLLM_SHIFT 0x4 #define RCC_PLLCFGR_PLLM_MASK 0x7 #define RCC_PLLCFGR_PLLM(x) ((x)-1) -/*@}*/ +/**@}*/ #define RCC_PLLCFGR_PLLSRC_SHIFT 0 #define RCC_PLLCFGR_PLLSRC_MASK 0x3 @@ -420,7 +420,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_AHB1ENR_FLASHEN (1 << 8) #define RCC_AHB1ENR_DMA2EN (1 << 1) #define RCC_AHB1ENR_DMA1EN (1 << 0) -/*@}*/ +/**@}*/ /* --- RCC_AHB2ENR values --------------------------------------------------- */ @@ -440,7 +440,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_AHB2ENR_GPIOCEN (1 << 2) #define RCC_AHB2ENR_GPIOBEN (1 << 1) #define RCC_AHB2ENR_GPIOAEN (1 << 0) -/*@}*/ +/**@}*/ /* --- RCC_AHB3ENR values --------------------------------------------------- */ @@ -450,7 +450,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, @{*/ #define RCC_AHB3ENR_QSPIEN (1 << 8) #define RCC_AHB3ENR_FMCEN (1 << 0) -/*@}*/ +/**@}*/ /**@}*/ @@ -483,7 +483,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_APB1ENR1_TIM4EN (1 << 2) #define RCC_APB1ENR1_TIM3EN (1 << 1) #define RCC_APB1ENR1_TIM2EN (1 << 0) -/*@}*/ +/**@}*/ /* --- RCC_APB1ENR2 values -------------------------------------------------- */ @@ -494,8 +494,8 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_APB1ENR2_LPTIM2EN (1 << 5) #define RCC_APB1ENR2_SWPMI1EN (1 << 2) #define RCC_APB1ENR2_LPUART1EN (1 << 0) -/*@}*/ -/*@}*/ +/**@}*/ +/**@}*/ /* --- RCC_APB2ENR values -------------------------------------------------- */ @@ -516,7 +516,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_APB2ENR_SDMMC1EN (1 << 10) #define RCC_APB2ENR_FWEN (1 << 7) #define RCC_APB2ENR_SYSCFGEN (1 << 0) -/*@}*/ +/**@}*/ /* --- RCC_AHB1SMENR - AHB1 periph clock in sleep mode --------------------- */ @@ -722,7 +722,7 @@ Twelve frequency ranges are available: 100 kHz, 200 kHz, 400 kHz, 800 kHz, #define RCC_CSR_MSIRANGE_2MHZ 5 #define RCC_CSR_MSIRANGE_4MHZ 6 #define RCC_CSR_MSIRANGE_8MHZ 7 -/*@}*/ +/**@}*/ #define RCC_CSR_LSIRDY (1 << 1) #define RCC_CSR_LSION (1 << 0) diff --git a/lib/stm32/common/flash_common_l01.c b/lib/stm32/common/flash_common_l01.c index 6415f728..e7b2b8d4 100644 --- a/lib/stm32/common/flash_common_l01.c +++ b/lib/stm32/common/flash_common_l01.c @@ -97,10 +97,6 @@ void flash_unlock_acr(void) FLASH_PDKEYR = FLASH_PDKEYR_PDKEY2; } -/** - * Erase a page in ram. - * @param page_address must be first word in page for L1, any address in page for L0 - */ void flash_erase_page(uint32_t page_address) { FLASH_PECR |= FLASH_PECR_ERASE | FLASH_PECR_PROG;