jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32h7: added minimal stm32h7 exti defs, which share with G0.

Browse Source 
Separated definitions that did not seem consistent between the "v2" EXTI
platforms. Added SYSCFG defs needed for EXTICR settings.
This commit is contained in:
Brian Viele 2020-03-20 18:21:38 -04:00
parent 89074d6a13
commit b1d8a4c546
6 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/libopencm3/stm32/common/exti_common_v2.h
View File

@ -44,17 +44,6 @@
/** EXTI Software Interrupt Event Register */
#define EXTI_SWIER1 MMIO32(EXTI_BASE + 0x08)
/** EXTI Rising Edge Pending Register */
#define EXTI_RPR1 MMIO32(EXTI_BASE + 0x0c)
/** EXTI Falling Edge Pending Register */
#define EXTI_FPR1 MMIO32(EXTI_BASE + 0x10)
/** EXTI External Interrupt Selection Registers */
#define EXTI_EXTICR(i) MMIO32(EXTI_BASE + 0x60 + (i)*4)
#define EXTI_EXTICR1 MMIO32(EXTI_BASE + 0x60)
#define EXTI_EXTICR2 MMIO32(EXTI_BASE + 0x64)
#define EXTI_EXTICR3 MMIO32(EXTI_BASE + 0x68)
#define EXTI_EXTICR4 MMIO32(EXTI_BASE + 0x6c)
/** EXTI Interrupt Mask Registers 1 */
#define EXTI_IMR1 MMIO32(EXTI_BASE + 0x80)

2
include/libopencm3/stm32/exti.h
View File

@ -42,6 +42,8 @@
# include <libopencm3/stm32/l4/exti.h>
#elif defined(STM32G0)
# include <libopencm3/stm32/g0/exti.h>
#elif defined(STM32H7)
# include <libopencm3/stm32/h7/exti.h>
#else
# error "stm32 family not defined."
#endif

12
include/libopencm3/stm32/g0/exti.h
View File

@ -32,6 +32,18 @@
#include <libopencm3/stm32/common/exti_common_all.h>
#include <libopencm3/stm32/common/exti_common_v2.h>
/** EXTI External Interrupt Selection Registers */
#define EXTI_EXTICR(i) MMIO32(EXTI_BASE + 0x60 + (i)*4)
#define EXTI_EXTICR1 MMIO32(EXTI_BASE + 0x60)
#define EXTI_EXTICR2 MMIO32(EXTI_BASE + 0x64)
#define EXTI_EXTICR3 MMIO32(EXTI_BASE + 0x68)
#define EXTI_EXTICR4 MMIO32(EXTI_BASE + 0x6c)
/** EXTI Rising Edge Pending Register */
#define EXTI_RPR1 MMIO32(EXTI_BASE + 0x0c)
/** EXTI Falling Edge Pending Register */
#define EXTI_FPR1 MMIO32(EXTI_BASE + 0x10)
BEGIN_DECLS
END_DECLS

43
include/libopencm3/stm32/h7/exti.h Normal file
View File

@ -0,0 +1,43 @@
/** @defgroup exti_defines EXTI Defines
*
* @ingroup STM32H7xx_defines
*
* @brief <b>Defined Constants and Types for the STM32H7xx EXTI Control</b>
*
* @version 1.0.0
*
* LGPL License Terms @ref lgpl_license
* */
/*
* This file is part of the libopencm3 project.
*
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/**@{*/
#ifndef LIBOPENCM3_EXTI_H
#define LIBOPENCM3_EXTI_H
#include <libopencm3/stm32/common/exti_common_all.h>
#include <libopencm3/stm32/common/exti_common_v2.h>
/** EXTI CPU Event Pending Register 1 */
#define EXTI_CPUPR1 MMIO32(EXTI_BASE + 0x88)
#define EXTI_PR EXTI_CPUPR1
BEGIN_DECLS
END_DECLS
#endif /* LIBOPENCM3_EXTI_H */
/**@}*/

5
include/libopencm3/stm32/h7/syscfg.h
View File

@ -37,6 +37,7 @@
/**@defgroup syscfg_registers SYSCFG Registers
 @{*/
#define SYSCFG_PMCR MMIO32(SYSCFG_BASE + 0x04)
#define SYSCFG_EXTICR(i) MMIO32(SYSCFG_BASE + 0x08 + (i)*4)
#define SYSCFG_EXTICR1 MMIO32(SYSCFG_BASE + 0x08)
#define SYSCFG_EXTICR2 MMIO32(SYSCFG_BASE + 0x0C)
#define SYSCFG_EXTICR3 MMIO32(SYSCFG_BASE + 0x10)
@ -48,8 +49,12 @@
#define SYSCFG_PWRCR MMIO32(SYSCFG_BASE + 0x2C)
#define SYSCFG_PKGR MMIO32(SYSCFG_BASE + 0x124)
#define SYSCFG_UR(n) MMIO32(SYSCFG_BASE + 0x300 + (4 * (n)))
#define SYSCFG_EXTICR_FIELDSIZE 4
/**@}*/
/** @defgroup syscfg_pwrcr PWRCR SYSCFG configuration register
* @ingroup syscfg_registers
* @{*/

1
lib/stm32/h7/Makefile
View File

@ -38,6 +38,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS)
ARFLAGS = rcs
OBJS += dac_common_all.o
OBJS += exti_common_all.o
OBJS += flash_common_all.o flash_common_f.o flash_common_f24.o
OBJS += fmc_common_f47.o
OBJS += gpio_common_all.o gpio_common_f0234.o