Skip to content

Commit 25e4316

Browse files
committed
STM32H7 directory cleanup and refactoring
1 parent 119ff51 commit 25e4316

File tree

9 files changed

+26
-77
lines changed

9 files changed

+26
-77
lines changed

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/objects.h

Lines changed: 0 additions & 67 deletions
This file was deleted.

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/us_ticker_data.h renamed to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/us_ticker_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "stm32h7xx.h"
2424
#include "stm32h7xx_ll_tim.h"
2525
#include "cmsis_nvic.h"
26-
26+
2727
#define TIM_MST TIM5
2828
#define TIM_MST_IRQ TIM5_IRQn
2929
#define TIM_MST_RCC __TIM5_CLK_ENABLE()

targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
/* Includes ------------------------------------------------------------------*/
2929
#include "stm32h7xx_hal_def.h"
30-
#include "stm32h7xx_ll_rtc.h" // MBED PATCH
3130

3231
/** @addtogroup STM32H7xx_HAL_Driver
3332
* @{

targets/TARGET_STM/TARGET_STM32H7/common_objects.h renamed to targets/TARGET_STM/TARGET_STM32H7/objects.h

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,39 @@
2727
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*******************************************************************************
2929
*/
30-
#ifndef MBED_COMMON_OBJECTS_H
31-
#define MBED_COMMON_OBJECTS_H
30+
#ifndef MBED_OBJECTS_H
31+
#define MBED_OBJECTS_H
3232

3333
#include "cmsis.h"
3434
#include "PortNames.h"
3535
#include "PeripheralNames.h"
3636
#include "PinNames.h"
3737
#include "stm32h7xx_ll_usart.h"
38+
#include "stm32h7xx_ll_rtc.h"
3839

3940
#ifdef __cplusplus
4041
extern "C" {
4142
#endif
4243

44+
struct gpio_irq_s {
45+
IRQn_Type irq_n;
46+
uint32_t irq_index;
47+
uint32_t event;
48+
PinName pin;
49+
};
50+
51+
struct port_s {
52+
PortName port;
53+
uint32_t mask;
54+
PinDirection direction;
55+
__IO uint32_t *reg_in;
56+
__IO uint32_t *reg_out;
57+
};
58+
59+
struct trng_s {
60+
RNG_HandleTypeDef handle;
61+
};
62+
4363
struct pwmout_s {
4464
PWMName pwm;
4565
PinName pin;
@@ -154,4 +174,3 @@ struct can_s {
154174
#endif
155175

156176
#endif
157-

targets/TARGET_STM/mbed_rtx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
defined(TARGET_STM32F446RE) ||\
9696
defined(TARGET_STM32F446VE) ||\
9797
defined(TARGET_STM32F446ZE) ||\
98-
defined(TARGET_STM32H743ZI) ||\
99-
defined(TARGET_STM32H753ZI))
98+
defined(TARGET_STM32H743xI) ||\
99+
defined(TARGET_STM32H753xI))
100100
#define INITIAL_SP (0x20020000UL)
101101

102102
#elif (defined(TARGET_STM32F429ZI) ||\

targets/targets.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3174,9 +3174,7 @@
31743174
"core": "Cortex-M7FD",
31753175
"extra_labels_add": [
31763176
"STM32H7",
3177-
"STM32H743",
3178-
"STM32H743xI",
3179-
"STM32H743ZI"
3177+
"STM32H743xI"
31803178
],
31813179
"config": {
31823180
"d11_configuration": {

0 commit comments

Comments
 (0)