diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_cap.h b/components/esp_driver_mcpwm/include/driver/mcpwm_cap.h index 13a34b4a8af0..3c78eb848072 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_cap.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_cap.h @@ -22,7 +22,8 @@ typedef struct { int group_id; /*!< Specify from which group to allocate the capture timer */ mcpwm_capture_clock_source_t clk_src; /*!< MCPWM capture timer clock source */ uint32_t resolution_hz; /*!< Resolution of capture timer */ - struct { + /// Extra configuration flags for capture timer + struct extra_capture_timer_flags { uint32_t allow_pd: 1; /*!< Set to allow power down. When this flag set, the driver will backup/restore the MCPWM registers before/after entering/exist sleep mode. By this approach, the system can power off MCPWM's power domain. This can save power, but at the expense of more RAM being consumed.*/ diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_cmpr.h b/components/esp_driver_mcpwm/include/driver/mcpwm_cmpr.h index 734190c5b0e0..8008a3294184 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_cmpr.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_cmpr.h @@ -21,7 +21,8 @@ extern "C" { typedef struct { int intr_priority; /*!< MCPWM comparator interrupt priority, if set to 0, the driver will try to allocate an interrupt with a relative low priority (1,2,3) */ - struct { + /// Extra configuration flags for comparator + struct extra_comparator_flags { uint32_t update_cmp_on_tez: 1; /*!< Whether to update compare value when timer count equals to zero (tez) */ uint32_t update_cmp_on_tep: 1; /*!< Whether to update compare value when timer count equals to peak (tep) */ uint32_t update_cmp_on_sync: 1; /*!< Whether to update compare value on sync event */ diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_fault.h b/components/esp_driver_mcpwm/include/driver/mcpwm_fault.h index 69fa8cb727de..c0d47eec7023 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_fault.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_fault.h @@ -23,7 +23,8 @@ typedef struct { int intr_priority; /*!< MCPWM GPIO fault interrupt priority, if set to 0, the driver will try to allocate an interrupt with a relative low priority (1,2,3) */ int gpio_num; /*!< GPIO used by the fault signal */ - struct { + // Extra configuration flags for GPIO fault + struct extra_gpio_fault_flags { uint32_t active_level: 1; /*!< On which level the fault signal is treated as active */ } flags; /*!< Extra configuration flags for GPIO fault */ } mcpwm_gpio_fault_config_t; diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_gen.h b/components/esp_driver_mcpwm/include/driver/mcpwm_gen.h index 924c0fe93137..56948ff6df57 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_gen.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_gen.h @@ -20,7 +20,8 @@ extern "C" { */ typedef struct { int gen_gpio_num; /*!< The GPIO number used to output the PWM signal */ - struct { + // Extra configuration flags for generator + struct extra_mcpwm_generator_flags { uint32_t invert_pwm: 1; /*!< Whether to invert the PWM signal (done by GPIO matrix) */ } flags; /*!< Extra configuration flags for generator */ } mcpwm_generator_config_t; diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_oper.h b/components/esp_driver_mcpwm/include/driver/mcpwm_oper.h index c3cb0781f694..9a1fe7bd0acf 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_oper.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_oper.h @@ -22,7 +22,8 @@ typedef struct { int group_id; /*!< Specify from which group to allocate the MCPWM operator */ int intr_priority; /*!< MCPWM operator interrupt priority, if set to 0, the driver will try to allocate an interrupt with a relative low priority (1,2,3) */ - struct { + /// Extra configuration flags for operator + struct extra_operator_flags { uint32_t update_gen_action_on_tez: 1; /*!< Whether to update generator action when timer counts to zero */ uint32_t update_gen_action_on_tep: 1; /*!< Whether to update generator action when timer counts to peak */ uint32_t update_gen_action_on_sync: 1; /*!< Whether to update generator action on sync event */ diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_sync.h b/components/esp_driver_mcpwm/include/driver/mcpwm_sync.h index 5158a3fd7ea3..0bfab1ad577f 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_sync.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_sync.h @@ -20,7 +20,7 @@ extern "C" { */ typedef struct { mcpwm_timer_event_t timer_event; /*!< Timer event, upon which MCPWM timer will generate the sync signal */ - struct { + struct extra_mcpwm_timer_event_flags { uint32_t propagate_input_sync: 1; /*!< The input sync signal would be routed to its sync output */ } flags; /*!< Extra configuration flags for timer sync source */ } mcpwm_timer_sync_src_config_t; @@ -46,7 +46,8 @@ esp_err_t mcpwm_new_timer_sync_src(mcpwm_timer_handle_t timer, const mcpwm_timer typedef struct { int group_id; /*!< MCPWM group ID */ int gpio_num; /*!< GPIO used by sync source */ - struct { + // Extra configuration flags for GPIO sync source + struct extra_mcpwm_gpio_sync_src_flags { uint32_t active_neg: 1; /*!< Whether the sync signal is active on negedge, by default, the sync signal's posedge is treated as active */ } flags; /*!< Extra configuration flags for GPIO sync source */ } mcpwm_gpio_sync_src_config_t; diff --git a/components/esp_driver_mcpwm/include/driver/mcpwm_timer.h b/components/esp_driver_mcpwm/include/driver/mcpwm_timer.h index 69a8b7a3b662..85c61ddcb002 100644 --- a/components/esp_driver_mcpwm/include/driver/mcpwm_timer.h +++ b/components/esp_driver_mcpwm/include/driver/mcpwm_timer.h @@ -37,7 +37,8 @@ typedef struct { uint32_t period_ticks; /*!< Number of count ticks within a period */ int intr_priority; /*!< MCPWM timer interrupt priority, if set to 0, the driver will try to allocate an interrupt with a relative low priority (1,2,3) */ - struct { + /// Extra configuration flags for MCPWM timer + struct extra_mcpwm_timer_flags { uint32_t update_period_on_empty: 1; /*!< Whether to update period when timer counts to zero */ uint32_t update_period_on_sync: 1; /*!< Whether to update period on sync event */ uint32_t allow_pd: 1; /*!< Set to allow power down. When this flag set, the driver will backup/restore the MCPWM registers before/after entering/exist sleep mode. diff --git a/components/esp_driver_parlio/include/driver/parlio_tx.h b/components/esp_driver_parlio/include/driver/parlio_tx.h index ee8fd5c91ede..fa09b7bda3ee 100644 --- a/components/esp_driver_parlio/include/driver/parlio_tx.h +++ b/components/esp_driver_parlio/include/driver/parlio_tx.h @@ -37,7 +37,8 @@ typedef struct { size_t dma_burst_size; /*!< DMA burst size, in bytes */ parlio_sample_edge_t sample_edge; /*!< Parallel IO sample edge */ parlio_bit_pack_order_t bit_pack_order; /*!< Set the order of packing the bits into bytes (only works when `data_width` < 8) */ - struct { + // Extra configuration flags + struct extra_parlio_tx_unit_flags { uint32_t clk_gate_en: 1; /*!< Enable TX clock gating, the output clock will be controlled by the MSB bit of the data bus, i.e. by data_gpio_nums[PARLIO_TX_UNIT_MAX_DATA_WIDTH-1]. High level to enable the clock output, low to disable */ diff --git a/components/esp_hal_dma/include/hal/gdma_hal.h b/components/esp_hal_dma/include/hal/gdma_hal.h index a34216288db9..32bc5e88d25d 100644 --- a/components/esp_hal_dma/include/hal/gdma_hal.h +++ b/components/esp_hal_dma/include/hal/gdma_hal.h @@ -34,7 +34,8 @@ typedef struct gdma_hal_context_t gdma_hal_context_t; */ typedef struct { int group_id; /*!< GDMA group ID */ - struct { + // Extra configuration flags + struct extra_gdma_hal_flags { uint32_t enable_weighted_arbitration: 1; /*!< Enable weighted arbitration */ } flags; /*!< Extra configuration flags */ } gdma_hal_config_t; diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index eafb64d259b2..3908ae6e37fc 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -19,12 +19,7 @@ components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/ # LWIP: sockets.h uses #include_next<>, which doesn't work correctly with the checker # memp_std.h is supposed to be included multiple times with different settings -components/lwip/lwip/src/include/lwip/priv/memp_std.h components/lwip/include/lwip/sockets.h -components/lwip/lwip/src/include/lwip/prot/nd6.h -components/lwip/lwip/src/include/netif/ppp/ -components/lwip/lwip/src/include/lwip/apps/tftp_server.h -components/lwip/lwip/src/include/lwip/apps/tftp_client.h components/spi_flash/include/spi_flash_chip_issi.h components/spi_flash/include/spi_flash_chip_mxic.h @@ -57,20 +52,15 @@ components/idf_test/include/idf_performance.h components/spiffs/include/spiffs_config.h -components/unity/unity/src/unity_internals.h components/unity/include/unity_config.h components/unity/include/unity_test_runner.h -components/cmock/CMock/src/cmock.h -components/cmock/CMock/src/cmock_internals.h components/openthread/openthread/ # The following TLSF headers contain object definitions but have to be # made public to be used in esp_rom to help patching the TLSF in ROM. -components/heap/tlsf/tlsf_block_functions.h -components/heap/tlsf/tlsf_control_functions.h ### Here are the files that do not compile for some reason #