Skip to content

Commit 8628604

Browse files
authored
Merge pull request #15399 from MaximIntegrated/dev-update_max32670_sdk
Update max32670 sdk files
2 parents 975dfcf + a50a444 commit 8628604

File tree

128 files changed

+9654
-9263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+9654
-9263
lines changed

targets/TARGET_Maxim/TARGET_MAX32670/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ target_sources(mbed-max32670
8484
${MXM_SOURCE_DIR}/FLC/flc_common.c
8585
${MXM_SOURCE_DIR}/FLC/flc_me15.c
8686
${MXM_SOURCE_DIR}/FLC/flc_reva.c
87-
${MXM_SOURCE_DIR}/FLC/flc_revb.c
8887

8988
${MXM_SOURCE_DIR}/GPIO/gpio_common.c
9089
${MXM_SOURCE_DIR}/GPIO/gpio_me15.c

targets/TARGET_Maxim/TARGET_MAX32670/Libraries/CMSIS/Device/Maxim/MAX32670/Include/aes_key_regs.h

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/**
22
* @file aes_key_regs.h
33
* @brief Registers, Bit Masks and Bit Positions for the AES_KEY Peripheral Module.
4+
* @note This file is @deprecated.
45
*/
56

6-
/* ****************************************************************************
7-
* Copyright (C) 2022 Maxim Integrated Products, Inc., All Rights Reserved.
7+
/******************************************************************************
8+
* Copyright (C) 2023 Maxim Integrated Products, Inc., All Rights Reserved.
89
*
910
* Permission is hereby granted, free of charge, to any person obtaining a
1011
* copy of this software and associated documentation files (the "Software"),
@@ -34,23 +35,24 @@
3435
* property whatsoever. Maxim Integrated Products, Inc. retains all
3536
* ownership rights.
3637
*
37-
*
38-
*************************************************************************** */
38+
******************************************************************************/
39+
40+
#ifndef LIBRARIES_CMSIS_DEVICE_MAXIM_MAX32670_INCLUDE_AES_KEY_REGS_H_
41+
#define LIBRARIES_CMSIS_DEVICE_MAXIM_MAX32670_INCLUDE_AES_KEY_REGS_H_
3942

40-
#ifndef _AES_KEY_REGS_H_
41-
#define _AES_KEY_REGS_H_
43+
#warning "DEPRECATED(1-10-2023): aes_key_regs.h - Scheduled for removal. Please use aeskeys_regs.h."
4244

4345
/* **** Includes **** */
4446
#include <stdint.h>
4547

4648
#ifdef __cplusplus
4749
extern "C" {
4850
#endif
49-
51+
5052
#if defined (__ICCARM__)
5153
#pragma system_include
5254
#endif
53-
55+
5456
#if defined (__CC_ARM)
5557
#pragma anon_unions
5658
#endif
@@ -75,13 +77,18 @@ extern "C" {
7577
* @ingroup aes_key
7678
* @defgroup aes_key_registers AES_KEY_Registers
7779
* @brief Registers, Bit Masks and Bit Positions for the AES_KEY Peripheral Module.
78-
* @details AES Key Registers.
80+
* @details AES Key Registers.
7981
*/
8082

8183
/**
8284
* @ingroup aes_key_registers
8385
* Structure type to access the AES_KEY Registers.
8486
*/
87+
#if defined(__GNUC__)
88+
__attribute__((deprecated("mxc_aes_key_regs_t struct and aes_key_regs.h no longer supported. Use aeskeys_regs.h and MXC_AESKEYS (mxc_aeskeys_regs_t) for AES Key Access. 1-10-2023")))
89+
#else
90+
#warning "mxc_aes_key_regs_t struct and aes_key_regs.h no longer supported. Use aeskeys_regs.h and MXC_AESKEYS (mxc_aeskeys_regs_t) for AES Key Access. 1-10-2023"
91+
#endif
8592
typedef struct {
8693
__IO uint32_t aes_key0; /**< <tt>\b 0x00:</tt> AES_KEY AES_KEY0 Register */
8794
__IO uint32_t aes_key1; /**< <tt>\b 0x04:</tt> AES_KEY AES_KEY1 Register */
@@ -97,21 +104,21 @@ typedef struct {
97104
/**
98105
* @ingroup aes_key_registers
99106
* @defgroup AES_KEY_Register_Offsets Register Offsets
100-
* @brief AES_KEY Peripheral Register Offsets from the AES_KEY Base Peripheral Address.
107+
* @brief AES_KEY Peripheral Register Offsets from the AES_KEY Base Peripheral Address.
101108
* @{
102109
*/
103-
#define MXC_R_AES_KEY_AES_KEY0 ((uint32_t)0x00000000UL) /**< Offset from AES_KEY Base Address: <tt> 0x0000</tt> */
104-
#define MXC_R_AES_KEY_AES_KEY1 ((uint32_t)0x00000004UL) /**< Offset from AES_KEY Base Address: <tt> 0x0004</tt> */
105-
#define MXC_R_AES_KEY_AES_KEY2 ((uint32_t)0x00000008UL) /**< Offset from AES_KEY Base Address: <tt> 0x0008</tt> */
106-
#define MXC_R_AES_KEY_AES_KEY3 ((uint32_t)0x0000000CUL) /**< Offset from AES_KEY Base Address: <tt> 0x000C</tt> */
107-
#define MXC_R_AES_KEY_AES_KEY4 ((uint32_t)0x00000010UL) /**< Offset from AES_KEY Base Address: <tt> 0x0010</tt> */
108-
#define MXC_R_AES_KEY_AES_KEY5 ((uint32_t)0x00000014UL) /**< Offset from AES_KEY Base Address: <tt> 0x0014</tt> */
109-
#define MXC_R_AES_KEY_AES_KEY6 ((uint32_t)0x00000018UL) /**< Offset from AES_KEY Base Address: <tt> 0x0018</tt> */
110-
#define MXC_R_AES_KEY_AES_KEY7 ((uint32_t)0x0000001CUL) /**< Offset from AES_KEY Base Address: <tt> 0x001C</tt> */
110+
#define MXC_R_AES_KEY_AES_KEY0 ((uint32_t)0x00000000UL) /**< Offset from AES_KEY Base Address: <tt> 0x0000</tt> */
111+
#define MXC_R_AES_KEY_AES_KEY1 ((uint32_t)0x00000004UL) /**< Offset from AES_KEY Base Address: <tt> 0x0004</tt> */
112+
#define MXC_R_AES_KEY_AES_KEY2 ((uint32_t)0x00000008UL) /**< Offset from AES_KEY Base Address: <tt> 0x0008</tt> */
113+
#define MXC_R_AES_KEY_AES_KEY3 ((uint32_t)0x0000000CUL) /**< Offset from AES_KEY Base Address: <tt> 0x000C</tt> */
114+
#define MXC_R_AES_KEY_AES_KEY4 ((uint32_t)0x00000010UL) /**< Offset from AES_KEY Base Address: <tt> 0x0010</tt> */
115+
#define MXC_R_AES_KEY_AES_KEY5 ((uint32_t)0x00000014UL) /**< Offset from AES_KEY Base Address: <tt> 0x0014</tt> */
116+
#define MXC_R_AES_KEY_AES_KEY6 ((uint32_t)0x00000018UL) /**< Offset from AES_KEY Base Address: <tt> 0x0018</tt> */
117+
#define MXC_R_AES_KEY_AES_KEY7 ((uint32_t)0x0000001CUL) /**< Offset from AES_KEY Base Address: <tt> 0x001C</tt> */
111118
/**@} end of group aes_key_registers */
112119

113120
#ifdef __cplusplus
114121
}
115122
#endif
116123

117-
#endif /* _AES_KEY_REGS_H_ */
124+
#endif // LIBRARIES_CMSIS_DEVICE_MAXIM_MAX32670_INCLUDE_AES_KEY_REGS_H_

0 commit comments

Comments
 (0)