diff options
| author | Chris Kay <chris.kay@arm.com> | 2020-03-09 16:35:12 +0000 |
|---|---|---|
| committer | jimqui01 <54316584+jimqui01@users.noreply.github.com> | 2020-03-24 17:44:33 +0000 |
| commit | f21bb9862ef6753577baa1b6eab62179d5c7fff4 (patch) | |
| tree | 5340894eac85f9fd49955224338710fd116e4ba9 /module | |
| parent | 2045eb2c129f173b4ab5c36ca37ae5109e92c007 (diff) | |
misc: Clean up include directives
This commit cleans up include directives across the project to reduce
the number of implicit transitive dependencies in preparation for mass
header changes in the logging patches later on.
These changes were made using two tools: clang-include-fixer and
include-what-you-use, which identify and remove headers that are
unnecessary, and insert headers which are used but not referenced. Some
manual tweaking was involved to handle special cases, like #ifdef'd
includes.
Includes have also been reordered and categorized according to their
project locality, and non-module includes now use quotes rather than
angle brackets.
Change-Id: Id39dc473f44b73cb98f3b8949f9e768fd2ace6cd
Signed-off-by: Chris Kay <chris.kay@arm.com>
Diffstat (limited to 'module')
120 files changed, 640 insertions, 345 deletions
diff --git a/module/apcontext/include/mod_apcontext.h b/module/apcontext/include/mod_apcontext.h index 572511c3..c1e1de4e 100644 --- a/module/apcontext/include/mod_apcontext.h +++ b/module/apcontext/include/mod_apcontext.h @@ -9,8 +9,10 @@ #ifndef MOD_APCONTEXT_H #define MOD_APCONTEXT_H -#include <stdint.h> +#include <fwk_id.h> + #include <stddef.h> +#include <stdint.h> /*! * \ingroup GroupModules Modules diff --git a/module/apcontext/src/mod_apcontext.c b/module/apcontext/src/mod_apcontext.c index 27373623..bc93c61c 100644 --- a/module/apcontext/src/mod_apcontext.c +++ b/module/apcontext/src/mod_apcontext.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> +#include <mod_apcontext.h> +#include <mod_clock.h> +#include <mod_log.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_apcontext.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_power_domain.h> + +#include <string.h> #define MODULE_NAME "[APContext]" diff --git a/module/armv7m_mpu/include/mod_armv7m_mpu.h b/module/armv7m_mpu/include/mod_armv7m_mpu.h index 39d6d466..c673bb94 100644 --- a/module/armv7m_mpu/include/mod_armv7m_mpu.h +++ b/module/armv7m_mpu/include/mod_armv7m_mpu.h @@ -9,6 +9,7 @@ #define MOD_ARMV7M_MPU_H #include <fmw_cmsis.h> + #include <stddef.h> /*! diff --git a/module/armv7m_mpu/src/mod_armv7m_mpu.c b/module/armv7m_mpu/src/mod_armv7m_mpu.c index f9c562d8..86ac0d18 100644 --- a/module/armv7m_mpu/src/mod_armv7m_mpu.c +++ b/module/armv7m_mpu/src/mod_armv7m_mpu.c @@ -6,9 +6,13 @@ */ #include <mod_armv7m_mpu.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_module.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> static int armv7m_mpu_init( fwk_id_t module_id, diff --git a/module/bootloader/include/mod_bootloader.h b/module/bootloader/include/mod_bootloader.h index 6fbcc452..78e87975 100644 --- a/module/bootloader/include/mod_bootloader.h +++ b/module/bootloader/include/mod_bootloader.h @@ -8,9 +8,11 @@ #ifndef MOD_BOOTLOADER_H #define MOD_BOOTLOADER_H -#include <stdint.h> #include <fwk_element.h> +#include <stddef.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/bootloader/src/mod_bootloader.c b/module/bootloader/src/mod_bootloader.c index 1cbe3682..b69c641d 100644 --- a/module/bootloader/src/mod_bootloader.c +++ b/module/bootloader/src/mod_bootloader.c @@ -8,7 +8,6 @@ #include <mod_bootloader.h> #include <mod_sds.h> -#include <fwk_element.h> #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module.h> @@ -18,6 +17,7 @@ #include <fmw_cmsis.h> +#include <stdbool.h> #include <stdint.h> #include <string.h> diff --git a/module/clock/include/mod_clock.h b/module/clock/include/mod_clock.h index 9a59fc40..31addbce 100644 --- a/module/clock/include/mod_clock.h +++ b/module/clock/include/mod_clock.h @@ -8,10 +8,12 @@ #ifndef MOD_CLOCK_H #define MOD_CLOCK_H -#include <stdint.h> #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ @@ -549,7 +551,7 @@ struct mod_clock_resp_params { */ #define MOD_CLOCK_EVENT_IDX_REQUEST 0 - /*! +/*! * \brief Request event identifier. * * \details This identifier is used by the clients that expect to receive a diff --git a/module/clock/src/clock.h b/module/clock/src/clock.h index 9322de87..4ca64bbd 100644 --- a/module/clock/src/clock.h +++ b/module/clock/src/clock.h @@ -8,9 +8,10 @@ #ifndef CLOCK_H #define CLOCK_H -#include <fwk_id.h> #include <mod_clock.h> +#include <fwk_id.h> + /* * Clock event indexes. */ diff --git a/module/clock/src/mod_clock.c b/module/clock/src/mod_clock.c index 0824f985..19eba164 100644 --- a/module/clock/src/mod_clock.c +++ b/module/clock/src/mod_clock.c @@ -5,17 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include <clock.h> + +#include <mod_clock.h> +#include <mod_power_domain.h> + #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_notification.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_power_domain.h> -#include <clock.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> /* Device context */ struct clock_dev_ctx { diff --git a/module/cmn600/include/internal/cmn600_ccix.h b/module/cmn600/include/internal/cmn600_ccix.h index 362b9192..d57eba39 100644 --- a/module/cmn600/include/internal/cmn600_ccix.h +++ b/module/cmn600/include/internal/cmn600_ccix.h @@ -12,11 +12,13 @@ #ifndef INTERNAL_CMN600_CCIX_H #define INTERNAL_CMN600_CCIX_H -#include <stdint.h> -#include <stdbool.h> -#include <fwk_module_idx.h> #include <internal/cmn600_ctx.h> +#include <fwk_module_idx.h> + +#include <stdbool.h> +#include <stdint.h> + /* * CMN600 CCIX Setup Function */ diff --git a/module/cmn600/include/internal/cmn600_ctx.h b/module/cmn600/include/internal/cmn600_ctx.h index 4f43b9d9..5a0c0327 100644 --- a/module/cmn600/include/internal/cmn600_ctx.h +++ b/module/cmn600/include/internal/cmn600_ctx.h @@ -11,13 +11,14 @@ #ifndef INTERNAL_CMN600_CTX_H #define INTERNAL_CMN600_CTX_H -#include <stdbool.h> -#include <stdint.h> +#include <cmn600.h> + #include <mod_cmn600.h> #include <mod_log.h> #include <mod_timer.h> -#include <cmn600.h> +#include <stdbool.h> +#include <stdint.h> /* External nodes that require RN-SAM mapping during run-time */ struct external_rnsam_tuple { diff --git a/module/cmn600/include/mod_cmn600.h b/module/cmn600/include/mod_cmn600.h index 8d8d0cb0..bf04bfa3 100644 --- a/module/cmn600/include/mod_cmn600.h +++ b/module/cmn600/include/mod_cmn600.h @@ -8,6 +8,8 @@ #ifndef MOD_CMN600_H #define MOD_CMN600_H +#include <fwk_id.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> diff --git a/module/cmn600/src/cmn600.c b/module/cmn600/src/cmn600.c index 609e1f10..40a6f804 100644 --- a/module/cmn600/src/cmn600.c +++ b/module/cmn600/src/cmn600.c @@ -5,10 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <cmn600.h> + #include <fwk_assert.h> -#include <fwk_macros.h> #include <fwk_math.h> -#include <cmn600.h> static unsigned int encoding_bits; static unsigned int mask_bits; diff --git a/module/cmn600/src/cmn600.h b/module/cmn600/src/cmn600.h index 28fd5c74..77111b15 100644 --- a/module/cmn600/src/cmn600.h +++ b/module/cmn600/src/cmn600.h @@ -11,10 +11,11 @@ #ifndef CMN600_H #define CMN600_H -#include <stdint.h> -#include <stdbool.h> #include <fwk_macros.h> +#include <stdbool.h> +#include <stdint.h> + #define CMN600_MAX_NUM_RNF 32 #define CMN600_MAX_NUM_HNF 32 #define CMN600_MAX_NUM_SCG 4 diff --git a/module/cmn600/src/cmn600_ccix.c b/module/cmn600/src/cmn600_ccix.c index b7b2d009..43cb1f6d 100644 --- a/module/cmn600/src/cmn600_ccix.c +++ b/module/cmn600/src/cmn600_ccix.c @@ -5,13 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_assert.h> -#include <fwk_macros.h> -#include <fwk_math.h> -#include <mod_log.h> #include <cmn600.h> -#include <internal/cmn600_ctx.h> + #include <internal/cmn600_ccix.h> +#include <internal/cmn600_ctx.h> + +#include <mod_cmn600.h> +#include <mod_log.h> +#include <mod_timer.h> + +#include <fwk_assert.h> +#include <fwk_id.h> +#include <fwk_math.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define MOD_NAME "[CMN600] " diff --git a/module/cmn600/src/mod_cmn600.c b/module/cmn600/src/mod_cmn600.c index 04fdce66..7ffdd37c 100644 --- a/module/cmn600/src/mod_cmn600.c +++ b/module/cmn600/src/mod_cmn600.c @@ -5,25 +5,29 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <string.h> +#include <cmn600.h> + +#include <internal/cmn600_ccix.h> +#include <internal/cmn600_ctx.h> + +#include <mod_clock.h> +#include <mod_cmn600.h> +#include <mod_log.h> +#include <mod_ppu_v1.h> +#include <mod_system_info.h> +#include <mod_timer.h> + #include <fwk_assert.h> -#include <fwk_macros.h> -#include <fwk_math.h> +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_cmn600.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_system_info.h> -#include <cmn600.h> -#include <internal/cmn600_ccix.h> -#include <internal/cmn600_ctx.h> -#include <mod_ppu_v1.h> + +#include <stdbool.h> +#include <string.h> #define MOD_NAME "[CMN600] " diff --git a/module/cmn_rhodes/include/internal/cmn_rhodes_ctx.h b/module/cmn_rhodes/include/internal/cmn_rhodes_ctx.h index 1c7842f1..aaa47f5e 100644 --- a/module/cmn_rhodes/include/internal/cmn_rhodes_ctx.h +++ b/module/cmn_rhodes/include/internal/cmn_rhodes_ctx.h @@ -11,11 +11,13 @@ #ifndef INTERNAL_CMN_RHODES_CTX_H #define INTERNAL_CMN_RHODES_CTX_H -#include <stdbool.h> -#include <stdint.h> +#include <cmn_rhodes.h> + #include <mod_cmn_rhodes.h> #include <mod_log.h> -#include <cmn_rhodes.h> + +#include <stdbool.h> +#include <stdint.h> static struct cmn_rhodes_ctx { const struct mod_cmn_rhodes_config *config; diff --git a/module/cmn_rhodes/include/mod_cmn_rhodes.h b/module/cmn_rhodes/include/mod_cmn_rhodes.h index 8312e061..a3236dc1 100644 --- a/module/cmn_rhodes/include/mod_cmn_rhodes.h +++ b/module/cmn_rhodes/include/mod_cmn_rhodes.h @@ -8,6 +8,10 @@ #ifndef MOD_CMN_RHODES_H #define MOD_CMN_RHODES_H +#include <fwk_id.h> + +#include <stdbool.h> +#include <stddef.h> #include <stdint.h> /*! diff --git a/module/cmn_rhodes/src/cmn_rhodes.c b/module/cmn_rhodes/src/cmn_rhodes.c index 3ebe8f63..d7639034 100644 --- a/module/cmn_rhodes/src/cmn_rhodes.c +++ b/module/cmn_rhodes/src/cmn_rhodes.c @@ -5,9 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <cmn_rhodes.h> + #include <fwk_assert.h> #include <fwk_math.h> -#include <cmn_rhodes.h> /* * Encoding bits size of the X and Y position in the Node info value. diff --git a/module/cmn_rhodes/src/cmn_rhodes.h b/module/cmn_rhodes/src/cmn_rhodes.h index ad698c37..6a45cd6d 100644 --- a/module/cmn_rhodes/src/cmn_rhodes.h +++ b/module/cmn_rhodes/src/cmn_rhodes.h @@ -11,10 +11,11 @@ #ifndef CMN_RHODES_H #define CMN_RHODES_H -#include <stdint.h> -#include <stdbool.h> #include <fwk_macros.h> +#include <stdbool.h> +#include <stdint.h> + /* Max Node Counts */ #define MAX_HNF_COUNT 64 #define MAX_RND_COUNT 32 diff --git a/module/cmn_rhodes/src/mod_cmn_rhodes.c b/module/cmn_rhodes/src/mod_cmn_rhodes.c index 57b1d736..72e8fc0d 100644 --- a/module/cmn_rhodes/src/mod_cmn_rhodes.c +++ b/module/cmn_rhodes/src/mod_cmn_rhodes.c @@ -5,17 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_assert.h> -#include <fwk_mm.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_notification.h> #include <cmn_rhodes.h> + +#include <internal/cmn_rhodes_ctx.h> + #include <mod_clock.h> #include <mod_cmn_rhodes.h> #include <mod_log.h> #include <mod_ppu_v1.h> -#include <internal/cmn_rhodes_ctx.h> + +#include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_mm.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_notification.h> +#include <fwk_status.h> #define MOD_NAME "[CMN_RHODES] " diff --git a/module/css_clock/include/mod_css_clock.h b/module/css_clock/include/mod_css_clock.h index 263b1d5e..b260324d 100644 --- a/module/css_clock/include/mod_css_clock.h +++ b/module/css_clock/include/mod_css_clock.h @@ -8,9 +8,11 @@ #ifndef MOD_CSS_CLOCK_H #define MOD_CSS_CLOCK_H +#include <fwk_element.h> +#include <fwk_id.h> + #include <stdbool.h> #include <stdint.h> -#include <fwk_element.h> /*! * \addtogroup GroupModules Modules diff --git a/module/css_clock/src/mod_css_clock.c b/module/css_clock/src/mod_css_clock.c index 39945dc4..733f1709 100644 --- a/module/css_clock/src/mod_css_clock.c +++ b/module/css_clock/src/mod_css_clock.c @@ -5,16 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdlib.h> -#include <fwk_element.h> -#include <fwk_mm.h> -#include <fwk_module.h> -#include <fwk_status.h> #include <mod_clock.h> #include <mod_css_clock.h> #include <mod_power_domain.h> +#include <fwk_id.h> +#include <fwk_mm.h> +#include <fwk_module.h> +#include <fwk_status.h> + +#include <stdint.h> +#include <stdlib.h> + /* Device context */ struct css_clock_dev_ctx { bool initialized; diff --git a/module/ddr_phy500/include/mod_ddr_phy500.h b/module/ddr_phy500/include/mod_ddr_phy500.h index ae8ed035..95363c91 100644 --- a/module/ddr_phy500/include/mod_ddr_phy500.h +++ b/module/ddr_phy500/include/mod_ddr_phy500.h @@ -1,4 +1,4 @@ - /* +/* * Arm SCP/MCP Software * Copyright (c) 2015-2020, Arm Limited and Contributors. All rights reserved. * @@ -10,12 +10,14 @@ #ifndef MOD_DDR_PHY500_H #define MOD_DDR_PHY500_H -#include <stdbool.h> -#include <stdint.h> +#include <mod_log.h> + #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_log.h> + +#include <stdbool.h> +#include <stdint.h> /*! * \addtogroup GroupModules Modules diff --git a/module/ddr_phy500/src/mod_ddr_phy500.c b/module/ddr_phy500/src/mod_ddr_phy500.c index e79a4732..9ad268cd 100644 --- a/module/ddr_phy500/src/mod_ddr_phy500.c +++ b/module/ddr_phy500/src/mod_ddr_phy500.c @@ -8,22 +8,25 @@ * DDR-PHY500 driver */ -#include <fwk_assert.h> -#include <fwk_id.h> -#include <fwk_mm.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_status.h> #include <mod_ddr_phy500.h> +#include <mod_log.h> #ifdef BUILD_HAS_MOD_DMC500 - #include <mod_dmc500.h> +# include <mod_dmc500.h> #endif #ifdef BUILD_HAS_MOD_DMC620 - #include <mod_dmc620.h> +# include <mod_dmc620.h> #endif +#include <fwk_assert.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> + +#include <stddef.h> + static struct mod_log_api *log_api; /* diff --git a/module/debug/include/mod_debug.h b/module/debug/include/mod_debug.h index 576b25be..2aeec8f4 100644 --- a/module/debug/include/mod_debug.h +++ b/module/debug/include/mod_debug.h @@ -8,11 +8,12 @@ #ifndef MOD_DEBUG_H #define MOD_DEBUG_H -#include <stdint.h> #include <fwk_event.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdint.h> + /*! * \ingroup GroupModules * \defgroup GroupDebug Debug HAL diff --git a/module/debug/src/debug.h b/module/debug/src/debug.h index b5719e1a..15b45f50 100644 --- a/module/debug/src/debug.h +++ b/module/debug/src/debug.h @@ -8,10 +8,12 @@ #ifndef DEBUG_H #define DEBUG_H -#include <stdint.h> -#include <fwk_id.h> #include <mod_debug.h> +#include <fwk_id.h> + +#include <stdint.h> + enum debug_state { DEBUG_IDLE, DEBUG_GET, diff --git a/module/debug/src/mod_debug.c b/module/debug/src/mod_debug.c index 79f7eb5c..c8caf26c 100644 --- a/module/debug/src/mod_debug.c +++ b/module/debug/src/mod_debug.c @@ -5,7 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include <debug.h> + +#include <mod_debug.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_macros.h> @@ -14,8 +17,8 @@ #include <fwk_module_idx.h> #include <fwk_multi_thread.h> #include <fwk_status.h> -#include <mod_debug.h> -#include <debug.h> + +#include <stdbool.h> static struct debug_dev_ctx *ctx_table; diff --git a/module/debugger_cli/include/mod_debugger_cli.h b/module/debugger_cli/include/mod_debugger_cli.h index b9c9ce13..9e5b80b8 100644 --- a/module/debugger_cli/include/mod_debugger_cli.h +++ b/module/debugger_cli/include/mod_debugger_cli.h @@ -12,6 +12,7 @@ #define MOD_DEBUGGER_CLI_H #include <mod_timer.h> + #include <fwk_module.h> /*! diff --git a/module/debugger_cli/src/mod_debugger_cli.c b/module/debugger_cli/src/mod_debugger_cli.c index 2898b380..3d99567b 100644 --- a/module/debugger_cli/src/mod_debugger_cli.c +++ b/module/debugger_cli/src/mod_debugger_cli.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <cli.h> +#include <cli_platform.h> + +#include <mod_debugger_cli.h> + #include <fwk_assert.h> #include <fwk_module.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_debugger_cli.h> -#include <cli.h> -#include <cli_platform.h> enum debugger_cli_internal_event_idx { DEBUGGER_CLI_INTERNAL_EVENT_IDX_ENTER_DEBUGGER, diff --git a/module/dmc500/include/mod_dmc500.h b/module/dmc500/include/mod_dmc500.h index d611af83..50e7b149 100644 --- a/module/dmc500/include/mod_dmc500.h +++ b/module/dmc500/include/mod_dmc500.h @@ -11,12 +11,15 @@ #ifndef MOD_DMC500_H #define MOD_DMC500_H -#include <stdint.h> -#include <fwk_macros.h> -#include <fwk_module.h> #include <mod_log.h> #include <mod_timer.h> +#include <fwk_id.h> +#include <fwk_macros.h> +#include <fwk_module.h> + +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/dmc500/src/mod_dmc500.c b/module/dmc500/src/mod_dmc500.c index 5e5e3d73..9ff03e8b 100644 --- a/module/dmc500/src/mod_dmc500.c +++ b/module/dmc500/src/mod_dmc500.c @@ -8,12 +8,16 @@ * DMC-500 driver */ -#include <assert.h> -#include <fwk_mm.h> +#include <mod_dmc500.h> +#include <mod_log.h> +#include <mod_timer.h> + +#include <fwk_assert.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_dmc500.h> + +#include <stddef.h> static struct mod_log_api *log_api; static struct mod_dmc_ddr_phy_api *ddr_phy_api; diff --git a/module/dmc620/include/mod_dmc620.h b/module/dmc620/include/mod_dmc620.h index 4afca08a..27a5e109 100644 --- a/module/dmc620/include/mod_dmc620.h +++ b/module/dmc620/include/mod_dmc620.h @@ -11,10 +11,12 @@ #ifndef MOD_DMC620_H #define MOD_DMC620_H -#include <stdint.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/dmc620/src/mod_dmc620.c b/module/dmc620/src/mod_dmc620.c index adb6118a..2da6d08e 100644 --- a/module/dmc620/src/mod_dmc620.c +++ b/module/dmc620/src/mod_dmc620.c @@ -8,16 +8,20 @@ * DMC-620 driver */ +#include <mod_clock.h> +#include <mod_dmc620.h> +#include <mod_log.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_dmc620.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <cmsis_compiler.h> + +#include <fmw_cmsis.h> + +#include <stddef.h> static struct mod_log_api *log_api; static struct mod_dmc_ddr_phy_api *ddr_phy_api; diff --git a/module/dvfs/include/mod_dvfs.h b/module/dvfs/include/mod_dvfs.h index 9ab5f2a7..584e1715 100644 --- a/module/dvfs/include/mod_dvfs.h +++ b/module/dvfs/include/mod_dvfs.h @@ -8,11 +8,12 @@ #ifndef MOD_DVFS_H #define MOD_DVFS_H -#include <stddef.h> -#include <stdint.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stddef.h> +#include <stdint.h> + /*! * \ingroup GroupModules * \defgroup GroupDvfs Dynamic Voltage and Frequency Scaling (DVFS) diff --git a/module/dvfs/src/mod_dvfs.c b/module/dvfs/src/mod_dvfs.c index 71c98aec..0e6e184e 100644 --- a/module/dvfs/src/mod_dvfs.c +++ b/module/dvfs/src/mod_dvfs.c @@ -5,22 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include <mod_clock.h> +#include <mod_dvfs.h> +#include <mod_psu.h> +#include <mod_timer.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> -#include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#ifdef BUILD_HAS_MULTITHREADING -#include <fwk_multi_thread.h> -#endif -#include <fwk_notification.h> -#include <mod_clock.h> -#include <mod_dvfs.h> -#include <mod_power_domain.h> -#include <mod_psu.h> -#include <mod_timer.h> +#include <fwk_status.h> +#include <fwk_thread.h> + +#include <stdbool.h> /* * Maximum number of attempts to complete a request diff --git a/module/dw_apb_i2c/include/mod_dw_apb_i2c.h b/module/dw_apb_i2c/include/mod_dw_apb_i2c.h index da380e63..3e662379 100644 --- a/module/dw_apb_i2c/include/mod_dw_apb_i2c.h +++ b/module/dw_apb_i2c/include/mod_dw_apb_i2c.h @@ -11,10 +11,11 @@ #ifndef MOD_DW_APB_I2C_H #define MOD_DW_APB_I2C_H -#include <stdint.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/dw_apb_i2c/src/dw_apb_i2c.h b/module/dw_apb_i2c/src/dw_apb_i2c.h index 18d44f58..214c0f63 100644 --- a/module/dw_apb_i2c/src/dw_apb_i2c.h +++ b/module/dw_apb_i2c/src/dw_apb_i2c.h @@ -11,9 +11,10 @@ #ifndef DW_APB_I2C_H #define DW_APB_I2C_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + #define I2C_TRANSMIT_BUFFER_LENGTH 16 #define I2C_RECEIVE_BUFFER_LENGTH 16 #define I2C_TIMEOUT_US 250 diff --git a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c index f7345ade..28f2c1f3 100644 --- a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c +++ b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c @@ -4,16 +4,20 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include <dw_apb_i2c.h> + +#include <mod_dw_apb_i2c.h> +#include <mod_i2c.h> +#include <mod_timer.h> + #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_status.h> -#include <mod_dw_apb_i2c.h> -#include <mod_i2c.h> -#include <mod_timer.h> -#include <dw_apb_i2c.h> + +#include <stdbool.h> +#include <stddef.h> struct dw_apb_i2c_ctx { const struct mod_dw_apb_i2c_dev_config *config; diff --git a/module/gtimer/include/mod_gtimer.h b/module/gtimer/include/mod_gtimer.h index adbd8c56..f592f67e 100644 --- a/module/gtimer/include/mod_gtimer.h +++ b/module/gtimer/include/mod_gtimer.h @@ -11,9 +11,10 @@ #ifndef MOD_GTIMER_H #define MOD_GTIMER_H -#include <stdint.h> #include <fwk_id.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/gtimer/src/gtimer_reg.h b/module/gtimer/src/gtimer_reg.h index e602c386..4cecdcb9 100644 --- a/module/gtimer/src/gtimer_reg.h +++ b/module/gtimer/src/gtimer_reg.h @@ -8,9 +8,10 @@ #ifndef GTIMER_REG_H #define GTIMER_REG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Counter registers (CNTCONTROL) */ diff --git a/module/gtimer/src/mod_gtimer.c b/module/gtimer/src/mod_gtimer.c index d281c679..6fe50019 100644 --- a/module/gtimer/src/mod_gtimer.c +++ b/module/gtimer/src/mod_gtimer.c @@ -5,19 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include <gtimer_reg.h> + +#include <mod_clock.h> +#include <mod_gtimer.h> +#include <mod_timer.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <gtimer_reg.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_power_domain.h> -#include <mod_timer.h> + +#include <stddef.h> +#include <stdint.h> #define GTIMER_FREQUENCY_MIN_HZ UINT32_C(1) #define GTIMER_FREQUENCY_MAX_HZ UINT32_C(1000000000) diff --git a/module/host_console/src/mod_host_console.c b/module/host_console/src/mod_host_console.c index 4d7551fc..b303f826 100644 --- a/module/host_console/src/mod_host_console.c +++ b/module/host_console/src/mod_host_console.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdio.h> +#include <mod_log.h> + #include <fwk_module.h> #include <fwk_status.h> -#include <mod_log.h> + +#include <stdint.h> +#include <stdio.h> /* * Module driver API diff --git a/module/i2c/include/mod_i2c.h b/module/i2c/include/mod_i2c.h index 6451b9f6..273c456f 100644 --- a/module/i2c/include/mod_i2c.h +++ b/module/i2c/include/mod_i2c.h @@ -11,14 +11,15 @@ #ifndef MOD_I2C_H #define MOD_I2C_H -#include <stdbool.h> -#include <stdint.h> #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_event.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/i2c/src/mod_i2c.c b/module/i2c/src/mod_i2c.c index 2155debe..0b552d68 100644 --- a/module/i2c/src/mod_i2c.c +++ b/module/i2c/src/mod_i2c.c @@ -4,16 +4,19 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <string.h> +#include <mod_i2c.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_i2c.h> + +#include <stdbool.h> +#include <string.h> enum mod_i2c_dev_state { MOD_I2C_DEV_IDLE, diff --git a/module/log/src/mod_log.c b/module/log/src/mod_log.c index 55e544ef..707e8650 100644 --- a/module/log/src/mod_log.c +++ b/module/log/src/mod_log.c @@ -5,9 +5,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdint.h> +#include <mod_log.h> + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_macros.h> @@ -15,7 +14,10 @@ #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_log.h> + +#include <stdarg.h> +#include <stdbool.h> +#include <stdint.h> static const struct mod_log_config *log_config; static struct mod_log_driver_api *log_driver; diff --git a/module/mhu/include/internal/mhu.h b/module/mhu/include/internal/mhu.h index 0b29c124..07ae9702 100644 --- a/module/mhu/include/internal/mhu.h +++ b/module/mhu/include/internal/mhu.h @@ -8,10 +8,12 @@ #ifndef INTERNAL_MHU_H #define INTERNAL_MHU_H -#include <stdint.h> -#include <fwk_macros.h> #include <mod_mhu.h> +#include <fwk_macros.h> + +#include <stdint.h> + /*! * \brief MHU Register Definitions */ diff --git a/module/mhu/include/mod_mhu.h b/module/mhu/include/mod_mhu.h index b2db7588..d433ad6b 100644 --- a/module/mhu/include/mod_mhu.h +++ b/module/mhu/include/mod_mhu.h @@ -11,9 +11,10 @@ #ifndef MOD_MHU_H #define MOD_MHU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/mhu/src/mod_mhu.c b/module/mhu/src/mod_mhu.c index caf49f30..d232d93e 100644 --- a/module/mhu/src/mod_mhu.c +++ b/module/mhu/src/mod_mhu.c @@ -8,16 +8,20 @@ * Message Handling Unit (MHU) Device Driver. */ -#include <stddef.h> -#include <stdint.h> +#include <internal/mhu.h> + +#include <mod_mhu.h> +#include <mod_smt.h> + #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <internal/mhu.h> -#include <mod_smt.h> + +#include <stddef.h> +#include <stdint.h> /* * Maximum number of slots per MHU device. The maximum number of slots is 31 and diff --git a/module/mhu2/include/mod_mhu2.h b/module/mhu2/include/mod_mhu2.h index 120567ac..718b1174 100644 --- a/module/mhu2/include/mod_mhu2.h +++ b/module/mhu2/include/mod_mhu2.h @@ -11,9 +11,10 @@ #ifndef MOD_MHU2_H #define MOD_MHU2_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/mhu2/src/mhu2.h b/module/mhu2/src/mhu2.h index 52f496dc..a7f3cf19 100644 --- a/module/mhu2/src/mhu2.h +++ b/module/mhu2/src/mhu2.h @@ -8,9 +8,10 @@ #ifndef MHU2_H #define MHU2_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + #define CHANNEL_MAX 124 struct mhu2_id_reg { diff --git a/module/mhu2/src/mod_mhu2.c b/module/mhu2/src/mod_mhu2.c index 67a6c7eb..49c804f2 100644 --- a/module/mhu2/src/mod_mhu2.c +++ b/module/mhu2/src/mod_mhu2.c @@ -8,8 +8,11 @@ * Message Handling Unit (MHU) v2 Device Driver. */ -#include <stddef.h> -#include <stdint.h> +#include <mhu2.h> + +#include <mod_mhu2.h> +#include <mod_smt.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_interrupt.h> @@ -17,9 +20,10 @@ #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_mhu2.h> -#include <mhu2.h> -#include <mod_smt.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define MHU_SLOT_COUNT_MAX 32 diff --git a/module/mock_psu/include/mod_mock_psu.h b/module/mock_psu/include/mod_mock_psu.h index 7a90a51f..e1f3e167 100644 --- a/module/mock_psu/include/mod_mock_psu.h +++ b/module/mock_psu/include/mod_mock_psu.h @@ -8,7 +8,9 @@ #ifndef MOD_MOCK_PSU_H #define MOD_MOCK_PSU_H +#include <fwk_id.h> #include <fwk_module_idx.h> + #include <stdbool.h> #include <stdint.h> diff --git a/module/mock_psu/src/mod_mock_psu.c b/module/mock_psu/src/mod_mock_psu.c index 7d9294c1..52a89f4d 100644 --- a/module/mock_psu/src/mod_mock_psu.c +++ b/module/mock_psu/src/mod_mock_psu.c @@ -8,12 +8,14 @@ #include <mod_mock_psu.h> #include <mod_psu.h> #include <mod_timer.h> + #include <fwk_assert.h> #include <fwk_id.h> -#include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> +#include <fwk_status.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> diff --git a/module/mock_sensor/include/mod_mock_sensor.h b/module/mock_sensor/include/mod_mock_sensor.h index 8b79194c..59d649ee 100644 --- a/module/mock_sensor/include/mod_mock_sensor.h +++ b/module/mock_sensor/include/mod_mock_sensor.h @@ -8,9 +8,10 @@ #ifndef MOD_MOCK_SENSOR_H #define MOD_MOCK_SENSOR_H -#include <stdint.h> #include <mod_sensor.h> +#include <stdint.h> + /*! * \ingroup GroupModules * \defgroup GroupMockSensor Mock Sensor Driver diff --git a/module/mock_sensor/src/mod_mock_sensor.c b/module/mock_sensor/src/mod_mock_sensor.c index 5a71056e..d820bf93 100644 --- a/module/mock_sensor/src/mod_mock_sensor.c +++ b/module/mock_sensor/src/mod_mock_sensor.c @@ -5,14 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include <mod_mock_sensor.h> +#include <mod_sensor.h> +#include <mod_timer.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_status.h> -#include <mod_mock_sensor.h> -#include <mod_sensor.h> -#include <mod_timer.h> + +#include <stdint.h> #define MOCK_SENSOR_ALARM_DELAY_MS 10 diff --git a/module/msys_rom/src/mod_msys_rom.c b/module/msys_rom/src/mod_msys_rom.c index 001bb4c2..d2a7a4ce 100644 --- a/module/msys_rom/src/mod_msys_rom.c +++ b/module/msys_rom/src/mod_msys_rom.c @@ -16,8 +16,10 @@ #include <mod_ppu_v1.h> #include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <fwk_noreturn.h> +#include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> #include <fwk_thread.h> diff --git a/module/pcid/include/mod_pcid.h b/module/pcid/include/mod_pcid.h index f1edba61..dd74a086 100644 --- a/module/pcid/include/mod_pcid.h +++ b/module/pcid/include/mod_pcid.h @@ -8,9 +8,10 @@ #ifndef MOD_PCID_H #define MOD_PCID_H +#include <fwk_macros.h> + #include <stdbool.h> #include <stdint.h> -#include <fwk_macros.h> /*! * \addtogroup GroupModules Modules diff --git a/module/pcid/src/mod_pcid.c b/module/pcid/src/mod_pcid.c index 4bb06564..e776b063 100644 --- a/module/pcid/src/mod_pcid.c +++ b/module/pcid/src/mod_pcid.c @@ -5,11 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <string.h> +#include <mod_pcid.h> + #include <fwk_assert.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_pcid.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <string.h> bool mod_pcid_check_registers(const struct mod_pcid_registers *registers, const struct mod_pcid_registers *expected) diff --git a/module/pik_clock/include/mod_pik_clock.h b/module/pik_clock/include/mod_pik_clock.h index 6edf6915..7bd92867 100644 --- a/module/pik_clock/include/mod_pik_clock.h +++ b/module/pik_clock/include/mod_pik_clock.h @@ -8,9 +8,11 @@ #ifndef MOD_PIK_CLOCK_H #define MOD_PIK_CLOCK_H -#include <stdint.h> #include <fwk_element.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/pik_clock/src/mod_pik_clock.c b/module/pik_clock/src/mod_pik_clock.c index 0211e87e..99ffb44c 100644 --- a/module/pik_clock/src/mod_pik_clock.c +++ b/module/pik_clock/src/mod_pik_clock.c @@ -5,18 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdlib.h> +#include <mod_clock.h> +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_power_domain.h> + #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_css_clock.h> -#include <mod_pik_clock.h> -#include <mod_power_domain.h> + +#include <stdint.h> +#include <stdlib.h> /* * Masks for single-source clock divider control. diff --git a/module/pl011/include/mod_pl011.h b/module/pl011/include/mod_pl011.h index 0bad3267..d92c3ac6 100644 --- a/module/pl011/include/mod_pl011.h +++ b/module/pl011/include/mod_pl011.h @@ -9,9 +9,10 @@ #ifndef MOD_PL011_H #define MOD_PL011_H -#include <stdint.h> #include <fwk_id.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/pl011/src/debug_uart.c b/module/pl011/src/debug_uart.c index 9e9f0805..4af08dc2 100644 --- a/module/pl011/src/debug_uart.c +++ b/module/pl011/src/debug_uart.c @@ -5,13 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <dbg_system_map.h> +#include <pl011.h> + +#include <mod_pl011.h> + #include <fwk_assert.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <mod_pl011.h> -#include <pl011.h> -#include <dbg_system_map.h> static const struct mod_pl011_device_config config = { .reg_base = DEBUG_UART_BASE, diff --git a/module/pl011/src/mod_pl011.c b/module/pl011/src/mod_pl011.c index b12e6234..72e20f09 100644 --- a/module/pl011/src/mod_pl011.c +++ b/module/pl011/src/mod_pl011.c @@ -5,19 +5,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_assert.h> -#include <fwk_mm.h> -#include <fwk_module.h> -#include <fwk_notification.h> -#include <fwk_status.h> +#include <pl011.h> + #include <mod_clock.h> #include <mod_log.h> #include <mod_pl011.h> #include <mod_power_domain.h> + #if BUILD_HAS_MOD_POWER_DOMAIN -#include <mod_system_power.h> +# include <mod_system_power.h> #endif -#include <pl011.h> + +#include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_mm.h> +#include <fwk_module.h> +#include <fwk_notification.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> struct pl011_device_ctx { /* Pointer to configuration data */ diff --git a/module/pl011/src/pl011.h b/module/pl011/src/pl011.h index 7097ce87..c5146258 100644 --- a/module/pl011/src/pl011.h +++ b/module/pl011/src/pl011.h @@ -13,6 +13,8 @@ #include <fwk_macros.h> +#include <stdint.h> + struct pl011_reg { FWK_RW uint16_t DR; uint16_t RESERVED0; diff --git a/module/power_domain/include/mod_power_domain.h b/module/power_domain/include/mod_power_domain.h index 0662b7db..bf2e1f57 100644 --- a/module/power_domain/include/mod_power_domain.h +++ b/module/power_domain/include/mod_power_domain.h @@ -11,13 +11,15 @@ #ifndef MOD_POWER_DOMAIN_H #define MOD_POWER_DOMAIN_H -#include <limits.h> -#include <stdbool.h> -#include <stdint.h> #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <limits.h> +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/power_domain/src/mod_power_domain.c b/module/power_domain/src/mod_power_domain.c index 49c253ee..6a3c7aeb 100644 --- a/module/power_domain/src/mod_power_domain.c +++ b/module/power_domain/src/mod_power_domain.c @@ -8,12 +8,11 @@ * Power domain management support. */ -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> -#include <string.h> +#include <mod_log.h> +#include <mod_power_domain.h> + #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> @@ -23,8 +22,10 @@ #include <fwk_notification.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_log.h> -#include <mod_power_domain.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> /* * Module and power domain contexts diff --git a/module/ppu_v0/include/mod_ppu_v0.h b/module/ppu_v0/include/mod_ppu_v0.h index 627f9b16..85bc6045 100644 --- a/module/ppu_v0/include/mod_ppu_v0.h +++ b/module/ppu_v0/include/mod_ppu_v0.h @@ -11,9 +11,10 @@ #ifndef MOD_PPU_V0_H #define MOD_PPU_V0_H +#include <mod_power_domain.h> + #include <stdbool.h> #include <stdint.h> -#include <mod_power_domain.h> /*! * \addtogroup GroupModules Modules diff --git a/module/ppu_v0/src/mod_ppu_v0.c b/module/ppu_v0/src/mod_ppu_v0.c index a3d4263b..376a03b1 100644 --- a/module/ppu_v0/src/mod_ppu_v0.c +++ b/module/ppu_v0/src/mod_ppu_v0.c @@ -8,21 +8,27 @@ * Power State Management PPU v0 driver. */ -#include <stdint.h> -#include <fwk_id.h> -#include <fwk_assert.h> -#include <fwk_macros.h> -#include <fwk_mm.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include <ppu_v0.h> + #include <mod_log.h> #include <mod_power_domain.h> #include <mod_ppu_v0.h> -#include <ppu_v0.h> + #if BUILD_HAS_MOD_SYSTEM_POWER -#include <mod_system_power.h> +# include <mod_system_power.h> #endif +#include <fwk_assert.h> +#include <fwk_id.h> +#include <fwk_macros.h> +#include <fwk_mm.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> + +#include <stddef.h> +#include <stdint.h> + /* Power domain context */ struct ppu_v0_pd_ctx { /* Power domain configuration data */ diff --git a/module/ppu_v0/src/ppu_v0.c b/module/ppu_v0/src/ppu_v0.c index e3c297dc..50dbf8c8 100644 --- a/module/ppu_v0/src/ppu_v0.c +++ b/module/ppu_v0/src/ppu_v0.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <ppu_v0.h> + #include <fwk_assert.h> #include <fwk_status.h> +#include <stddef.h> + void ppu_v0_init(struct ppu_v0_reg *ppu) { assert(ppu != NULL); diff --git a/module/ppu_v0/src/ppu_v0.h b/module/ppu_v0/src/ppu_v0.h index d779808d..d69e2940 100644 --- a/module/ppu_v0/src/ppu_v0.h +++ b/module/ppu_v0/src/ppu_v0.h @@ -13,9 +13,10 @@ * @{ */ +#include <fwk_macros.h> + #include <stdbool.h> #include <stdint.h> -#include <fwk_macros.h> struct ppu_v0_reg { FWK_RW uint32_t POWER_POLICY; diff --git a/module/ppu_v1/include/mod_ppu_v1.h b/module/ppu_v1/include/mod_ppu_v1.h index 604bcebb..4531572e 100644 --- a/module/ppu_v1/include/mod_ppu_v1.h +++ b/module/ppu_v1/include/mod_ppu_v1.h @@ -11,12 +11,13 @@ #ifndef MOD_PPU_V1_H #define MOD_PPU_V1_H +#include <mod_power_domain.h> + +#include <fwk_id.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <fwk_id.h> -#include <mod_power_domain.h> - /*! * \addtogroup GroupModules Modules diff --git a/module/ppu_v1/src/mod_ppu_v1.c b/module/ppu_v1/src/mod_ppu_v1.c index fb39ff71..89656ef8 100644 --- a/module/ppu_v1/src/mod_ppu_v1.c +++ b/module/ppu_v1/src/mod_ppu_v1.c @@ -8,8 +8,18 @@ * Power State Management PPU v1 driver. */ -#include <stdbool.h> +#include <ppu_v1.h> + +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + +#if BUILD_HAS_MOD_SYSTEM_POWER +# include <mod_system_power.h> +#endif + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_macros.h> @@ -17,13 +27,10 @@ #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <ppu_v1.h> -#if BUILD_HAS_MOD_SYSTEM_POWER -#include <mod_system_power.h> -#endif +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> #define CORE_PER_CLUSTER_COUNT_MAX 8 diff --git a/module/ppu_v1/src/ppu_v1.c b/module/ppu_v1/src/ppu_v1.c index 131a94ce..308a4c9a 100644 --- a/module/ppu_v1/src/ppu_v1.c +++ b/module/ppu_v1/src/ppu_v1.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <ppu_v1.h> + #include <fwk_assert.h> #include <fwk_status.h> +#include <stddef.h> + void ppu_v1_init(struct ppu_v1_reg *ppu) { assert(ppu != NULL); diff --git a/module/ppu_v1/src/ppu_v1.h b/module/ppu_v1/src/ppu_v1.h index 202de955..41a91c84 100644 --- a/module/ppu_v1/src/ppu_v1.h +++ b/module/ppu_v1/src/ppu_v1.h @@ -13,9 +13,10 @@ * @{ */ +#include <fwk_macros.h> + #include <stdbool.h> #include <stdint.h> -#include <fwk_macros.h> /* * PPU 1.1 register definitions diff --git a/module/psu/include/mod_psu.h b/module/psu/include/mod_psu.h index 2408e162..ad2a645f 100644 --- a/module/psu/include/mod_psu.h +++ b/module/psu/include/mod_psu.h @@ -11,6 +11,7 @@ #include <fwk_id.h> #include <fwk_module_idx.h> #include <fwk_status.h> + #include <stdbool.h> #include <stdint.h> diff --git a/module/psu/src/mod_psu.c b/module/psu/src/mod_psu.c index 6f8d4538..be521201 100644 --- a/module/psu/src/mod_psu.c +++ b/module/psu/src/mod_psu.c @@ -6,12 +6,16 @@ */ #include <mod_psu.h> + #include <fwk_assert.h> #include <fwk_event.h> -#include <fwk_macros.h> +#include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> #include <fwk_thread.h> + #include <string.h> enum mod_psu_state { diff --git a/module/reg_sensor/include/mod_reg_sensor.h b/module/reg_sensor/include/mod_reg_sensor.h index fe7442b9..26f83076 100644 --- a/module/reg_sensor/include/mod_reg_sensor.h +++ b/module/reg_sensor/include/mod_reg_sensor.h @@ -8,9 +8,10 @@ #ifndef MOD_REG_SENSOR_H #define MOD_REG_SENSOR_H -#include <stdint.h> #include <mod_sensor.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/reg_sensor/src/mod_reg_sensor.c b/module/reg_sensor/src/mod_reg_sensor.c index 3f95be41..5b37fe1f 100644 --- a/module/reg_sensor/src/mod_reg_sensor.c +++ b/module/reg_sensor/src/mod_reg_sensor.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include <mod_reg_sensor.h> +#include <mod_sensor.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_status.h> -#include <mod_reg_sensor.h> -#include <mod_sensor.h> + +#include <stddef.h> +#include <stdint.h> static struct mod_reg_sensor_dev_config **config_table; diff --git a/module/scmi/include/internal/mod_scmi.h b/module/scmi/include/internal/mod_scmi.h index b707a302..99e981c6 100644 --- a/module/scmi/include/internal/mod_scmi.h +++ b/module/scmi/include/internal/mod_scmi.h @@ -11,9 +11,12 @@ #ifndef MOD_INTERNAL_SCMI_H #define MOD_INTERNAL_SCMI_H +#include <mod_scmi.h> + +#include <fwk_id.h> + #include <stddef.h> #include <stdint.h> -#include <mod_scmi.h> #define SCMI_VERSION 0x10000 diff --git a/module/scmi/include/internal/scmi_base.h b/module/scmi/include/internal/scmi_base.h index bc8dee66..ae430792 100644 --- a/module/scmi/include/internal/scmi_base.h +++ b/module/scmi/include/internal/scmi_base.h @@ -11,6 +11,8 @@ #ifndef INTERNAL_SCMI_BASE_H #define INTERNAL_SCMI_BASE_H +#include <stdint.h> + #define SCMI_PROTOCOL_ID_BASE UINT32_C(0x10) #define SCMI_PROTOCOL_VERSION_BASE UINT32_C(0x10000) diff --git a/module/scmi/include/mod_scmi.h b/module/scmi/include/mod_scmi.h index 689bc7ee..955a8f93 100644 --- a/module/scmi/include/mod_scmi.h +++ b/module/scmi/include/mod_scmi.h @@ -11,10 +11,14 @@ #ifndef MOD_SCMI_H #define MOD_SCMI_H +#include <internal/scmi.h> + +#include <fwk_id.h> +#include <fwk_module_idx.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <internal/scmi.h> /*! * \addtogroup GroupModules Modules diff --git a/module/scmi/src/mod_scmi.c b/module/scmi/src/mod_scmi.c index 6b820db2..95e0f3d2 100644 --- a/module/scmi/src/mod_scmi.c +++ b/module/scmi/src/mod_scmi.c @@ -8,26 +8,29 @@ * System Control and Management Interface (SCMI) support. */ -#include <stdbool.h> -#include <stdio.h> -#include <string.h> +#include <internal/mod_scmi.h> +#include <internal/scmi.h> +#include <internal/scmi_base.h> + +#include <mod_log.h> +#include <mod_scmi.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#ifdef BUILD_HAS_MULTITHREADING -#include <fwk_multi_thread.h> -#else -#include <fwk_thread.h> -#endif #include <fwk_notification.h> #include <fwk_status.h> -#include <internal/mod_scmi.h> -#include <internal/scmi.h> -#include <internal/scmi_base.h> -#include <mod_log.h> +#include <fwk_thread.h> + +#ifdef BUILD_HAS_MULTITHREADING +# include <fwk_multi_thread.h> +#endif + +#include <string.h> struct scmi_protocol { /* SCMI protocol message handler */ diff --git a/module/scmi_apcore/include/mod_scmi_apcore.h b/module/scmi_apcore/include/mod_scmi_apcore.h index e2876f05..bd9465fe 100644 --- a/module/scmi_apcore/include/mod_scmi_apcore.h +++ b/module/scmi_apcore/include/mod_scmi_apcore.h @@ -11,8 +11,8 @@ #ifndef MOD_SCMI_APCORE_H #define MOD_SCMI_APCORE_H -#include <stdint.h> #include <stddef.h> +#include <stdint.h> /*! * \ingroup GroupModules Modules diff --git a/module/scmi_apcore/src/mod_scmi_apcore.c b/module/scmi_apcore/src/mod_scmi_apcore.c index 4687b2b1..ea71a450 100644 --- a/module/scmi_apcore/src/mod_scmi_apcore.c +++ b/module/scmi_apcore/src/mod_scmi_apcore.c @@ -8,17 +8,21 @@ * SCMI Core Configuration Protocol Support. */ -#include <stdint.h> +#include <internal/scmi.h> +#include <internal/scmi_apcore.h> + +#include <mod_scmi.h> +#include <mod_scmi_apcore.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <internal/scmi.h> -#include <internal/scmi_apcore.h> -#include <mod_scmi.h> -#include <mod_scmi_apcore.h> + +#include <stdbool.h> +#include <stdint.h> struct scmi_apcore_ctx { /* Module Configuration */ diff --git a/module/scmi_clock/include/mod_scmi_clock.h b/module/scmi_clock/include/mod_scmi_clock.h index cbabf8f6..75941387 100644 --- a/module/scmi_clock/include/mod_scmi_clock.h +++ b/module/scmi_clock/include/mod_scmi_clock.h @@ -11,6 +11,9 @@ #ifndef MOD_SCMI_CLOCK_H #define MOD_SCMI_CLOCK_H +#include <fwk_id.h> + +#include <stddef.h> #include <stdint.h> /*! diff --git a/module/scmi_clock/src/mod_scmi_clock.c b/module/scmi_clock/src/mod_scmi_clock.c index a611dcc2..e532506e 100644 --- a/module/scmi_clock/src/mod_scmi_clock.c +++ b/module/scmi_clock/src/mod_scmi_clock.c @@ -8,8 +8,15 @@ * SCMI Clock Management Protocol Support. */ -#include <string.h> +#include <internal/scmi.h> +#include <internal/scmi_clock.h> + +#include <mod_clock.h> +#include <mod_scmi.h> +#include <mod_scmi_clock.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> @@ -17,10 +24,9 @@ #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <internal/scmi.h> -#include <internal/scmi_clock.h> -#include <mod_scmi.h> -#include <mod_scmi_clock.h> + +#include <stdbool.h> +#include <string.h> struct clock_operations { /* diff --git a/module/scmi_perf/include/internal/scmi_perf.h b/module/scmi_perf/include/internal/scmi_perf.h index 45624de3..50df7f3e 100644 --- a/module/scmi_perf/include/internal/scmi_perf.h +++ b/module/scmi_perf/include/internal/scmi_perf.h @@ -11,6 +11,8 @@ #ifndef INTERNAL_SCMI_PERF_H #define INTERNAL_SCMI_PERF_H +#include <stdint.h> + #define SCMI_PROTOCOL_ID_PERF UINT32_C(0x13) #define SCMI_PROTOCOL_VERSION_PERF UINT32_C(0x10000) diff --git a/module/scmi_perf/include/mod_scmi_perf.h b/module/scmi_perf/include/mod_scmi_perf.h index c971c36f..23f65357 100644 --- a/module/scmi_perf/include/mod_scmi_perf.h +++ b/module/scmi_perf/include/mod_scmi_perf.h @@ -12,6 +12,7 @@ #define MOD_SCMI_PERF_H #include <stddef.h> +#include <stdint.h> /*! * \addtogroup GroupModules Modules diff --git a/module/scmi_perf/src/mod_scmi_perf.c b/module/scmi_perf/src/mod_scmi_perf.c index b52ef71e..67d7510d 100644 --- a/module/scmi_perf/src/mod_scmi_perf.c +++ b/module/scmi_perf/src/mod_scmi_perf.c @@ -8,21 +8,26 @@ * SCMI performance domain management protocol support. */ -#include <string.h> +#include <internal/scmi.h> +#include <internal/scmi_perf.h> + +#include <mod_dvfs.h> +#include <mod_scmi.h> +#include <mod_scmi_perf.h> + #include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#ifdef BUILD_HAS_MULTITHREADING -#include <fwk_multi_thread.h> -#endif #include <fwk_status.h> -#include <internal/scmi.h> -#include <internal/scmi_perf.h> -#include <mod_dvfs.h> -#include <mod_scmi.h> -#include <mod_scmi_perf.h> +#include <fwk_thread.h> + +#include <stdbool.h> +#include <stddef.h> +#include <string.h> static int scmi_perf_protocol_version_handler( fwk_id_t service_id, const uint32_t *payload); diff --git a/module/scmi_power_domain/include/internal/scmi_power_domain.h b/module/scmi_power_domain/include/internal/scmi_power_domain.h index a0c30796..a2a5126e 100644 --- a/module/scmi_power_domain/include/internal/scmi_power_domain.h +++ b/module/scmi_power_domain/include/internal/scmi_power_domain.h @@ -11,6 +11,8 @@ #ifndef INTERNAL_SCMI_POWER_H #define INTERNAL_SCMI_POWER_H +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/scmi_power_domain/include/mod_scmi_power_domain.h b/module/scmi_power_domain/include/mod_scmi_power_domain.h index a89af1e0..4d4dd165 100644 --- a/module/scmi_power_domain/include/mod_scmi_power_domain.h +++ b/module/scmi_power_domain/include/mod_scmi_power_domain.h @@ -10,7 +10,7 @@ #define MOD_SCMI_POWER_DOMAIN_H #if BUILD_HAS_MOD_DEBUG -#include <fwk_id.h> +# include <fwk_id.h> /*! * \ingroup GroupModules Modules diff --git a/module/scmi_power_domain/src/mod_scmi_power_domain.c b/module/scmi_power_domain/src/mod_scmi_power_domain.c index 2ea4d87b..c4d4ac51 100644 --- a/module/scmi_power_domain/src/mod_scmi_power_domain.c +++ b/module/scmi_power_domain/src/mod_scmi_power_domain.c @@ -8,7 +8,18 @@ * SCMI power domain management protocol support. */ -#include <string.h> +#include <internal/scmi.h> +#include <internal/scmi_power_domain.h> + +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_scmi.h> +#include <mod_scmi_power_domain.h> + +#ifdef BUILD_HAS_MOD_DEBUG +# include <mod_debug.h> +#endif + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_id.h> @@ -17,17 +28,11 @@ #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <internal/scmi.h> -#include <internal/scmi_power_domain.h> -#include <config_power_domain.h> -#if BUILD_HAS_MOD_DEBUG -#include <mod_debug.h> #include <fwk_thread.h> -#endif -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_scmi.h> -#include <mod_scmi_power_domain.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> struct scmi_pd_operations { /* diff --git a/module/scmi_sensor/include/internal/scmi_sensor.h b/module/scmi_sensor/include/internal/scmi_sensor.h index fe33f487..e707b713 100644 --- a/module/scmi_sensor/include/internal/scmi_sensor.h +++ b/module/scmi_sensor/include/internal/scmi_sensor.h @@ -11,6 +11,8 @@ #ifndef INTERNAL_SCMI_SENSOR_H #define INTERNAL_SCMI_SENSOR_H +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/scmi_sensor/src/mod_scmi_sensor.c b/module/scmi_sensor/src/mod_scmi_sensor.c index b5559b83..85132c06 100644 --- a/module/scmi_sensor/src/mod_scmi_sensor.c +++ b/module/scmi_sensor/src/mod_scmi_sensor.c @@ -8,9 +8,14 @@ * SCMI sensor management protocol support. */ -#include <string.h> +#include <internal/scmi.h> +#include <internal/scmi_sensor.h> + +#include <mod_scmi.h> +#include <mod_sensor.h> + #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> @@ -18,10 +23,10 @@ #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <internal/scmi.h> -#include <internal/scmi_sensor.h> -#include <mod_scmi.h> -#include <mod_sensor.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> struct sensor_operations { /* diff --git a/module/scmi_system_power/include/internal/scmi_system_power.h b/module/scmi_system_power/include/internal/scmi_system_power.h index debd2286..41bbac38 100644 --- a/module/scmi_system_power/include/internal/scmi_system_power.h +++ b/module/scmi_system_power/include/internal/scmi_system_power.h @@ -8,6 +8,8 @@ #ifndef INTERNAL_SCMI_SYSTEM_POWER_H #define INTERNAL_SCMI_SYSTEM_POWER_H +#include <stdint.h> + #define SCMI_PROTOCOL_ID_SYS_POWER UINT32_C(0x12) #define SCMI_PROTOCOL_VERSION_SYS_POWER UINT32_C(0x10000) diff --git a/module/scmi_system_power/include/mod_scmi_system_power.h b/module/scmi_system_power/include/mod_scmi_system_power.h index af82b6d0..7f6f9bf7 100644 --- a/module/scmi_system_power/include/mod_scmi_system_power.h +++ b/module/scmi_system_power/include/mod_scmi_system_power.h @@ -8,6 +8,10 @@ #ifndef MOD_SCMI_SYSTEM_POWER_H #define MOD_SCMI_SYSTEM_POWER_H +#include <fwk_id.h> + +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/scmi_system_power/src/mod_scmi_system_power.c b/module/scmi_system_power/src/mod_scmi_system_power.c index 3df679ec..0ee2c1b5 100644 --- a/module/scmi_system_power/src/mod_scmi_system_power.c +++ b/module/scmi_system_power/src/mod_scmi_system_power.c @@ -5,18 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <internal/scmi.h> +#include <internal/scmi_system_power.h> + +#include <mod_power_domain.h> +#include <mod_scmi.h> +#include <mod_scmi_system_power.h> + #include <fwk_assert.h> -#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <internal/scmi.h> -#include <internal/scmi_system_power.h> -#include <mod_power_domain.h> -#include <mod_scmi.h> -#include <mod_scmi_system_power.h> + +#include <stddef.h> struct scmi_sys_power_ctx { const struct mod_scmi_system_power_config *config; diff --git a/module/sds/include/mod_sds.h b/module/sds/include/mod_sds.h index 8b0c2201..d19d39df 100644 --- a/module/sds/include/mod_sds.h +++ b/module/sds/include/mod_sds.h @@ -8,12 +8,13 @@ #ifndef MOD_SDS_H #define MOD_SDS_H +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module_idx.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <fwk_element.h> -#include <fwk_module_idx.h> -#include <fwk_id.h> /*! * \addtogroup GroupModules Modules diff --git a/module/sds/src/mod_sds.c b/module/sds/src/mod_sds.c index 7d189474..090fabfa 100644 --- a/module/sds/src/mod_sds.c +++ b/module/sds/src/mod_sds.c @@ -5,22 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> -#include <string.h> +#include <mod_sds.h> + +#if BUILD_HAS_MOD_CLOCK +# include <mod_clock.h> +#endif + #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_sds.h> -#if BUILD_HAS_MOD_CLOCK -#include <mod_clock.h> -#endif +#include <stdbool.h> +#include <stdint.h> /* Arbitrary, 16 bit value that indicates a valid SDS Memory Region */ #define REGION_SIGNATURE 0xAA7A diff --git a/module/sensor/include/mod_sensor.h b/module/sensor/include/mod_sensor.h index 29dd0683..5e39d7c9 100644 --- a/module/sensor/include/mod_sensor.h +++ b/module/sensor/include/mod_sensor.h @@ -8,11 +8,12 @@ #ifndef MOD_SENSOR_H #define MOD_SENSOR_H -#include <stdbool.h> -#include <stdint.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ @@ -313,7 +314,7 @@ struct mod_sensor_event_params { */ #define MOD_SENSOR_EVENT_IDX_READ_REQUEST 0 - /*! +/*! * \brief Read request event identifier. * * \details Clients which expect to receive a response event from this module diff --git a/module/sensor/src/mod_sensor.c b/module/sensor/src/mod_sensor.c index e11dae56..73563a43 100644 --- a/module/sensor/src/mod_sensor.c +++ b/module/sensor/src/mod_sensor.c @@ -5,15 +5,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include <sensor.h> + +#include <mod_sensor.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <sensor.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> static struct sensor_dev_ctx *ctx_table; diff --git a/module/sensor/src/sensor.h b/module/sensor/src/sensor.h index 7791dc18..1bd31217 100644 --- a/module/sensor/src/sensor.h +++ b/module/sensor/src/sensor.h @@ -8,10 +8,12 @@ #ifndef SENSOR_H #define SENSOR_H -#include <stdint.h> -#include <fwk_id.h> #include <mod_sensor.h> +#include <fwk_id.h> + +#include <stdint.h> + /*! * \cond * @{ diff --git a/module/sid/include/mod_sid.h b/module/sid/include/mod_sid.h index 1484b16c..f17824a1 100644 --- a/module/sid/include/mod_sid.h +++ b/module/sid/include/mod_sid.h @@ -8,10 +8,13 @@ #ifndef MOD_SID_H #define MOD_SID_H -#include <stdint.h> +#include <mod_pcid.h> + #include <fwk_id.h> #include <fwk_module_idx.h> -#include <mod_pcid.h> + +#include <stdbool.h> +#include <stdint.h> /*! * \addtogroup GroupModules Modules diff --git a/module/sid/src/mod_sid.c b/module/sid/src/mod_sid.c index 2a2caeda..0407d7e8 100644 --- a/module/sid/src/mod_sid.c +++ b/module/sid/src/mod_sid.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <sid_reg.h> + +#include <mod_pcid.h> +#include <mod_sid.h> +#include <mod_system_info.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <fwk_mm.h> -#include <mod_pcid.h> -#include <mod_sid.h> -#include <mod_system_info.h> -#include <sid_reg.h> +#include <fwk_status.h> + +#include <stddef.h> static bool initialized; static struct mod_sid_info info; diff --git a/module/sid/src/sid_reg.h b/module/sid/src/sid_reg.h index bfeb97a9..ba70054d 100644 --- a/module/sid/src/sid_reg.h +++ b/module/sid/src/sid_reg.h @@ -8,10 +8,12 @@ #ifndef SID_REG_H #define SID_REG_H -#include <stdint.h> -#include <fwk_macros.h> #include <mod_pcid.h> +#include <fwk_macros.h> + +#include <stdint.h> + struct sid_reg { uint8_t RESERVED0[0x40 - 0]; FWK_R uint32_t SYSTEM_ID; diff --git a/module/smt/include/internal/smt.h b/module/smt/include/internal/smt.h index 08e9f8d0..ed3cab19 100644 --- a/module/smt/include/internal/smt.h +++ b/module/smt/include/internal/smt.h @@ -8,6 +8,8 @@ #ifndef INTERNAL_SMT_H #define INTERNAL_SMT_H +#include <stdint.h> + struct __attribute((packed)) mod_smt_memory { uint32_t reserved0; uint32_t status; diff --git a/module/smt/include/mod_smt.h b/module/smt/include/mod_smt.h index 992f8447..4ecc0237 100644 --- a/module/smt/include/mod_smt.h +++ b/module/smt/include/mod_smt.h @@ -8,9 +8,11 @@ #ifndef MOD_SMT_H #define MOD_SMT_H +#include <fwk_id.h> +#include <fwk_module_idx.h> + #include <stddef.h> #include <stdint.h> -#include <fwk_id.h> /*! * \name Channel policies diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c index c2515b20..8769a05b 100644 --- a/module/smt/src/mod_smt.c +++ b/module/smt/src/mod_smt.c @@ -5,20 +5,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <string.h> +#include <internal/scmi.h> +#include <internal/smt.h> + +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_scmi.h> -#include <mod_smt.h> -#include <internal/smt.h> + +#include <stdbool.h> +#include <string.h> struct smt_channel_ctx { /* Channel identifier */ diff --git a/module/ssc/include/mod_ssc.h b/module/ssc/include/mod_ssc.h index 365c1687..de4188bb 100644 --- a/module/ssc/include/mod_ssc.h +++ b/module/ssc/include/mod_ssc.h @@ -8,6 +8,8 @@ #ifndef MOD_SSC_H #define MOD_SSC_H +#include <stdint.h> + /*! * \brief Module configuration. */ diff --git a/module/ssc/src/mod_ssc.c b/module/ssc/src/mod_ssc.c index 8e819c07..e059b347 100644 --- a/module/ssc/src/mod_ssc.c +++ b/module/ssc/src/mod_ssc.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_assert.h> +#include <ssc_reg.h> + +#include <mod_ssc.h> +#include <mod_system_info.h> + #include <fwk_id.h> #include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_mm.h> -#include <mod_system_info.h> -#include <mod_ssc.h> -#include <ssc_reg.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> static bool initialized; static int chip_id, multi_chip_mode, part_number, revision_number; diff --git a/module/ssc/src/ssc_reg.h b/module/ssc/src/ssc_reg.h index 6c36b833..e7f4619b 100644 --- a/module/ssc/src/ssc_reg.h +++ b/module/ssc/src/ssc_reg.h @@ -8,9 +8,10 @@ #ifndef SSC_REG_H #define SSC_REG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief System Security Control (SSC) register definitions */ diff --git a/module/system_info/include/mod_system_info.h b/module/system_info/include/mod_system_info.h index a212a816..ef5870e5 100644 --- a/module/system_info/include/mod_system_info.h +++ b/module/system_info/include/mod_system_info.h @@ -8,6 +8,9 @@ #ifndef MOD_SYSTEM_INFO_H #define MOD_SYSTEM_INFO_H +#include <fwk_id.h> + +#include <stdbool.h> #include <stdint.h> /*! diff --git a/module/system_info/src/mod_system_info.c b/module/system_info/src/mod_system_info.c index 581e4d8a..92e484cb 100644 --- a/module/system_info/src/mod_system_info.c +++ b/module/system_info/src/mod_system_info.c @@ -8,12 +8,14 @@ * System Information Hardware Abstraction module. */ +#include <mod_system_info.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_module.h> -#include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_system_info.h> + +#include <stddef.h> /* Pointer to the config data for module use. */ static const struct mod_system_info_config *config; diff --git a/module/system_pll/include/mod_system_pll.h b/module/system_pll/include/mod_system_pll.h index e16c1257..78bf8776 100644 --- a/module/system_pll/include/mod_system_pll.h +++ b/module/system_pll/include/mod_system_pll.h @@ -8,10 +8,12 @@ #ifndef MOD_SYSTEM_PLL_H #define MOD_SYSTEM_PLL_H -#include <stdint.h> #include <fwk_element.h> #include <fwk_macros.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \ingroup GroupModules Modules * \defgroup GroupSystemPll System PLL Driver diff --git a/module/system_pll/src/mod_system_pll.c b/module/system_pll/src/mod_system_pll.c index 2e5e4b50..00b71748 100644 --- a/module/system_pll/src/mod_system_pll.c +++ b/module/system_pll/src/mod_system_pll.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> +#include <mod_clock.h> +#include <mod_power_domain.h> +#include <mod_system_pll.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_system_pll.h> -#include <mod_power_domain.h> + +#include <stddef.h> +#include <stdint.h> /* Device context */ struct system_pll_dev_ctx { diff --git a/module/system_power/include/mod_system_power.h b/module/system_power/include/mod_system_power.h index 753f4c6c..49e3c620 100644 --- a/module/system_power/include/mod_system_power.h +++ b/module/system_power/include/mod_system_power.h @@ -11,9 +11,14 @@ #ifndef MOD_SYSTEM_POWER_H #define MOD_SYSTEM_POWER_H -#include <fwk_id.h> #include <mod_power_domain.h> +#include <fwk_id.h> +#include <fwk_module_idx.h> + +#include <stddef.h> +#include <stdint.h> + /*! * \ingroup GroupModules Modules * \defgroup GroupSystemPower System Power Support diff --git a/module/system_power/src/mod_system_power.c b/module/system_power/src/mod_system_power.c index 408a7563..72e5c0aa 100644 --- a/module/system_power/src/mod_system_power.c +++ b/module/system_power/src/mod_system_power.c @@ -8,17 +8,19 @@ * System Power Support. */ -#include <stdint.h> +#include <mod_power_domain.h> +#include <mod_system_power.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_interrupt.h> -#include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_system_power.h> -#include <mod_power_domain.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stdint.h> /* SoC wakeup composite state */ #define MOD_SYSTEM_POWER_SOC_WAKEUP_STATE \ diff --git a/module/timer/include/mod_timer.h b/module/timer/include/mod_timer.h index c1f98c12..45e0a522 100644 --- a/module/timer/include/mod_timer.h +++ b/module/timer/include/mod_timer.h @@ -11,11 +11,12 @@ #ifndef MOD_TIMER_H #define MOD_TIMER_H -#include <stdbool.h> -#include <stdint.h> #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/module/timer/src/mod_timer.c b/module/timer/src/mod_timer.c index efebb8b6..3ce8d732 100644 --- a/module/timer/src/mod_timer.c +++ b/module/timer/src/mod_timer.c @@ -8,23 +8,23 @@ * Implementation of Timer module */ -#include <stdbool.h> -#include <stdint.h> -#include <string.h> +#include <mod_log.h> +#include <mod_timer.h> + #include <fwk_assert.h> -#include <fwk_element.h> -#include <fwk_event.h> +#include <fwk_dlist.h> #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> -#include <fwk_status.h> -#include <fwk_thread.h> -#include <mod_log.h> -#include <mod_timer.h> #include <fwk_module_idx.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> /* Timer device context (element) */ struct dev_ctx { |