Merge branch 'staging/esp_static_assert' into 'master'

C/Cxx: Static assertions are now unified

Closes IDFGH-8479

See merge request espressif/esp-idf!20569

components/soc/esp32s2/include/soc/cp_dma_struct.h

@@ -612,7 +612,9 @@ typedef struct {
     volatile cp_dma_date_reg_t dma_date;
 } cp_dma_dev_t;
 
+#ifndef __cplusplus
 _Static_assert(sizeof(cp_dma_dev_t) == 0x100, "cp_dma_dev_t should occupy 0x100 bytes in memory");
+#endif
 
 extern cp_dma_dev_t CP_DMA;
 

components/soc/esp32s2/include/soc/dedic_gpio_struct.h

@@ -519,7 +519,9 @@ typedef struct {
     volatile dedic_gpio_intr_clr_reg_t gpio_intr_clr;
 } dedic_dev_t;
 
+#ifndef __cplusplus
 _Static_assert(sizeof(dedic_dev_t) == 0x30, "dedic_dev_t should occupy 0x30 bytes in memory");
+#endif
 
 extern dedic_dev_t DEDIC_GPIO;
 

components/soc/esp32s2/include/soc/i2s_struct.h

@@ -404,7 +404,9 @@ typedef volatile struct i2s_dev_s {
 } i2s_dev_t;
 extern i2s_dev_t I2S0;
 
+#ifndef __cplusplus
 _Static_assert(sizeof(i2s_dev_t)==0x100, "invalid i2s_dev_t size");
+#endif
 
 #ifdef __cplusplus
 }

components/soc/esp32s2/include/soc/spi_mem_struct.h

@@ -693,7 +693,11 @@ typedef volatile struct spi_mem_dev_s {
         uint32_t val;
     } date;
 } spi_mem_dev_t;
+
+#ifndef __cplusplus
 _Static_assert(sizeof(spi_mem_dev_t) == 0x400, "invalid spi_mem_dev_t size");
+#endif
+
 extern spi_mem_dev_t SPIMEM0;
 extern spi_mem_dev_t SPIMEM1;
 #ifdef __cplusplus

components/soc/esp32s2/include/soc/spi_struct.h

@@ -749,8 +749,9 @@ typedef volatile struct spi_dev_s {
 extern spi_dev_t GPSPI2;   //FSPI
 extern spi_dev_t GPSPI3;   //HSPI
 
+#ifndef __cplusplus
 _Static_assert(sizeof(spi_dev_t)==0x400, "***invalid spi");
-
+#endif
 
 #ifdef __cplusplus
 }

components/soc/esp32s2/include/soc/timer_group_struct.h

@@ -1,5 +1,5 @@
 /**
- * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  *  SPDX-License-Identifier: Apache-2.0
  */

components/soc/esp32s2/include/soc/twai_struct.h

@@ -197,7 +197,9 @@ typedef volatile struct twai_dev_s {
     } clock_divider_reg;                        /* Address 0x007C */
 } twai_dev_t;
 
+#ifndef __cplusplus
 _Static_assert(sizeof(twai_dev_t) == 128, "TWAI registers should be 32 * 4 bytes");
+#endif
 
 extern twai_dev_t TWAI;
 

components/soc/esp32s2/include/soc/usb_dwc_struct.h

@@ -1140,7 +1140,9 @@ typedef struct {
 } usb_dwc_dev_t;
 
 
+#ifndef __cplusplus
 _Static_assert(sizeof(usb_dwc_dev_t) == 0xe08, "Invalid size of usb_dwc_dev_t structure");
+#endif
 
 extern usb_dwc_dev_t USB_DWC;
 

components/soc/esp32s2/include/soc/usb_wrap_struct.h

@@ -433,7 +433,9 @@ typedef struct {
     volatile usb_wrap_date_reg_t date;
 } usb_wrap_dev_t;
 
+#ifndef __cplusplus
 _Static_assert(sizeof(usb_wrap_dev_t)==0x400, "Invalid USB_WRAP size");
+#endif
 
 extern usb_wrap_dev_t USB_WRAP;