diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aes_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aes_regs.h
index d76e19f69a..42275a34f7 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aes_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aes_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aeskeys_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aeskeys_regs.h
index 3e030d4cce..85a60d26d0 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aeskeys_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/aeskeys_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/boost_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/boost_regs.h
index f501eddd82..05f1eb8a6c 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/boost_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/boost_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/crc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/crc_regs.h
index 8f2430af69..6681c1a942 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/crc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/crc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/dma_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/dma_regs.h
index 7c19634859..8e6c2b89a5 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/dma_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/dma_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/fcr_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/fcr_regs.h
index 62b4e1f24a..3103f26202 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/fcr_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/fcr_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
@@ -114,12 +118,6 @@ typedef struct {
* @brief Function Control 0 Register.
* @{
*/
-#define MXC_F_FCR_CTRL_BTLELDO_RF_POS 0 /**< CTRL_BTLELDO_RF Position */
-#define MXC_F_FCR_CTRL_BTLELDO_RF ((uint32_t)(0x1FUL << MXC_F_FCR_CTRL_BTLELDO_RF_POS)) /**< CTRL_BTLELDO_RF Mask */
-
-#define MXC_F_FCR_CTRL_BTLELDO_BB_POS 8 /**< CTRL_BTLELDO_BB Position */
-#define MXC_F_FCR_CTRL_BTLELDO_BB ((uint32_t)(0x1FUL << MXC_F_FCR_CTRL_BTLELDO_BB_POS)) /**< CTRL_BTLELDO_BB Mask */
-
#define MXC_F_FCR_CTRL_I3CDGEN0_POS 20 /**< CTRL_I3CDGEN0 Position */
#define MXC_F_FCR_CTRL_I3CDGEN0 ((uint32_t)(0x1UL << MXC_F_FCR_CTRL_I3CDGEN0_POS)) /**< CTRL_I3CDGEN0 Mask */
@@ -215,8 +213,8 @@ typedef struct {
* @brief Interrupt Flag Register.
* @{
*/
-#define MXC_F_FCR_INTFL_ERTOC_RDY_POS 0 /**< INTFL_ERTOC_RDY Position */
-#define MXC_F_FCR_INTFL_ERTOC_RDY ((uint32_t)(0x1UL << MXC_F_FCR_INTFL_ERTOC_RDY_POS)) /**< INTFL_ERTOC_RDY Mask */
+#define MXC_F_FCR_INTFL_ERFO_RDY_POS 0 /**< INTFL_ERFO_RDY Position */
+#define MXC_F_FCR_INTFL_ERFO_RDY ((uint32_t)(0x1UL << MXC_F_FCR_INTFL_ERFO_RDY_POS)) /**< INTFL_ERFO_RDY Mask */
#define MXC_F_FCR_INTFL_FRQCNT_POS 1 /**< INTFL_FRQCNT Position */
#define MXC_F_FCR_INTFL_FRQCNT ((uint32_t)(0x1UL << MXC_F_FCR_INTFL_FRQCNT_POS)) /**< INTFL_FRQCNT Mask */
@@ -229,8 +227,8 @@ typedef struct {
* @brief Interrupt Enable Register.
* @{
*/
-#define MXC_F_FCR_INTEN_ERTOC_RDY_POS 0 /**< INTEN_ERTOC_RDY Position */
-#define MXC_F_FCR_INTEN_ERTOC_RDY ((uint32_t)(0x1UL << MXC_F_FCR_INTEN_ERTOC_RDY_POS)) /**< INTEN_ERTOC_RDY Mask */
+#define MXC_F_FCR_INTEN_ERFO_RDY_POS 0 /**< INTEN_ERFO_RDY Position */
+#define MXC_F_FCR_INTEN_ERFO_RDY ((uint32_t)(0x1UL << MXC_F_FCR_INTEN_ERFO_RDY_POS)) /**< INTEN_ERFO_RDY Mask */
#define MXC_F_FCR_INTEN_FRQCNT_POS 1 /**< INTEN_FRQCNT Position */
#define MXC_F_FCR_INTEN_FRQCNT ((uint32_t)(0x1UL << MXC_F_FCR_INTEN_FRQCNT_POS)) /**< INTEN_FRQCNT Mask */
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/flc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/flc_regs.h
index 491a95737d..1894e55095 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/flc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/flc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gcr_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gcr_regs.h
index d49be0aa3b..3c5536ea23 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gcr_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gcr_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
@@ -571,6 +575,14 @@ typedef struct {
#define MXC_F_GCR_BTLELDOCTRL_BB_VSEL_POS 2 /**< BTLELDOCTRL_BB_VSEL Position */
#define MXC_F_GCR_BTLELDOCTRL_BB_VSEL ((uint32_t)(0x3UL << MXC_F_GCR_BTLELDOCTRL_BB_VSEL_POS)) /**< BTLELDOCTRL_BB_VSEL Mask */
+#define MXC_V_GCR_BTLELDOCTRL_BB_VSEL_0_9 ((uint32_t)0x0UL) /**< BTLELDOCTRL_BB_VSEL_0_9 Value */
+#define MXC_S_GCR_BTLELDOCTRL_BB_VSEL_0_9 (MXC_V_GCR_BTLELDOCTRL_BB_VSEL_0_9 << MXC_F_GCR_BTLELDOCTRL_BB_VSEL_POS) /**< BTLELDOCTRL_BB_VSEL_0_9 Setting */
+#define MXC_V_GCR_BTLELDOCTRL_BB_VSEL_1_0 ((uint32_t)0x1UL) /**< BTLELDOCTRL_BB_VSEL_1_0 Value */
+#define MXC_S_GCR_BTLELDOCTRL_BB_VSEL_1_0 (MXC_V_GCR_BTLELDOCTRL_BB_VSEL_1_0 << MXC_F_GCR_BTLELDOCTRL_BB_VSEL_POS) /**< BTLELDOCTRL_BB_VSEL_1_0 Setting */
+#define MXC_V_GCR_BTLELDOCTRL_BB_VSEL_1_1 ((uint32_t)0x2UL) /**< BTLELDOCTRL_BB_VSEL_1_1 Value */
+#define MXC_S_GCR_BTLELDOCTRL_BB_VSEL_1_1 (MXC_V_GCR_BTLELDOCTRL_BB_VSEL_1_1 << MXC_F_GCR_BTLELDOCTRL_BB_VSEL_POS) /**< BTLELDOCTRL_BB_VSEL_1_1 Setting */
+#define MXC_V_GCR_BTLELDOCTRL_BB_VSEL_1_2 ((uint32_t)0x3UL) /**< BTLELDOCTRL_BB_VSEL_1_2 Value */
+#define MXC_S_GCR_BTLELDOCTRL_BB_VSEL_1_2 (MXC_V_GCR_BTLELDOCTRL_BB_VSEL_1_2 << MXC_F_GCR_BTLELDOCTRL_BB_VSEL_POS) /**< BTLELDOCTRL_BB_VSEL_1_2 Setting */
#define MXC_F_GCR_BTLELDOCTRL_RF_EN_POS 4 /**< BTLELDOCTRL_RF_EN Position */
#define MXC_F_GCR_BTLELDOCTRL_RF_EN ((uint32_t)(0x1UL << MXC_F_GCR_BTLELDOCTRL_RF_EN_POS)) /**< BTLELDOCTRL_RF_EN Mask */
@@ -580,6 +592,14 @@ typedef struct {
#define MXC_F_GCR_BTLELDOCTRL_RF_VSEL_POS 6 /**< BTLELDOCTRL_RF_VSEL Position */
#define MXC_F_GCR_BTLELDOCTRL_RF_VSEL ((uint32_t)(0x3UL << MXC_F_GCR_BTLELDOCTRL_RF_VSEL_POS)) /**< BTLELDOCTRL_RF_VSEL Mask */
+#define MXC_V_GCR_BTLELDOCTRL_RF_VSEL_0_9 ((uint32_t)0x0UL) /**< BTLELDOCTRL_RF_VSEL_0_9 Value */
+#define MXC_S_GCR_BTLELDOCTRL_RF_VSEL_0_9 (MXC_V_GCR_BTLELDOCTRL_RF_VSEL_0_9 << MXC_F_GCR_BTLELDOCTRL_RF_VSEL_POS) /**< BTLELDOCTRL_RF_VSEL_0_9 Setting */
+#define MXC_V_GCR_BTLELDOCTRL_RF_VSEL_1_0 ((uint32_t)0x1UL) /**< BTLELDOCTRL_RF_VSEL_1_0 Value */
+#define MXC_S_GCR_BTLELDOCTRL_RF_VSEL_1_0 (MXC_V_GCR_BTLELDOCTRL_RF_VSEL_1_0 << MXC_F_GCR_BTLELDOCTRL_RF_VSEL_POS) /**< BTLELDOCTRL_RF_VSEL_1_0 Setting */
+#define MXC_V_GCR_BTLELDOCTRL_RF_VSEL_1_1 ((uint32_t)0x2UL) /**< BTLELDOCTRL_RF_VSEL_1_1 Value */
+#define MXC_S_GCR_BTLELDOCTRL_RF_VSEL_1_1 (MXC_V_GCR_BTLELDOCTRL_RF_VSEL_1_1 << MXC_F_GCR_BTLELDOCTRL_RF_VSEL_POS) /**< BTLELDOCTRL_RF_VSEL_1_1 Setting */
+#define MXC_V_GCR_BTLELDOCTRL_RF_VSEL_1_2 ((uint32_t)0x3UL) /**< BTLELDOCTRL_RF_VSEL_1_2 Value */
+#define MXC_S_GCR_BTLELDOCTRL_RF_VSEL_1_2 (MXC_V_GCR_BTLELDOCTRL_RF_VSEL_1_2 << MXC_F_GCR_BTLELDOCTRL_RF_VSEL_POS) /**< BTLELDOCTRL_RF_VSEL_1_2 Setting */
#define MXC_F_GCR_BTLELDOCTRL_RF_BP_EN_POS 8 /**< BTLELDOCTRL_RF_BP_EN Position */
#define MXC_F_GCR_BTLELDOCTRL_RF_BP_EN ((uint32_t)(0x1UL << MXC_F_GCR_BTLELDOCTRL_RF_BP_EN_POS)) /**< BTLELDOCTRL_RF_BP_EN Mask */
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gpio_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gpio_regs.h
index 6005fb7982..bd4852c526 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gpio_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/gpio_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/i3c_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/i3c_regs.h
index 02d2f94eae..29bf4ed462 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/i3c_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/i3c_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/icc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/icc_regs.h
index e7691d5549..d0f3643463 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/icc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/icc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.svd b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.svd
index ecfcfda3e4..0beab42655 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.svd
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/max32657.svd
@@ -1265,18 +1265,6 @@
0x00
read-write
-
- BTLELDO_RF
- BTLE LDO RF Trim.
- 0
- 5
-
-
- BTLELDO_BB
- BTLE LDO BB Trim.
- 8
- 5
-
I3CDGEN0
I3C SDA Glitch Filter Enable.
@@ -1504,8 +1492,8 @@
read-write
- ERTOC_RDY
- ERTCO 32K Ready.
+ ERFO_RDY
+ ERFO Ready.
0
1
@@ -1524,8 +1512,8 @@
read-write
- ERTOC_RDY
- ERTCO 32K Ready Interrupt Enable.
+ ERFO_RDY
+ ERFO Ready Interrupt Enable.
0
1
@@ -2808,6 +2796,28 @@
Voltage Selection for BB LDO.
2
2
+
+
+ 0_9
+ 0.9V
+ 0
+
+
+ 1_0
+ 1.0V
+ 1
+
+
+ 1_1
+ 1.1V
+ 2
+
+
+ 1_2
+ 1.2V
+ 3
+
+
RF_EN
@@ -2826,6 +2836,28 @@
LDO RF Voltage Setting.
6
2
+
+
+ 0_9
+ 0.9V
+ 0
+
+
+ 1_0
+ 1.0V
+ 1
+
+
+ 1_1
+ 1.1V
+ 2
+
+
+ 1_2
+ 1.2V
+ 3
+
+
RF_BP_EN
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mcr_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mcr_regs.h
index 039c79405e..a463cd22cc 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mcr_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mcr_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mpc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mpc_regs.h
index 5944ce49d4..3d61fa74a1 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mpc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/mpc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/nspc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/nspc_regs.h
index fd2b7bb166..070c5e3fbf 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/nspc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/nspc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/pwrseq_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/pwrseq_regs.h
index 216ede9b62..0ee8c4d562 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/pwrseq_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/pwrseq_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rstz_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rstz_regs.h
index 5920d77a62..62f5a9d3c2 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rstz_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rstz_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rtc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rtc_regs.h
index f54cf7b4c2..02232d7035 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rtc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/rtc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/sir_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/sir_regs.h
index 8be7861a5a..2d3a8ae58d 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/sir_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/sir_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spc_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spc_regs.h
index 69408b70f4..34b24863af 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spc_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spc_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spi_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spi_regs.h
index 75860a7efc..5f8ecaad1f 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spi_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/spi_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/tmr_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/tmr_regs.h
index 61b8e57c73..94bf7f6dfc 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/tmr_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/tmr_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trimsir_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trimsir_regs.h
index 63a2682e7a..8c2fb8dc93 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trimsir_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trimsir_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trng_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trng_regs.h
index 362dd3551e..f76ab2eaa7 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trng_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/trng_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/uart_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/uart_regs.h
index 831c2a57de..98bacabc31 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/uart_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/uart_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wdt_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wdt_regs.h
index 1e62996109..99d6039e89 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wdt_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wdt_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wut_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wut_regs.h
index 37f3861f46..8969ba670a 100644
--- a/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wut_regs.h
+++ b/Libraries/CMSIS/Device/Maxim/MAX32657/Include/wut_regs.h
@@ -48,7 +48,11 @@ extern "C" {
#define __IO volatile
#endif
#ifndef __I
-#define __I volatile const
+#ifdef __cplusplus
+#define __I volatile
+#else
+#define __I volatile const
+#endif
#endif
#ifndef __O
#define __O volatile
diff --git a/Libraries/PeriphDrivers/Source/SYS/SVD/fcr_me30.svd b/Libraries/PeriphDrivers/Source/SYS/SVD/fcr_me30.svd
index 005effeba8..e540a715e1 100644
--- a/Libraries/PeriphDrivers/Source/SYS/SVD/fcr_me30.svd
+++ b/Libraries/PeriphDrivers/Source/SYS/SVD/fcr_me30.svd
@@ -16,18 +16,6 @@
0x00
read-write
-
- BTLELDO_RF
- BTLE LDO RF Trim.
- 0
- 5
-
-
- BTLELDO_BB
- BTLE LDO BB Trim.
- 8
- 5
-
I3CDGEN0
I3C SDA Glitch Filter Enable.
@@ -255,8 +243,8 @@
read-write
- ERTOC_RDY
- ERTCO 32K Ready.
+ ERFO_RDY
+ ERFO Ready.
0
1
@@ -275,8 +263,8 @@
read-write
- ERTOC_RDY
- ERTCO 32K Ready Interrupt Enable.
+ ERFO_RDY
+ ERFO Ready Interrupt Enable.
0
1
diff --git a/Libraries/PeriphDrivers/Source/SYS/SVD/gcr_me30.svd b/Libraries/PeriphDrivers/Source/SYS/SVD/gcr_me30.svd
index a580c6ad64..86ff7156d9 100644
--- a/Libraries/PeriphDrivers/Source/SYS/SVD/gcr_me30.svd
+++ b/Libraries/PeriphDrivers/Source/SYS/SVD/gcr_me30.svd
@@ -896,6 +896,28 @@
Voltage Selection for BB LDO.
2
2
+
+
+ 0_9
+ 0.9V
+ 0
+
+
+ 1_0
+ 1.0V
+ 1
+
+
+ 1_1
+ 1.1V
+ 2
+
+
+ 1_2
+ 1.2V
+ 3
+
+
RF_EN
@@ -914,6 +936,28 @@
LDO RF Voltage Setting.
6
2
+
+
+ 0_9
+ 0.9V
+ 0
+
+
+ 1_0
+ 1.0V
+ 1
+
+
+ 1_1
+ 1.1V
+ 2
+
+
+ 1_2
+ 1.2V
+ 3
+
+
RF_BP_EN