diff options
748 files changed, 4554 insertions, 2636 deletions
diff --git a/arch/src/arm_main.c b/arch/src/arm_main.c index f412ac8c..92b84c36 100644 --- a/arch/src/arm_main.c +++ b/arch/src/arm_main.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include <cmsis_compiler.h> + #include <fwk_arch.h> #include <fwk_assert.h> #include <fwk_macros.h> -#include <fwk_status.h> -#include <cmsis_compiler.h> + +#include <stdbool.h> +#include <stdint.h> #define SCB_CCR ((FWK_RW uint32_t *)(0xE000ED14)) diff --git a/arch/src/arm_mm.c b/arch/src/arm_mm.c index 7bf3cc81..f1058bd9 100644 --- a/arch/src/arm_mm.c +++ b/arch/src/arm_mm.c @@ -8,12 +8,13 @@ * Memory initialization. */ -#include <stdint.h> #include <fwk_arch.h> #include <fwk_assert.h> -#include <fwk_macros.h> #include <fwk_status.h> +#include <stddef.h> +#include <stdint.h> + int arm_mm_init(struct fwk_arch_mm_data *data) { fwk_assert(data != NULL); diff --git a/arch/src/arm_nvic.c b/arch/src/arm_nvic.c index 9893f40e..0012da10 100644 --- a/arch/src/arm_nvic.c +++ b/arch/src/arm_nvic.c @@ -8,24 +8,25 @@ * Interrupt management. */ -#include <limits.h> -#include <stdint.h> +#include <cmsis_compiler.h> + #include <fwk_arch.h> #include <fwk_interrupt.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_noreturn.h> #include <fwk_status.h> -#include <cmsis_compiler.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #ifdef BUILD_HAS_MULTITHREADING - #include <rtx_os.h> +# include <rtx_os.h> #endif extern noreturn void arm_exception_invalid(void); -struct nvic; - #define SCB_SHCSR ((FWK_RW uint32_t *)(0xE000ED24UL)) #define SCB_VTOR ((FWK_RW uint32_t *)(0xE000ED08UL)) #define SCS_ICTR ((FWK_R uint32_t *)(0xE000E004UL)) diff --git a/arch/src/armv7-m/exceptions.c b/arch/src/armv7-m/exceptions.c index 3f634742..64ee723c 100644 --- a/arch/src/armv7-m/exceptions.c +++ b/arch/src/armv7-m/exceptions.c @@ -8,12 +8,10 @@ * ARMv7-M exception handlers. */ -#include <stdbool.h> +#include "exceptions.h" + #include <stdint.h> #include <string.h> -#include <fwk_noreturn.h> -#include <cmsis_compiler.h> -#include "exceptions.h" #ifdef __NEWLIB__ /* diff --git a/arch/src/armv7-m/handlers.c b/arch/src/armv7-m/handlers.c index f74fe2ab..19f22dce 100644 --- a/arch/src/armv7-m/handlers.c +++ b/arch/src/armv7-m/handlers.c @@ -8,10 +8,12 @@ * ARMv7-M exception handlers. */ -#include <stdbool.h> #include <cmsis_compiler.h> + #include <fwk_noreturn.h> +#include <stdbool.h> + noreturn void arm_exception_reset(void) { /* diff --git a/arch/src/host.c b/arch/src/host.c index 545313bd..f30b0087 100644 --- a/arch/src/host.c +++ b/arch/src/host.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> -#include <stdlib.h> #include <fwk_arch.h> #include <fwk_noreturn.h> #include <fwk_status.h> +#include <stdio.h> +#include <stdlib.h> + extern int host_interrupt_init(struct fwk_arch_interrupt_driver **driver); /* diff --git a/arch/src/host_interrupt.c b/arch/src/host_interrupt.c index 4b7e0efd..26bc7360 100644 --- a/arch/src/host_interrupt.c +++ b/arch/src/host_interrupt.c @@ -8,11 +8,12 @@ * Interrupt management. */ -#include <stdbool.h> -#include <stdint.h> #include <fwk_arch.h> #include <fwk_status.h> +#include <stdbool.h> +#include <stdint.h> + static int global_enable(void) { return FWK_E_SUPPORT; diff --git a/arch/src/host_thread.c b/arch/src/host_thread.c index 4e4f0fe0..292a9b90 100644 --- a/arch/src/host_thread.c +++ b/arch/src/host_thread.c @@ -10,11 +10,13 @@ #include <cmsis_os2.h> #include <pthread.h> -#include <stdbool.h> #include <unistd.h> + #include <fwk_assert.h> #include <fwk_mm.h> +#include <stdbool.h> + /* CMSIS-RTOS2 thread context data */ struct thread_data { /* Function associated with a thread */ diff --git a/debugger/include/cli.h b/debugger/include/cli.h index ef34d323..a62d5d6f 100644 --- a/debugger/include/cli.h +++ b/debugger/include/cli.h @@ -12,12 +12,12 @@ /* Include Files */ /*****************************************************************************/ -#include <stdbool.h> -#include <stdint.h> - #include "cli_config.h" #include "cli_fifo.h" +#include <stdbool.h> +#include <stdint.h> + /*****************************************************************************/ /* Enumerated Types */ /*****************************************************************************/ diff --git a/debugger/src/checkpoint.c b/debugger/src/checkpoint.c index 36107ef7..090c1b83 100644 --- a/debugger/src/checkpoint.c +++ b/debugger/src/checkpoint.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <checkpoint.h> +#include <cli.h> + +#include <fwk_status.h> + #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include <checkpoint.h> -#include <fwk_status.h> -#include <cli.h> checkpoint_st checkpoint_table[CHECKPOINT_NUM] = {0}; diff --git a/debugger/src/cli/cli.c b/debugger/src/cli/cli.c index 631f5e46..aab034c6 100644 --- a/debugger/src/cli/cli.c +++ b/debugger/src/cli/cli.c @@ -5,14 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_list.h> -#include <fwk_mm.h> - #include <cli.h> #include <cli_config.h> #include <cli_fifo.h> #include <cli_platform.h> +#include <fwk_list.h> +#include <fwk_mm.h> + #include <stdarg.h> #include <stdbool.h> #include <stdint.h> diff --git a/debugger/src/cli/cli_commands_checkpoint.c b/debugger/src/cli/cli_commands_checkpoint.c index dd203d66..12b7eb23 100644 --- a/debugger/src/cli/cli_commands_checkpoint.c +++ b/debugger/src/cli/cli_commands_checkpoint.c @@ -6,9 +6,8 @@ */ #include <checkpoint.h> - -#include <cli_platform.h> #include <cli.h> +#include <cli_platform.h> #include <fwk_status.h> diff --git a/debugger/src/cli/cli_commands_core.c b/debugger/src/cli/cli_commands_core.c index ce21e14b..04d4f5ae 100644 --- a/debugger/src/cli/cli_commands_core.c +++ b/debugger/src/cli/cli_commands_core.c @@ -54,10 +54,10 @@ /* */ /*****************************************************************************/ -#include <cli_platform.h> #include <cli.h> #include <cli_config.h> #include <cli_fifo.h> +#include <cli_platform.h> #include <stdint.h> #include <stdlib.h> diff --git a/debugger/src/cli/cli_fifo.c b/debugger/src/cli/cli_fifo.c index 76a8a566..19991b41 100644 --- a/debugger/src/cli/cli_fifo.c +++ b/debugger/src/cli/cli_fifo.c @@ -5,12 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> - #include <cli_config.h> #include <cli_fifo.h> +#include <stdbool.h> +#include <stdint.h> + uint32_t fifo_init(fifo_st *fifo, char *buf, uint32_t buf_size) { if (fifo == 0 || buf == 0 || buf_size == 0) diff --git a/debugger/src/cli/cli_platform_time.c b/debugger/src/cli/cli_platform_time.c index 27d13aeb..3ed7a638 100644 --- a/debugger/src/cli/cli_platform_time.c +++ b/debugger/src/cli/cli_platform_time.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> #include <cli.h> #include <cli_platform.h> +#include <stdint.h> + __attribute__((weak)) void cli_platform_get_time(cli_timestamp_t *t) { } diff --git a/doc/code_style.md b/doc/code_style.md index 04acd7ba..641f4fc0 100644 --- a/doc/code_style.md +++ b/doc/code_style.md @@ -47,13 +47,20 @@ SPDX-License-Identifier: BSD-3-Clause Inclusions ---------- -Header file inclusions should follow a consistent sequence, defined as: - -- Standard library (stdbool, stdint, etc) -- Framework components (fwk_<component>.h) -- Modules - -For each group, order the individual headers alphabetically. +Header file inclusions should follow a consistent sequence, defined by scope +from local to global: + +- Private firmware headers (`"config_scmi.h"`) +- Public non-project headers (`<cmsis.h>`) +- Private module headers (`<internal/scmi.h>) +- Public module headers (`<mod_scmi.h>) +- Public framework headers (`<fwk_list.h>`) +- Public architecture headers (`<arch_exceptions.h>`) +- Public firmware headers (`<fmw_cmsis.h>`) +- Public standard library headers (`<stddef.h>`) + +For each group, order the individual headers alphabetically and separate the +blocks logically. Header files (`.h` files) should include the headers needed for them to compile and only these ones. diff --git a/doc/template/device.h b/doc/template/device.h index d8802741..42602a8d 100644 --- a/doc/template/device.h +++ b/doc/template/device.h @@ -11,8 +11,9 @@ #ifndef <DEVICE>_H #define <DEVICE>_H -#include <stdint.h> -#include <fwk_macros.h> +# include <fwk_macros.h> + +# include <stdint.h> typedef struct { /* Readable and writable register */ diff --git a/framework/include/fwk_align.h b/framework/include/fwk_align.h index bac76542..78a9030b 100644 --- a/framework/include/fwk_align.h +++ b/framework/include/fwk_align.h @@ -19,7 +19,7 @@ # define __alignas_is_defined 1 # define __alignof_is_defined 1 #else -# include <stdalign.h> +# include <stdalign.h> #endif #endif /* FWK_ALIGN_H */ diff --git a/framework/include/fwk_assert.h b/framework/include/fwk_assert.h index 4d243af6..52a58026 100644 --- a/framework/include/fwk_assert.h +++ b/framework/include/fwk_assert.h @@ -8,9 +8,10 @@ #ifndef FWK_ASSERT_H #define FWK_ASSERT_H +#include <fwk_noreturn.h> + #include <assert.h> #include <stdbool.h> -#include <fwk_noreturn.h> #ifndef static_assert # define static_assert _Static_assert diff --git a/framework/include/fwk_cli_dbg.h b/framework/include/fwk_cli_dbg.h index bcc13ffb..de55c608 100644 --- a/framework/include/fwk_cli_dbg.h +++ b/framework/include/fwk_cli_dbg.h @@ -20,7 +20,7 @@ */ #if defined(BUILD_HAS_DEBUGGER) -#include <cli.h> +# include <cli.h> /*! * \brief Define the CLI Debugger function diff --git a/framework/include/fwk_event.h b/framework/include/fwk_event.h index 6aea0447..dbbd0a03 100644 --- a/framework/include/fwk_event.h +++ b/framework/include/fwk_event.h @@ -11,13 +11,14 @@ #ifndef FWK_EVENT_H #define FWK_EVENT_H -#include <stdbool.h> -#include <stddef.h> -#include <stdint.h> #include <fwk_align.h> #include <fwk_id.h> #include <fwk_list.h> +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> + /*! * \addtogroup GroupLibFramework Framework * @{ diff --git a/framework/include/fwk_host.h b/framework/include/fwk_host.h index 0662b028..107027ef 100644 --- a/framework/include/fwk_host.h +++ b/framework/include/fwk_host.h @@ -9,7 +9,7 @@ #define FWK_HOST_H #ifdef BUILD_HOST -#include <stdio.h> +# include <stdio.h> /*! * \brief Print a message using the host's standard output. diff --git a/framework/include/fwk_id.h b/framework/include/fwk_id.h index 31bb9d24..90f27a06 100644 --- a/framework/include/fwk_id.h +++ b/framework/include/fwk_id.h @@ -11,11 +11,13 @@ #ifndef FWK_ID_H #define FWK_ID_H -#include <stdbool.h> -#include <stdint.h> #include <internal/fwk_id.h> + #include <fwk_status.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupLibFramework Framework * @{ diff --git a/framework/include/fwk_interrupt.h b/framework/include/fwk_interrupt.h index a8814994..3d9d6d8f 100644 --- a/framework/include/fwk_interrupt.h +++ b/framework/include/fwk_interrupt.h @@ -12,9 +12,10 @@ #define FWK_INTERRUPT_H #include <fwk_arch.h> + +#include <limits.h> #include <stdbool.h> #include <stdint.h> -#include <limits.h> /*! * \addtogroup GroupLibFramework Framework diff --git a/framework/include/fwk_list.h b/framework/include/fwk_list.h index d5061599..e796a917 100644 --- a/framework/include/fwk_list.h +++ b/framework/include/fwk_list.h @@ -11,11 +11,12 @@ #ifndef FWK_LIST_H #define FWK_LIST_H -#include <stddef.h> -#include <stdint.h> #include <fwk_dlist.h> #include <fwk_slist.h> +#include <stddef.h> +#include <stdint.h> + /*! * \addtogroup GroupLibFramework Framework * @{ diff --git a/framework/include/fwk_mm.h b/framework/include/fwk_mm.h index 32cee0a6..57748ba9 100644 --- a/framework/include/fwk_mm.h +++ b/framework/include/fwk_mm.h @@ -11,9 +11,10 @@ #ifndef FWK_MM_H #define FWK_MM_H -#include <stddef.h> #include <fwk_align.h> +#include <stddef.h> + /*! * \addtogroup GroupLibFramework Framework * @{ diff --git a/framework/include/fwk_module.h b/framework/include/fwk_module.h index 98d989ea..017e114e 100644 --- a/framework/include/fwk_module.h +++ b/framework/include/fwk_module.h @@ -11,12 +11,13 @@ #ifndef FWK_MODULE_H #define FWK_MODULE_H -#include <stdbool.h> -#include <stdint.h> #include <fwk_element.h> #include <fwk_event.h> #include <fwk_id.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupLibFramework Framework * @{ diff --git a/framework/include/fwk_noreturn.h b/framework/include/fwk_noreturn.h index 2052f7b8..338337eb 100644 --- a/framework/include/fwk_noreturn.h +++ b/framework/include/fwk_noreturn.h @@ -3,7 +3,7 @@ * Copyright (c) 2018-2020, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause -* + * * Description: * Provides <stdnoreturn.h> features missing in certain standard library * implementations. @@ -15,7 +15,7 @@ #ifdef __ARMCC_VERSION # define noreturn _Noreturn #else -# include <stdnoreturn.h> +# include <stdnoreturn.h> #endif #endif /* FWK_NORETURN_H */ diff --git a/framework/include/fwk_thread.h b/framework/include/fwk_thread.h index f6736d40..936381c4 100644 --- a/framework/include/fwk_thread.h +++ b/framework/include/fwk_thread.h @@ -12,7 +12,9 @@ #define FWK_THREAD_H #include <fwk_event.h> +#include <fwk_id.h> +#include <stdbool.h> #include <stdint.h> /*! diff --git a/framework/include/internal/fwk_id.h b/framework/include/internal/fwk_id.h index 2d0aa2e9..6d472454 100644 --- a/framework/include/internal/fwk_id.h +++ b/framework/include/internal/fwk_id.h @@ -8,6 +8,8 @@ #ifndef FWK_INTERNAL_ID_H #define FWK_INTERNAL_ID_H +#include <stdint.h> + /* Identifier type */ enum __fwk_id_type { /* diff --git a/framework/include/internal/fwk_module.h b/framework/include/internal/fwk_module.h index 9faef488..034d2be7 100644 --- a/framework/include/internal/fwk_module.h +++ b/framework/include/internal/fwk_module.h @@ -11,10 +11,14 @@ #ifndef FWK_INTERNAL_MODULE_H #define FWK_INTERNAL_MODULE_H -#include <stddef.h> -#include <fwk_module.h> #include <internal/fwk_notification.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_slist.h> + +#include <stddef.h> + /* * Module context. */ diff --git a/framework/include/internal/fwk_multi_thread.h b/framework/include/internal/fwk_multi_thread.h index b7ad8336..2ec2c6f5 100644 --- a/framework/include/internal/fwk_multi_thread.h +++ b/framework/include/internal/fwk_multi_thread.h @@ -8,13 +8,16 @@ #ifndef FWK_INTERNAL_MULTI_THREAD_H #define FWK_INTERNAL_MULTI_THREAD_H -#include <stdbool.h> +#include <cmsis_os2.h> + +#include <internal/fwk_thread.h> + #include <fwk_event.h> #include <fwk_id.h> #include <fwk_list.h> #include <fwk_multi_thread.h> -#include <internal/fwk_thread.h> -#include <cmsis_os2.h> + +#include <stdbool.h> /* * Module/element thread context. diff --git a/framework/include/internal/fwk_notification.h b/framework/include/internal/fwk_notification.h index 69af47e8..880b9989 100644 --- a/framework/include/internal/fwk_notification.h +++ b/framework/include/internal/fwk_notification.h @@ -8,11 +8,12 @@ #ifndef FWK_INTERNAL_NOTIFICATION_H #define FWK_INTERNAL_NOTIFICATION_H -#include <stdbool.h> -#include <stddef.h> #include <fwk_list.h> #include <fwk_notification.h> +#include <stdbool.h> +#include <stddef.h> + struct __fwk_notification_subscription { struct fwk_dlist_node dlist_node; diff --git a/framework/include/internal/fwk_single_thread.h b/framework/include/internal/fwk_single_thread.h index cdc16459..2639e0ef 100644 --- a/framework/include/internal/fwk_single_thread.h +++ b/framework/include/internal/fwk_single_thread.h @@ -8,10 +8,11 @@ #ifndef FWK_INTERNAL_SINGLE_THREAD_H #define FWK_INTERNAL_SINGLE_THREAD_H -#include <stdbool.h> #include <fwk_event.h> #include <fwk_list.h> +#include <stdbool.h> + /* * Thread component context. Exposed for testing purposes only. */ diff --git a/framework/include/internal/fwk_thread.h b/framework/include/internal/fwk_thread.h index e178f4a7..b1f2ab03 100644 --- a/framework/include/internal/fwk_thread.h +++ b/framework/include/internal/fwk_thread.h @@ -8,11 +8,12 @@ #ifndef FWK_INTERNAL_THREAD_H #define FWK_INTERNAL_THREAD_H -#include <stddef.h> #include <fwk_event.h> #include <fwk_noreturn.h> #include <fwk_thread.h> +#include <stddef.h> + /* * \brief Initialize the thread framework component. * diff --git a/framework/src/fwk_arch.c b/framework/src/fwk_arch.c index af315618..b9092bb2 100644 --- a/framework/src/fwk_arch.c +++ b/framework/src/fwk_arch.c @@ -8,11 +8,11 @@ * Framework API for the architecture layer. */ +#include <internal/fwk_module.h> + #include <fwk_arch.h> #include <fwk_host.h> -#include <fwk_mm.h> #include <fwk_status.h> -#include <internal/fwk_module.h> extern int fwk_mm_init(uintptr_t start, size_t size); extern int fwk_interrupt_init(const struct fwk_arch_interrupt_driver *driver); diff --git a/framework/src/fwk_dlist.c b/framework/src/fwk_dlist.c index 2f75a86b..a42e53f5 100644 --- a/framework/src/fwk_dlist.c +++ b/framework/src/fwk_dlist.c @@ -8,9 +8,11 @@ * Intrusive circular doubly-linked list. */ -#include <stddef.h> #include <fwk_assert.h> -#include <fwk_list.h> +#include <fwk_dlist.h> +#include <fwk_slist.h> + +#include <stddef.h> void __fwk_dlist_push_head( struct fwk_dlist *list, diff --git a/framework/src/fwk_id.c b/framework/src/fwk_id.c index 96e59c43..da0292c9 100644 --- a/framework/src/fwk_id.c +++ b/framework/src/fwk_id.c @@ -8,10 +8,14 @@ * Identifiers. */ -#include <stdio.h> +#include <internal/fwk_id.h> + #include <fwk_assert.h> #include <fwk_id.h> +#include <stdint.h> +#include <stdio.h> + struct __fwk_id_fmt __fwk_id_str(fwk_id_t id) { struct __fwk_id_fmt fmt; diff --git a/framework/src/fwk_interrupt.c b/framework/src/fwk_interrupt.c index 19db92ee..561e1801 100644 --- a/framework/src/fwk_interrupt.c +++ b/framework/src/fwk_interrupt.c @@ -8,13 +8,14 @@ * Interrupt management. */ -#include <limits.h> -#include <stdbool.h> +#include <internal/fwk_interrupt.h> + #include <fwk_arch.h> #include <fwk_interrupt.h> -#include <fwk_mm.h> #include <fwk_status.h> -#include <internal/fwk_interrupt.h> + +#include <stdbool.h> +#include <stddef.h> static bool initialized; static const struct fwk_arch_interrupt_driver *driver; diff --git a/framework/src/fwk_mm.c b/framework/src/fwk_mm.c index 0a732af9..2abab443 100644 --- a/framework/src/fwk_mm.c +++ b/framework/src/fwk_mm.c @@ -8,15 +8,16 @@ * Memory management. */ +#include <fwk_assert.h> +#include <fwk_macros.h> +#include <fwk_mm.h> +#include <fwk_status.h> + #include <errno.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> #include <string.h> -#include <fwk_assert.h> -#include <fwk_macros.h> -#include <fwk_mm.h> -#include <fwk_status.h> static bool initialized; static bool mm_locked; diff --git a/framework/src/fwk_module.c b/framework/src/fwk_module.c index cf568940..c617d74e 100644 --- a/framework/src/fwk_module.c +++ b/framework/src/fwk_module.c @@ -8,17 +8,25 @@ * Module facilities. */ -#include <string.h> +#include <internal/fwk_id.h> +#include <internal/fwk_module.h> +#include <internal/fwk_thread.h> + +#ifdef BUILD_HAS_NOTIFICATION +# include <internal/fwk_notification.h> +#endif + #include <fwk_assert.h> #include <fwk_cli_dbg.h> +#include <fwk_dlist.h> +#include <fwk_element.h> #include <fwk_host.h> +#include <fwk_list.h> #include <fwk_mm.h> +#include <fwk_module.h> #include <fwk_status.h> -#include <internal/fwk_module.h> -#include <internal/fwk_thread.h> -#ifdef BUILD_HAS_NOTIFICATION -#include <internal/fwk_notification.h> -#endif + +#include <stdbool.h> #define EVENT_COUNT 64 #define BIND_ROUND_MAX 1 diff --git a/framework/src/fwk_multi_thread.c b/framework/src/fwk_multi_thread.c index 181e1aab..85415297 100644 --- a/framework/src/fwk_multi_thread.c +++ b/framework/src/fwk_multi_thread.c @@ -5,20 +5,29 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <cmsis_os2.h> #include <rtx_os.h> +#include <internal/fwk_id.h> #include <internal/fwk_module.h> #include <internal/fwk_multi_thread.h> -#include <internal/fwk_notification.h> +#include <internal/fwk_thread.h> #include <internal/fwk_thread_delayed_resp.h> #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_event.h> #include <fwk_host.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_multi_thread.h> +#include <fwk_noreturn.h> +#include <fwk_slist.h> #include <fwk_status.h> +#include <fwk_thread.h> #include <stdbool.h> #include <stdint.h> diff --git a/framework/src/fwk_notification.c b/framework/src/fwk_notification.c index d3b5d6bd..cd80f6d4 100644 --- a/framework/src/fwk_notification.c +++ b/framework/src/fwk_notification.c @@ -8,14 +8,24 @@ * Notification facilities. */ +#include <internal/fwk_module.h> +#include <internal/fwk_notification.h> +#include <internal/fwk_thread.h> + #include <fwk_assert.h> +#include <fwk_dlist.h> +#include <fwk_event.h> #include <fwk_host.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_list.h> #include <fwk_mm.h> -#include <internal/fwk_module.h> -#include <internal/fwk_notification.h> -#include <internal/fwk_thread.h> +#include <fwk_module.h> +#include <fwk_notification.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> struct notification_ctx { /* diff --git a/framework/src/fwk_slist.c b/framework/src/fwk_slist.c index 32f938aa..cd0900c6 100644 --- a/framework/src/fwk_slist.c +++ b/framework/src/fwk_slist.c @@ -8,10 +8,12 @@ * Intrusive circular singly-linked list. */ -#include <stdbool.h> -#include <stddef.h> #include <fwk_assert.h> #include <fwk_list.h> +#include <fwk_slist.h> + +#include <stdbool.h> +#include <stddef.h> void __fwk_slist_init(struct fwk_slist *list) { diff --git a/framework/src/fwk_thread.c b/framework/src/fwk_thread.c index d4baa612..6e6e741b 100644 --- a/framework/src/fwk_thread.c +++ b/framework/src/fwk_thread.c @@ -9,18 +9,22 @@ */ #include <internal/fwk_module.h> -#include <internal/fwk_notification.h> #include <internal/fwk_single_thread.h> #include <internal/fwk_thread.h> #include <internal/fwk_thread_delayed_resp.h> #include <fwk_assert.h> -#include <fwk_element.h> +#include <fwk_event.h> #include <fwk_host.h> #include <fwk_id.h> #include <fwk_interrupt.h> +#include <fwk_list.h> #include <fwk_mm.h> +#include <fwk_module.h> +#include <fwk_noreturn.h> +#include <fwk_slist.h> #include <fwk_status.h> +#include <fwk_thread.h> #include <stdbool.h> #include <string.h> diff --git a/framework/src/fwk_thread_delayed_resp.c b/framework/src/fwk_thread_delayed_resp.c index 769f135a..77bfe00c 100644 --- a/framework/src/fwk_thread_delayed_resp.c +++ b/framework/src/fwk_thread_delayed_resp.c @@ -7,10 +7,16 @@ #include <internal/fwk_module.h> -#include <fwk_element.h> +#include <fwk_event.h> #include <fwk_host.h> +#include <fwk_id.h> #include <fwk_interrupt.h> +#include <fwk_list.h> +#include <fwk_module.h> +#include <fwk_status.h> +#include <stdbool.h> +#include <stddef.h> #include <stdint.h> #ifdef BUILD_HOST diff --git a/framework/test/fwk_test.c b/framework/test/fwk_test.c index c8ef2c3e..7d0314c1 100644 --- a/framework/test/fwk_test.c +++ b/framework/test/fwk_test.c @@ -4,14 +4,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <setjmp.h> -#include <stdbool.h> -#include <stdlib.h> -#include <stdio.h> #include <fwk_noreturn.h> #include <fwk_status.h> #include <fwk_test.h> +#include <setjmp.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> + /* Test information provided by the test suite */ extern struct fwk_test_suite_desc test_suite; diff --git a/framework/test/test_fwk_arch.c b/framework/test/test_fwk_arch.c index 095633b3..ff12c1b2 100644 --- a/framework/test/test_fwk_arch.c +++ b/framework/test/test_fwk_arch.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <fwk_assert.h> #include <fwk_arch.h> +#include <fwk_assert.h> #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> +#include <stdbool.h> + static int fwk_mm_init_return_val; static int mm_init_handler_return_val; static int fwk_interrupt_init_return_val; diff --git a/framework/test/test_fwk_id_format.c b/framework/test/test_fwk_id_format.c index 3b44306f..6cb0f768 100644 --- a/framework/test/test_fwk_id_format.c +++ b/framework/test/test_fwk_id_format.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> -#include <string.h> #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stdio.h> +#include <string.h> + static void test_format_module_id(void) { fwk_id_t id = FWK_ID_MODULE(42); diff --git a/framework/test/test_fwk_id_get_idx.c b/framework/test/test_fwk_id_get_idx.c index 2e88da16..12bf4bda 100644 --- a/framework/test/test_fwk_id_get_idx.c +++ b/framework/test/test_fwk_id_get_idx.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> + static void test_module_idx_of_module_id(void) { fwk_id_t id = FWK_ID_MODULE(42); diff --git a/framework/test/test_fwk_interrupt.c b/framework/test/test_fwk_interrupt.c index 3f33fff9..0b85f9dd 100644 --- a/framework/test/test_fwk_interrupt.c +++ b/framework/test/test_fwk_interrupt.c @@ -4,15 +4,17 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <fwk_assert.h> +#include <internal/fwk_interrupt.h> + #include <fwk_arch.h> +#include <fwk_assert.h> #include <fwk_interrupt.h> #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_interrupt.h> + +#include <stdbool.h> +#include <stdint.h> #define INTERRUPT_ID 42 diff --git a/framework/test/test_fwk_list_empty.c b/framework/test/test_fwk_list_empty.c index e096307f..6ad76730 100644 --- a/framework/test/test_fwk_list_empty.c +++ b/framework/test/test_fwk_list_empty.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> + static struct fwk_slist slist; static struct fwk_dlist dlist; diff --git a/framework/test/test_fwk_list_head.c b/framework/test/test_fwk_list_head.c index 09b39451..3207cf2a 100644 --- a/framework/test/test_fwk_list_head.c +++ b/framework/test/test_fwk_list_head.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> + static struct fwk_slist slist; static struct fwk_dlist dlist; diff --git a/framework/test/test_fwk_list_insert.c b/framework/test/test_fwk_list_insert.c index 00138b5f..e0c65452 100644 --- a/framework/test/test_fwk_list_insert.c +++ b/framework/test/test_fwk_list_insert.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <string.h> + static struct fwk_dlist list; static struct fwk_dlist_node node[3]; diff --git a/framework/test/test_fwk_list_next.c b/framework/test/test_fwk_list_next.c index c0910b4f..877ec2b1 100644 --- a/framework/test/test_fwk_list_next.c +++ b/framework/test/test_fwk_list_next.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> + static struct fwk_slist slist; static struct fwk_dlist dlist; diff --git a/framework/test/test_fwk_list_pop.c b/framework/test/test_fwk_list_pop.c index 9e549787..1eebcf6b 100644 --- a/framework/test/test_fwk_list_pop.c +++ b/framework/test/test_fwk_list_pop.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> + static struct fwk_slist slist; static struct fwk_dlist dlist; diff --git a/framework/test/test_fwk_list_push.c b/framework/test/test_fwk_list_push.c index 6c46fcb5..4e9b2aaf 100644 --- a/framework/test/test_fwk_list_push.c +++ b/framework/test/test_fwk_list_push.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <string.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> +#include <string.h> + static struct fwk_slist slist; static struct fwk_dlist dlist; diff --git a/framework/test/test_fwk_list_remove.c b/framework/test/test_fwk_list_remove.c index 1640512b..2194d187 100644 --- a/framework/test/test_fwk_list_remove.c +++ b/framework/test/test_fwk_list_remove.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <string.h> #include <fwk_assert.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_test.h> +#include <stddef.h> +#include <string.h> + static struct fwk_slist slist; static struct fwk_dlist dlist; diff --git a/framework/test/test_fwk_math.c b/framework/test/test_fwk_math.c index 8cc26191..63fd611c 100644 --- a/framework/test/test_fwk_math.c +++ b/framework/test/test_fwk_math.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <limits.h> -#include <stdint.h> #include <fwk_assert.h> #include <fwk_macros.h> #include <fwk_math.h> #include <fwk_test.h> +#include <limits.h> +#include <stdint.h> + static void test_fwk_math_pow2_uc(void) { unsigned char exp = (sizeof(exp) * CHAR_BIT) - 1; diff --git a/framework/test/test_fwk_mm.c b/framework/test/test_fwk_mm.c index 908006a6..5e9952ff 100644 --- a/framework/test/test_fwk_mm.c +++ b/framework/test/test_fwk_mm.c @@ -5,16 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stddef.h> -#include <stdint.h> -#include <string.h> #include <fwk_assert.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_status.h> #include <fwk_test.h> +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + #define SIZE_MEM (1024 * 1024) #define ALLOC_NUM 5 #define ALLOC_SIZE 64 diff --git a/framework/test/test_fwk_module.c b/framework/test/test_fwk_module.c index 95a3b8d7..d931994a 100644 --- a/framework/test/test_fwk_module.c +++ b/framework/test/test_fwk_module.c @@ -4,13 +4,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdlib.h> -#include <string.h> +#include <internal/fwk_module.h> + #include <fwk_assert.h> #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_module.h> + +#include <stdlib.h> +#include <string.h> #define MODULE0_IDX 0 #define MODULE1_IDX 1 diff --git a/framework/test/test_fwk_multi_thread_common_thread.c b/framework/test/test_fwk_multi_thread_common_thread.c index cd57af5f..62cb4093 100644 --- a/framework/test/test_fwk_multi_thread_common_thread.c +++ b/framework/test/test_fwk_multi_thread_common_thread.c @@ -5,21 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <setjmp.h> -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> +#include <internal/fwk_id.h> +#include <internal/fwk_module.h> +#include <internal/fwk_multi_thread.h> +#include <internal/fwk_notification.h> + #include <fwk_assert.h> #include <fwk_event.h> #include <fwk_list.h> #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_id.h> -#include <internal/fwk_module.h> -#include <internal/fwk_multi_thread.h> -#include <internal/fwk_notification.h> + +#include <setjmp.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> #define SIGNAL_ISR_EVENT 0x01 #define SIGNAL_EVENT_TO_PROCESS 0x02 diff --git a/framework/test/test_fwk_multi_thread_create.c b/framework/test/test_fwk_multi_thread_create.c index 35cef643..ca3f6f28 100644 --- a/framework/test/test_fwk_multi_thread_create.c +++ b/framework/test/test_fwk_multi_thread_create.c @@ -6,22 +6,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <limits.h> -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> +#include <rtx_os.h> + +#include <internal/fwk_id.h> +#include <internal/fwk_module.h> +#include <internal/fwk_multi_thread.h> + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_id.h> -#include <internal/fwk_module.h> -#include <internal/fwk_multi_thread.h> -#include <rtx_os.h> +#include <limits.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> #define ELEM_THREAD_ID 10 #define MODULE_THREAD_ID 11 diff --git a/framework/test/test_fwk_multi_thread_init.c b/framework/test/test_fwk_multi_thread_init.c index 5f8d56c6..c617f7e3 100644 --- a/framework/test/test_fwk_multi_thread_init.c +++ b/framework/test/test_fwk_multi_thread_init.c @@ -5,9 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> +#include <internal/fwk_id.h> +#include <internal/fwk_module.h> +#include <internal/fwk_multi_thread.h> + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_event.h> @@ -15,9 +16,10 @@ #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_id.h> -#include <internal/fwk_module.h> -#include <internal/fwk_multi_thread.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> #define COMMON_THREAD_ID 12 diff --git a/framework/test/test_fwk_multi_thread_put_event.c b/framework/test/test_fwk_multi_thread_put_event.c index 2c020244..6015f774 100644 --- a/framework/test/test_fwk_multi_thread_put_event.c +++ b/framework/test/test_fwk_multi_thread_put_event.c @@ -5,12 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <setjmp.h> -#include <stdio.h> -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> +#include <internal/fwk_id.h> +#include <internal/fwk_module.h> +#include <internal/fwk_multi_thread.h> + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_event.h> @@ -18,9 +16,13 @@ #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_id.h> -#include <internal/fwk_module.h> -#include <internal/fwk_multi_thread.h> + +#include <setjmp.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #define ELEM_THREAD_ID 10 #define MODULE_THREAD_ID 11 diff --git a/framework/test/test_fwk_multi_thread_util.c b/framework/test/test_fwk_multi_thread_util.c index 6f01aa05..a1d9dc0b 100644 --- a/framework/test/test_fwk_multi_thread_util.c +++ b/framework/test/test_fwk_multi_thread_util.c @@ -5,10 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <setjmp.h> -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> +#include <internal/fwk_id.h> +#include <internal/fwk_module.h> +#include <internal/fwk_multi_thread.h> + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_event.h> @@ -16,9 +16,11 @@ #include <fwk_macros.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_id.h> -#include <internal/fwk_module.h> -#include <internal/fwk_multi_thread.h> + +#include <setjmp.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> #define ELEM_THREAD_ID 10 #define MODULE_THREAD_ID 11 diff --git a/framework/test/test_fwk_notification.c b/framework/test/test_fwk_notification.c index c2981f93..3da21ebd 100644 --- a/framework/test/test_fwk_notification.c +++ b/framework/test/test_fwk_notification.c @@ -5,9 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <setjmp.h> -#include <stdbool.h> -#include <stdlib.h> +#include <internal/fwk_module.h> +#include <internal/fwk_single_thread.h> +#include <internal/fwk_thread.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_list.h> @@ -15,9 +16,10 @@ #include <fwk_slist.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_module.h> -#include <internal/fwk_single_thread.h> -#include <internal/fwk_thread.h> + +#include <setjmp.h> +#include <stdbool.h> +#include <stdlib.h> /* Mock functions */ static void * fwk_mm_calloc_val; diff --git a/framework/test/test_fwk_thread.c b/framework/test/test_fwk_thread.c index e0f2e1c9..73762554 100644 --- a/framework/test/test_fwk_thread.c +++ b/framework/test/test_fwk_thread.c @@ -5,9 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <setjmp.h> -#include <stdbool.h> -#include <stdlib.h> +#include <internal/fwk_module.h> +#include <internal/fwk_single_thread.h> +#include <internal/fwk_thread.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_list.h> @@ -15,9 +16,10 @@ #include <fwk_slist.h> #include <fwk_status.h> #include <fwk_test.h> -#include <internal/fwk_module.h> -#include <internal/fwk_single_thread.h> -#include <internal/fwk_thread.h> + +#include <setjmp.h> +#include <stdbool.h> +#include <stdlib.h> static jmp_buf test_context; static struct __fwk_thread_ctx *ctx; 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 { diff --git a/product/host/fw/config_log.c b/product/host/fw/config_log.c index 508f1108..80da36bd 100644 --- a/product/host/fw/config_log.c +++ b/product/host/fw/config_log.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_log.h> + #include <fwk_banner.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> /* * Log module diff --git a/product/juno/include/coresight_soc400.h b/product/juno/include/coresight_soc400.h index 233747d0..3f0f0f55 100644 --- a/product/juno/include/coresight_soc400.h +++ b/product/juno/include/coresight_soc400.h @@ -13,9 +13,10 @@ #ifndef CORESIGHT_SOC400_H #define CORESIGHT_SOC400_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + struct cti_reg { FWK_RW uint32_t CTI_CONTROL; uint8_t RESERVED1[0x10 - 0x04]; diff --git a/product/juno/include/juno_clock.h b/product/juno/include/juno_clock.h index 6d8c19c8..fe94690b 100644 --- a/product/juno/include/juno_clock.h +++ b/product/juno/include/juno_clock.h @@ -8,9 +8,11 @@ #ifndef JUNO_CLOCK_H #define JUNO_CLOCK_H -#include <stdint.h> +#include "juno_scc.h" + #include <fwk_macros.h> -#include <juno_scc.h> + +#include <stdint.h> /* Number of entries of the HDLCD lookup table */ #define JUNO_CLOCK_HDLCD_LOOKUP_COUNT 566 diff --git a/product/juno/include/juno_mmap.h b/product/juno/include/juno_mmap.h index 22e3c4a6..36da785d 100644 --- a/product/juno/include/juno_mmap.h +++ b/product/juno/include/juno_mmap.h @@ -11,8 +11,9 @@ #ifndef JUNO_MMAP_H #define JUNO_MMAP_H +#include "system_mmap.h" + #include <stdint.h> -#include <system_mmap.h> #define I2C_BASE (VENDOR_EXTENSION_BASE + 0x00000000) #define PVT_AON_BASE (VENDOR_EXTENSION_BASE + 0x00001000) diff --git a/product/juno/include/juno_nic400.h b/product/juno/include/juno_nic400.h index 4e40c296..4f0b8b09 100644 --- a/product/juno/include/juno_nic400.h +++ b/product/juno/include/juno_nic400.h @@ -11,8 +11,9 @@ #ifndef JUNO_NIC400_H #define JUNO_NIC400_H +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> struct nic400_reg { FWK_RW uint32_t REMAP; diff --git a/product/juno/include/juno_pvt.h b/product/juno/include/juno_pvt.h index 3eedc936..41b2aa5a 100644 --- a/product/juno/include/juno_pvt.h +++ b/product/juno/include/juno_pvt.h @@ -11,9 +11,11 @@ #ifndef JUNO_PVT_H #define JUNO_PVT_H -#include <stdint.h> +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> + +#include <stdint.h> /* * PVT-Group register definitions. diff --git a/product/juno/include/juno_scc.h b/product/juno/include/juno_scc.h index 5c371dab..84a05537 100644 --- a/product/juno/include/juno_scc.h +++ b/product/juno/include/juno_scc.h @@ -11,9 +11,11 @@ #ifndef JUNO_SCC_H #define JUNO_SCC_H -#include <stdint.h> +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> + +#include <stdint.h> enum pll_idx { PLL_IDX_BIG, diff --git a/product/juno/include/juno_ssc.h b/product/juno/include/juno_ssc.h index 8e99f4c0..7a2bd3b0 100644 --- a/product/juno/include/juno_ssc.h +++ b/product/juno/include/juno_ssc.h @@ -11,9 +11,11 @@ #ifndef JUNO_SSC_H #define JUNO_SSC_H -#include <stdint.h> +#include "system_mmap.h" + #include <fwk_macros.h> -#include <system_mmap.h> + +#include <stdint.h> struct ssc_reg { uint8_t RESERVED1[0x10 - 0]; diff --git a/product/juno/include/juno_utils.h b/product/juno/include/juno_utils.h index 9db25ed1..be2734d0 100644 --- a/product/juno/include/juno_utils.h +++ b/product/juno/include/juno_utils.h @@ -8,6 +8,9 @@ #ifndef JUNO_UTILS_H #define JUNO_UTILS_H +#include <stdbool.h> +#include <stdint.h> + void juno_utils_open_snoop_gate_and_wait(volatile uint32_t *snoop_ctrl); void juno_utils_close_snoop_gate(volatile uint32_t *snoop_ctrl); diff --git a/product/juno/include/juno_wdog.h b/product/juno/include/juno_wdog.h index a3ed95b2..99fd0874 100644 --- a/product/juno/include/juno_wdog.h +++ b/product/juno/include/juno_wdog.h @@ -11,9 +11,11 @@ #ifndef JUNO_WDOG_H #define JUNO_WDOG_H -#include <stdint.h> +#include "system_mmap.h" + #include <fwk_macros.h> -#include <system_mmap.h> + +#include <stdint.h> struct sp805_reg { FWK_RW uint32_t LOAD; diff --git a/product/juno/include/nic400_gpv.h b/product/juno/include/nic400_gpv.h index 4f049ce8..90e144dc 100644 --- a/product/juno/include/nic400_gpv.h +++ b/product/juno/include/nic400_gpv.h @@ -13,9 +13,11 @@ #ifndef NIC400_GPV_H #define NIC400_GPV_H -#include <stdint.h> +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> + +#include <stdint.h> struct nic400_gpv_reg { uint8_t RESERVED1[0x100 - 0x0]; diff --git a/product/juno/include/pl35x.h b/product/juno/include/pl35x.h index cb312f8d..bbd08975 100644 --- a/product/juno/include/pl35x.h +++ b/product/juno/include/pl35x.h @@ -11,9 +11,11 @@ #ifndef PL35X_H #define PL35X_H -#include <stdint.h> +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> + +#include <stdint.h> /* * PL35X register definitions diff --git a/product/juno/include/pvt_sensor_calibration.h b/product/juno/include/pvt_sensor_calibration.h index b653525e..654a3456 100644 --- a/product/juno/include/pvt_sensor_calibration.h +++ b/product/juno/include/pvt_sensor_calibration.h @@ -8,8 +8,11 @@ #ifndef PVT_SENSOR_CALIBRATION_H #define PVT_SENSOR_CALIBRATION_H +#include "juno_mmap.h" + +#include <fwk_macros.h> + #include <stdint.h> -#include <juno_mmap.h> #define SOC_PART_ID_LEN 7 diff --git a/product/juno/include/scp_config.h b/product/juno/include/scp_config.h index 472dbb75..9b18f02c 100644 --- a/product/juno/include/scp_config.h +++ b/product/juno/include/scp_config.h @@ -11,9 +11,11 @@ #ifndef SCP_CONFIG_H #define SCP_CONFIG_H -#include <stdint.h> +#include "system_mmap.h" + #include <fwk_macros.h> -#include <system_mmap.h> + +#include <stdint.h> struct scp_config_reset_reg { FWK_RW uint32_t STATUS; diff --git a/product/juno/include/software_mmap.h b/product/juno/include/software_mmap.h index cbc0649b..55f60f4f 100644 --- a/product/juno/include/software_mmap.h +++ b/product/juno/include/software_mmap.h @@ -11,7 +11,7 @@ #ifndef SOFTWARE_MMAP_H #define SOFTWARE_MMAP_H -#include <system_mmap.h> +#include "system_mmap.h" /* * The 4KB "Context Region" at the base of Trusted SRAM is used for several diff --git a/product/juno/include/v2m_sys_regs.h b/product/juno/include/v2m_sys_regs.h index 63efed3c..b97a8be3 100644 --- a/product/juno/include/v2m_sys_regs.h +++ b/product/juno/include/v2m_sys_regs.h @@ -11,9 +11,11 @@ #ifndef V2M_SYS_REGS_H #define V2M_SYS_REGS_H -#include <stdint.h> +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> + +#include <stdint.h> enum v2m_sys_regs_adc_dev { SYS_REGS_ADC_DEV_SYS, diff --git a/product/juno/include/xpressrich3.h b/product/juno/include/xpressrich3.h index e171a916..3b2d795a 100644 --- a/product/juno/include/xpressrich3.h +++ b/product/juno/include/xpressrich3.h @@ -11,9 +11,11 @@ #ifndef XPRESSRICH3_H #define XPRESSRICH3_H -#include <stdint.h> +#include "juno_mmap.h" + #include <fwk_macros.h> -#include <juno_mmap.h> + +#include <stdint.h> /* Controller Core Registers (ARM defined) */ struct xpressrich3_core_reg { diff --git a/product/juno/module/juno_adc/include/mod_juno_adc.h b/product/juno/module/juno_adc/include/mod_juno_adc.h index 36165394..ce12a1a7 100644 --- a/product/juno/module/juno_adc/include/mod_juno_adc.h +++ b/product/juno/module/juno_adc/include/mod_juno_adc.h @@ -11,9 +11,13 @@ #ifndef MOD_JUNO_ADC_H #define MOD_JUNO_ADC_H -#include <stdint.h> #include <mod_sensor.h> +#include <fwk_id.h> +#include <fwk_module_idx.h> + +#include <stdint.h> + /*! * \ingroup GroupJunoModule * \defgroup GroupADC ADC Sensor Driver diff --git a/product/juno/module/juno_adc/src/mod_juno_adc.c b/product/juno/module/juno_adc/src/mod_juno_adc.c index fc73a95e..9dd4ce90 100644 --- a/product/juno/module/juno_adc/src/mod_juno_adc.c +++ b/product/juno/module/juno_adc/src/mod_juno_adc.c @@ -8,16 +8,20 @@ * Juno ADC Driver */ +#include "juno_adc.h" +#include "v2m_sys_regs.h" + +#include <mod_juno_adc.h> +#include <mod_sensor.h> + #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_juno_adc.h> -#include <mod_sensor.h> -#include <juno_adc.h> -#include <v2m_sys_regs.h> + +#include <stddef.h> +#include <stdint.h> /* * ADC driver API functions. diff --git a/product/juno/module/juno_cdcel937/include/mod_juno_cdcel937.h b/product/juno/module/juno_cdcel937/include/mod_juno_cdcel937.h index 9e70f4fa..f8aece56 100644 --- a/product/juno/module/juno_cdcel937/include/mod_juno_cdcel937.h +++ b/product/juno/module/juno_cdcel937/include/mod_juno_cdcel937.h @@ -8,11 +8,14 @@ #ifndef MOD_JUNO_CDCEL937_H #define MOD_JUNO_CDCEL937_H -#include <stdint.h> +#include "juno_clock.h" + +#include <mod_clock.h> + #include <fwk_id.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <juno_clock.h> + +#include <stdint.h> /*! * \addtogroup GroupModules Modules diff --git a/product/juno/module/juno_cdcel937/src/juno_cdcel937.h b/product/juno/module/juno_cdcel937/src/juno_cdcel937.h index b6b6ba08..47b9aa80 100644 --- a/product/juno/module/juno_cdcel937/src/juno_cdcel937.h +++ b/product/juno/module/juno_cdcel937/src/juno_cdcel937.h @@ -8,10 +8,15 @@ #ifndef JUNO_CDCEL937_H #define JUNO_CDCEL937_H -#include <stdint.h> -#include <fwk_macros.h> #include <mod_juno_cdcel937.h> +#include <fwk_id.h> +#include <fwk_macros.h> +#include <fwk_module_idx.h> + +#include <stdbool.h> +#include <stdint.h> + #define JUNO_CDCEL937_I2C_TRANSFER_MODE_POS 7 #define JUNO_CDCEL937_I2C_BYTE_OFFSET_MASK 0x7F diff --git a/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c b/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c index b8a76f48..707a0fdd 100644 --- a/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c +++ b/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c @@ -5,22 +5,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include "juno_cdcel937.h" +#include "juno_clock.h" + +#include <mod_clock.h> +#include <mod_i2c.h> +#include <mod_juno_cdcel937.h> +#include <mod_juno_hdlcd.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_multi_thread.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_i2c.h> -#include <mod_juno_cdcel937.h> -#include <mod_juno_hdlcd.h> -#include <mod_log.h> -#include <juno_cdcel937.h> -#include <juno_clock.h> -#include <juno_id.h> +#include <fwk_thread.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> static const struct mod_juno_cdcel937_config *module_config; static struct juno_cdcel937_module_ctx module_ctx; diff --git a/product/juno/module/juno_ddr_phy400/include/mod_juno_ddr_phy400.h b/product/juno/module/juno_ddr_phy400/include/mod_juno_ddr_phy400.h index aeb1cf54..5a0e05d5 100644 --- a/product/juno/module/juno_ddr_phy400/include/mod_juno_ddr_phy400.h +++ b/product/juno/module/juno_ddr_phy400/include/mod_juno_ddr_phy400.h @@ -1,4 +1,4 @@ - /* +/* * Arm SCP/MCP Software * Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved. * @@ -10,11 +10,13 @@ #ifndef MOD_JUNO_DDR_PHY400_H #define MOD_JUNO_DDR_PHY400_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 <stdint.h> /*! * \ingroup GroupJunoModule diff --git a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c index ce96dd29..6505fc2b 100644 --- a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c +++ b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c @@ -8,15 +8,20 @@ * Juno DDR-PHY400 driver */ +#include "juno_scc.h" + +#include <mod_juno_ddr_phy400.h> +#include <mod_juno_dmc400.h> +#include <mod_timer.h> + #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_juno_ddr_phy400.h> -#include <mod_juno_dmc400.h> -#include <juno_scc.h> + +#include <stdbool.h> +#include <stddef.h> static struct mod_timer_api *timer_api; diff --git a/product/juno/module/juno_debug/include/mod_juno_debug.h b/product/juno/module/juno_debug/include/mod_juno_debug.h index 49e736e7..a11221c7 100644 --- a/product/juno/module/juno_debug/include/mod_juno_debug.h +++ b/product/juno/module/juno_debug/include/mod_juno_debug.h @@ -11,9 +11,10 @@ #ifndef MOD_JUNO_DEBUG_H #define MOD_JUNO_DEBUG_H -#include <stdint.h> #include <fwk_id.h> +#include <stdint.h> + /*! * \brief Element-specific clock configuration. */ diff --git a/product/juno/module/juno_debug/src/mod_juno_debug.c b/product/juno/module/juno_debug/src/mod_juno_debug.c index a10e6f48..17330b17 100644 --- a/product/juno/module/juno_debug/src/mod_juno_debug.c +++ b/product/juno/module/juno_debug/src/mod_juno_debug.c @@ -8,17 +8,6 @@ * Juno Debug driver */ -#include <fwk_assert.h> -#include <fwk_interrupt.h> -#include <fwk_macros.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_multi_thread.h> -#include <fwk_status.h> -#include <mod_debug.h> -#include <mod_juno_debug.h> -#include <mod_power_domain.h> -#include <mod_timer.h> #include <coresight_soc400.h> #include <juno_irq.h> #include <juno_ssc.h> @@ -27,6 +16,19 @@ #include <system_clock.h> #include <system_mmap.h> +#include <mod_debug.h> +#include <mod_juno_debug.h> +#include <mod_power_domain.h> +#include <mod_timer.h> + +#include <fwk_assert.h> +#include <fwk_interrupt.h> +#include <fwk_macros.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_multi_thread.h> +#include <fwk_status.h> + #define CS_CNTCONTROL ((struct cs_cnt_ctrl_reg *) CS_CNTCONTROL_BASE) #define CNTCONTROL_CR_HDBG UINT32_C(0x00000002) #define CNTCONTROL_CR_EN UINT32_C(0x00000001) diff --git a/product/juno/module/juno_dmc400/include/mod_juno_dmc400.h b/product/juno/module/juno_dmc400/include/mod_juno_dmc400.h index 60222cff..a60ff1c1 100644 --- a/product/juno/module/juno_dmc400/include/mod_juno_dmc400.h +++ b/product/juno/module/juno_dmc400/include/mod_juno_dmc400.h @@ -11,11 +11,16 @@ #ifndef MOD_JUNO_DMC400_H #define MOD_JUNO_DMC400_H -#include <stdint.h> -#include <fwk_macros.h> +#include "scp_config.h" + #include <mod_log.h> #include <mod_timer.h> -#include <scp_config.h> + +#include <fwk_id.h> +#include <fwk_macros.h> + +#include <stdbool.h> +#include <stdint.h> /*! * \ingroup GroupJunoModule diff --git a/product/juno/module/juno_dmc400/src/juno_dmc400.h b/product/juno/module/juno_dmc400/src/juno_dmc400.h index 30344584..3861bd21 100644 --- a/product/juno/module/juno_dmc400/src/juno_dmc400.h +++ b/product/juno/module/juno_dmc400/src/juno_dmc400.h @@ -8,10 +8,11 @@ #ifndef JUNO_DMC400_H #define JUNO_DMC400_H +#include "system_clock.h" + #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module_idx.h> -#include <system_clock.h> /* DDR frequency in MHz */ #define DDR_FREQUENCY_MHZ UINT32_C(800) diff --git a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c index 2313d3f3..59443045 100644 --- a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c +++ b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c @@ -8,26 +8,32 @@ * Juno DMC-400 driver */ +#include "juno_dmc400.h" +#include "juno_id.h" +#include "juno_irq.h" +#include "juno_scc.h" +#include "scp_config.h" +#include "system_clock.h" + +#include <mod_juno_dmc400.h> +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_system_power.h> +#include <mod_timer.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_interrupt.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <fwk_multi_thread.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_juno_dmc400.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_system_power.h> -#include <cmsis_compiler.h> -#include <juno_id.h> -#include <juno_irq.h> -#include <juno_dmc400.h> -#include <juno_scc.h> -#include <scp_config.h> -#include <system_clock.h> -#include <system_mmap.h> +#include <fwk_thread.h> + +#include <fmw_cmsis.h> + +#include <stddef.h> struct juno_dmc400_ctx { const struct mod_juno_dmc400_ddr_phy_api *ddr_phy_api; diff --git a/product/juno/module/juno_hdlcd/include/mod_juno_hdlcd.h b/product/juno/module/juno_hdlcd/include/mod_juno_hdlcd.h index 6f861245..90c98216 100644 --- a/product/juno/module/juno_hdlcd/include/mod_juno_hdlcd.h +++ b/product/juno/module/juno_hdlcd/include/mod_juno_hdlcd.h @@ -8,11 +8,15 @@ #ifndef MOD_JUNO_HDLCD_H #define MOD_JUNO_HDLCD_H -#include <stdint.h> +#include "juno_clock.h" + +#include <mod_clock.h> + #include <fwk_id.h> +#include <fwk_macros.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <juno_clock.h> + +#include <stdint.h> /*! * \addtogroup GroupModules Modules diff --git a/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c b/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c index bdc5b081..109663ee 100644 --- a/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c +++ b/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c @@ -5,19 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "juno_clock.h" +#include "juno_id.h" +#include "juno_scc.h" +#include "system_clock.h" + +#include <mod_clock.h> +#include <mod_juno_hdlcd.h> +#include <mod_log.h> + #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_clock.h> -#include <mod_juno_hdlcd.h> -#include <mod_log.h> -#include <juno_clock.h> -#include <juno_id.h> -#include <juno_scc.h> -#include <system_clock.h> + +#include <stddef.h> +#include <stdint.h> /* * This driver supports the following policy with regards to how both HDLCDs diff --git a/product/juno/module/juno_ppu/include/mod_juno_ppu.h b/product/juno/module/juno_ppu/include/mod_juno_ppu.h index 519e51fd..2072a90e 100644 --- a/product/juno/module/juno_ppu/include/mod_juno_ppu.h +++ b/product/juno/module/juno_ppu/include/mod_juno_ppu.h @@ -8,10 +8,12 @@ #ifndef MOD_JUNO_PPU_H #define MOD_JUNO_PPU_H -#include <stdint.h> +#include <mod_power_domain.h> + #include <fwk_id.h> #include <fwk_module_idx.h> -#include <mod_power_domain.h> + +#include <stdint.h> /*! * \addtogroup GroupJunoModule Juno Product Modules diff --git a/product/juno/module/juno_ppu/src/juno_ppu.h b/product/juno/module/juno_ppu/src/juno_ppu.h index d29f1d7d..8ee65dcd 100644 --- a/product/juno/module/juno_ppu/src/juno_ppu.h +++ b/product/juno/module/juno_ppu/src/juno_ppu.h @@ -8,10 +8,12 @@ #ifndef JUNO_PPU_H #define JUNO_PPU_H -#include <stdint.h> -#include <fwk_macros.h> #include <mod_juno_ppu.h> +#include <fwk_macros.h> + +#include <stdint.h> + struct ppu_reg { FWK_RW uint32_t POWER_POLICY; FWK_R uint32_t POWER_STATUS; diff --git a/product/juno/module/juno_ppu/src/mod_juno_ppu.c b/product/juno/module/juno_ppu/src/mod_juno_ppu.c index c96f42b3..861dda3b 100644 --- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c +++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c @@ -5,7 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "juno_ppu.h" +#include "juno_ppu_idx.h" +#include "juno_utils.h" +#include "scp_config.h" +#include "system_mmap.h" + +#include <mod_juno_ppu.h> +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_system_power.h> +#include <mod_timer.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_interrupt.h> @@ -13,18 +24,10 @@ #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_juno_ppu.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_system_power.h> -#include <mod_timer.h> -#include <juno_irq.h> -#include <juno_power_domain.h> -#include <juno_ppu.h> -#include <juno_ppu_idx.h> -#include <juno_utils.h> -#include <scp_config.h> -#include <system_mmap.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define PPU_SET_STATE_AND_WAIT_TIMEOUT_US (100 * 1000) diff --git a/product/juno/module/juno_pvt/include/mod_juno_pvt.h b/product/juno/module/juno_pvt/include/mod_juno_pvt.h index 7367348b..098fcf1c 100644 --- a/product/juno/module/juno_pvt/include/mod_juno_pvt.h +++ b/product/juno/module/juno_pvt/include/mod_juno_pvt.h @@ -11,6 +11,10 @@ #ifndef MOD_JUNO_PVT_H #define MOD_JUNO_PVT_H +#include <fwk_id.h> + +#include <stdint.h> + /*! * \ingroup GroupJunoModule * \defgroup GroupJunoPVT Juno PVT diff --git a/product/juno/module/juno_pvt/src/mod_juno_pvt.c b/product/juno/module/juno_pvt/src/mod_juno_pvt.c index ae5ef3ca..b9f70c72 100644 --- a/product/juno/module/juno_pvt/src/mod_juno_pvt.c +++ b/product/juno/module/juno_pvt/src/mod_juno_pvt.c @@ -8,22 +8,28 @@ * Juno PVT Sensors driver. */ +#include "juno_id.h" +#include "juno_pvt.h" +#include "pvt_sensor_calibration.h" +#include "system_clock.h" + +#include <mod_juno_pvt.h> +#include <mod_power_domain.h> +#include <mod_sensor.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 <fwk_thread.h> -#include <mod_juno_pvt.h> -#include <mod_power_domain.h> -#include <mod_sensor.h> -#include <juno_id.h> -#include <juno_irq.h> -#include <juno_pvt.h> -#include <pvt_sensor_calibration.h> -#include <system_clock.h> + +#include <stdbool.h> +#include <stddef.h> /* Location Identifier */ #define PVTGROUP_GROUP_INFO_LOC UINT32_C(0x00000001) diff --git a/product/juno/module/juno_ram/src/juno_wdog_ram.c b/product/juno/module/juno_ram/src/juno_wdog_ram.c index 8864f2d2..842dff85 100644 --- a/product/juno/module/juno_ram/src/juno_wdog_ram.c +++ b/product/juno/module/juno_ram/src/juno_wdog_ram.c @@ -5,8 +5,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <juno_wdog.h> +#include "juno_wdog.h" void juno_wdog_ram_disable(void) { diff --git a/product/juno/module/juno_ram/src/mod_juno_ram.c b/product/juno/module/juno_ram/src/mod_juno_ram.c index 7aefbee9..9e1e9b70 100644 --- a/product/juno/module/juno_ram/src/mod_juno_ram.c +++ b/product/juno/module/juno_ram/src/mod_juno_ram.c @@ -5,24 +5,33 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_power_domain.h" +#include "juno_id.h" +#include "juno_pcie.h" +#include "juno_scc.h" +#include "juno_utils.h" +#include "juno_wdog_ram.h" +#include "nic400_gpv.h" +#include "pl35x.h" +#include "xpressrich3.h" + +#include <mod_juno_ram.h> +#include <mod_power_domain.h> +#include <mod_system_power.h> +#include <mod_timer.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_math.h> #include <fwk_module.h> +#include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_juno_ram.h> -#include <mod_system_power.h> -#include <mod_timer.h> -#include <config_power_domain.h> -#include <juno_id.h> -#include <juno_pcie.h> -#include <juno_scc.h> -#include <juno_utils.h> -#include <juno_wdog_ram.h> -#include <nic400_gpv.h> -#include <pl35x.h> -#include <xpressrich3.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define TIMEOUT_RESET_PCIE_US (1000 * 1000) #define SMC_INIT_CMD_SET_CS5 UINT32_C(5 << 23) diff --git a/product/juno/module/juno_rom/include/juno_debug_rom.h b/product/juno/module/juno_rom/include/juno_debug_rom.h index 1d276c3b..46d76073 100644 --- a/product/juno/module/juno_rom/include/juno_debug_rom.h +++ b/product/juno/module/juno_rom/include/juno_debug_rom.h @@ -8,9 +8,10 @@ #ifndef JUNO_DEBUG_ROM_H #define JUNO_DEBUG_ROM_H -#include <stdint.h> #include <mod_juno_ppu.h> +#include <stdint.h> + int juno_debug_rom_init(const struct mod_juno_ppu_rom_api *rom_ppu_api); #endif /* JUNO_DEBUG_ROM_H */ diff --git a/product/juno/module/juno_rom/include/juno_wdog_rom.h b/product/juno/module/juno_rom/include/juno_wdog_rom.h index 4b306c22..801b84d4 100644 --- a/product/juno/module/juno_rom/include/juno_wdog_rom.h +++ b/product/juno/module/juno_rom/include/juno_wdog_rom.h @@ -8,6 +8,7 @@ #ifndef JUNO_WDOG_ROM_H #define JUNO_WDOG_ROM_H +#include <stdbool.h> #include <stdint.h> void juno_wdog_rom_halt_on_debug_config(void); diff --git a/product/juno/module/juno_rom/include/mod_juno_rom.h b/product/juno/module/juno_rom/include/mod_juno_rom.h index 06812b7e..0a5cf347 100644 --- a/product/juno/module/juno_rom/include/mod_juno_rom.h +++ b/product/juno/module/juno_rom/include/mod_juno_rom.h @@ -11,6 +11,9 @@ #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stddef.h> +#include <stdint.h> + /*! * \addtogroup GroupJunoModule Juno Product Modules * \{ diff --git a/product/juno/module/juno_rom/src/juno_debug_rom.c b/product/juno/module/juno_rom/src/juno_debug_rom.c index d9862e4f..63946671 100644 --- a/product/juno/module/juno_rom/src/juno_debug_rom.c +++ b/product/juno/module/juno_rom/src/juno_debug_rom.c @@ -5,16 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_irq.h" +#include "juno_ppu_idx.h" +#include "juno_utils.h" +#include "juno_wdog_rom.h" +#include "scp_config.h" + +#include <mod_juno_ppu.h> +#include <mod_power_domain.h> + #include <fwk_assert.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_juno_ppu.h> -#include <juno_irq.h> -#include <juno_ppu_idx.h> -#include <juno_utils.h> -#include <juno_wdog_rom.h> -#include <scp_config.h> + +#include <stdbool.h> +#include <stdint.h> /* Platform default dividers for debug clocks */ #define JUNO_DEBUG_ROM_DIVIDER_ATCLK 16 diff --git a/product/juno/module/juno_rom/src/juno_wdog_rom.c b/product/juno/module/juno_rom/src/juno_wdog_rom.c index b5bc7c25..7bc00088 100644 --- a/product/juno/module/juno_rom/src/juno_wdog_rom.c +++ b/product/juno/module/juno_rom/src/juno_wdog_rom.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "coresight_soc400.h" +#include "juno_ssc.h" +#include "juno_wdog.h" +#include "system_mmap.h" + #include <stdbool.h> #include <stdint.h> -#include <coresight_soc400.h> -#include <juno_ssc.h> -#include <juno_wdog.h> #define CTI_TRIGGER_WDOG_DISABLE UINT32_C(0x00000001) diff --git a/product/juno/module/juno_rom/src/mod_juno_rom.c b/product/juno/module/juno_rom/src/mod_juno_rom.c index 9bf5e058..633e5750 100644 --- a/product/juno/module/juno_rom/src/mod_juno_rom.c +++ b/product/juno/module/juno_rom/src/mod_juno_rom.c @@ -5,13 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <juno_debug_rom.h> -#include <juno_nic400.h> -#include <juno_ppu_idx.h> -#include <juno_scc.h> -#include <juno_utils.h> -#include <juno_wdog_rom.h> -#include <scp_config.h> +#include "juno_debug_rom.h" +#include "juno_nic400.h" +#include "juno_ppu_idx.h" +#include "juno_scc.h" +#include "juno_utils.h" +#include "juno_wdog_rom.h" +#include "scp_config.h" #include <mod_bootloader.h> #include <mod_juno_ppu.h> @@ -20,13 +20,16 @@ #include <mod_power_domain.h> #include <fwk_assert.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 <fwk_thread.h> +#include <stdbool.h> #include <string.h> /* Values for cluster configuration */ diff --git a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c index 18bb33be..e9422650 100644 --- a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c +++ b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c @@ -8,15 +8,21 @@ * Clock driver for the clocks of the Juno SoC */ -#include <stdint.h> +#include "juno_id.h" +#include "juno_scc.h" +#include "scp_config.h" +#include "system_clock.h" + +#include <mod_juno_soc_clock.h> + #include <fwk_assert.h> +#include <fwk_id.h> +#include <fwk_macros.h> #include <fwk_module.h> #include <fwk_status.h> -#include <mod_juno_soc_clock.h> -#include <juno_id.h> -#include <juno_scc.h> -#include <scp_config.h> -#include <system_clock.h> + +#include <stddef.h> +#include <stdint.h> /* * Masks for clock control registers diff --git a/product/juno/module/juno_soc_clock_ram/include/mod_juno_soc_clock_ram.h b/product/juno/module/juno_soc_clock_ram/include/mod_juno_soc_clock_ram.h index b50d9ac7..f63c085a 100644 --- a/product/juno/module/juno_soc_clock_ram/include/mod_juno_soc_clock_ram.h +++ b/product/juno/module/juno_soc_clock_ram/include/mod_juno_soc_clock_ram.h @@ -8,11 +8,12 @@ #ifndef MOD_JUNO_SOC_CLOCK_RAM_H #define MOD_JUNO_SOC_CLOCK_RAM_H -#include <stdint.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module_idx.h> +#include <stdint.h> + /*! * \addtogroup GroupModules Modules * @{ diff --git a/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c b/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c index dbddc2fb..eb81c304 100644 --- a/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c +++ b/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c @@ -8,14 +8,17 @@ * Clock driver for the big/little cluster and GPU clocks of the Juno SoC */ -#include <stdbool.h> -#include <stdint.h> -#include <stdlib.h> +#include "juno_scc.h" +#include "juno_soc_clock_ram_pll.h" +#include "scp_config.h" + +#include <mod_juno_soc_clock_ram.h> + #include <fwk_assert.h> #include <fwk_status.h> -#include <juno_scc.h> -#include <juno_soc_clock_ram_pll.h> -#include <scp_config.h> + +#include <stdint.h> +#include <stdlib.h> /* * Static helper functions diff --git a/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.h b/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.h index 323e6f94..81983bdf 100644 --- a/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.h +++ b/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.h @@ -8,9 +8,11 @@ #ifndef JUNO_SOC_CLOCK_RAM_PLL_H #define JUNO_SOC_CLOCK_RAM_PLL_H -#include <stdint.h> +#include "juno_scc.h" + #include <mod_juno_soc_clock_ram.h> -#include <juno_scc.h> + +#include <stdint.h> void juno_soc_clock_ram_pll_init(void); diff --git a/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c b/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c index bc1829c3..2c51ac38 100644 --- a/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c +++ b/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c @@ -5,10 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdlib.h> +#include "juno_scc.h" +#include "juno_soc_clock_ram_pll.h" +#include "scp_config.h" +#include "system_clock.h" + +#include <mod_clock.h> +#include <mod_juno_soc_clock_ram.h> +#include <mod_power_domain.h> +#include <mod_timer.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> @@ -16,13 +24,10 @@ #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_juno_soc_clock_ram.h> -#include <mod_power_domain.h> -#include <mod_timer.h> -#include <juno_soc_clock_ram_pll.h> -#include <system_clock.h> -#include <scp_config.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> /* * When changing CLUSTER_MIN_FREQ, make sure it is a frequency we can easily diff --git a/product/juno/module/juno_system/src/juno_system.h b/product/juno/module/juno_system/src/juno_system.h index 027ba998..d7d86dc7 100644 --- a/product/juno/module/juno_system/src/juno_system.h +++ b/product/juno/module/juno_system/src/juno_system.h @@ -8,9 +8,13 @@ #ifndef JUNO_SYSTEM_H #define JUNO_SYSTEM_H +#include "config_power_domain.h" +#include "config_psu.h" + +#include <mod_psu.h> + #include <fwk_id.h> #include <fwk_module_idx.h> -#include <config_psu.h> /* PSU API identifier */ static const fwk_id_t psu_api_id = diff --git a/product/juno/module/juno_system/src/mod_juno_system.c b/product/juno/module/juno_system/src/mod_juno_system.c index 44697d0e..9791cd02 100644 --- a/product/juno/module/juno_system/src/mod_juno_system.c +++ b/product/juno/module/juno_system/src/mod_juno_system.c @@ -5,32 +5,34 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fmw_cmsis.h> +#include "juno_id.h" +#include "juno_scmi.h" +#include "juno_sds.h" +#include "juno_system.h" + +#include <mod_juno_system.h> +#include <mod_juno_xrp7724.h> +#include <mod_power_domain.h> +#include <mod_psu.h> +#include <mod_scmi.h> +#include <mod_sds.h> +#include <mod_system_power.h> + #include <fwk_assert.h> #include <fwk_event.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <fwk_multi_thread.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_juno_system.h> -#include <mod_juno_xrp7724.h> -#include <mod_power_domain.h> -#include <mod_psu.h> -#include <mod_scmi.h> -#include <mod_sds.h> -#include <mod_system_power.h> -#include <config_power_domain.h> -#include <juno_id.h> -#include <juno_irq.h> -#include <juno_ppu_idx.h> -#include <juno_scmi.h> -#include <juno_sds.h> -#include <juno_system.h> -#include <system_mmap.h> +#include <fwk_thread.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> static fwk_id_t sds_feature_availability_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_SDS, JUNO_SDS_RAM_FEATURES_IDX); diff --git a/product/juno/module/juno_thermal/include/mod_juno_thermal.h b/product/juno/module/juno_thermal/include/mod_juno_thermal.h index f81fffd6..96d70176 100644 --- a/product/juno/module/juno_thermal/include/mod_juno_thermal.h +++ b/product/juno/module/juno_thermal/include/mod_juno_thermal.h @@ -1,4 +1,4 @@ - /* +/* * Arm SCP/MCP Software * Copyright (c) 2020, Arm Limited and Contributors. All rights reserved. * diff --git a/product/juno/module/juno_thermal/src/mod_juno_thermal.c b/product/juno/module/juno_thermal/src/mod_juno_thermal.c index b644e279..fbff4c34 100644 --- a/product/juno/module/juno_thermal/src/mod_juno_thermal.c +++ b/product/juno/module/juno_thermal/src/mod_juno_thermal.c @@ -8,24 +8,26 @@ * Juno Thermal Protection */ +#include "config_juno_thermal.h" +#include "config_power_domain.h" +#include "juno_alarm_idx.h" +#include "juno_id.h" + +#include <mod_juno_thermal.h> +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_sensor.h> +#include <mod_system_power.h> +#include <mod_timer.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> -#include <fwk_thread.h> #include <fwk_status.h> -#include <mod_juno_thermal.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_sensor.h> -#include <mod_system_power.h> -#include <mod_timer.h> -#include <config_juno_thermal.h> -#include <config_power_domain.h> -#include <juno_alarm_idx.h> -#include <juno_id.h> +#include <fwk_thread.h> enum mod_juno_thermal_event_idx { MOD_JUNO_THERMAL_EVENT_IDX_TIMER, diff --git a/product/juno/module/juno_xrp7724/include/mod_juno_xrp7724.h b/product/juno/module/juno_xrp7724/include/mod_juno_xrp7724.h index 2e30ade0..d35c12dd 100644 --- a/product/juno/module/juno_xrp7724/include/mod_juno_xrp7724.h +++ b/product/juno/module/juno_xrp7724/include/mod_juno_xrp7724.h @@ -14,6 +14,8 @@ #include <fwk_id.h> #include <fwk_module_idx.h> +#include <stdint.h> + /*! * \ingroup GroupJunoModule * diff --git a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c index 23cf96c6..dd3074c7 100644 --- a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c +++ b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c @@ -5,19 +5,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "juno_id.h" + +#include <mod_i2c.h> +#include <mod_juno_xrp7724.h> +#include <mod_psu.h> +#include <mod_sensor.h> +#include <mod_timer.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_multi_thread.h> #include <fwk_status.h> -#include <mod_i2c.h> -#include <mod_juno_xrp7724.h> -#include <mod_psu.h> -#include <mod_sensor.h> -#include <mod_timer.h> -#include <juno_id.h> +#include <fwk_thread.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> /* Maximum required length for the I2C transmissions */ #define TRANSMIT_DATA_MAX 3 diff --git a/product/juno/scp_ramfw/config_clock.c b/product/juno/scp_ramfw/config_clock.c index c34c8b55..1b0ca8f4 100644 --- a/product/juno/scp_ramfw/config_clock.c +++ b/product/juno/scp_ramfw/config_clock.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "config_power_domain.h" +#include "juno_clock.h" + #include <mod_clock.h> #include <mod_juno_cdcel937.h> #include <mod_juno_hdlcd.h> #include <mod_juno_soc_clock_ram.h> #include <mod_power_domain.h> -#include <juno_clock.h> -#include <config_power_domain.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static struct fwk_element clock_dev_desc_table[] = { [JUNO_CLOCK_IDX_I2SCLK] = { diff --git a/product/juno/scp_ramfw/config_debug.c b/product/juno/scp_ramfw/config_debug.c index 0ed72e81..1417ee94 100644 --- a/product/juno/scp_ramfw/config_debug.c +++ b/product/juno/scp_ramfw/config_debug.c @@ -5,11 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_debug.h> +#include <mod_juno_debug.h> + #include <fwk_element.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_debug.h> -#include <mod_juno_debug.h> /* Configuration of the Debug elements */ static const struct fwk_element debug_element_table[] = { diff --git a/product/juno/scp_ramfw/config_dvfs.c b/product/juno/scp_ramfw/config_dvfs.c index 1c4643de..360473e4 100644 --- a/product/juno/scp_ramfw/config_dvfs.c +++ b/product/juno/scp_ramfw/config_dvfs.c @@ -5,17 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_dvfs.h" +#include "config_psu.h" +#include "juno_alarm_idx.h" +#include "juno_clock.h" +#include "juno_id.h" + +#include <mod_dvfs.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 <config_dvfs.h> -#include <config_psu.h> -#include <juno_alarm_idx.h> -#include <juno_clock.h> -#include <juno_id.h> -#include <mod_dvfs.h> +#include <fwk_status.h> + +#include <stddef.h> /* * The power cost figures from this file are built using the dynamic power diff --git a/product/juno/scp_ramfw/config_i2c.c b/product/juno/scp_ramfw/config_i2c.c index 4d59e1e3..23da91b4 100644 --- a/product/juno/scp_ramfw/config_i2c.c +++ b/product/juno/scp_ramfw/config_i2c.c @@ -5,14 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_irq.h" +#include "juno_mmap.h" + +#include <mod_dw_apb_i2c.h> +#include <mod_i2c.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_dw_apb_i2c.h> -#include <mod_i2c.h> -#include <juno_irq.h> -#include <juno_mmap.h> + +#include <stdint.h> static const struct fwk_element dw_apb_i2c_element_table[] = { [0] = { diff --git a/product/juno/scp_ramfw/config_juno_adc.c b/product/juno/scp_ramfw/config_juno_adc.c index 20ec5aed..f3f86032 100644 --- a/product/juno/scp_ramfw/config_juno_adc.c +++ b/product/juno/scp_ramfw/config_juno_adc.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include <config_sensor.h> + #include <mod_juno_adc.h> #include <mod_sensor.h> -#include <config_sensor.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> static const struct fwk_element adc_juno_element_table[] = { [ADC_TYPE_VOLT] = { diff --git a/product/juno/scp_ramfw/config_juno_cdcel937.c b/product/juno/scp_ramfw/config_juno_cdcel937.c index 47aa3eb3..02f4f8c9 100644 --- a/product/juno/scp_ramfw/config_juno_cdcel937.c +++ b/product/juno/scp_ramfw/config_juno_cdcel937.c @@ -5,18 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_clock.h" +#include "juno_id.h" +#include "juno_mmap.h" +#include "juno_scc.h" + +#include <mod_clock.h> +#include <mod_juno_cdcel937.h> +#include <mod_juno_hdlcd.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 <mod_clock.h> -#include <mod_juno_cdcel937.h> -#include <mod_juno_hdlcd.h> -#include <juno_clock.h> -#include <juno_id.h> -#include <juno_mmap.h> +#include <fwk_status.h> + +#include <stddef.h> +#include <stdint.h> static struct juno_clock_lookup i2s_lookup_table[] = { { diff --git a/product/juno/scp_ramfw/config_juno_ddr_phy400.c b/product/juno/scp_ramfw/config_juno_ddr_phy400.c index ca9a9280..1f298a29 100644 --- a/product/juno/scp_ramfw/config_juno_ddr_phy400.c +++ b/product/juno/scp_ramfw/config_juno_ddr_phy400.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_mmap.h" + +#include <mod_juno_ddr_phy400.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_ddr_phy400.h> -#include <juno_mmap.h> static struct fwk_element juno_ddr_phy400_element_table[] = { [0] = { diff --git a/product/juno/scp_ramfw/config_juno_debug.c b/product/juno/scp_ramfw/config_juno_debug.c index 9d7f6415..60c7b5b7 100644 --- a/product/juno/scp_ramfw/config_juno_debug.c +++ b/product/juno/scp_ramfw/config_juno_debug.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <config_power_domain.h> +#include <juno_id.h> +#include <system_clock.h> + +#include <mod_debug.h> +#include <mod_juno_debug.h> + #include <fwk_element.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_debug.h> -#include <mod_juno_debug.h> -#include <config_power_domain.h> -#include <juno_id.h> -#include <system_clock.h> /* Debug clock settings for Juno with default values for R0 */ static struct juno_css_debug_dev clock_settings = { diff --git a/product/juno/scp_ramfw/config_juno_dmc400.c b/product/juno/scp_ramfw/config_juno_dmc400.c index 2729dd26..467989e3 100644 --- a/product/juno/scp_ramfw/config_juno_dmc400.c +++ b/product/juno/scp_ramfw/config_juno_dmc400.c @@ -5,16 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_power_domain.h" +#include "juno_id.h" +#include "system_mmap.h" + +#include <mod_juno_dmc400.h> + #include <fwk_assert.h> #include <fwk_element.h> -#include <fwk_macros.h> -#include <fwk_mm.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_dmc400.h> -#include <config_power_domain.h> -#include <juno_id.h> -#include <system_mmap.h> +#include <fwk_status.h> + +#include <stddef.h> /* All Juno variants but A */ #define COL_BITS 2 diff --git a/product/juno/scp_ramfw/config_juno_hdlcd.c b/product/juno/scp_ramfw/config_juno_hdlcd.c index 10f9691b..43d81484 100644 --- a/product/juno/scp_ramfw/config_juno_hdlcd.c +++ b/product/juno/scp_ramfw/config_juno_hdlcd.c @@ -5,18 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_clock.h" +#include "juno_id.h" +#include "juno_mmap.h" +#include "juno_scc.h" + +#include <mod_clock.h> +#include <mod_juno_cdcel937.h> +#include <mod_juno_hdlcd.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 <mod_juno_cdcel937.h> -#include <mod_juno_hdlcd.h> -#include <mod_clock.h> -#include <juno_clock.h> -#include <juno_id.h> -#include <juno_scc.h> +#include <fwk_status.h> + +#include <stddef.h> +#include <stdint.h> enum juno_hdlcd_element_idx { JUNO_HDLCD_ELEMENT_IDX_HDLCD0, diff --git a/product/juno/scp_ramfw/config_juno_ppu.c b/product/juno/scp_ramfw/config_juno_ppu.c index 487034da..1ec9eade 100644 --- a/product/juno/scp_ramfw/config_juno_ppu.c +++ b/product/juno/scp_ramfw/config_juno_ppu.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_alarm_idx.h" +#include "juno_irq.h" +#include "juno_ppu_idx.h" +#include "system_mmap.h" + +#include <mod_juno_ppu.h> +#include <mod_power_domain.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_ppu.h> -#include <juno_alarm_idx.h> -#include <juno_irq.h> -#include <juno_ppu_idx.h> -#include <system_clock.h> -#include <system_mmap.h> static struct fwk_element element_table[] = { [JUNO_PPU_DEV_IDX_BIG_SSTOP] = { diff --git a/product/juno/scp_ramfw/config_juno_pvt.c b/product/juno/scp_ramfw/config_juno_pvt.c index dacf579c..19dbeac6 100644 --- a/product/juno/scp_ramfw/config_juno_pvt.c +++ b/product/juno/scp_ramfw/config_juno_pvt.c @@ -5,18 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_macros.h> +#include "config_power_domain.h" +#include "config_sensor.h" +#include "juno_id.h" +#include "juno_irq.h" +#include "juno_pvt.h" +#include "pvt_sensor_calibration.h" + +#include <mod_juno_pvt.h> +#include <mod_sensor.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_pvt.h> -#include <mod_sensor.h> -#include <juno_id.h> -#include <juno_irq.h> -#include <juno_pvt.h> -#include <config_power_domain.h> -#include <config_sensor.h> -#include <pvt_sensor_calibration.h> +#include <fwk_status.h> + +#include <stddef.h> +#include <stdint.h> /* Constants for additional calibration on Juno R0 */ #define CAL_45_JUNO_R0 455 diff --git a/product/juno/scp_ramfw/config_juno_ram.c b/product/juno/scp_ramfw/config_juno_ram.c index efc539a3..c1ecc878 100644 --- a/product/juno/scp_ramfw/config_juno_ram.c +++ b/product/juno/scp_ramfw/config_juno_ram.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_juno_ram.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_ram.h> struct fwk_module_config config_juno_ram = { .data = &(struct mod_juno_ram_config) { diff --git a/product/juno/scp_ramfw/config_juno_soc_clock_ram.c b/product/juno/scp_ramfw/config_juno_soc_clock_ram.c index d141fd9d..c765ce38 100644 --- a/product/juno/scp_ramfw/config_juno_soc_clock_ram.c +++ b/product/juno/scp_ramfw/config_juno_soc_clock_ram.c @@ -5,16 +5,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_power_domain.h" +#include "juno_clock.h" +#include "juno_id.h" +#include "juno_scc.h" +#include "scp_config.h" + +#include <mod_juno_soc_clock_ram.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_soc_clock_ram.h> -#include <juno_clock.h> -#include <juno_id.h> -#include <juno_scc.h> -#include <scp_config.h> -#include <config_power_domain.h> +#include <fwk_status.h> + +#include <stddef.h> /* * Big cluster rate tables respectively for Juno r0, r1 and r2. diff --git a/product/juno/scp_ramfw/config_juno_thermal.c b/product/juno/scp_ramfw/config_juno_thermal.c index 015bc737..d76cafb9 100644 --- a/product/juno/scp_ramfw/config_juno_thermal.c +++ b/product/juno/scp_ramfw/config_juno_thermal.c @@ -5,13 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_juno_thermal.h" +#include "config_sensor.h" +#include "juno_alarm_idx.h" + +#include <mod_juno_thermal.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <juno_alarm_idx.h> -#include <mod_juno_thermal.h> -#include <config_juno_thermal.h> -#include <config_sensor.h> + +#include <stdint.h> static struct fwk_element juno_thermal_element_table[] = { [MOD_JUNO_THERMAL_ELEMENT_IDX_CRITICAL] = { diff --git a/product/juno/scp_ramfw/config_juno_xrp7724.c b/product/juno/scp_ramfw/config_juno_xrp7724.c index 1f40923f..0471299d 100644 --- a/product/juno/scp_ramfw/config_juno_xrp7724.c +++ b/product/juno/scp_ramfw/config_juno_xrp7724.c @@ -5,19 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_juno_xrp7724.h" +#include "config_psu.h" +#include "config_sensor.h" +#include "juno_alarm_idx.h" + +#include <mod_juno_xrp7724.h> +#include <mod_psu.h> +#include <mod_sensor.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_i2c.h> -#include <mod_juno_xrp7724.h> -#include <mod_psu.h> -#include <mod_sensor.h> -#include <mod_timer.h> -#include <juno_alarm_idx.h> -#include <config_sensor.h> -#include <config_juno_xrp7724.h> -#include <config_psu.h> enum mod_juno_xrp7724_gpio_idx { MOD_JUNO_XRP7724_GPIO_IDX_ASSERT, diff --git a/product/juno/scp_ramfw/config_log.c b/product/juno/scp_ramfw/config_log.c index c48a238d..1a7da35d 100644 --- a/product/juno/scp_ramfw/config_log.c +++ b/product/juno/scp_ramfw/config_log.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_power_domain.h" +#include "juno_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <config_power_domain.h> -#include <juno_mmap.h> + +#include <stddef.h> static const struct fwk_element pl011_element_desc_table[] = { [0] = { diff --git a/product/juno/scp_ramfw/config_mhu.c b/product/juno/scp_ramfw/config_mhu.c index ab60844b..e09ce451 100644 --- a/product/juno/scp_ramfw/config_mhu.c +++ b/product/juno/scp_ramfw/config_mhu.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_irq.h" +#include "juno_mhu.h" +#include "system_mmap.h" + +#include <mod_mhu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu.h> -#include <juno_irq.h> -#include <juno_mhu.h> -#include <system_mmap.h> + +#include <stddef.h> static const struct fwk_element element_table[] = { [JUNO_MHU_DEVICE_IDX_S] = { diff --git a/product/juno/scp_ramfw/config_mock_psu.c b/product/juno/scp_ramfw/config_mock_psu.c index 7374db0a..cfb2ac13 100644 --- a/product/juno/scp_ramfw/config_mock_psu.c +++ b/product/juno/scp_ramfw/config_mock_psu.c @@ -5,9 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_mock_psu.h> + +#include <stdbool.h> +#include <stddef.h> static const struct fwk_element element_table[] = { [0] = { diff --git a/product/juno/scp_ramfw/config_power_domain.c b/product/juno/scp_ramfw/config_power_domain.c index ebcc28c9..8d9ed2da 100644 --- a/product/juno/scp_ramfw/config_power_domain.c +++ b/product/juno/scp_ramfw/config_power_domain.c @@ -5,16 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> -#include <fwk_macros.h> -#include <fwk_module.h> +#include "config_power_domain.h" +#include "juno_power_domain.h" +#include "juno_ppu_idx.h" + #include <mod_juno_ppu.h> #include <mod_power_domain.h> #include <mod_system_power.h> -#include <config_power_domain.h> -#include <juno_power_domain.h> -#include <juno_ppu_idx.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_macros.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> + +#include <stdint.h> /* Masks of the allowed states for the systop power domain */ static const uint32_t systop_pd_allowed_state_mask_table[] = { diff --git a/product/juno/scp_ramfw/config_psu.c b/product/juno/scp_ramfw/config_psu.c index f2e36a2b..4da6a984 100644 --- a/product/juno/scp_ramfw/config_psu.c +++ b/product/juno/scp_ramfw/config_psu.c @@ -5,16 +5,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_juno_xrp7724.h" +#include "config_psu.h" +#include "juno_id.h" + +#include <mod_juno_xrp7724.h> +#include <mod_mock_psu.h> +#include <mod_psu.h> + #include <fwk_assert.h> #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_xrp7724.h> -#include <mod_mock_psu.h> -#include <mod_psu.h> -#include <config_juno_xrp7724.h> -#include <config_psu.h> -#include <juno_id.h> +#include <fwk_status.h> + +#include <stddef.h> static struct fwk_element psu_dev_desc_table[] = { [MOD_PSU_ELEMENT_IDX_VSYS] = { diff --git a/product/juno/scp_ramfw/config_reg_sensor.c b/product/juno/scp_ramfw/config_reg_sensor.c index bf928208..0fee4765 100644 --- a/product/juno/scp_ramfw/config_reg_sensor.c +++ b/product/juno/scp_ramfw/config_reg_sensor.c @@ -5,11 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> #include <mod_reg_sensor.h> #include <mod_sensor.h> -#include <system_mmap.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> + +#include <stddef.h> +#include <stdint.h> static uint64_t fake_register = UINT64_C(0x1234); diff --git a/product/juno/scp_ramfw/config_scmi.c b/product/juno/scp_ramfw/config_scmi.c index 67d841f9..67b1cbee 100644 --- a/product/juno/scp_ramfw/config_scmi.c +++ b/product/juno/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi.h> -#include <mod_smt.h> -#include <juno_scmi.h> -#include <internal/scmi.h> static const struct fwk_element element_table[] = { [JUNO_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/juno/scp_ramfw/config_scmi_clock.c b/product/juno/scp_ramfw/config_scmi_clock.c index 8f564125..95a3759b 100644 --- a/product/juno/scp_ramfw/config_scmi_clock.c +++ b/product/juno/scp_ramfw/config_scmi_clock.c @@ -5,14 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> +#include "juno_clock.h" +#include "juno_scmi.h" + +#include <mod_scmi_clock.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi_clock.h> -#include <juno_scmi.h> -#include <juno_clock.h> static const struct mod_scmi_clock_device agent_device_table_ospm[] = { { diff --git a/product/juno/scp_ramfw/config_scmi_perf.c b/product/juno/scp_ramfw/config_scmi_perf.c index 0d0667bd..06741258 100644 --- a/product/juno/scp_ramfw/config_scmi_perf.c +++ b/product/juno/scp_ramfw/config_scmi_perf.c @@ -5,15 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <config_dvfs.h> -#include <juno_scmi.h> -#include <mod_scmi.h> +#include "config_dvfs.h" +#include "juno_scmi.h" + #include <mod_scmi_perf.h> +#include <fwk_module.h> + +#include <stddef.h> +#include <stdint.h> + static const struct mod_scmi_perf_domain_config domains[] = { [DVFS_ELEMENT_IDX_LITTLE] = { .permissions = &(const uint32_t[]) { diff --git a/product/juno/scp_ramfw/config_scmi_power_domain.c b/product/juno/scp_ramfw/config_scmi_power_domain.c index 5e89f54b..04a63910 100644 --- a/product/juno/scp_ramfw/config_scmi_power_domain.c +++ b/product/juno/scp_ramfw/config_scmi_power_domain.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <config_power_domain.h> + +#include <mod_scmi_power_domain.h> + #include <fwk_element.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi_power_domain.h> -#include <config_power_domain.h> #if BUILD_HAS_MOD_DEBUG struct fwk_module_config config_scmi_power_domain = { diff --git a/product/juno/scp_ramfw/config_scmi_system_power.c b/product/juno/scp_ramfw/config_scmi_system_power.c index 14a6b90c..42b6199c 100644 --- a/product/juno/scp_ramfw/config_scmi_system_power.c +++ b/product/juno/scp_ramfw/config_scmi_system_power.c @@ -5,11 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + struct fwk_module_config config_scmi_system_power = { .data = &(struct mod_scmi_system_power_config) { .system_view = MOD_SCMI_SYSTEM_VIEW_FULL, diff --git a/product/juno/scp_ramfw/config_sds.c b/product/juno/scp_ramfw/config_sds.c index 32c14f7d..a855a1fa 100644 --- a/product/juno/scp_ramfw/config_sds.c +++ b/product/juno/scp_ramfw/config_sds.c @@ -5,13 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "juno_sds.h" +#include "software_mmap.h" + +#include <mod_sds.h> + #include <fwk_assert.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_sds.h> -#include <juno_sds.h> -#include <software_mmap.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t feature_flags = 0x00000000; static const uint32_t version_packed = FWK_BUILD_VERSION; diff --git a/product/juno/scp_ramfw/config_sensor.c b/product/juno/scp_ramfw/config_sensor.c index ad71226f..119d296e 100644 --- a/product/juno/scp_ramfw/config_sensor.c +++ b/product/juno/scp_ramfw/config_sensor.c @@ -5,18 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> +#include "config_sensor.h" +#include "juno_id.h" + +#include <mod_juno_adc.h> +#include <mod_juno_pvt.h> +#include <mod_juno_xrp7724.h> +#include <mod_sensor.h> + #include <fwk_assert.h> #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_juno_adc.h> -#include <mod_juno_pvt.h> -#include <mod_juno_xrp7724.h> -#include <config_sensor.h> -#include <juno_id.h> +#include <fwk_status.h> + +#include <string.h> static const struct fwk_element sensor_element_table_r0[] = { /* diff --git a/product/juno/scp_ramfw/config_smt.c b/product/juno/scp_ramfw/config_smt.c index 0b32db19..2fbe0756 100644 --- a/product/juno/scp_ramfw/config_smt.c +++ b/product/juno/scp_ramfw/config_smt.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_power_domain.h" +#include "juno_mhu.h" +#include "juno_scmi.h" +#include "software_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <config_power_domain.h> -#include <juno_mhu.h> -#include <juno_scmi.h> -#include <software_mmap.h> + +#include <stddef.h> +#include <stdint.h> static const struct fwk_element element_table[] = { [JUNO_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/juno/scp_ramfw/config_system_power.c b/product/juno/scp_ramfw/config_system_power.c index e296bf31..c475c1c9 100644 --- a/product/juno/scp_ramfw/config_system_power.c +++ b/product/juno/scp_ramfw/config_system_power.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_irq.h" +#include "juno_ppu_idx.h" + +#include <mod_juno_ppu.h> +#include <mod_power_domain.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> -#include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <juno_irq.h> -#include <juno_power_domain.h> -#include <juno_ppu_idx.h> -#include <mod_juno_ppu.h> -#include <mod_system_power.h> + +#include <stdint.h> static const uint8_t system_power_to_sys_ppu_state[] = { [MOD_PD_STATE_ON] = (uint8_t)MOD_PD_STATE_ON, diff --git a/product/juno/scp_ramfw/config_timer.c b/product/juno/scp_ramfw/config_timer.c index ef2d94c4..d3ca47b5 100644 --- a/product/juno/scp_ramfw/config_timer.c +++ b/product/juno/scp_ramfw/config_timer.c @@ -5,17 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_alarm_idx.h" +#include "juno_irq.h" +#include "system_clock.h" +#include "system_mmap.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> -#include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <juno_alarm_idx.h> -#include <juno_irq.h> -#include <system_clock.h> -#include <system_mmap.h> static const struct fwk_element gtimer_element_table[] = { [0] = { diff --git a/product/juno/scp_ramfw/fmw_memory.h b/product/juno/scp_ramfw/fmw_memory.h index ff834a19..11b2cf37 100644 --- a/product/juno/scp_ramfw/fmw_memory.h +++ b/product/juno/scp_ramfw/fmw_memory.h @@ -8,7 +8,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_mmap.h> +#include "scp_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION diff --git a/product/juno/scp_ramfw/rtx_config.c b/product/juno/scp_ramfw/rtx_config.c index 814d7441..995d049a 100644 --- a/product/juno/scp_ramfw/rtx_config.c +++ b/product/juno/scp_ramfw/rtx_config.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <cmsis_compiler.h> +#include "system_clock.h" + #include <rtx_lib.c> #include <rtx_os.h> -#include <system_clock.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/juno/scp_romfw/config_bootloader.c b/product/juno/scp_romfw/config_bootloader.c index ba9ffae6..d54921dd 100644 --- a/product/juno/scp_romfw/config_bootloader.c +++ b/product/juno/scp_romfw/config_bootloader.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "juno_sds.h" +#include "scp_mmap.h" +#include "system_mmap.h" + #include <mod_bootloader.h> -#include <juno_sds.h> -#include <scp_mmap.h> -#include <system_mmap.h> + +#include <fwk_module.h> static const struct mod_bootloader_config bootloader_module_config = { .source_base = TRUSTED_RAM_BASE, diff --git a/product/juno/scp_romfw/config_juno_ppu.c b/product/juno/scp_romfw/config_juno_ppu.c index 991814c2..b4cba63c 100644 --- a/product/juno/scp_romfw/config_juno_ppu.c +++ b/product/juno/scp_romfw/config_juno_ppu.c @@ -5,13 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_ppu_idx.h" +#include "system_mmap.h" + +#include <mod_juno_ppu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_juno_ppu.h> -#include <juno_ppu_idx.h> -#include <system_clock.h> -#include <system_mmap.h> + +#include <stddef.h> static struct fwk_element element_table[] = { [JUNO_PPU_DEV_IDX_BIG_SSTOP] = { diff --git a/product/juno/scp_romfw/config_juno_rom.c b/product/juno/scp_romfw/config_juno_rom.c index cc9e9f85..85b141fa 100644 --- a/product/juno/scp_romfw/config_juno_rom.c +++ b/product/juno/scp_romfw/config_juno_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "scp_mmap.h" +#include "software_mmap.h" + #include <mod_juno_rom.h> -#include <software_mmap.h> -#include <scp_mmap.h> + +#include <fwk_module.h> struct fwk_module_config config_juno_rom = { .data = &(struct mod_juno_rom_config) { diff --git a/product/juno/scp_romfw/config_log.c b/product/juno/scp_romfw/config_log.c index 54342a2c..c449fde3 100644 --- a/product/juno/scp_romfw/config_log.c +++ b/product/juno/scp_romfw/config_log.c @@ -5,14 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <juno_mmap.h> + +#include <stddef.h> static const struct fwk_element pl011_element_desc_table[] = { [0] = { diff --git a/product/juno/scp_romfw/config_sds.c b/product/juno/scp_romfw/config_sds.c index 97b3a2e3..f97a6ad6 100644 --- a/product/juno/scp_romfw/config_sds.c +++ b/product/juno/scp_romfw/config_sds.c @@ -5,21 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "juno_id.h" +#include "juno_scc.h" +#include "juno_sds.h" +#include "juno_ssc.h" +#include "scp_config.h" +#include "software_mmap.h" + +#include <mod_sds.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 <mod_sds.h> -#include <juno_id.h> -#include <juno_mmap.h> -#include <juno_scc.h> -#include <juno_sds.h> -#include <juno_ssc.h> -#include <scp_config.h> -#include <software_mmap.h> -#include <system_mmap.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static struct juno_sds_platid platid; diff --git a/product/juno/scp_romfw/config_timer.c b/product/juno/scp_romfw/config_timer.c index 4840c12d..c3b16d2e 100644 --- a/product/juno/scp_romfw/config_timer.c +++ b/product/juno/scp_romfw/config_timer.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "system_clock.h" +#include "system_mmap.h" + +#include <mod_gtimer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_gtimer.h> -#include <system_mmap.h> -#include <system_clock.h> static const struct fwk_element element_table[] = { [0] = { diff --git a/product/juno/scp_romfw/fmw_memory.h b/product/juno/scp_romfw/fmw_memory.h index dd552e45..4cccc6a7 100644 --- a/product/juno/scp_romfw/fmw_memory.h +++ b/product/juno/scp_romfw/fmw_memory.h @@ -8,7 +8,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_mmap.h> +#include "scp_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/juno/scp_romfw_bypass/config_bootloader.c b/product/juno/scp_romfw_bypass/config_bootloader.c index ba9ffae6..d54921dd 100644 --- a/product/juno/scp_romfw_bypass/config_bootloader.c +++ b/product/juno/scp_romfw_bypass/config_bootloader.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "juno_sds.h" +#include "scp_mmap.h" +#include "system_mmap.h" + #include <mod_bootloader.h> -#include <juno_sds.h> -#include <scp_mmap.h> -#include <system_mmap.h> + +#include <fwk_module.h> static const struct mod_bootloader_config bootloader_module_config = { .source_base = TRUSTED_RAM_BASE, diff --git a/product/juno/scp_romfw_bypass/config_juno_ppu.c b/product/juno/scp_romfw_bypass/config_juno_ppu.c index 991814c2..b4cba63c 100644 --- a/product/juno/scp_romfw_bypass/config_juno_ppu.c +++ b/product/juno/scp_romfw_bypass/config_juno_ppu.c @@ -5,13 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_ppu_idx.h" +#include "system_mmap.h" + +#include <mod_juno_ppu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_juno_ppu.h> -#include <juno_ppu_idx.h> -#include <system_clock.h> -#include <system_mmap.h> + +#include <stddef.h> static struct fwk_element element_table[] = { [JUNO_PPU_DEV_IDX_BIG_SSTOP] = { diff --git a/product/juno/scp_romfw_bypass/config_juno_rom.c b/product/juno/scp_romfw_bypass/config_juno_rom.c index cc9e9f85..85b141fa 100644 --- a/product/juno/scp_romfw_bypass/config_juno_rom.c +++ b/product/juno/scp_romfw_bypass/config_juno_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "scp_mmap.h" +#include "software_mmap.h" + #include <mod_juno_rom.h> -#include <software_mmap.h> -#include <scp_mmap.h> + +#include <fwk_module.h> struct fwk_module_config config_juno_rom = { .data = &(struct mod_juno_rom_config) { diff --git a/product/juno/scp_romfw_bypass/config_log.c b/product/juno/scp_romfw_bypass/config_log.c index 54342a2c..c449fde3 100644 --- a/product/juno/scp_romfw_bypass/config_log.c +++ b/product/juno/scp_romfw_bypass/config_log.c @@ -5,14 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "juno_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <juno_mmap.h> + +#include <stddef.h> static const struct fwk_element pl011_element_desc_table[] = { [0] = { diff --git a/product/juno/scp_romfw_bypass/config_sds.c b/product/juno/scp_romfw_bypass/config_sds.c index 520f6a86..41a63ce2 100644 --- a/product/juno/scp_romfw_bypass/config_sds.c +++ b/product/juno/scp_romfw_bypass/config_sds.c @@ -5,21 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "juno_id.h" +#include "juno_scc.h" +#include "juno_sds.h" +#include "juno_ssc.h" +#include "scp_config.h" +#include "software_mmap.h" + +#include <mod_sds.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 <mod_sds.h> -#include <juno_id.h> -#include <juno_mmap.h> -#include <juno_scc.h> -#include <juno_sds.h> -#include <juno_ssc.h> -#include <scp_config.h> -#include <software_mmap.h> -#include <system_mmap.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static struct juno_sds_platid platid; diff --git a/product/juno/scp_romfw_bypass/config_timer.c b/product/juno/scp_romfw_bypass/config_timer.c index 4840c12d..c3b16d2e 100644 --- a/product/juno/scp_romfw_bypass/config_timer.c +++ b/product/juno/scp_romfw_bypass/config_timer.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "system_clock.h" +#include "system_mmap.h" + +#include <mod_gtimer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_gtimer.h> -#include <system_mmap.h> -#include <system_clock.h> static const struct fwk_element element_table[] = { [0] = { diff --git a/product/juno/scp_romfw_bypass/fmw_memory.h b/product/juno/scp_romfw_bypass/fmw_memory.h index dd552e45..4cccc6a7 100644 --- a/product/juno/scp_romfw_bypass/fmw_memory.h +++ b/product/juno/scp_romfw_bypass/fmw_memory.h @@ -8,7 +8,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_mmap.h> +#include "scp_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/juno/scp_romfw_bypass/juno_pll_workaround.c b/product/juno/scp_romfw_bypass/juno_pll_workaround.c index 5ab4cdaa..6ae3553d 100644 --- a/product/juno/scp_romfw_bypass/juno_pll_workaround.c +++ b/product/juno/scp_romfw_bypass/juno_pll_workaround.c @@ -10,9 +10,9 @@ * timeframe. */ +#include "juno_scc.h" + #include <fwk_noreturn.h> -#include <fwk_module.h> -#include <juno_scc.h> #ifdef __ARMCC_VERSION # define __wrap_arm_exception_reset $Sub$$arm_exception_reset diff --git a/product/juno/src/juno_id.c b/product/juno/src/juno_id.c index cf1b52dd..bc24e884 100644 --- a/product/juno/src/juno_id.c +++ b/product/juno/src/juno_id.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include "juno_id.h" +#include "juno_scc.h" +#include "v2m_sys_regs.h" + #include <fwk_assert.h> #include <fwk_status.h> -#include <juno_id.h> -#include <juno_scc.h> -#include <v2m_sys_regs.h> + +#include <stddef.h> /* SYS_ID Rev Field description */ enum juno_id_board_rev { diff --git a/product/juno/src/juno_utils.c b/product/juno/src/juno_utils.c index 55c74496..94913df8 100644 --- a/product/juno/src/juno_utils.c +++ b/product/juno/src/juno_utils.c @@ -8,12 +8,14 @@ * Utility functions for Juno. */ -#include <stddef.h> +#include "pl35x.h" +#include "scp_config.h" + #include <fwk_assert.h> -#include <juno_id.h> -#include <juno_scc.h> -#include <pl35x.h> -#include <scp_config.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define SNOOP_CONTROL_L2ACCREQ UINT32_C(0x00000001) #define SNOOP_CONTROL_L2ACCACK UINT32_C(0x00000002) diff --git a/product/n1sdp/include/n1sdp_core.h b/product/n1sdp/include/n1sdp_core.h index 7fe9462b..2ea6e668 100644 --- a/product/n1sdp/include/n1sdp_core.h +++ b/product/n1sdp/include/n1sdp_core.h @@ -8,8 +8,8 @@ #ifndef N1SDP_CORE_H #define N1SDP_CORE_H -#include <stdint.h> #include <stdbool.h> +#include <stdint.h> #define CORES_PER_CLUSTER 2 #define NUMBER_OF_CLUSTERS 2 diff --git a/product/n1sdp/include/n1sdp_mcp_pik.h b/product/n1sdp/include/n1sdp_mcp_pik.h index 730bcbe7..5541c875 100644 --- a/product/n1sdp/include/n1sdp_mcp_pik.h +++ b/product/n1sdp/include/n1sdp_mcp_pik.h @@ -8,8 +8,8 @@ #ifndef N1SDP_MCP_PIK_H #define N1SDP_MCP_PIK_H -#include <n1sdp_mcp_mmap.h> -#include <n1sdp_pik_mcp.h> +#include "n1sdp_mcp_mmap.h" +#include "n1sdp_pik_mcp.h" #define PIK_MCP ((struct pik_mcp_reg *) MCP_PIK_BASE) diff --git a/product/n1sdp/include/n1sdp_mcp_software_mmap.h b/product/n1sdp/include/n1sdp_mcp_software_mmap.h index 9f9e0a30..ad8cf84a 100644 --- a/product/n1sdp/include/n1sdp_mcp_software_mmap.h +++ b/product/n1sdp/include/n1sdp_mcp_software_mmap.h @@ -11,7 +11,7 @@ #ifndef N1SDP_MCP_SOFTWARE_MMAP_H #define N1SDP_MCP_SOFTWARE_MMAP_H -#include <n1sdp_mcp_mmap.h> +#include "n1sdp_mcp_mmap.h" /* SCMI payload size */ #define MCP_SCMI_PAYLOAD_SIZE (128) diff --git a/product/n1sdp/include/n1sdp_pik_cpu.h b/product/n1sdp/include/n1sdp_pik_cpu.h index 0d55b0ac..c781ac5b 100644 --- a/product/n1sdp/include/n1sdp_pik_cpu.h +++ b/product/n1sdp/include/n1sdp_pik_cpu.h @@ -8,9 +8,10 @@ #ifndef N1SDP_PIK_CPU_H #define N1SDP_PIK_CPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + #define PE_COUNT_MAX 16 /*! diff --git a/product/n1sdp/include/n1sdp_pik_debug.h b/product/n1sdp/include/n1sdp_pik_debug.h index 3275e257..804f6481 100644 --- a/product/n1sdp/include/n1sdp_pik_debug.h +++ b/product/n1sdp/include/n1sdp_pik_debug.h @@ -8,9 +8,10 @@ #ifndef N1SDP_PIK_DEBUG_H #define N1SDP_PIK_DEBUG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Debug register definitions */ diff --git a/product/n1sdp/include/n1sdp_pik_mcp.h b/product/n1sdp/include/n1sdp_pik_mcp.h index 67f850c6..b1de6420 100644 --- a/product/n1sdp/include/n1sdp_pik_mcp.h +++ b/product/n1sdp/include/n1sdp_pik_mcp.h @@ -11,9 +11,10 @@ #ifndef N1SDP_PIK_MCP_H #define N1SDP_PIK_MCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief MCP PIK register definitions */ diff --git a/product/n1sdp/include/n1sdp_pik_scp.h b/product/n1sdp/include/n1sdp_pik_scp.h index b5e801d7..c8b36f6e 100644 --- a/product/n1sdp/include/n1sdp_pik_scp.h +++ b/product/n1sdp/include/n1sdp_pik_scp.h @@ -11,9 +11,10 @@ #ifndef N1SDP_PIK_SCP_H #define N1SDP_PIK_SCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief SCP PIK register definitions */ diff --git a/product/n1sdp/include/n1sdp_pik_system.h b/product/n1sdp/include/n1sdp_pik_system.h index 18204827..0ae63d26 100644 --- a/product/n1sdp/include/n1sdp_pik_system.h +++ b/product/n1sdp/include/n1sdp_pik_system.h @@ -8,9 +8,10 @@ #ifndef N1SDP_PIK_SYSTEM_H #define N1SDP_PIK_SYSTEM_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief TCU clock register definitions */ diff --git a/product/n1sdp/include/n1sdp_scc_reg.h b/product/n1sdp/include/n1sdp_scc_reg.h index 3d1ff30a..45550d12 100644 --- a/product/n1sdp/include/n1sdp_scc_reg.h +++ b/product/n1sdp/include/n1sdp_scc_reg.h @@ -11,9 +11,10 @@ #ifndef N1SDP_SCC_REG_H #define N1SDP_SCC_REG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + struct scc_pcid_registers { FWK_R uint32_t PID4; FWK_R uint32_t PID0; diff --git a/product/n1sdp/include/n1sdp_scp_pik.h b/product/n1sdp/include/n1sdp_scp_pik.h index c1a397bb..05e0b755 100644 --- a/product/n1sdp/include/n1sdp_scp_pik.h +++ b/product/n1sdp/include/n1sdp_scp_pik.h @@ -8,12 +8,12 @@ #ifndef N1SDP_SCP_PIK_H #define N1SDP_SCP_PIK_H -#include <n1sdp_pik_cpu.h> -#include <n1sdp_pik_debug.h> -#include <n1sdp_pik_scp.h> -#include <n1sdp_pik_system.h> -#include <n1sdp_scc_reg.h> -#include <n1sdp_scp_mmap.h> +#include "n1sdp_pik_cpu.h" +#include "n1sdp_pik_debug.h" +#include "n1sdp_pik_scp.h" +#include "n1sdp_pik_system.h" +#include "n1sdp_scc_reg.h" +#include "n1sdp_scp_mmap.h" #define PIK_CLUSTER(IDX) ((struct pik_cpu_reg *)SCP_PIK_CLUSTER_BASE(IDX)) #define PIK_SCP ((struct pik_scp_reg *)SCP_PIK_SCP_BASE) diff --git a/product/n1sdp/include/n1sdp_scp_software_mmap.h b/product/n1sdp/include/n1sdp_scp_software_mmap.h index 7ade8396..325c1739 100644 --- a/product/n1sdp/include/n1sdp_scp_software_mmap.h +++ b/product/n1sdp/include/n1sdp_scp_software_mmap.h @@ -11,8 +11,9 @@ #ifndef N1SDP_SCP_SOFTWARE_MMAP_H #define N1SDP_SCP_SOFTWARE_MMAP_H +#include "n1sdp_scp_mmap.h" + #include <fwk_macros.h> -#include <n1sdp_scp_mmap.h> /* * Trusted shared SRAM region diff --git a/product/n1sdp/include/n1sdp_sds.h b/product/n1sdp/include/n1sdp_sds.h index adc3a1b8..58119ca3 100644 --- a/product/n1sdp/include/n1sdp_sds.h +++ b/product/n1sdp/include/n1sdp_sds.h @@ -10,6 +10,8 @@ #include <mod_sds.h> +#include <stdint.h> + /* * Structure identifiers. */ diff --git a/product/n1sdp/mcp_ramfw/config_armv7m_mpu.c b/product/n1sdp/mcp_ramfw/config_armv7m_mpu.c index 4287eca1..74148ac8 100644 --- a/product/n1sdp/mcp_ramfw/config_armv7m_mpu.c +++ b/product/n1sdp/mcp_ramfw/config_armv7m_mpu.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_mcp_system_mmap.h" + +#include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_armv7m_mpu.h> -#include <n1sdp_mcp_mmap.h> -#include <n1sdp_mcp_system_mmap.h> + +#include <fmw_cmsis.h> static const ARM_MPU_Region_t regions[] = { { /* 0x0000_0000 - 0xFFFF_FFFF */ diff --git a/product/n1sdp/mcp_ramfw/config_log.c b/product/n1sdp/mcp_ramfw/config_log.c index e71b9f37..fb3433ea 100644 --- a/product/n1sdp/mcp_ramfw/config_log.c +++ b/product/n1sdp/mcp_ramfw/config_log.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_mcp_mmap.h" +#include "n1sdp_system_clock.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> -#include <fwk_macros.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <n1sdp_mcp_mmap.h> -#include <n1sdp_system_clock.h> /* * PL011 module diff --git a/product/n1sdp/mcp_ramfw/config_mhu.c b/product/n1sdp/mcp_ramfw/config_mhu.c index 39667c77..1ae4fdf2 100644 --- a/product/n1sdp/mcp_ramfw/config_mhu.c +++ b/product/n1sdp/mcp_ramfw/config_mhu.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_mcp_irq.h" +#include "n1sdp_mcp_mhu.h" +#include "n1sdp_mcp_mmap.h" + +#include <mod_mhu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu.h> -#include <n1sdp_mcp_irq.h> -#include <n1sdp_mcp_mhu.h> -#include <n1sdp_mcp_mmap.h> static const struct fwk_element mhu_element_table[] = { [N1SDP_MHU_DEVICE_IDX_S_SCP] = { diff --git a/product/n1sdp/mcp_ramfw/config_pik_clock.c b/product/n1sdp/mcp_ramfw/config_pik_clock.c index a74360a3..b7531e37 100644 --- a/product/n1sdp/mcp_ramfw/config_pik_clock.c +++ b/product/n1sdp/mcp_ramfw/config_pik_clock.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "config_clock.h" +#include "n1sdp_mcp_pik.h" +#include "n1sdp_pik_mcp.h" +#include "n1sdp_system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> +#include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <n1sdp_mcp_pik.h> -#include <n1sdp_pik_mcp.h> -#include <n1sdp_system_clock.h> -#include <config_clock.h> + +#include <stdbool.h> /* * Rate lookup tables diff --git a/product/n1sdp/mcp_ramfw/config_scmi_agent.c b/product/n1sdp/mcp_ramfw/config_scmi_agent.c index 3381dece..956869f9 100644 --- a/product/n1sdp/mcp_ramfw/config_scmi_agent.c +++ b/product/n1sdp/mcp_ramfw/config_scmi_agent.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "n1sdp_mcp_scmi.h" + +#include <mod_scmi_agent.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> -#include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi_agent.h> -#include <mod_smt.h> -#include <n1sdp_mcp_scmi.h> + +#include <stddef.h> static const struct fwk_element agent_table[] = { [MCP_N1SDP_SCMI_AGENT_IDX_MANAGEMENT] = { diff --git a/product/n1sdp/mcp_ramfw/config_smt.c b/product/n1sdp/mcp_ramfw/config_smt.c index 7064bb97..0fa30bbd 100644 --- a/product/n1sdp/mcp_ramfw/config_smt.c +++ b/product/n1sdp/mcp_ramfw/config_smt.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "n1sdp_mcp_mhu.h" +#include "n1sdp_mcp_software_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <n1sdp_mcp_mhu.h> -#include <n1sdp_mcp_software_mmap.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [0] = { diff --git a/product/n1sdp/mcp_ramfw/fmw_memory.h b/product/n1sdp/mcp_ramfw/fmw_memory.h index c0e3a6f8..65e1d2e7 100644 --- a/product/n1sdp/mcp_ramfw/fmw_memory.h +++ b/product/n1sdp/mcp_ramfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <n1sdp_mcp_system_mmap.h> +#include "n1sdp_mcp_system_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/n1sdp/mcp_ramfw/rtx_config.c b/product/n1sdp/mcp_ramfw/rtx_config.c index df37a88b..69685f16 100644 --- a/product/n1sdp/mcp_ramfw/rtx_config.c +++ b/product/n1sdp/mcp_ramfw/rtx_config.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_system_clock.h" + +#include <rtx_lib.c> +#include <rtx_os.h> + +#include <fmw_cmsis.h> + #include <stdbool.h> #include <stdint.h> -#include <cmsis_compiler.h> -#include <rtx_os.h> -#include <n1sdp_system_clock.h> -#include <rtx_lib.c> /* * Required by RTX to configure the SysTick timer. diff --git a/product/n1sdp/mcp_romfw/config_log.c b/product/n1sdp/mcp_romfw/config_log.c index f584b527..bf4412b0 100644 --- a/product/n1sdp/mcp_romfw/config_log.c +++ b/product/n1sdp/mcp_romfw/config_log.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_mcp_mmap.h" +#include "n1sdp_system_clock.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> -#include <fwk_macros.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <n1sdp_mcp_mmap.h> -#include <n1sdp_system_clock.h> /* * N1SDP BYPASS ROM firmware banner string. diff --git a/product/n1sdp/mcp_romfw/config_n1sdp_flash.c b/product/n1sdp/mcp_romfw/config_n1sdp_flash.c index 0b5326db..e74b009a 100644 --- a/product/n1sdp/mcp_romfw/config_n1sdp_flash.c +++ b/product/n1sdp/mcp_romfw/config_n1sdp_flash.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "n1sdp_mcp_system_mmap.h" + #include <mod_n1sdp_flash.h> -#include <n1sdp_mcp_system_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_n1sdp_flash = { .data = &((struct mod_n1sdp_flash_config) { diff --git a/product/n1sdp/mcp_romfw/config_n1sdp_rom.c b/product/n1sdp/mcp_romfw/config_n1sdp_rom.c index 926c13e1..421e9c5d 100644 --- a/product/n1sdp/mcp_romfw/config_n1sdp_rom.c +++ b/product/n1sdp/mcp_romfw/config_n1sdp_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "n1sdp_mcp_system_mmap.h" + #include <mod_n1sdp_flash.h> #include <mod_n1sdp_rom.h> -#include <n1sdp_mcp_system_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_n1sdp_rom = { .data = &((struct n1sdp_rom_config) { diff --git a/product/n1sdp/mcp_romfw/fmw_memory.h b/product/n1sdp/mcp_romfw/fmw_memory.h index 4a8287ec..1f1b41ba 100644 --- a/product/n1sdp/mcp_romfw/fmw_memory.h +++ b/product/n1sdp/mcp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <n1sdp_mcp_system_mmap.h> +#include "n1sdp_mcp_system_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/n1sdp/module/n1sdp_c2c/include/mod_n1sdp_c2c_i2c.h b/product/n1sdp/module/n1sdp_c2c/include/mod_n1sdp_c2c_i2c.h index 93ffd3a5..06420fd3 100644 --- a/product/n1sdp/module/n1sdp_c2c/include/mod_n1sdp_c2c_i2c.h +++ b/product/n1sdp/module/n1sdp_c2c/include/mod_n1sdp_c2c_i2c.h @@ -11,10 +11,13 @@ #ifndef MOD_N1SDP_C2C_I2C_H #define MOD_N1SDP_C2C_I2C_H -#include <stdint.h> -#include <fwk_id.h> #include <mod_power_domain.h> +#include <fwk_id.h> + +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c b/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c index d450fb08..f4242ee0 100644 --- a/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c +++ b/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c @@ -8,17 +8,11 @@ * N1SDP SCP to SCP I2C communications protocol driver */ -#include <stdint.h> -#include <string.h> -#include <stdbool.h> -#include <fmw_cmsis.h> -#include <fwk_assert.h> -#include <fwk_element.h> -#include <fwk_id.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_multi_thread.h> -#include <fwk_notification.h> +#include "config_clock.h" +#include "n1sdp_core.h" + +#include <internal/n1sdp_scp2pcc.h> + #include <mod_clock.h> #include <mod_cmn600.h> #include <mod_log.h> @@ -30,8 +24,22 @@ #include <mod_n1sdp_timer_sync.h> #include <mod_power_domain.h> #include <mod_timer.h> -#include <config_clock.h> -#include <n1sdp_core.h> + +#include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_macros.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_multi_thread.h> +#include <fwk_notification.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> /* Module definitions */ #define N1SDP_C2C_DATA_SIZE 8 diff --git a/product/n1sdp/module/n1sdp_ddr_phy/include/internal/n1sdp_ddr_phy.h b/product/n1sdp/module/n1sdp_ddr_phy/include/internal/n1sdp_ddr_phy.h index 9d524377..09934e40 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/include/internal/n1sdp_ddr_phy.h +++ b/product/n1sdp/module/n1sdp_ddr_phy/include/internal/n1sdp_ddr_phy.h @@ -11,9 +11,10 @@ #ifndef INTERNAL_N1SDP_DDR_PHY_H #define INTERNAL_N1SDP_DDR_PHY_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /* * N1SDP DDR PHY register definitions. */ diff --git a/product/n1sdp/module/n1sdp_ddr_phy/include/mod_n1sdp_ddr_phy.h b/product/n1sdp/module/n1sdp_ddr_phy/include/mod_n1sdp_ddr_phy.h index e847b75f..e48f261b 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/include/mod_n1sdp_ddr_phy.h +++ b/product/n1sdp/module/n1sdp_ddr_phy/include/mod_n1sdp_ddr_phy.h @@ -1,4 +1,4 @@ - /* +/* * Arm SCP/MCP Software * Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved. * diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c index 0110b58c..0b4cf460 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c @@ -8,12 +8,17 @@ * N1SDP DDR-PHY register value configuration for 800MHz speed. */ -#include <stddef.h> -#include <fwk_assert.h> -#include <mod_n1sdp_dmc620.h> #include <n1sdp_ddr_phy_values.h> + #include <internal/n1sdp_ddr_phy.h> +#include <mod_n1sdp_dmc620.h> + +#include <fwk_assert.h> + +#include <stddef.h> +#include <stdint.h> + static uint8_t PHY_WRITE_PATH_LAT_ADD_2400[9] = {1, 1, 1, 1, 1, 1, 1, 1, 1}; static uint16_t PHY_WRLVL_DELAY_PERIOD_THRESHOLD_2400[9] = { 0x100, 0x100, 0, 0, 0, 0, 0, 0x100, 0}; diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c index 5f47a8fe..36266d22 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c @@ -8,12 +8,17 @@ * N1SDP DDR-PHY register value configuration for 800MHz speed. */ -#include <stddef.h> -#include <fwk_assert.h> -#include <mod_n1sdp_dmc620.h> #include <n1sdp_ddr_phy_values.h> + #include <internal/n1sdp_ddr_phy.h> +#include <mod_n1sdp_dmc620.h> + +#include <fwk_assert.h> + +#include <stddef.h> +#include <stdint.h> + static uint8_t PHY_WRITE_PATH_LAT_ADD_2667[9] = {1, 1, 1, 1, 1, 1, 1, 1, 1}; static uint16_t PHY_WRLVL_DELAY_PERIOD_THRESHOLD_2667[9] = { 0x1A0, 0x120, 0x100, 0, 0, 0, 0x100, 0x100, 0}; diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c index 44645a70..ed3847e9 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c @@ -8,12 +8,17 @@ * N1SDP DDR-PHY register value configuration for 800MHz speed. */ -#include <stddef.h> -#include <fwk_assert.h> -#include <mod_n1sdp_dmc620.h> #include <n1sdp_ddr_phy_values.h> + #include <internal/n1sdp_ddr_phy.h> +#include <mod_n1sdp_dmc620.h> + +#include <fwk_assert.h> + +#include <stddef.h> +#include <stdint.h> + static uint8_t PHY_WRITE_PATH_LAT_ADD_1600[9] = {0, 0, 0, 0, 0, 0, 0, 0, 0}; static uint16_t PHY_WRLVL_DELAY_PERIOD_THRESHOLD_1600[9] = { 0x100, 0x100, 0x100, 0, 0, 0, 0x100, 0x100, 0}; diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c index 4955e736..c9dd483b 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c @@ -8,19 +8,22 @@ * N1SDP DDR-PHY driver */ -#include <string.h> +#include "n1sdp_scp_mmap.h" + +#include <n1sdp_ddr_phy_values.h> + +#include <mod_log.h> +#include <mod_n1sdp_ddr_phy.h> +#include <mod_n1sdp_dmc620.h> + #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 <internal/n1sdp_ddr_phy.h> -#include <mod_n1sdp_ddr_phy.h> -#include <mod_n1sdp_dmc620.h> -#include <mod_log.h> -#include <n1sdp_ddr_phy_values.h> -#include <n1sdp_scp_mmap.h> + +#include <stdbool.h> +#include <string.h> #define NUM_SLICES 9 #define NUM_BITS_PER_SLICE 8 diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/n1sdp_ddr_phy_values.h b/product/n1sdp/module/n1sdp_ddr_phy/src/n1sdp_ddr_phy_values.h index f7deaf4d..8127f708 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/n1sdp_ddr_phy_values.h +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/n1sdp_ddr_phy_values.h @@ -1,4 +1,4 @@ - /* +/* * Arm SCP/MCP Software * Copyright (c) 2019-2020, Arm Limited and Contributors. All rights reserved. * @@ -10,10 +10,12 @@ #ifndef PHY_VALUES_H #define PHY_VALUES_H -#include <stdint.h> -#include <mod_n1sdp_dmc620.h> #include <internal/n1sdp_ddr_phy.h> +#include <mod_n1sdp_dmc620.h> + +#include <stdint.h> + /* * \brief Function to configure and run DDR PHY at 800MHz frequency. * diff --git a/product/n1sdp/module/n1sdp_dmc620/include/mod_n1sdp_dmc620.h b/product/n1sdp/module/n1sdp_dmc620/include/mod_n1sdp_dmc620.h index b5377aaa..604b3dfd 100644 --- a/product/n1sdp/module/n1sdp_dmc620/include/mod_n1sdp_dmc620.h +++ b/product/n1sdp/module/n1sdp_dmc620/include/mod_n1sdp_dmc620.h @@ -11,10 +11,12 @@ #ifndef MOD_N1SDP_DMC620_H #define MOD_N1SDP_DMC620_H -#include <stdint.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c index e591dc9f..b036cbdd 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c +++ b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c @@ -5,15 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include <dimm_spd.h> + +#include <mod_log.h> +#include <mod_n1sdp_dmc620.h> +#include <mod_n1sdp_i2c.h> + #include <fwk_assert.h> -#include <fwk_macros.h> #include <fwk_id.h> +#include <fwk_macros.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_n1sdp_i2c.h> -#include <dimm_spd.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> static bool multi_rank; static float t_refi = .0000078; diff --git a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h index 0efc347d..85afa17c 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h +++ b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.h @@ -8,11 +8,12 @@ #ifndef DIMM_SPD_H #define DIMM_SPD_H -#include <stdint.h> -#include <mod_n1sdp_dmc620.h> #include <mod_log.h> +#include <mod_n1sdp_dmc620.h> #include <mod_n1sdp_i2c.h> +#include <stdint.h> + /* * DMC-620 ADDRESS_CONTROL register bit field values */ diff --git a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c index 8956884e..d2e04b9b 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c +++ b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c @@ -8,23 +8,28 @@ * N1SDP DMC-620 driver */ +#include "n1sdp_pik_system.h" +#include "n1sdp_scp_irq.h" +#include "n1sdp_scp_pik.h" + +#include <dimm_spd.h> + +#include <mod_clock.h> +#include <mod_log.h> +#include <mod_n1sdp_dmc620.h> +#include <mod_n1sdp_i2c.h> +#include <mod_timer.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_interrupt.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_n1sdp_dmc620.h> -#include <mod_n1sdp_i2c.h> -#include <mod_power_domain.h> -#include <mod_timer.h> -#include <config_clock.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_pik.h> -#include <n1sdp_pik_system.h> -#include <dimm_spd.h> + +#include <stdbool.h> +#include <stddef.h> /* DMC-620 register specific definitions */ #define DDR_TRAIN_TWO_RANKS 0 diff --git a/product/n1sdp/module/n1sdp_flash/include/internal/n1sdp_flash_layout.h b/product/n1sdp/module/n1sdp_flash/include/internal/n1sdp_flash_layout.h index 28223caa..e6d0a5f9 100644 --- a/product/n1sdp/module/n1sdp_flash/include/internal/n1sdp_flash_layout.h +++ b/product/n1sdp/module/n1sdp_flash/include/internal/n1sdp_flash_layout.h @@ -13,9 +13,10 @@ #ifndef INTERNAL_N1SDP_FLASH_LAYOUT_H #define INTERNAL_N1SDP_FLASH_LAYOUT_H -#include <stdint.h> #include "uuid.h" +#include <stdint.h> + /* * Flash entry definitions */ diff --git a/product/n1sdp/module/n1sdp_flash/include/internal/uuid.h b/product/n1sdp/module/n1sdp_flash/include/internal/uuid.h index 87951ca7..36c93901 100644 --- a/product/n1sdp/module/n1sdp_flash/include/internal/uuid.h +++ b/product/n1sdp/module/n1sdp_flash/include/internal/uuid.h @@ -13,6 +13,8 @@ #ifndef INTERNAL_UUID_H #define INTERNAL_UUID_H +#include <stdint.h> + /* Length of a node address (an IEEE 802 address). */ #define _UUID_NODE_LEN 6 diff --git a/product/n1sdp/module/n1sdp_flash/include/mod_n1sdp_flash.h b/product/n1sdp/module/n1sdp_flash/include/mod_n1sdp_flash.h index e67ee20b..41a06828 100644 --- a/product/n1sdp/module/n1sdp_flash/include/mod_n1sdp_flash.h +++ b/product/n1sdp/module/n1sdp_flash/include/mod_n1sdp_flash.h @@ -12,9 +12,10 @@ #ifndef MOD_N1SDP_FLASH_H #define MOD_N1SDP_FLASH_H +#include <fwk_id.h> + #include <stddef.h> #include <stdint.h> -#include <fwk_id.h> /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules diff --git a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c index 5fdee269..901a8342 100644 --- a/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c +++ b/product/n1sdp/module/n1sdp_flash/src/mod_n1sdp_flash.c @@ -9,14 +9,18 @@ * package residing in on-board QSPI flash memory. */ -#include <string.h> +#include <internal/n1sdp_flash_layout.h> +#include <internal/uuid.h> + +#include <mod_n1sdp_flash.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_status.h> -#include <mod_n1sdp_flash.h> -#include <internal/n1sdp_flash_layout.h> + +#include <string.h> /* * Module context diff --git a/product/n1sdp/module/n1sdp_i2c/include/internal/n1sdp_i2c.h b/product/n1sdp/module/n1sdp_i2c/include/internal/n1sdp_i2c.h index fc05575a..3336b683 100644 --- a/product/n1sdp/module/n1sdp_i2c/include/internal/n1sdp_i2c.h +++ b/product/n1sdp/module/n1sdp_i2c/include/internal/n1sdp_i2c.h @@ -13,6 +13,8 @@ #include <fwk_macros.h> +#include <stdint.h> + struct i2c_reg { /* Control Register */ FWK_RW uint16_t CR; diff --git a/product/n1sdp/module/n1sdp_i2c/include/mod_n1sdp_i2c.h b/product/n1sdp/module/n1sdp_i2c/include/mod_n1sdp_i2c.h index 6f453b97..edbc556b 100644 --- a/product/n1sdp/module/n1sdp_i2c/include/mod_n1sdp_i2c.h +++ b/product/n1sdp/module/n1sdp_i2c/include/mod_n1sdp_i2c.h @@ -12,12 +12,14 @@ #define MOD_N1SDP_I2C_H #include <internal/n1sdp_i2c.h> -#include <stdbool.h> -#include <stdint.h> + #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module_idx.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c index 552497f5..ad73d5ac 100644 --- a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c +++ b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c @@ -8,19 +8,25 @@ * N1SDP I2C Driver */ -#include <string.h> -#include <stdbool.h> +#include "n1sdp_core.h" + +#include <internal/n1sdp_i2c.h> + +#include <mod_log.h> +#include <mod_n1sdp_i2c.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 <internal/n1sdp_i2c.h> -#include <mod_log.h> -#include <mod_n1sdp_i2c.h> -#include <mod_power_domain.h> -#include <n1sdp_core.h> + +#include <stdbool.h> +#include <string.h> /* I2C divider calculation values */ #define I2C_HZ 22 diff --git a/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c b/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c index 1cf406c7..98369828 100644 --- a/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c +++ b/product/n1sdp/module/n1sdp_mcp_system/src/mod_n1sdp_mcp_system.c @@ -8,21 +8,23 @@ * N1SDP MCP System Support. */ -#include <stdint.h> -#include <fwk_id.h> -#include <fwk_macros.h> -#include <fwk_mm.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_thread.h> +#include "config_clock.h" + #include <mod_clock.h> -#include <mod_n1sdp_mcp_system.h> #include <mod_log.h> +#include <mod_n1sdp_mcp_system.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> #include <mod_scmi_agent.h> -#include <n1sdp_mcp_pik.h> -#include <config_clock.h> + +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> +#include <fwk_thread.h> + +#include <stdint.h> /* Module context */ struct n1sdp_mcp_system_ctx { diff --git a/product/n1sdp/module/n1sdp_mhu/include/internal/mhu.h b/product/n1sdp/module/n1sdp_mhu/include/internal/mhu.h index 0b29c124..07ae9702 100644 --- a/product/n1sdp/module/n1sdp_mhu/include/internal/mhu.h +++ b/product/n1sdp/module/n1sdp_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/product/n1sdp/module/n1sdp_mhu/include/mod_mhu.h b/product/n1sdp/module/n1sdp_mhu/include/mod_mhu.h index 9f4f662e..e9f63e27 100644 --- a/product/n1sdp/module/n1sdp_mhu/include/mod_mhu.h +++ b/product/n1sdp/module/n1sdp_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 GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c b/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c index 214d40c7..8ac2e315 100644 --- a/product/n1sdp/module/n1sdp_mhu/src/mod_mhu.c +++ b/product/n1sdp/module/n1sdp_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/product/n1sdp/module/n1sdp_pcie/include/internal/pcie_ctrl_apb_reg.h b/product/n1sdp/module/n1sdp_pcie/include/internal/pcie_ctrl_apb_reg.h index 7cfc2351..0b2c851a 100644 --- a/product/n1sdp/module/n1sdp_pcie/include/internal/pcie_ctrl_apb_reg.h +++ b/product/n1sdp/module/n1sdp_pcie/include/internal/pcie_ctrl_apb_reg.h @@ -11,9 +11,10 @@ #ifndef INTERNAL_PCIE_CTRL_APB_REG_H #define INTERNAL_PCIE_CTRL_APB_REG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief PCIe APB register definitions */ diff --git a/product/n1sdp/module/n1sdp_pcie/include/mod_n1sdp_pcie.h b/product/n1sdp/module/n1sdp_pcie/include/mod_n1sdp_pcie.h index 7e1449e9..2a006138 100644 --- a/product/n1sdp/module/n1sdp_pcie/include/mod_n1sdp_pcie.h +++ b/product/n1sdp/module/n1sdp_pcie/include/mod_n1sdp_pcie.h @@ -8,9 +8,10 @@ #ifndef MOD_N1SDP_PCIE_H #define MOD_N1SDP_PCIE_H +#include <fwk_id.h> + #include <stdbool.h> #include <stdint.h> -#include <fwk_id.h> /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules diff --git a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c index 3fab9354..bd4e856a 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c +++ b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c @@ -5,8 +5,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> -#include <fwk_assert.h> +#include "config_clock.h" +#include "n1sdp_core.h" +#include "n1sdp_scc_reg.h" +#include "n1sdp_scp_pik.h" + +#include <n1sdp_pcie.h> + +#include <internal/pcie_ctrl_apb_reg.h> + +#include <mod_clock.h> +#include <mod_log.h> +#include <mod_n1sdp_c2c_i2c.h> +#include <mod_n1sdp_pcie.h> +#include <mod_timer.h> + +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_math.h> #include <fwk_mm.h> @@ -14,17 +28,8 @@ #include <fwk_module_idx.h> #include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_n1sdp_c2c_i2c.h> -#include <mod_n1sdp_pcie.h> -#include <mod_log.h> -#include <mod_timer.h> -#include <config_clock.h> -#include <n1sdp_core.h> -#include <n1sdp_pcie.h> -#include <n1sdp_scc_reg.h> -#include <n1sdp_scp_pik.h> -#include <internal/pcie_ctrl_apb_reg.h> + +#include <string.h> void pcie_bus_enumeration(struct n1sdp_pcie_dev_config *config); void pcie_init_bdf_table(struct n1sdp_pcie_dev_config *config); diff --git a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c index 954896f6..cbceab68 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c +++ b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c @@ -5,16 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scc_reg.h" +#include "n1sdp_scp_pik.h" + +#include <n1sdp_pcie.h> + +#include <internal/pcie_ctrl_apb_reg.h> + +#include <mod_timer.h> + +#include <fwk_assert.h> +#include <fwk_id.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> + #include <stddef.h> #include <stdint.h> #include <string.h> -#include <fwk_assert.h> -#include <fwk_status.h> -#include <internal/pcie_ctrl_apb_reg.h> -#include <mod_n1sdp_pcie.h> -#include <mod_timer.h> -#include <n1sdp_pcie.h> -#include <n1sdp_scp_pik.h> void pcie_phy_init(uint32_t phy_apb_base) { diff --git a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h index 7605267e..737e87e3 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h +++ b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.h @@ -8,11 +8,15 @@ #ifndef N1SDP_PCIE_H #define N1SDP_PCIE_H -#include <stdint.h> -#include <fwk_macros.h> -#include <mod_timer.h> #include <internal/pcie_ctrl_apb_reg.h> +#include <mod_timer.h> + +#include <fwk_macros.h> + +#include <stdbool.h> +#include <stdint.h> + /* * Definitions of PCIe APB register offsets from global configuration * base address. diff --git a/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c b/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c index 527513ac..e6bc6134 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c +++ b/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c @@ -14,16 +14,20 @@ * fault when reading the configuration space. */ +#include "n1sdp_scp_mmap.h" + +#include <n1sdp_pcie.h> + +#include <mod_n1sdp_pcie.h> + +#include <fwk_assert.h> +#include <fwk_macros.h> + +#include <fmw_cmsis.h> + #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <cmsis_compiler.h> -#include <fwk_assert.h> -#include <fwk_macros.h> -#include <fwk_status.h> -#include <mod_n1sdp_pcie.h> -#include <n1sdp_pcie.h> -#include <n1sdp_scp_mmap.h> /* PCIe configuration space offset definitions */ #define PCIE_HEADER_TYPE_OFFSET 0xE diff --git a/product/n1sdp/module/n1sdp_pll/include/mod_n1sdp_pll.h b/product/n1sdp/module/n1sdp_pll/include/mod_n1sdp_pll.h index e51d165d..ea4c355e 100644 --- a/product/n1sdp/module/n1sdp_pll/include/mod_n1sdp_pll.h +++ b/product/n1sdp/module/n1sdp_pll/include/mod_n1sdp_pll.h @@ -9,6 +9,7 @@ #define MOD_N1SDP_PLL_H #include <stdbool.h> +#include <stddef.h> #include <stdint.h> /*! diff --git a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c index ca9c6343..15aae83d 100644 --- a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c +++ b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c @@ -5,18 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> +#include <internal/n1sdp_pll.h> + +#include <mod_clock.h> +#include <mod_n1sdp_pll.h> +#include <mod_power_domain.h> + #include <fwk_assert.h> -#include <fwk_element.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_n1sdp_pll.h> -#include <mod_power_domain.h> -#include <internal/n1sdp_pll.h> + +#include <stdbool.h> +#include <stdint.h> /* Device context */ struct n1sdp_pll_dev_ctx { diff --git a/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c b/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c index 6c16e7fd..273e7c12 100644 --- a/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c +++ b/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c @@ -8,18 +8,22 @@ * N1SDP Remote Power Domain (PD) management driver. */ -#include <stddef.h> -#include <stdint.h> +#include "n1sdp_core.h" + +#include <mod_log.h> +#include <mod_n1sdp_c2c_i2c.h> +#include <mod_n1sdp_remote_pd.h> +#include <mod_power_domain.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_n1sdp_c2c_i2c.h> -#include <mod_n1sdp_remote_pd.h> -#include <mod_power_domain.h> -#include <n1sdp_core.h> +#include <fwk_status.h> + +#include <stddef.h> +#include <stdint.h> /* N1SDP remote PD driver device context */ struct n1sdp_remote_pd_device_ctx { diff --git a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c index 0a7fb283..73d56ff3 100644 --- a/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c +++ b/product/n1sdp/module/n1sdp_rom/src/mod_n1sdp_rom.c @@ -5,16 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include <mod_log.h> +#include <mod_n1sdp_flash.h> +#include <mod_n1sdp_rom.h> + +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_n1sdp_flash.h> -#include <mod_n1sdp_rom.h> -#include <mod_log.h> + +#include <stdint.h> +#include <string.h> /* * Module context diff --git a/product/n1sdp/module/n1sdp_scp2pcc/include/mod_n1sdp_scp2pcc.h b/product/n1sdp/module/n1sdp_scp2pcc/include/mod_n1sdp_scp2pcc.h index 3d9c8de7..d88bb973 100644 --- a/product/n1sdp/module/n1sdp_scp2pcc/include/mod_n1sdp_scp2pcc.h +++ b/product/n1sdp/module/n1sdp_scp2pcc/include/mod_n1sdp_scp2pcc.h @@ -12,6 +12,8 @@ #define MOD_N1SDP_SCP2PCC_H #include <internal/n1sdp_scp2pcc.h> + +#include <stdint.h> /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c b/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c index aa6aaa26..fd0c09bb 100644 --- a/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c +++ b/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c @@ -8,12 +8,19 @@ * N1SDP SCP to PCC communications protocol driver */ -#include <stdint.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include <internal/n1sdp_scp2pcc.h> + #include <mod_log.h> #include <mod_n1sdp_scp2pcc.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> + +#include <stddef.h> +#include <stdint.h> + /* Module context */ struct n1sdp_scp2pcc_ctx { /* Pointer to module configuration */ diff --git a/product/n1sdp/module/n1sdp_sensor/include/mod_n1sdp_sensor.h b/product/n1sdp/module/n1sdp_sensor/include/mod_n1sdp_sensor.h index 83924a9b..fa771279 100644 --- a/product/n1sdp/module/n1sdp_sensor/include/mod_n1sdp_sensor.h +++ b/product/n1sdp/module/n1sdp_sensor/include/mod_n1sdp_sensor.h @@ -8,10 +8,12 @@ #ifndef MOD_N1SDP_SENSOR_H #define MOD_N1SDP_SENSOR_H -#include <stdint.h> -#include <fwk_id.h> #include <mod_sensor.h> +#include <fwk_id.h> + +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_smt/include/internal/smt.h b/product/n1sdp/module/n1sdp_smt/include/internal/smt.h index 3ddb3fdd..1156ef41 100644 --- a/product/n1sdp/module/n1sdp_smt/include/internal/smt.h +++ b/product/n1sdp/module/n1sdp_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/product/n1sdp/module/n1sdp_smt/include/mod_smt.h b/product/n1sdp/module/n1sdp_smt/include/mod_smt.h index 175a4748..06285b11 100644 --- a/product/n1sdp/module/n1sdp_smt/include/mod_smt.h +++ b/product/n1sdp/module/n1sdp_smt/include/mod_smt.h @@ -8,10 +8,11 @@ #ifndef MOD_SMT_H #define MOD_SMT_H +#include <fwk_id.h> + +#include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <stdbool.h> -#include <fwk_id.h> /*! * \name Channel policies diff --git a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c index 7eda6299..6f842dbf 100644 --- a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c +++ b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c @@ -5,19 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <string.h> +#include <internal/smt.h> + +#include <mod_smt.h> + #include <fwk_assert.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_smt.h> -#include <internal/smt.h> + +#include <stdbool.h> +#include <string.h> struct smt_channel_ctx { /* Channel identifier */ diff --git a/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h b/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h index d2276702..9328fa27 100644 --- a/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h +++ b/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h @@ -11,6 +11,8 @@ #ifndef MOD_N1SDP_SYSTEM_H #define MOD_N1SDP_SYSTEM_H +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c index 6c681daf..026f6eea 100644 --- a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c +++ b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c @@ -8,37 +8,47 @@ * N1SDP System Support. */ -#include <stdint.h> -#include <string.h> -#include <fmw_cmsis.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 <fwk_notification.h> +#include "config_clock.h" +#include "n1sdp_core.h" +#include "n1sdp_pik_cpu.h" +#include "n1sdp_pik_debug.h" +#include "n1sdp_pik_scp.h" +#include "n1sdp_scp_irq.h" +#include "n1sdp_scp_mmap.h" +#include "n1sdp_scp_pik.h" +#include "n1sdp_scp_scmi.h" +#include "n1sdp_sds.h" + +#include <internal/n1sdp_scp2pcc.h> + #include <mod_clock.h> -#include <mod_cmn600.h> +#include <mod_log.h> #include <mod_n1sdp_c2c_i2c.h> #include <mod_n1sdp_dmc620.h> #include <mod_n1sdp_flash.h> #include <mod_n1sdp_scp2pcc.h> #include <mod_n1sdp_system.h> -#include <mod_log.h> #include <mod_power_domain.h> #include <mod_ppu_v1.h> #include <mod_scmi.h> #include <mod_sds.h> #include <mod_system_power.h> -#include <n1sdp_core.h> -#include <n1sdp_scp_pik.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_scp_scmi.h> -#include <n1sdp_sds.h> -#include <config_clock.h> + +#include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_interrupt.h> +#include <fwk_macros.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_notification.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> /* * Platform information structure used by BL31 diff --git a/product/n1sdp/module/n1sdp_timer_sync/include/internal/timer_sync.h b/product/n1sdp/module/n1sdp_timer_sync/include/internal/timer_sync.h index 7f7e12d0..1203cb3e 100644 --- a/product/n1sdp/module/n1sdp_timer_sync/include/internal/timer_sync.h +++ b/product/n1sdp/module/n1sdp_timer_sync/include/internal/timer_sync.h @@ -8,9 +8,10 @@ #ifndef INTERNAL_TIMER_SYNC_H #define INTERNAL_TIMER_SYNC_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Timer Synchronization Register Definitions */ diff --git a/product/n1sdp/module/n1sdp_timer_sync/include/mod_n1sdp_timer_sync.h b/product/n1sdp/module/n1sdp_timer_sync/include/mod_n1sdp_timer_sync.h index 168edc1a..8bb2d677 100644 --- a/product/n1sdp/module/n1sdp_timer_sync/include/mod_n1sdp_timer_sync.h +++ b/product/n1sdp/module/n1sdp_timer_sync/include/mod_n1sdp_timer_sync.h @@ -11,9 +11,11 @@ #ifndef MOD_N1SDP_TIMER_SYNC_H #define MOD_N1SDP_TIMER_SYNC_H -#include <stdint.h> +#include <fwk_id.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c b/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c index 9e44c725..259c924e 100644 --- a/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c +++ b/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c @@ -8,8 +8,15 @@ * N1SDP Timer Synchronization Driver. */ -#include <stddef.h> -#include <stdint.h> +#include "n1sdp_scp_mmap.h" + +#include <internal/timer_sync.h> + +#include <mod_log.h> +#include <mod_n1sdp_system.h> +#include <mod_n1sdp_timer_sync.h> +#include <mod_timer.h> + #include <fwk_assert.h> #include <fwk_id.h> #include <fwk_interrupt.h> @@ -17,12 +24,10 @@ #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <internal/timer_sync.h> -#include <mod_log.h> -#include <mod_n1sdp_system.h> -#include <mod_n1sdp_timer_sync.h> -#include <mod_timer.h> -#include <n1sdp_scp_pik.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define COUNTER_DELTA_MAX 0x100 #define INT_STATUS_TIMEOUT UINT32_C(1000) diff --git a/product/n1sdp/module/scmi_agent/include/mod_scmi_agent.h b/product/n1sdp/module/scmi_agent/include/mod_scmi_agent.h index 1c5c0730..8a168e94 100644 --- a/product/n1sdp/module/scmi_agent/include/mod_scmi_agent.h +++ b/product/n1sdp/module/scmi_agent/include/mod_scmi_agent.h @@ -11,6 +11,10 @@ #ifndef MOD_SCMI_AGENT_H #define MOD_SCMI_AGENT_H +#include <fwk_id.h> + +#include <stdint.h> + /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules * @{ diff --git a/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c b/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c index 333c0465..470a0aa0 100644 --- a/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c +++ b/product/n1sdp/module/scmi_agent/src/mod_scmi_agent.c @@ -8,16 +8,20 @@ * SCMI Agent Support. */ -#include <stdint.h> +#include <mod_log.h> +#include <mod_scmi_agent.h> +#include <mod_smt.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> +#include <fwk_status.h> #include <fwk_thread.h> -#include <mod_log.h> -#include <mod_scmi_agent.h> -#include <mod_smt.h> + +#include <stddef.h> +#include <stdint.h> /* SCMI agent context */ struct scmi_agent_ctx { diff --git a/product/n1sdp/module/scmi_ccix_config/include/internal/mod_scmi_ccix_config.h b/product/n1sdp/module/scmi_ccix_config/include/internal/mod_scmi_ccix_config.h index 907b3d34..7035e22c 100644 --- a/product/n1sdp/module/scmi_ccix_config/include/internal/mod_scmi_ccix_config.h +++ b/product/n1sdp/module/scmi_ccix_config/include/internal/mod_scmi_ccix_config.h @@ -11,6 +11,8 @@ #ifndef INTERNAL_SCMI_CCIX_CONFIG_H #define INTERNAL_SCMI_CCIX_CONFIG_H +#include <stdint.h> + /* * SCMI CCIX config ID definition. */ diff --git a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c index bc8206cf..f780d89e 100644 --- a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c +++ b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c @@ -8,20 +8,23 @@ * SCMI CCIX_CONFIG management protocol support. */ -#include <string.h> +#include <internal/mod_scmi_ccix_config.h> +#include <internal/scmi.h> + +#include <mod_cmn600.h> +#include <mod_log.h> +#include <mod_n1sdp_pcie.h> +#include <mod_scmi.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/mod_scmi_ccix_config.h> -#include <mod_n1sdp_pcie.h> -#include <mod_scmi.h> -#include <mod_cmn600.h> -#include <mod_log.h> + +#include <stdbool.h> +#include <string.h> struct scmi_ccix_config_ctx { /* scmi module api */ diff --git a/product/n1sdp/module/scmi_management/include/mod_scmi_management.h b/product/n1sdp/module/scmi_management/include/mod_scmi_management.h index eaabda2d..5b38a5ba 100644 --- a/product/n1sdp/module/scmi_management/include/mod_scmi_management.h +++ b/product/n1sdp/module/scmi_management/include/mod_scmi_management.h @@ -11,8 +11,8 @@ #ifndef MOD_SCMI_MANAGEMENT_H #define MOD_SCMI_MANAGEMENT_H -#include <stdint.h> #include <stddef.h> +#include <stdint.h> /*! * \addtogroup GroupN1SDPModule N1SDP Product Modules diff --git a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c index 67c7719b..c77e0f37 100644 --- a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c +++ b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c @@ -8,18 +8,23 @@ * SCMI Management Protocol Support. */ -#include <stdint.h> +#include "n1sdp_scc_reg.h" +#include "n1sdp_scp_pik.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_scmi_management.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 <mod_scmi.h> -#include <mod_scmi_management.h> -#include <n1sdp_scc_reg.h> -#include <n1sdp_scp_pik.h> + +#include <stddef.h> +#include <stdint.h> struct scmi_management_ctx { /* SCMI module API */ diff --git a/product/n1sdp/scp_ramfw/config_apcontext.c b/product/n1sdp/scp_ramfw/config_apcontext.c index cc380fc4..b3ddb28d 100644 --- a/product/n1sdp/scp_ramfw/config_apcontext.c +++ b/product/n1sdp/scp_ramfw/config_apcontext.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "n1sdp_scp_software_mmap.h" + +#include <mod_apcontext.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_apcontext.h> -#include <n1sdp_scp_software_mmap.h> -#include <config_clock.h> /* * AP Context module configuration diff --git a/product/n1sdp/scp_ramfw/config_armv7m_mpu.c b/product/n1sdp/scp_ramfw/config_armv7m_mpu.c index 8483fa99..a8f6c551 100644 --- a/product/n1sdp/scp_ramfw/config_armv7m_mpu.c +++ b/product/n1sdp/scp_ramfw/config_armv7m_mpu.c @@ -5,11 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_mmap.h" +#include "n1sdp_scp_system_mmap.h" + +#include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_armv7m_mpu.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_scp_system_mmap.h> + +#include <fmw_cmsis.h> static const ARM_MPU_Region_t regions[] = { { /* 0x0000_0000 - 0xFFFF_FFFF */ diff --git a/product/n1sdp/scp_ramfw/config_clock.c b/product/n1sdp/scp_ramfw/config_clock.c index 72aef6e7..d6ab6eb4 100644 --- a/product/n1sdp/scp_ramfw/config_clock.c +++ b/product/n1sdp/scp_ramfw/config_clock.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "config_clock.h" +#include "config_power_domain.h" +#include "n1sdp_core.h" + #include <mod_clock.h> #include <mod_css_clock.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> -#include <n1sdp_core.h> -#include <n1sdp_system_clock.h> -#include <config_clock.h> -#include <config_power_domain.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_IDX_INTERCONNECT] = { diff --git a/product/n1sdp/scp_ramfw/config_cmn600.c b/product/n1sdp/scp_ramfw/config_cmn600.c index ec13271c..be92ceba 100644 --- a/product/n1sdp/scp_ramfw/config_cmn600.c +++ b/product/n1sdp/scp_ramfw/config_cmn600.c @@ -5,13 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_cmn600.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_cmn600.h> -#include <mod_n1sdp_system.h> -#include <n1sdp_scp_mmap.h> -#include <config_clock.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> /* * CMN600 nodes diff --git a/product/n1sdp/scp_ramfw/config_css_clock.c b/product/n1sdp/scp_ramfw/config_css_clock.c index 5adec7f5..76e299ee 100644 --- a/product/n1sdp/scp_ramfw/config_css_clock.c +++ b/product/n1sdp/scp_ramfw/config_css_clock.c @@ -5,16 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" + +#include <mod_css_clock.h> +#include <mod_n1sdp_pll.h> +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_n1sdp_pll.h> -#include <mod_pik_clock.h> -#include <n1sdp_scp_pik.h> -#include <config_clock.h> + +#include <stdbool.h> static const struct mod_css_clock_rate rate_table_cpu_group_0[] = { { diff --git a/product/n1sdp/scp_ramfw/config_debugger_cli.c b/product/n1sdp/scp_ramfw/config_debugger_cli.c index 274c9e42..e6b5c974 100644 --- a/product/n1sdp/scp_ramfw/config_debugger_cli.c +++ b/product/n1sdp/scp_ramfw/config_debugger_cli.c @@ -6,6 +6,7 @@ */ #include <mod_debugger_cli.h> + #include <fwk_module_idx.h> /* diff --git a/product/n1sdp/scp_ramfw/config_log.c b/product/n1sdp/scp_ramfw/config_log.c index bd57e035..21cb3b6a 100644 --- a/product/n1sdp/scp_ramfw/config_log.c +++ b/product/n1sdp/scp_ramfw/config_log.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_mmap.h" +#include "n1sdp_system_clock.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> -#include <fwk_macros.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_system_clock.h> /* * PL011 module diff --git a/product/n1sdp/scp_ramfw/config_mhu.c b/product/n1sdp/scp_ramfw/config_mhu.c index 97507f94..baf7cfa4 100644 --- a/product/n1sdp/scp_ramfw/config_mhu.c +++ b/product/n1sdp/scp_ramfw/config_mhu.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_irq.h" +#include "n1sdp_scp_mhu.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_mhu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_mhu.h> -#include <n1sdp_scp_mmap.h> static const struct fwk_element mhu_element_table[] = { [N1SDP_MHU_DEVICE_IDX_S_CLUS0] = { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_c2c_i2c.c b/product/n1sdp/scp_ramfw/config_n1sdp_c2c_i2c.c index 9b5480d3..5bd14eff 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_c2c_i2c.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_c2c_i2c.c @@ -5,12 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> +#include <mod_n1sdp_c2c_i2c.h> + #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_n1sdp_c2c_i2c.h> -#include <mod_n1sdp_i2c.h> const struct fwk_module_config config_n1sdp_c2c = { .data = &((struct n1sdp_c2c_dev_config) { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_ddr_phy.c b/product/n1sdp/scp_ramfw/config_n1sdp_ddr_phy.c index 21fb212a..b5e973ce 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_ddr_phy.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_ddr_phy.c @@ -4,12 +4,13 @@ * * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_mmap.h" + +#include <mod_n1sdp_ddr_phy.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <internal/n1sdp_ddr_phy.h> -#include <mod_n1sdp_ddr_phy.h> -#include <n1sdp_scp_mmap.h> -#include <config_clock.h> /* Table of N1SDP DDR PHY element descriptions. */ static struct fwk_element n1sdp_ddr_phy_element_table[] = { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_dmc620.c b/product/n1sdp/scp_ramfw/config_n1sdp_dmc620.c index d4140ac8..f739896a 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_dmc620.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_dmc620.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_n1sdp_dmc620.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_n1sdp_dmc620.h> -#include <n1sdp_scp_mmap.h> -#include <config_clock.h> /* Table of DMC620 elements descriptions. */ static struct fwk_element dmc620_element_table[] = { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_flash.c b/product/n1sdp/scp_ramfw/config_n1sdp_flash.c index bfedc305..ac8e970e 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_flash.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_flash.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "n1sdp_scp_system_mmap.h" + #include <mod_n1sdp_flash.h> -#include <n1sdp_scp_system_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_n1sdp_flash = { .data = &((struct mod_n1sdp_flash_config) { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_i2c.c b/product/n1sdp/scp_ramfw/config_n1sdp_i2c.c index 49479395..684b27d3 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_i2c.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_i2c.c @@ -5,14 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "config_clock.h" +#include "n1sdp_scp_irq.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_n1sdp_i2c.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_n1sdp_i2c.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_mmap.h> -#include <config_clock.h> +#include <fwk_module_idx.h> + +#include <stdbool.h> static const struct fwk_element i2c_element_desc_table[] = { [0] = { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_pcie.c b/product/n1sdp/scp_ramfw/config_n1sdp_pcie.c index 37512fb1..b0f50116 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_pcie.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_pcie.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "n1sdp_scp_mmap.h" + +#include <mod_n1sdp_pcie.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_n1sdp_pcie.h> -#include <n1sdp_scp_mmap.h> + +#include <stdbool.h> static const struct fwk_element n1sdp_pcie_element_table[] = { [0] = { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_pll.c b/product/n1sdp/scp_ramfw/config_n1sdp_pll.c index de708e8e..dfc29464 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_pll.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_pll.c @@ -5,14 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "n1sdp_scp_mmap.h" +#include "n1sdp_system_clock.h" + +#include <mod_n1sdp_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_n1sdp_pll.h> -#include <n1sdp_scp_mmap.h> -#include <config_clock.h> -#include <n1sdp_system_clock.h> static struct n1sdp_pll_custom_freq_param_entry freq_table[] = { { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_remote_pd.c b/product/n1sdp/scp_ramfw/config_n1sdp_remote_pd.c index 9f789364..39b413e6 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_remote_pd.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_remote_pd.c @@ -5,11 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_n1sdp_remote_pd.h> +#include <mod_power_domain.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_n1sdp_remote_pd.h> -#include <mod_power_domain.h> static const struct fwk_element remote_pd_element_table[] = { [0] = { diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_scp2pcc.c b/product/n1sdp/scp_ramfw/config_n1sdp_scp2pcc.c index 415509ad..33a523c5 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_scp2pcc.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_scp2pcc.c @@ -6,8 +6,11 @@ */ #include <mod_n1sdp_scp2pcc.h> + #include <fwk_module.h> +#include <stdint.h> + #define MSG_ALIVE_ADDRESS 0xB3FFF000 #define MSG_RX_BUF_ADDRESS 0xB3FFF104 #define MSG_TX_BUF_ADDRESS 0xB3FFF004 diff --git a/product/n1sdp/scp_ramfw/config_n1sdp_timer_sync.c b/product/n1sdp/scp_ramfw/config_n1sdp_timer_sync.c index 97627355..a2bf96e9 100644 --- a/product/n1sdp/scp_ramfw/config_n1sdp_timer_sync.c +++ b/product/n1sdp/scp_ramfw/config_n1sdp_timer_sync.c @@ -5,14 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_irq.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_n1sdp_timer_sync.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_n1sdp_timer_sync.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_mhu.h> -#include <n1sdp_scp_mmap.h> static const struct fwk_element n1sdp_tsync_element_table[] = { [0] = { diff --git a/product/n1sdp/scp_ramfw/config_pik_clock.c b/product/n1sdp/scp_ramfw/config_pik_clock.c index 94ca0860..d51606e3 100644 --- a/product/n1sdp/scp_ramfw/config_pik_clock.c +++ b/product/n1sdp/scp_ramfw/config_pik_clock.c @@ -5,15 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "n1sdp_pik_cpu.h" +#include "n1sdp_pik_debug.h" +#include "n1sdp_pik_scp.h" +#include "n1sdp_pik_system.h" +#include "n1sdp_scc_reg.h" +#include "n1sdp_scp_pik.h" +#include "n1sdp_system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <n1sdp_pik_system.h> -#include <n1sdp_scp_pik.h> -#include <n1sdp_system_clock.h> -#include <config_clock.h> + +#include <stdbool.h> /* * Rate lookup tables diff --git a/product/n1sdp/scp_ramfw/config_power_domain.c b/product/n1sdp/scp_ramfw/config_power_domain.c index 22b68ec4..73cb8827 100644 --- a/product/n1sdp/scp_ramfw/config_power_domain.c +++ b/product/n1sdp/scp_ramfw/config_power_domain.c @@ -5,22 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> -#include <stdint.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v0.h" +#include "n1sdp_core.h" +#include "n1sdp_power_domain.h" + +#include <mod_n1sdp_remote_pd.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_n1sdp_remote_pd.h> -#include <mod_system_power.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <n1sdp_core.h> -#include <n1sdp_power_domain.h> -#include <config_power_domain.h> -#include <config_ppu_v0.h> + +#include <stdint.h> +#include <stdio.h> /* Maximum power domain name size including the null terminator */ #define PD_NAME_SIZE 16 diff --git a/product/n1sdp/scp_ramfw/config_ppu_v0.c b/product/n1sdp/scp_ramfw/config_ppu_v0.c index 8a701295..8cbb1ff0 100644 --- a/product/n1sdp/scp_ramfw/config_ppu_v0.c +++ b/product/n1sdp/scp_ramfw/config_ppu_v0.c @@ -5,12 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "config_ppu_v0.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v0.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ppu_v0.h> -#include <n1sdp_scp_mmap.h> -#include <config_ppu_v0.h> + +#include <stdbool.h> static struct fwk_element ppu_v0_element_table[] = { [PPU_V0_ELEMENT_IDX_DBGTOP] = { diff --git a/product/n1sdp/scp_ramfw/config_ppu_v1.c b/product/n1sdp/scp_ramfw/config_ppu_v1.c index 173dce9a..45743e2c 100644 --- a/product/n1sdp/scp_ramfw/config_ppu_v1.c +++ b/product/n1sdp/scp_ramfw/config_ppu_v1.c @@ -5,22 +5,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> -#include <stdio.h> -#include <stdbool.h> +#include "config_power_domain.h" +#include "n1sdp_core.h" +#include "n1sdp_scp_mmap.h" + +#include <mod_cmn600.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_assert.h> #include <fwk_element.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_cmn600.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <n1sdp_core.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_mmap.h> -#include <config_power_domain.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> /* Maximum PPU core name size including the null terminator */ #define PPU_CORE_NAME_SIZE 16 diff --git a/product/n1sdp/scp_ramfw/config_scmi.c b/product/n1sdp/scp_ramfw/config_scmi.c index 213a09e3..7da4e38e 100644 --- a/product/n1sdp/scp_ramfw/config_scmi.c +++ b/product/n1sdp/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi.h> -#include <internal/scmi.h> -#include <mod_smt.h> -#include <n1sdp_scp_scmi.h> static const struct fwk_element service_table[] = { [SCP_N1SDP_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/n1sdp/scp_ramfw/config_scmi_system_power.c b/product/n1sdp/scp_ramfw/config_scmi_system_power.c index 61bf73e0..821cb7d2 100644 --- a/product/n1sdp/scp_ramfw/config_scmi_system_power.c +++ b/product/n1sdp/scp_ramfw/config_scmi_system_power.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + const struct fwk_module_config config_scmi_system_power = { .data = &((struct mod_scmi_system_power_config) { .system_view = MOD_SCMI_SYSTEM_VIEW_FULL, diff --git a/product/n1sdp/scp_ramfw/config_sds.c b/product/n1sdp/scp_ramfw/config_sds.c index 3facc7a6..74312871 100644 --- a/product/n1sdp/scp_ramfw/config_sds.c +++ b/product/n1sdp/scp_ramfw/config_sds.c @@ -5,18 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "config_clock.h" +#include "n1sdp_pik_scp.h" +#include "n1sdp_scp_pik.h" +#include "n1sdp_scp_software_mmap.h" +#include "n1sdp_sds.h" + +#include <mod_sds.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 <mod_sds.h> -#include <n1sdp_sds.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_scp_pik.h> -#include <n1sdp_scp_software_mmap.h> -#include <config_clock.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static const uint32_t feature_flags = 0x00000000; diff --git a/product/n1sdp/scp_ramfw/config_sensor.c b/product/n1sdp/scp_ramfw/config_sensor.c index 21a448fd..305934e8 100644 --- a/product/n1sdp/scp_ramfw/config_sensor.c +++ b/product/n1sdp/scp_ramfw/config_sensor.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> #include <mod_n1sdp_sensor.h> #include <mod_sensor.h> #include <mod_timer.h> +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> + +#include <stddef.h> + /* * N1SDP sensor driver config */ diff --git a/product/n1sdp/scp_ramfw/config_smt.c b/product/n1sdp/scp_ramfw/config_smt.c index 5e9ee2df..c0b49524 100644 --- a/product/n1sdp/scp_ramfw/config_smt.c +++ b/product/n1sdp/scp_ramfw/config_smt.c @@ -5,18 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_power_domain.h" +#include "n1sdp_core.h" +#include "n1sdp_scp_mhu.h" +#include "n1sdp_scp_mmap.h" +#include "n1sdp_scp_scmi.h" +#include "n1sdp_scp_software_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <n1sdp_core.h> -#include <n1sdp_scp_mhu.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_scp_scmi.h> -#include <n1sdp_scp_software_mmap.h> -#include <config_power_domain.h> static const struct fwk_element smt_element_table[] = { [SCP_N1SDP_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/n1sdp/scp_ramfw/config_ssc.c b/product/n1sdp/scp_ramfw/config_ssc.c index 191b0cad..7aef3a82 100644 --- a/product/n1sdp/scp_ramfw/config_ssc.c +++ b/product/n1sdp/scp_ramfw/config_ssc.c @@ -5,9 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "n1sdp_scp_mmap.h" + #include <mod_ssc.h> -#include <n1sdp_scp_mmap.h> + +#include <fwk_module.h> + +#include <stddef.h> const struct fwk_module_config config_ssc = { .get_element_table = NULL, diff --git a/product/n1sdp/scp_ramfw/config_system_info.c b/product/n1sdp/scp_ramfw/config_system_info.c index 08884553..95f509eb 100644 --- a/product/n1sdp/scp_ramfw/config_system_info.c +++ b/product/n1sdp/scp_ramfw/config_system_info.c @@ -5,10 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_ssc.h> +#include <mod_system_info.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_info.h> -#include <mod_ssc.h> + +#include <stddef.h> const struct fwk_module_config config_system_info = { .get_element_table = NULL, diff --git a/product/n1sdp/scp_ramfw/config_system_power.c b/product/n1sdp/scp_ramfw/config_system_power.c index decb1a51..d4d351e7 100644 --- a/product/n1sdp/scp_ramfw/config_system_power.c +++ b/product/n1sdp/scp_ramfw/config_system_power.c @@ -5,16 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_core.h" +#include "n1sdp_scp_irq.h" + +#include <mod_n1sdp_system.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_n1sdp_system.h> -#include <mod_ppu_v1.h> -#include <mod_system_power.h> -#include <n1sdp_core.h> -#include <n1sdp_scp_irq.h> + +#include <stdint.h> static const uint8_t system_power_to_sys_ppu0_state[] = { [MOD_PD_STATE_ON] = (uint8_t)MOD_PD_STATE_ON, diff --git a/product/n1sdp/scp_ramfw/config_timer.c b/product/n1sdp/scp_ramfw/config_timer.c index e5066a4e..c3e28ca5 100644 --- a/product/n1sdp/scp_ramfw/config_timer.c +++ b/product/n1sdp/scp_ramfw/config_timer.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "n1sdp_scp_irq.h" +#include "n1sdp_scp_mmap.h" +#include "n1sdp_system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <n1sdp_scp_irq.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_system_clock.h> -#include <config_clock.h> /* * Generic timer driver config diff --git a/product/n1sdp/scp_ramfw/fmw_memory.h b/product/n1sdp/scp_ramfw/fmw_memory.h index 601f27c4..54f5f589 100644 --- a/product/n1sdp/scp_ramfw/fmw_memory.h +++ b/product/n1sdp/scp_ramfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <n1sdp_scp_system_mmap.h> +#include "n1sdp_scp_system_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/n1sdp/scp_ramfw/rtx_config.c b/product/n1sdp/scp_ramfw/rtx_config.c index b45a946d..69685f16 100644 --- a/product/n1sdp/scp_ramfw/rtx_config.c +++ b/product/n1sdp/scp_ramfw/rtx_config.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_system_clock.h" + +#include <rtx_lib.c> +#include <rtx_os.h> + +#include <fmw_cmsis.h> + #include <stdbool.h> #include <stdint.h> -#include <cmsis_compiler.h> -#include <rtx_os.h> -#include <rtx_lib.c> -#include <n1sdp_system_clock.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/n1sdp/scp_romfw/config_log.c b/product/n1sdp/scp_romfw/config_log.c index 6ca8384d..757d5fbe 100644 --- a/product/n1sdp/scp_romfw/config_log.c +++ b/product/n1sdp/scp_romfw/config_log.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_scp_mmap.h" +#include "n1sdp_system_clock.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> -#include <fwk_macros.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <n1sdp_scp_mmap.h> -#include <n1sdp_system_clock.h> /* * N1SDP BYPASS ROM firmware banner string. diff --git a/product/n1sdp/scp_romfw/config_n1sdp_flash.c b/product/n1sdp/scp_romfw/config_n1sdp_flash.c index bfedc305..ac8e970e 100644 --- a/product/n1sdp/scp_romfw/config_n1sdp_flash.c +++ b/product/n1sdp/scp_romfw/config_n1sdp_flash.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "n1sdp_scp_system_mmap.h" + #include <mod_n1sdp_flash.h> -#include <n1sdp_scp_system_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_n1sdp_flash = { .data = &((struct mod_n1sdp_flash_config) { diff --git a/product/n1sdp/scp_romfw/config_n1sdp_rom.c b/product/n1sdp/scp_romfw/config_n1sdp_rom.c index 048371a8..535d726b 100644 --- a/product/n1sdp/scp_romfw/config_n1sdp_rom.c +++ b/product/n1sdp/scp_romfw/config_n1sdp_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "n1sdp_scp_system_mmap.h" + #include <mod_n1sdp_flash.h> #include <mod_n1sdp_rom.h> -#include <n1sdp_scp_system_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_n1sdp_rom = { .data = &((struct n1sdp_rom_config) { diff --git a/product/n1sdp/scp_romfw/fmw_memory.h b/product/n1sdp/scp_romfw/fmw_memory.h index 7cd5c8c8..467fbc2d 100644 --- a/product/n1sdp/scp_romfw/fmw_memory.h +++ b/product/n1sdp/scp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <n1sdp_scp_system_mmap.h> +#include "n1sdp_scp_system_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/n1sdp/src/n1sdp_core.c b/product/n1sdp/src/n1sdp_core.c index fa41b9ea..cbf88133 100644 --- a/product/n1sdp/src/n1sdp_core.c +++ b/product/n1sdp/src/n1sdp_core.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "n1sdp_core.h" +#include "n1sdp_scc_reg.h" +#include "n1sdp_scp_pik.h" + #include <fwk_assert.h> -#include <n1sdp_core.h> -#include <n1sdp_scc_reg.h> -#include <n1sdp_scp_pik.h> unsigned int n1sdp_core_get_core_per_cluster_count(unsigned int cluster) { diff --git a/product/rddaniel/include/cpu_pik.h b/product/rddaniel/include/cpu_pik.h index 4da96626..b789638a 100644 --- a/product/rddaniel/include/cpu_pik.h +++ b/product/rddaniel/include/cpu_pik.h @@ -8,9 +8,11 @@ #ifndef CPU_PIK_H #define CPU_PIK_H -#include <stdint.h> +#include "scp_css_mmap.h" + #include <fwk_macros.h> -#include <scp_css_mmap.h> + +#include <stdint.h> /*! * \brief PE Static Configuration register definitions diff --git a/product/rddaniel/include/rddaniel_sds.h b/product/rddaniel/include/rddaniel_sds.h index be852dc4..32dc4673 100644 --- a/product/rddaniel/include/rddaniel_sds.h +++ b/product/rddaniel/include/rddaniel_sds.h @@ -10,6 +10,8 @@ #include <mod_sds.h> +#include <stdint.h> + /* * Structure identifiers. */ diff --git a/product/rddaniel/include/scp_css_mmap.h b/product/rddaniel/include/scp_css_mmap.h index 9fd1fb99..c326636f 100644 --- a/product/rddaniel/include/scp_css_mmap.h +++ b/product/rddaniel/include/scp_css_mmap.h @@ -8,7 +8,7 @@ #ifndef SCP_CSS_MMAP_H #define SCP_CSS_MMAP_H -#include <scp_mmap.h> +#include "scp_mmap.h" #define SCP_CMN_RHODES_BASE (SCP_SYSTEM_ACCESS_PORT0_BASE + 0x10000000) diff --git a/product/rddaniel/include/scp_pik.h b/product/rddaniel/include/scp_pik.h index 732d18fd..9ce9d6f8 100644 --- a/product/rddaniel/include/scp_pik.h +++ b/product/rddaniel/include/scp_pik.h @@ -11,9 +11,11 @@ #ifndef SCP_PIK_H #define SCP_PIK_H -#include <stdint.h> +#include "scp_css_mmap.h" + #include <fwk_macros.h> -#include <scp_css_mmap.h> + +#include <stdint.h> /*! * \brief SCP PIK register definitions diff --git a/product/rddaniel/include/scp_soc_mmap.h b/product/rddaniel/include/scp_soc_mmap.h index f84652f9..3dbb0572 100644 --- a/product/rddaniel/include/scp_soc_mmap.h +++ b/product/rddaniel/include/scp_soc_mmap.h @@ -8,7 +8,7 @@ #ifndef SCP_SOC_MMAP_H #define SCP_SOC_MMAP_H -#include <scp_mmap.h> +#include "scp_mmap.h" #define SCP_NOR0_FLASH_BASE (SCP_SOC_EXPANSION1_BASE + 0x07000000) #define SCP_PLL_BASE (SCP_SOC_EXPANSION3_BASE + 0x03000000) diff --git a/product/rddaniel/include/scp_software_mmap.h b/product/rddaniel/include/scp_software_mmap.h index 08c00bba..536b4de7 100644 --- a/product/rddaniel/include/scp_software_mmap.h +++ b/product/rddaniel/include/scp_software_mmap.h @@ -8,7 +8,8 @@ #ifndef SCP_SOFTWARE_MMAP_H #define SCP_SOFTWARE_MMAP_H -#include <scp_soc_mmap.h> +#include "scp_soc_mmap.h" + #include <fwk_macros.h> /* SCP ROM and RAM firmware size loaded on main memory */ diff --git a/product/rddaniel/include/system_pik.h b/product/rddaniel/include/system_pik.h index 63878109..d83bd1de 100644 --- a/product/rddaniel/include/system_pik.h +++ b/product/rddaniel/include/system_pik.h @@ -8,9 +8,11 @@ #ifndef SYSTEM_PIK_H #define SYSTEM_PIK_H -#include <stdint.h> +#include "scp_css_mmap.h" + #include <fwk_macros.h> -#include <scp_css_mmap.h> + +#include <stdint.h> /*! * \brief TCU clock register definitions diff --git a/product/rddaniel/mcp_romfw/config_log.c b/product/rddaniel/mcp_romfw/config_log.c index 4c9ed6a5..1924abce 100644 --- a/product/rddaniel/mcp_romfw/config_log.c +++ b/product/rddaniel/mcp_romfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "mcp_rddaniel_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <mcp_rddaniel_mmap.h> /* * PL011 module diff --git a/product/rddaniel/mcp_romfw/config_rddaniel_rom.c b/product/rddaniel/mcp_romfw/config_rddaniel_rom.c index 80114de2..a8af750a 100644 --- a/product/rddaniel/mcp_romfw/config_rddaniel_rom.c +++ b/product/rddaniel/mcp_romfw/config_rddaniel_rom.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "mcp_software_mmap.h" + #include <mod_mscp_rom.h> -#include <mcp_software_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_mscp_rom = { .data = &((struct mscp_rom_config) { diff --git a/product/rddaniel/mcp_romfw/fmw_memory.h b/product/rddaniel/mcp_romfw/fmw_memory.h index fb183bf1..28b15541 100644 --- a/product/rddaniel/mcp_romfw/fmw_memory.h +++ b/product/rddaniel/mcp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <mcp_software_mmap.h> +#include "mcp_software_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c b/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c index 0795428b..3463d6c7 100644 --- a/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c +++ b/product/rddaniel/module/mscp_rom/src/mod_mscp_rom.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> -#include <fwk_status.h> +#include <mod_log.h> +#include <mod_mscp_rom.h> + +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module.h> #include <fwk_module_idx.h> +#include <fwk_status.h> #include <fwk_thread.h> -#include <mod_log.h> -#include <mod_mscp_rom.h> + +#include <stdint.h> +#include <string.h> static const struct mscp_rom_config *rom_config; static struct mod_log_api *log_api; diff --git a/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c b/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c index ee25a6ab..0f01aa44 100644 --- a/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c +++ b/product/rddaniel/module/rddaniel_system/src/mod_rddaniel_system.c @@ -8,29 +8,37 @@ * RD-Daniel System Support. */ -#include <stdint.h> -#include <fmw_cmsis.h> +#include "clock_soc.h" +#include "rddaniel_core.h" +#include "rddaniel_scmi.h" +#include "rddaniel_sds.h" +#include "scp_css_mmap.h" +#include "scp_pik.h" +#include "scp_rddaniel_irq.h" + +#include <mod_clock.h> +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_rddaniel_system.h> +#include <mod_scmi.h> +#include <mod_sds.h> +#include <mod_system_power.h> + #include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_notification.h> -#include <mod_clock.h> -#include <mod_rddaniel_system.h> -#include <mod_log.h> -#include <mod_scmi.h> -#include <mod_sds.h> -#include <mod_system_power.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <clock_soc.h> -#include <rddaniel_core.h> -#include <rddaniel_sds.h> -#include <rddaniel_scmi.h> -#include <scp_rddaniel_irq.h> -#include <scp_pik.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* SCMI services required to enable the messaging stack */ static unsigned int scmi_notification_table[] = { diff --git a/product/rddaniel/scp_ramfw/config_apcontext.c b/product/rddaniel/scp_ramfw/config_apcontext.c index 77396883..5232cfc0 100644 --- a/product/rddaniel/scp_ramfw/config_apcontext.c +++ b/product/rddaniel/scp_ramfw/config_apcontext.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" +#include "scp_software_mmap.h" + +#include <mod_apcontext.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_apcontext.h> -#include <clock_soc.h> -#include <scp_software_mmap.h> /* * AP Context module configuration diff --git a/product/rddaniel/scp_ramfw/config_armv7m_mpu.c b/product/rddaniel/scp_ramfw/config_armv7m_mpu.c index 2fa082d1..cdeeac7a 100644 --- a/product/rddaniel/scp_ramfw/config_armv7m_mpu.c +++ b/product/rddaniel/scp_ramfw/config_armv7m_mpu.c @@ -5,11 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_mmap.h" +#include "scp_software_mmap.h" + +#include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_armv7m_mpu.h> -#include <scp_mmap.h> -#include <scp_software_mmap.h> + +#include <fmw_cmsis.h> static const ARM_MPU_Region_t regions[] = { { /* 0x0000_0000 - 0xFFFF_FFFF */ diff --git a/product/rddaniel/scp_ramfw/config_clock.c b/product/rddaniel/scp_ramfw/config_clock.c index 3dcc735b..8729aaa8 100644 --- a/product/rddaniel/scp_ramfw/config_clock.c +++ b/product/rddaniel/scp_ramfw/config_clock.c @@ -5,16 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "clock_soc.h" +#include "config_power_domain.h" +#include "rddaniel_core.h" + #include <mod_clock.h> #include <mod_css_clock.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> -#include <clock_soc.h> -#include <rddaniel_core.h> -#include <config_power_domain.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_IDX_INTERCONNECT] = { diff --git a/product/rddaniel/scp_ramfw/config_cmn_rhodes.c b/product/rddaniel/scp_ramfw/config_cmn_rhodes.c index 0a84aeb2..55683dda 100644 --- a/product/rddaniel/scp_ramfw/config_cmn_rhodes.c +++ b/product/rddaniel/scp_ramfw/config_cmn_rhodes.c @@ -5,12 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" +#include "scp_css_mmap.h" + +#include <mod_cmn_rhodes.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_cmn_rhodes.h> -#include <clock_soc.h> -#include <scp_css_mmap.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> /* * CMN_RHODES nodes diff --git a/product/rddaniel/scp_ramfw/config_css_clock.c b/product/rddaniel/scp_ramfw/config_css_clock.c index 8307752c..7a07fe82 100644 --- a/product/rddaniel/scp_ramfw/config_css_clock.c +++ b/product/rddaniel/scp_ramfw/config_css_clock.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" + +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_system_pll.h> -#include <mod_pik_clock.h> -#include <clock_soc.h> + +#include <stdbool.h> static const struct mod_css_clock_rate rate_table_cpu_group[] = { { diff --git a/product/rddaniel/scp_ramfw/config_gtimer.c b/product/rddaniel/scp_ramfw/config_gtimer.c index e425b901..e3325a17 100644 --- a/product/rddaniel/scp_ramfw/config_gtimer.c +++ b/product/rddaniel/scp_ramfw/config_gtimer.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" +#include "scp_css_mmap.h" + +#include <mod_gtimer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <clock_soc.h> -#include <scp_css_mmap.h> /* * Generic timer driver config diff --git a/product/rddaniel/scp_ramfw/config_log.c b/product/rddaniel/scp_ramfw/config_log.c index bfefacfd..89d3575d 100644 --- a/product/rddaniel/scp_ramfw/config_log.c +++ b/product/rddaniel/scp_ramfw/config_log.c @@ -5,11 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_log.h> + #include <fwk_banner.h> -#include <fwk_macros.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> /* * Log module diff --git a/product/rddaniel/scp_ramfw/config_mhu2.c b/product/rddaniel/scp_ramfw/config_mhu2.c index 4422c03e..09cf6925 100644 --- a/product/rddaniel/scp_ramfw/config_mhu2.c +++ b/product/rddaniel/scp_ramfw/config_mhu2.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_css_mmap.h" +#include "scp_rddaniel_irq.h" +#include "scp_rddaniel_mhu.h" + +#include <mod_mhu2.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu2.h> -#include <scp_rddaniel_irq.h> -#include <scp_css_mmap.h> -#include <scp_rddaniel_mhu.h> static const struct fwk_element mhu_element_table[] = { [SCP_RDDANIEL_MHU_DEVICE_IDX_SCP_AP_S_CLUS0] = { diff --git a/product/rddaniel/scp_ramfw/config_pik_clock.c b/product/rddaniel/scp_ramfw/config_pik_clock.c index dfb50223..1efc16cc 100644 --- a/product/rddaniel/scp_ramfw/config_pik_clock.c +++ b/product/rddaniel/scp_ramfw/config_pik_clock.c @@ -5,16 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" +#include "cpu_pik.h" +#include "scp_pik.h" +#include "system_pik.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <clock_soc.h> -#include <cpu_pik.h> -#include <scp_pik.h> -#include <system_pik.h> -#include <clock_soc.h> + +#include <stdbool.h> /* * Rate lookup tables diff --git a/product/rddaniel/scp_ramfw/config_power_domain.c b/product/rddaniel/scp_ramfw/config_power_domain.c index a35a58cb..b3c1622e 100644 --- a/product/rddaniel/scp_ramfw/config_power_domain.c +++ b/product/rddaniel/scp_ramfw/config_power_domain.c @@ -5,20 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> -#include <stdint.h> -#include <string.h> +#include "config_power_domain.h" +#include "rddaniel_core.h" +#include "rddaniel_power_domain.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_power.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <config_power_domain.h> -#include <rddaniel_power_domain.h> -#include <rddaniel_core.h> + +#include <stdint.h> +#include <stdio.h> +#include <string.h> /* Maximum power domain name size including the null terminator */ #define PD_NAME_SIZE 12 diff --git a/product/rddaniel/scp_ramfw/config_ppu_v1.c b/product/rddaniel/scp_ramfw/config_ppu_v1.c index d8f16387..9dede325 100644 --- a/product/rddaniel/scp_ramfw/config_ppu_v1.c +++ b/product/rddaniel/scp_ramfw/config_ppu_v1.c @@ -5,20 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> -#include <stdio.h> -#include <fwk_assert.h> +#include "config_power_domain.h" +#include "rddaniel_core.h" +#include "scp_css_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_element.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_power_domain.h> -#include <mod_ppu_v1.h> -#include <rddaniel_core.h> -#include <scp_css_mmap.h> -#include <config_power_domain.h> + +#include <stdio.h> +#include <string.h> /* Maximum PPU core name size including the null terminator */ #define PPU_CORE_NAME_SIZE 12 diff --git a/product/rddaniel/scp_ramfw/config_scmi.c b/product/rddaniel/scp_ramfw/config_scmi.c index 202058d2..555ac645 100644 --- a/product/rddaniel/scp_ramfw/config_scmi.c +++ b/product/rddaniel/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "rddaniel_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi.h> -#include <mod_smt.h> -#include <internal/scmi.h> -#include <rddaniel_scmi.h> static const struct fwk_element service_table[] = { [SCP_RDDANIEL_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/rddaniel/scp_ramfw/config_scmi_system_power.c b/product/rddaniel/scp_ramfw/config_scmi_system_power.c index cc704ed6..20b22582 100644 --- a/product/rddaniel/scp_ramfw/config_scmi_system_power.c +++ b/product/rddaniel/scp_ramfw/config_scmi_system_power.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + const struct fwk_module_config config_scmi_system_power = { .data = &((struct mod_scmi_system_power_config) { .system_view = MOD_SCMI_SYSTEM_VIEW_FULL, diff --git a/product/rddaniel/scp_ramfw/config_sds.c b/product/rddaniel/scp_ramfw/config_sds.c index 89fc5017..d5f95478 100644 --- a/product/rddaniel/scp_ramfw/config_sds.c +++ b/product/rddaniel/scp_ramfw/config_sds.c @@ -5,18 +5,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "clock_soc.h" +#include "rddaniel_sds.h" +#include "scp_pik.h" +#include "scp_software_mmap.h" + +#include <mod_sds.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 <mod_sds.h> -#include <mod_sid.h> -#include <clock_soc.h> -#include <rddaniel_sds.h> -#include <scp_pik.h> -#include <scp_software_mmap.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static const uint32_t feature_flags = 0x00000000; diff --git a/product/rddaniel/scp_ramfw/config_smt.c b/product/rddaniel/scp_ramfw/config_smt.c index 313aadf6..e3b2abcb 100644 --- a/product/rddaniel/scp_ramfw/config_smt.c +++ b/product/rddaniel/scp_ramfw/config_smt.c @@ -5,17 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_power_domain.h" +#include "rddaniel_core.h" +#include "rddaniel_scmi.h" +#include "scp_rddaniel_mhu.h" +#include "scp_software_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <rddaniel_core.h> -#include <scp_rddaniel_mhu.h> -#include <rddaniel_scmi.h> -#include <scp_software_mmap.h> -#include <config_power_domain.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [SCP_RDDANIEL_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/rddaniel/scp_ramfw/config_system_pll.c b/product/rddaniel/scp_ramfw/config_system_pll.c index 3cd68f54..d7cf71b3 100644 --- a/product/rddaniel/scp_ramfw/config_system_pll.c +++ b/product/rddaniel/scp_ramfw/config_system_pll.c @@ -5,14 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" +#include "scp_pik.h" +#include "scp_soc_mmap.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <clock_soc.h> -#include <scp_pik.h> -#include <scp_soc_mmap.h> static const struct fwk_element system_pll_element_table[] = { [CLOCK_PLL_IDX_CPU0] = { diff --git a/product/rddaniel/scp_ramfw/config_system_power.c b/product/rddaniel/scp_ramfw/config_system_power.c index 23237d5f..c0b66323 100644 --- a/product/rddaniel/scp_ramfw/config_system_power.c +++ b/product/rddaniel/scp_ramfw/config_system_power.c @@ -5,16 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "rddaniel_core.h" +#include "scp_rddaniel_irq.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_rddaniel_system.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_ppu_v1.h> -#include <mod_system_power.h> -#include <mod_rddaniel_system.h> -#include <scp_rddaniel_irq.h> -#include <rddaniel_core.h> + +#include <stdint.h> static const uint8_t system_power_to_sys_ppu0_state[] = { [MOD_PD_STATE_ON] = (uint8_t)MOD_PD_STATE_ON, diff --git a/product/rddaniel/scp_ramfw/config_timer.c b/product/rddaniel/scp_ramfw/config_timer.c index 432417c3..db0fed9c 100644 --- a/product/rddaniel/scp_ramfw/config_timer.c +++ b/product/rddaniel/scp_ramfw/config_timer.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rddaniel_irq.h" + +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_timer.h> -#include <scp_rddaniel_irq.h> /* * Timer HAL config diff --git a/product/rddaniel/scp_ramfw/fmw_memory.h b/product/rddaniel/scp_ramfw/fmw_memory.h index a40230c0..01ff8e4f 100644 --- a/product/rddaniel/scp_ramfw/fmw_memory.h +++ b/product/rddaniel/scp_ramfw/fmw_memory.h @@ -11,8 +11,8 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_mmap.h> -#include <scp_software_mmap.h> +#include "scp_mmap.h" +#include "scp_software_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/rddaniel/scp_ramfw/rtx_config.c b/product/rddaniel/scp_ramfw/rtx_config.c index 1ef20dd7..3f0acbaa 100644 --- a/product/rddaniel/scp_ramfw/rtx_config.c +++ b/product/rddaniel/scp_ramfw/rtx_config.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_soc.h" + +#include <rtx_lib.c> +#include <rtx_os.h> + +#include <fmw_cmsis.h> + #include <stdbool.h> #include <stdint.h> -#include <cmsis_compiler.h> -#include <rtx_os.h> -#include <clock_soc.h> -#include <rtx_lib.c> /* * Required by RTX to configure the SysTick timer. diff --git a/product/rddaniel/scp_romfw/config_log.c b/product/rddaniel/scp_romfw/config_log.c index 66ed02aa..a6531f24 100644 --- a/product/rddaniel/scp_romfw/config_log.c +++ b/product/rddaniel/scp_romfw/config_log.c @@ -5,11 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_id.h> +#include <mod_log.h> + #include <fwk_banner.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> static const struct mod_log_config log_data = { .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0), diff --git a/product/rddaniel/scp_romfw/config_scp_rom.c b/product/rddaniel/scp_romfw/config_scp_rom.c index 7793671f..93b41811 100644 --- a/product/rddaniel/scp_romfw/config_scp_rom.c +++ b/product/rddaniel/scp_romfw/config_scp_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "scp_mmap.h" +#include "scp_software_mmap.h" + #include <mod_mscp_rom.h> -#include <scp_mmap.h> -#include <scp_software_mmap.h> + +#include <fwk_module.h> const struct fwk_module_config config_mscp_rom = { .data = &((struct mscp_rom_config) { diff --git a/product/rddaniel/scp_romfw/fmw_memory.h b/product/rddaniel/scp_romfw/fmw_memory.h index f2bd256a..78978aba 100644 --- a/product/rddaniel/scp_romfw/fmw_memory.h +++ b/product/rddaniel/scp_romfw/fmw_memory.h @@ -11,8 +11,8 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_mmap.h> -#include <scp_software_mmap.h> +#include "scp_mmap.h" +#include "scp_software_mmap.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/rddaniel/src/config_pl011.c b/product/rddaniel/src/config_pl011.c index a40cd04d..07192a92 100644 --- a/product/rddaniel/src/config_pl011.c +++ b/product/rddaniel/src/config_pl011.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_css_mmap.h" + +#include <mod_pl011.h> + #include <fwk_element.h> -#include <fwk_macros.h> #include <fwk_id.h> +#include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pl011.h> -#include <scp_css_mmap.h> static const struct fwk_element pl011_element_desc_table[] = { [0] = { diff --git a/product/rddaniel/src/config_sid.c b/product/rddaniel/src/config_sid.c index 234f8675..5244deba 100644 --- a/product/rddaniel/src/config_sid.c +++ b/product/rddaniel/src/config_sid.c @@ -5,10 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_css_mmap.h" + +#include <mod_sid.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_sid.h> -#include <scp_css_mmap.h> static const struct fwk_element subsystem_table[] = { { diff --git a/product/rddaniel/src/config_system_info.c b/product/rddaniel/src/config_system_info.c index 6fc99805..23a2b480 100644 --- a/product/rddaniel/src/config_system_info.c +++ b/product/rddaniel/src/config_system_info.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_macros.h> +#include <mod_sid.h> +#include <mod_system_info.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_info.h> -#include <mod_sid.h> + +#include <stddef.h> const struct fwk_module_config config_system_info = { .get_element_table = NULL, diff --git a/product/rdn1e1/include/mcp_system_mmap_mcp.h b/product/rdn1e1/include/mcp_system_mmap_mcp.h index b4878c56..07961891 100644 --- a/product/rdn1e1/include/mcp_system_mmap_mcp.h +++ b/product/rdn1e1/include/mcp_system_mmap_mcp.h @@ -8,7 +8,7 @@ #ifndef MCP_SYSTEM_MMAP_MCP_H #define MCP_SYSTEM_MMAP_MCP_H -#include <mcp_rdn1e1_mmap_mcp.h> +#include "mcp_rdn1e1_mmap_mcp.h" #define MCP_ROM_SIZE (64 * 1024) #define MCP_RAM0_SIZE (64 * 1024) diff --git a/product/rdn1e1/include/rdn1e1_pik_cpu.h b/product/rdn1e1/include/rdn1e1_pik_cpu.h index d1f0976a..bf021a08 100644 --- a/product/rdn1e1/include/rdn1e1_pik_cpu.h +++ b/product/rdn1e1/include/rdn1e1_pik_cpu.h @@ -8,9 +8,10 @@ #ifndef RDN1E1_PIK_CPU_H #define RDN1E1_PIK_CPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief PE Static Configuration register definitions */ diff --git a/product/rdn1e1/include/rdn1e1_pik_debug.h b/product/rdn1e1/include/rdn1e1_pik_debug.h index cfaa69e4..817cd747 100644 --- a/product/rdn1e1/include/rdn1e1_pik_debug.h +++ b/product/rdn1e1/include/rdn1e1_pik_debug.h @@ -8,9 +8,10 @@ #ifndef RDN1E1_PIK_DEBUG_H #define RDN1E1_PIK_DEBUG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Debug register definitions */ diff --git a/product/rdn1e1/include/rdn1e1_pik_scp.h b/product/rdn1e1/include/rdn1e1_pik_scp.h index 689006c0..6f989732 100644 --- a/product/rdn1e1/include/rdn1e1_pik_scp.h +++ b/product/rdn1e1/include/rdn1e1_pik_scp.h @@ -11,9 +11,10 @@ #ifndef RDN1E1_PIK_SCP_H #define RDN1E1_PIK_SCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief SCP PIK register definitions */ diff --git a/product/rdn1e1/include/rdn1e1_pik_system.h b/product/rdn1e1/include/rdn1e1_pik_system.h index 6567346c..5ac9a4d2 100644 --- a/product/rdn1e1/include/rdn1e1_pik_system.h +++ b/product/rdn1e1/include/rdn1e1_pik_system.h @@ -8,9 +8,10 @@ #ifndef RDN1E1_PIK_SYSTEM_H #define RDN1E1_PIK_SYSTEM_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief TCU clock register definitions */ diff --git a/product/rdn1e1/include/rdn1e1_sds.h b/product/rdn1e1/include/rdn1e1_sds.h index 1bd0434f..d7c99063 100644 --- a/product/rdn1e1/include/rdn1e1_sds.h +++ b/product/rdn1e1/include/rdn1e1_sds.h @@ -10,6 +10,8 @@ #include <mod_sds.h> +#include <stdint.h> + /* * Structure identifiers. */ diff --git a/product/rdn1e1/include/scp_rdn1e1_pik.h b/product/rdn1e1/include/scp_rdn1e1_pik.h index 125dbf62..6954a438 100644 --- a/product/rdn1e1/include/scp_rdn1e1_pik.h +++ b/product/rdn1e1/include/scp_rdn1e1_pik.h @@ -8,10 +8,10 @@ #ifndef SCP_RDN1E1_PIK_H #define SCP_RDN1E1_PIK_H -#include <scp_rdn1e1_mmap.h> -#include <rdn1e1_pik_cpu.h> -#include <rdn1e1_pik_scp.h> -#include <rdn1e1_pik_system.h> +#include "rdn1e1_pik_cpu.h" +#include "rdn1e1_pik_scp.h" +#include "rdn1e1_pik_system.h" +#include "scp_rdn1e1_mmap.h" #define PIK_CLUSTER(IDX) ((struct pik_cpu_reg *) SCP_PIK_CLUSTER_BASE(IDX)) #define PIK_SCP ((struct pik_scp_reg *) SCP_PIK_SCP_BASE) diff --git a/product/rdn1e1/include/scp_software_mmap.h b/product/rdn1e1/include/scp_software_mmap.h index 2cb6f661..f3e10dd0 100644 --- a/product/rdn1e1/include/scp_software_mmap.h +++ b/product/rdn1e1/include/scp_software_mmap.h @@ -11,7 +11,8 @@ #ifndef SCP_SOFTWARE_MMAP_H #define SCP_SOFTWARE_MMAP_H -#include <scp_rdn1e1_mmap.h> +#include "scp_rdn1e1_mmap.h" + #include <fwk_macros.h> #define SCP_NOR_FLASH_BASE 0x08000000 diff --git a/product/rdn1e1/include/scp_system_mmap.h b/product/rdn1e1/include/scp_system_mmap.h index d668c1e3..499eac45 100644 --- a/product/rdn1e1/include/scp_system_mmap.h +++ b/product/rdn1e1/include/scp_system_mmap.h @@ -8,7 +8,7 @@ #ifndef SCP_SYSTEM_MMAP_H #define SCP_SYSTEM_MMAP_H -#include <scp_rdn1e1_mmap.h> +#include "scp_rdn1e1_mmap.h" #define SCP_PLAT_BASE (SCP_SYS0_BASE + 0x3FFE0000) diff --git a/product/rdn1e1/include/scp_system_mmap_scp.h b/product/rdn1e1/include/scp_system_mmap_scp.h index 73e4c727..31d5d980 100644 --- a/product/rdn1e1/include/scp_system_mmap_scp.h +++ b/product/rdn1e1/include/scp_system_mmap_scp.h @@ -8,7 +8,7 @@ #ifndef SCP_SYSTEM_MMAP_SCP_H #define SCP_SYSTEM_MMAP_SCP_H -#include <scp_rdn1e1_mmap_scp.h> +#include "scp_rdn1e1_mmap_scp.h" #define SCP_ROM_SIZE (64 * 1024) #define SCP_RAM0_SIZE (256 * 1024) diff --git a/product/rdn1e1/mcp_romfw/config_log.c b/product/rdn1e1/mcp_romfw/config_log.c index cb3efd40..f332ccfd 100644 --- a/product/rdn1e1/mcp_romfw/config_log.c +++ b/product/rdn1e1/mcp_romfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "mcp_rdn1e1_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <mcp_rdn1e1_mmap.h> /* * PL011 module diff --git a/product/rdn1e1/mcp_romfw/config_rdn1e1_rom.c b/product/rdn1e1/mcp_romfw/config_rdn1e1_rom.c index 25c74db3..23c688d9 100644 --- a/product/rdn1e1/mcp_romfw/config_rdn1e1_rom.c +++ b/product/rdn1e1/mcp_romfw/config_rdn1e1_rom.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "mcp_rdn1e1_mmap_mcp.h" + #include <mod_rdn1e1_rom.h> -#include <mcp_rdn1e1_mmap_mcp.h> + +#include <fwk_module.h> const struct fwk_module_config config_rdn1e1_rom = { .data = &((struct rdn1e1_rom_config) { diff --git a/product/rdn1e1/mcp_romfw/fmw_memory.h b/product/rdn1e1/mcp_romfw/fmw_memory.h index 674840ac..e5f2ad2c 100644 --- a/product/rdn1e1/mcp_romfw/fmw_memory.h +++ b/product/rdn1e1/mcp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <mcp_system_mmap_mcp.h> +#include "mcp_system_mmap_mcp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c index c9cda354..0087f885 100644 --- a/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c +++ b/product/rdn1e1/module/rdn1e1_rom/src/mod_rdn1e1_rom.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include <mod_log.h> +#include <mod_rdn1e1_rom.h> + +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_log.h> -#include <mod_rdn1e1_rom.h> + +#include <stdint.h> +#include <string.h> static const struct rdn1e1_rom_config *rom_config; static struct mod_log_api *log_api; diff --git a/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c b/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c index 32610e31..4fe77376 100644 --- a/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c +++ b/product/rdn1e1/module/rdn1e1_system/src/mod_rdn1e1_system.c @@ -8,32 +8,39 @@ * RDN1E1 System Support. */ -#include <stdint.h> -#include <fmw_cmsis.h> -#include <fwk_assert.h> -#include <fwk_id.h> -#include <fwk_interrupt.h> -#include <fwk_macros.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_notification.h> +#include "config_clock.h" +#include "rdn1e1_core.h" +#include "rdn1e1_pik_scp.h" +#include "rdn1e1_sds.h" +#include "scp_rdn1e1_irq.h" +#include "scp_rdn1e1_mmap.h" +#include "scp_rdn1e1_scmi.h" + #include <mod_clock.h> #include <mod_cmn600.h> -#include <mod_rdn1e1_system.h> #include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_rdn1e1_system.h> #include <mod_scmi.h> #include <mod_sds.h> #include <mod_system_info.h> #include <mod_system_power.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <rdn1e1_core.h> -#include <rdn1e1_pik_scp.h> -#include <rdn1e1_sds.h> -#include <scp_rdn1e1_irq.h> -#include <scp_rdn1e1_mmap.h> -#include <scp_rdn1e1_scmi.h> -#include <config_clock.h> + +#include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_interrupt.h> +#include <fwk_macros.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_notification.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* SCMI services required to enable the messaging stack */ static unsigned int scmi_notification_table[] = { diff --git a/product/rdn1e1/scp_ramfw/config_apcontext.c b/product/rdn1e1/scp_ramfw/config_apcontext.c index b27ef22c..51a93ac1 100644 --- a/product/rdn1e1/scp_ramfw/config_apcontext.c +++ b/product/rdn1e1/scp_ramfw/config_apcontext.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_software_mmap.h" + +#include <mod_apcontext.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_apcontext.h> -#include <scp_software_mmap.h> -#include <config_clock.h> /* * AP Context module configuration diff --git a/product/rdn1e1/scp_ramfw/config_armv7m_mpu.c b/product/rdn1e1/scp_ramfw/config_armv7m_mpu.c index 387a2f06..d8635b80 100644 --- a/product/rdn1e1/scp_ramfw/config_armv7m_mpu.c +++ b/product/rdn1e1/scp_ramfw/config_armv7m_mpu.c @@ -5,12 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <scp_rdn1e1_mmap.h> -#include <scp_rdn1e1_mmap_scp.h> +#include "scp_rdn1e1_mmap.h" +#include "scp_rdn1e1_mmap_scp.h" + #include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> +#include <fmw_cmsis.h> + static const ARM_MPU_Region_t regions[] = { { /* 0x0000_0000 - 0xFFFF_FFFF */ .RBAR = ARM_MPU_RBAR(0, 0x00000000), diff --git a/product/rdn1e1/scp_ramfw/config_clock.c b/product/rdn1e1/scp_ramfw/config_clock.c index 03668291..4a520df9 100644 --- a/product/rdn1e1/scp_ramfw/config_clock.c +++ b/product/rdn1e1/scp_ramfw/config_clock.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "config_clock.h" +#include "config_power_domain.h" +#include "rdn1e1_core.h" + #include <mod_clock.h> #include <mod_css_clock.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> -#include <rdn1e1_core.h> -#include <system_clock.h> -#include <config_clock.h> -#include <config_power_domain.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_IDX_INTERCONNECT] = { diff --git a/product/rdn1e1/scp_ramfw/config_cmn600.c b/product/rdn1e1/scp_ramfw/config_cmn600.c index 5b548dad..cdb83725 100644 --- a/product/rdn1e1/scp_ramfw/config_cmn600.c +++ b/product/rdn1e1/scp_ramfw/config_cmn600.c @@ -5,12 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_rdn1e1_mmap.h" + +#include <mod_cmn600.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_cmn600.h> -#include <scp_rdn1e1_mmap.h> -#include <config_clock.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> #define ROOT_NODE_OFFSET 0xD00000 diff --git a/product/rdn1e1/scp_ramfw/config_css_clock.c b/product/rdn1e1/scp_ramfw/config_css_clock.c index 79c3c715..e7ff3a48 100644 --- a/product/rdn1e1/scp_ramfw/config_css_clock.c +++ b/product/rdn1e1/scp_ramfw/config_css_clock.c @@ -5,16 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" + +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_system_pll.h> -#include <mod_pik_clock.h> -#include <scp_rdn1e1_pik.h> -#include <config_clock.h> + +#include <stdbool.h> static const struct mod_css_clock_rate rate_table_cpu_group_0[] = { { diff --git a/product/rdn1e1/scp_ramfw/config_ddr_phy500.c b/product/rdn1e1/scp_ramfw/config_ddr_phy500.c index 988284be..15ea65ef 100644 --- a/product/rdn1e1/scp_ramfw/config_ddr_phy500.c +++ b/product/rdn1e1/scp_ramfw/config_ddr_phy500.c @@ -4,10 +4,15 @@ * * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_system_mmap.h" + +#include <mod_ddr_phy500.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ddr_phy500.h> -#include <scp_system_mmap.h> + +#include <stdbool.h> /* Default configuration values for DDR PHY500 devices. */ static struct mod_ddr_phy500_reg ddr_reg_val = { diff --git a/product/rdn1e1/scp_ramfw/config_dmc620.c b/product/rdn1e1/scp_ramfw/config_dmc620.c index 93d5103b..6633abbe 100644 --- a/product/rdn1e1/scp_ramfw/config_dmc620.c +++ b/product/rdn1e1/scp_ramfw/config_dmc620.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_system_mmap.h" + +#include <mod_dmc620.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_dmc620.h> -#include <scp_system_mmap.h> -#include <config_clock.h> #define COL_BITS 2 #define BANK_BITS 4 diff --git a/product/rdn1e1/scp_ramfw/config_dvfs.c b/product/rdn1e1/scp_ramfw/config_dvfs.c index bba77d23..4f3cba22 100644 --- a/product/rdn1e1/scp_ramfw/config_dvfs.c +++ b/product/rdn1e1/scp_ramfw/config_dvfs.c @@ -5,14 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" + +#include <mod_dvfs.h> +#include <mod_sid.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 <mod_dvfs.h> -#include <mod_sid.h> -#include <config_clock.h> +#include <fwk_status.h> static struct mod_dvfs_opp opps[] = { { diff --git a/product/rdn1e1/scp_ramfw/config_log.c b/product/rdn1e1/scp_ramfw/config_log.c index f72a4331..981d1349 100644 --- a/product/rdn1e1/scp_ramfw/config_log.c +++ b/product/rdn1e1/scp_ramfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rdn1e1_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <scp_rdn1e1_mmap.h> /* * PL011 module diff --git a/product/rdn1e1/scp_ramfw/config_mhu2.c b/product/rdn1e1/scp_ramfw/config_mhu2.c index 18123959..9992a5fc 100644 --- a/product/rdn1e1/scp_ramfw/config_mhu2.c +++ b/product/rdn1e1/scp_ramfw/config_mhu2.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rdn1e1_irq.h" +#include "scp_rdn1e1_mhu.h" +#include "scp_rdn1e1_mmap.h" + +#include <mod_mhu2.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu2.h> -#include <scp_rdn1e1_irq.h> -#include <scp_rdn1e1_mmap.h> -#include <scp_rdn1e1_mhu.h> static const struct fwk_element mhu_element_table[] = { [SCP_RDN1E1_MHU_DEVICE_IDX_SCP_AP_S_CLUS0] = { diff --git a/product/rdn1e1/scp_ramfw/config_mock_psu.c b/product/rdn1e1/scp_ramfw/config_mock_psu.c index d921ee3c..c6045ead 100644 --- a/product/rdn1e1/scp_ramfw/config_mock_psu.c +++ b/product/rdn1e1/scp_ramfw/config_mock_psu.c @@ -5,9 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_mock_psu.h> + +#include <stdbool.h> static const struct fwk_element element_table[] = { { diff --git a/product/rdn1e1/scp_ramfw/config_pik_clock.c b/product/rdn1e1/scp_ramfw/config_pik_clock.c index 6c8b4ede..998c8fbd 100644 --- a/product/rdn1e1/scp_ramfw/config_pik_clock.c +++ b/product/rdn1e1/scp_ramfw/config_pik_clock.c @@ -5,15 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "rdn1e1_pik_cpu.h" +#include "rdn1e1_pik_scp.h" +#include "rdn1e1_pik_system.h" +#include "scp_rdn1e1_pik.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <rdn1e1_pik_system.h> -#include <scp_rdn1e1_pik.h> -#include <system_clock.h> -#include <config_clock.h> + +#include <stdbool.h> /* * Rate lookup tables diff --git a/product/rdn1e1/scp_ramfw/config_power_domain.c b/product/rdn1e1/scp_ramfw/config_power_domain.c index d7a4c0c1..9af50099 100644 --- a/product/rdn1e1/scp_ramfw/config_power_domain.c +++ b/product/rdn1e1/scp_ramfw/config_power_domain.c @@ -5,21 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> -#include <stdint.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v0.h" +#include "rdn1e1_core.h" +#include "rdn1e1_power_domain.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_power.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <rdn1e1_power_domain.h> -#include <rdn1e1_core.h> -#include <config_ppu_v0.h> -#include <config_power_domain.h> + +#include <stdint.h> +#include <stdio.h> +#include <string.h> /* Maximum power domain name size including the null terminator */ #define PD_NAME_SIZE 12 diff --git a/product/rdn1e1/scp_ramfw/config_ppu_v0.c b/product/rdn1e1/scp_ramfw/config_ppu_v0.c index 6397c79b..bf03aafc 100644 --- a/product/rdn1e1/scp_ramfw/config_ppu_v0.c +++ b/product/rdn1e1/scp_ramfw/config_ppu_v0.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_ppu_v0.h" +#include "scp_rdn1e1_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v0.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ppu_v0.h> -#include <config_ppu_v0.h> -#include <scp_rdn1e1_irq.h> -#include <scp_rdn1e1_mmap.h> static struct fwk_element ppu_v0_element_table[] = { [PPU_V0_ELEMENT_IDX_DBGTOP] = { diff --git a/product/rdn1e1/scp_ramfw/config_ppu_v1.c b/product/rdn1e1/scp_ramfw/config_ppu_v1.c index 0b5ec83d..b647a6eb 100644 --- a/product/rdn1e1/scp_ramfw/config_ppu_v1.c +++ b/product/rdn1e1/scp_ramfw/config_ppu_v1.c @@ -5,21 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> -#include <stdio.h> +#include "config_power_domain.h" +#include "rdn1e1_core.h" +#include "scp_rdn1e1_mmap.h" + +#include <mod_cmn600.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_assert.h> #include <fwk_element.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_cmn600.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <rdn1e1_core.h> -#include <scp_rdn1e1_irq.h> -#include <scp_rdn1e1_mmap.h> -#include <config_power_domain.h> + +#include <stdio.h> +#include <string.h> /* Maximum PPU core name size including the null terminator */ #define PPU_CORE_NAME_SIZE 12 diff --git a/product/rdn1e1/scp_ramfw/config_psu.c b/product/rdn1e1/scp_ramfw/config_psu.c index b2babcb6..60c9bebb 100644 --- a/product/rdn1e1/scp_ramfw/config_psu.c +++ b/product/rdn1e1/scp_ramfw/config_psu.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> +#include <mod_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_mock_psu.h> -#include <mod_psu.h> static const struct fwk_element element_table[] = { { diff --git a/product/rdn1e1/scp_ramfw/config_scmi.c b/product/rdn1e1/scp_ramfw/config_scmi.c index 45347025..7caf1532 100644 --- a/product/rdn1e1/scp_ramfw/config_scmi.c +++ b/product/rdn1e1/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rdn1e1_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <scp_rdn1e1_scmi.h> -#include <mod_scmi.h> -#include <internal/scmi.h> -#include <mod_smt.h> static const struct fwk_element service_table[] = { [SCP_RDN1E1_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/rdn1e1/scp_ramfw/config_scmi_apcore.c b/product/rdn1e1/scp_ramfw/config_scmi_apcore.c index 8f5ae1da..27ac9280 100644 --- a/product/rdn1e1/scp_ramfw/config_scmi_apcore.c +++ b/product/rdn1e1/scp_ramfw/config_scmi_apcore.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <rdn1e1_core.h> -#include <scp_rdn1e1_pik.h> +#include "rdn1e1_core.h" +#include "rdn1e1_pik_cpu.h" +#include "scp_rdn1e1_pik.h" + #include <mod_scmi_apcore.h> -#include <fwk_element.h> + #include <fwk_macros.h> #include <fwk_module.h> +#include <stdint.h> + static const struct mod_scmi_apcore_reset_register_group reset_reg_group_table[] = { { diff --git a/product/rdn1e1/scp_ramfw/config_scmi_perf.c b/product/rdn1e1/scp_ramfw/config_scmi_perf.c index d89a1ac0..a5304b35 100644 --- a/product/rdn1e1/scp_ramfw/config_scmi_perf.c +++ b/product/rdn1e1/scp_ramfw/config_scmi_perf.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <scp_rdn1e1_scmi.h> +#include "scp_rdn1e1_scmi.h" + #include <mod_scmi_perf.h> +#include <fwk_module.h> + +#include <stddef.h> +#include <stdint.h> + static const struct mod_scmi_perf_domain_config domains[] = { [0] = { .permissions = &(const uint32_t[]) { diff --git a/product/rdn1e1/scp_ramfw/config_scmi_system_power.c b/product/rdn1e1/scp_ramfw/config_scmi_system_power.c index 932143a6..32714d2e 100644 --- a/product/rdn1e1/scp_ramfw/config_scmi_system_power.c +++ b/product/rdn1e1/scp_ramfw/config_scmi_system_power.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + const struct fwk_module_config config_scmi_system_power = { .data = &((struct mod_scmi_system_power_config) { .system_view = MOD_SCMI_SYSTEM_VIEW_FULL, diff --git a/product/rdn1e1/scp_ramfw/config_sds.c b/product/rdn1e1/scp_ramfw/config_sds.c index 2c7bc38a..cb732503 100644 --- a/product/rdn1e1/scp_ramfw/config_sds.c +++ b/product/rdn1e1/scp_ramfw/config_sds.c @@ -5,20 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "config_clock.h" +#include "rdn1e1_pik_scp.h" +#include "rdn1e1_sds.h" +#include "scp_rdn1e1_pik.h" +#include "scp_software_mmap.h" + +#include <mod_sds.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 <mod_sds.h> -#include <mod_sid.h> -#include <rdn1e1_sds.h> -#include <scp_rdn1e1_mmap.h> -#include <scp_rdn1e1_pik.h> -#include <scp_software_mmap.h> -#include <scp_system_mmap.h> -#include <config_clock.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static const uint32_t feature_flags = 0x00000000; diff --git a/product/rdn1e1/scp_ramfw/config_sensor.c b/product/rdn1e1/scp_ramfw/config_sensor.c index 4fe2dff4..b75764b4 100644 --- a/product/rdn1e1/scp_ramfw/config_sensor.c +++ b/product/rdn1e1/scp_ramfw/config_sensor.c @@ -5,12 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_system_mmap.h" + +#include <mod_reg_sensor.h> +#include <mod_sensor.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_reg_sensor.h> -#include <mod_sensor.h> -#include <scp_system_mmap.h> + +#include <stdint.h> enum REG_SENSOR_DEVICES { REG_SENSOR_DEV_SOC_TEMP, diff --git a/product/rdn1e1/scp_ramfw/config_smt.c b/product/rdn1e1/scp_ramfw/config_smt.c index d094666d..56307ce5 100644 --- a/product/rdn1e1/scp_ramfw/config_smt.c +++ b/product/rdn1e1/scp_ramfw/config_smt.c @@ -5,17 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_power_domain.h" +#include "rdn1e1_core.h" +#include "scp_rdn1e1_mhu.h" +#include "scp_rdn1e1_scmi.h" +#include "scp_software_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <rdn1e1_core.h> -#include <scp_rdn1e1_mhu.h> -#include <scp_rdn1e1_scmi.h> -#include <scp_software_mmap.h> -#include <config_power_domain.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [SCP_RDN1E1_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/rdn1e1/scp_ramfw/config_system_pll.c b/product/rdn1e1/scp_ramfw/config_system_pll.c index 36315236..610068f7 100644 --- a/product/rdn1e1/scp_ramfw/config_system_pll.c +++ b/product/rdn1e1/scp_ramfw/config_system_pll.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "rdn1e1_pik_scp.h" +#include "scp_rdn1e1_pik.h" +#include "scp_system_mmap.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <rdn1e1_pik_scp.h> -#include <scp_rdn1e1_pik.h> -#include <scp_system_mmap.h> -#include <config_clock.h> static const struct fwk_element system_pll_element_table[] = { [CLOCK_PLL_IDX_CPU0] = { diff --git a/product/rdn1e1/scp_ramfw/config_system_power.c b/product/rdn1e1/scp_ramfw/config_system_power.c index 7d55f0d4..bc69c1d3 100644 --- a/product/rdn1e1/scp_ramfw/config_system_power.c +++ b/product/rdn1e1/scp_ramfw/config_system_power.c @@ -5,16 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "rdn1e1_core.h" +#include "scp_rdn1e1_irq.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_rdn1e1_system.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <scp_rdn1e1_irq.h> -#include <mod_rdn1e1_system.h> -#include <mod_system_power.h> -#include <mod_ppu_v1.h> -#include <rdn1e1_core.h> + +#include <stdint.h> static const uint8_t system_power_to_sys_ppu0_state[] = { [MOD_PD_STATE_ON] = (uint8_t)MOD_PD_STATE_ON, diff --git a/product/rdn1e1/scp_ramfw/config_timer.c b/product/rdn1e1/scp_ramfw/config_timer.c index a06870c7..6c295b31 100644 --- a/product/rdn1e1/scp_ramfw/config_timer.c +++ b/product/rdn1e1/scp_ramfw/config_timer.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_rdn1e1_irq.h" +#include "scp_rdn1e1_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <scp_rdn1e1_irq.h> -#include <scp_rdn1e1_mmap.h> -#include <system_clock.h> -#include <config_clock.h> /* * Generic timer driver config diff --git a/product/rdn1e1/scp_ramfw/fmw_memory.h b/product/rdn1e1/scp_ramfw/fmw_memory.h index c2394e4d..a93bf537 100644 --- a/product/rdn1e1/scp_ramfw/fmw_memory.h +++ b/product/rdn1e1/scp_ramfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_system_mmap_scp.h> +#include "scp_system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/rdn1e1/scp_ramfw/rtx_config.c b/product/rdn1e1/scp_ramfw/rtx_config.c index 847211a2..fcaa5a47 100644 --- a/product/rdn1e1/scp_ramfw/rtx_config.c +++ b/product/rdn1e1/scp_ramfw/rtx_config.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <cmsis_compiler.h> -#include <rtx_os.h> -#include <system_clock.h> +#include "system_clock.h" #include <rtx_lib.c> +#include <rtx_os.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/rdn1e1/scp_romfw/config_clock.c b/product/rdn1e1/scp_romfw/config_clock.c index 872e0f58..02b9c9f6 100644 --- a/product/rdn1e1/scp_romfw/config_clock.c +++ b/product/rdn1e1/scp_romfw/config_clock.c @@ -5,8 +5,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_id.h> #include <fwk_module.h> -#include <mod_clock.h> const struct fwk_module_config config_clock = { 0 }; diff --git a/product/rdn1e1/scp_romfw/config_gtimer.c b/product/rdn1e1/scp_romfw/config_gtimer.c index 54f014d1..bcf4515c 100644 --- a/product/rdn1e1/scp_romfw/config_gtimer.c +++ b/product/rdn1e1/scp_romfw/config_gtimer.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rdn1e1_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_gtimer.h> -#include <scp_rdn1e1_mmap.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/rdn1e1/scp_romfw/config_log.c b/product/rdn1e1/scp_romfw/config_log.c index 2e092507..80c24694 100644 --- a/product/rdn1e1/scp_romfw/config_log.c +++ b/product/rdn1e1/scp_romfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rdn1e1_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <scp_system_mmap.h> /* * PL011 module diff --git a/product/rdn1e1/scp_romfw/config_rdn1e1_rom.c b/product/rdn1e1/scp_romfw/config_rdn1e1_rom.c index 5aa16ab7..bc2997ef 100644 --- a/product/rdn1e1/scp_romfw/config_rdn1e1_rom.c +++ b/product/rdn1e1/scp_romfw/config_rdn1e1_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "scp_rdn1e1_mmap_scp.h" +#include "scp_software_mmap.h" + #include <mod_rdn1e1_rom.h> -#include <scp_software_mmap.h> -#include <scp_rdn1e1_mmap_scp.h> + +#include <fwk_module.h> const struct fwk_module_config config_rdn1e1_rom = { .data = &((struct rdn1e1_rom_config) { diff --git a/product/rdn1e1/scp_romfw/fmw_memory.h b/product/rdn1e1/scp_romfw/fmw_memory.h index d9e0c405..5e04875d 100644 --- a/product/rdn1e1/scp_romfw/fmw_memory.h +++ b/product/rdn1e1/scp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_system_mmap_scp.h> +#include "scp_system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/rdn1e1/src/config_sid.c b/product/rdn1e1/src/config_sid.c index bbfddc1b..2e8a3da3 100644 --- a/product/rdn1e1/src/config_sid.c +++ b/product/rdn1e1/src/config_sid.c @@ -5,10 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_rdn1e1_mmap.h" + +#include <mod_sid.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_sid.h> -#include <scp_rdn1e1_mmap.h> static const struct fwk_element subsystem_table[] = { { diff --git a/product/rdn1e1/src/config_system_info.c b/product/rdn1e1/src/config_system_info.c index 6fc99805..23a2b480 100644 --- a/product/rdn1e1/src/config_system_info.c +++ b/product/rdn1e1/src/config_system_info.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_macros.h> +#include <mod_sid.h> +#include <mod_system_info.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_info.h> -#include <mod_sid.h> + +#include <stddef.h> const struct fwk_module_config config_system_info = { .get_element_table = NULL, diff --git a/product/sgi575/include/mcp_system_mmap_mcp.h b/product/sgi575/include/mcp_system_mmap_mcp.h index 25228042..d4b8aa27 100644 --- a/product/sgi575/include/mcp_system_mmap_mcp.h +++ b/product/sgi575/include/mcp_system_mmap_mcp.h @@ -8,7 +8,7 @@ #ifndef MCP_SYSTEM_MMAP_MCP_H #define MCP_SYSTEM_MMAP_MCP_H -#include <mcp_sgi575_mmap_mcp.h> +#include "mcp_sgi575_mmap_mcp.h" #define MCP_ROM_SIZE (64 * 1024) #define MCP_RAM0_SIZE (64 * 1024) diff --git a/product/sgi575/include/scp_sgi575_pik.h b/product/sgi575/include/scp_sgi575_pik.h index 53a53aea..46512ece 100644 --- a/product/sgi575/include/scp_sgi575_pik.h +++ b/product/sgi575/include/scp_sgi575_pik.h @@ -8,10 +8,10 @@ #ifndef SCP_SGI575_PIK_H #define SCP_SGI575_PIK_H -#include <sgi575_pik_cpu.h> -#include <sgi575_pik_scp.h> -#include <sgi575_pik_system.h> -#include <scp_sgi575_mmap.h> +#include "scp_sgi575_mmap.h" +#include "sgi575_pik_cpu.h" +#include "sgi575_pik_scp.h" +#include "sgi575_pik_system.h" #define PIK_CLUSTER(IDX) ((struct pik_cpu_reg *) SCP_PIK_CLUSTER_BASE(IDX)) #define PIK_SCP ((struct pik_scp_reg *) SCP_PIK_SCP_BASE) diff --git a/product/sgi575/include/scp_software_mmap.h b/product/sgi575/include/scp_software_mmap.h index 08bae3ab..f31ec8f4 100644 --- a/product/sgi575/include/scp_software_mmap.h +++ b/product/sgi575/include/scp_software_mmap.h @@ -11,8 +11,9 @@ #ifndef SCP_SOFTWARE_MMAP_H #define SCP_SOFTWARE_MMAP_H +#include "scp_sgi575_mmap.h" + #include <fwk_macros.h> -#include <scp_sgi575_mmap.h> #define SCP_NOR_FLASH_BASE 0x08000000 #define SCP_NOR_BASE (SCP_NOR_FLASH_BASE + 0x03D80000) diff --git a/product/sgi575/include/scp_system_mmap.h b/product/sgi575/include/scp_system_mmap.h index cd8fe116..6c64c2ee 100644 --- a/product/sgi575/include/scp_system_mmap.h +++ b/product/sgi575/include/scp_system_mmap.h @@ -8,7 +8,7 @@ #ifndef SCP_SYSTEM_MMAP_H #define SCP_SYSTEM_MMAP_H -#include <scp_sgi575_mmap.h> +#include "scp_sgi575_mmap.h" #define SCP_PLAT_BASE (SCP_SYS0_BASE + 0x3FFE0000) diff --git a/product/sgi575/include/scp_system_mmap_scp.h b/product/sgi575/include/scp_system_mmap_scp.h index e072098b..3aeca245 100644 --- a/product/sgi575/include/scp_system_mmap_scp.h +++ b/product/sgi575/include/scp_system_mmap_scp.h @@ -8,7 +8,7 @@ #ifndef SCP_SYSTEM_MMAP_SCP_H #define SCP_SYSTEM_MMAP_SCP_H -#include <scp_sgi575_mmap_scp.h> +#include "scp_sgi575_mmap_scp.h" #define SCP_ROM_SIZE (64 * 1024) #define SCP_RAM0_SIZE (256 * 1024) diff --git a/product/sgi575/include/sgi575_pik_cpu.h b/product/sgi575/include/sgi575_pik_cpu.h index a2e94bfa..b0b13e8d 100644 --- a/product/sgi575/include/sgi575_pik_cpu.h +++ b/product/sgi575/include/sgi575_pik_cpu.h @@ -8,9 +8,10 @@ #ifndef SGI575_PIK_CPU_H #define SGI575_PIK_CPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief PE Static Configuration register definitions */ diff --git a/product/sgi575/include/sgi575_pik_debug.h b/product/sgi575/include/sgi575_pik_debug.h index 12b9ff3e..e0858c72 100644 --- a/product/sgi575/include/sgi575_pik_debug.h +++ b/product/sgi575/include/sgi575_pik_debug.h @@ -8,9 +8,10 @@ #ifndef SGI575_PIK_DEBUG_H #define SGI575_PIK_DEBUG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Debug register definitions */ diff --git a/product/sgi575/include/sgi575_pik_scp.h b/product/sgi575/include/sgi575_pik_scp.h index 57368a2c..2d92324d 100644 --- a/product/sgi575/include/sgi575_pik_scp.h +++ b/product/sgi575/include/sgi575_pik_scp.h @@ -11,9 +11,10 @@ #ifndef SGI575_PIK_SCP_H #define SGI575_PIK_SCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief SCP PIK register definitions */ diff --git a/product/sgi575/include/sgi575_pik_system.h b/product/sgi575/include/sgi575_pik_system.h index 1bd065b4..a4741fec 100644 --- a/product/sgi575/include/sgi575_pik_system.h +++ b/product/sgi575/include/sgi575_pik_system.h @@ -8,9 +8,10 @@ #ifndef SGI575_PIK_SYSTEM_H #define SGI575_PIK_SYSTEM_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief TCU clock register definitions */ diff --git a/product/sgi575/include/sgi575_sds.h b/product/sgi575/include/sgi575_sds.h index e70e4344..6df86896 100644 --- a/product/sgi575/include/sgi575_sds.h +++ b/product/sgi575/include/sgi575_sds.h @@ -10,6 +10,8 @@ #include <mod_sds.h> +#include <stdint.h> + /* * Structure identifiers. */ diff --git a/product/sgi575/include/sgi575_ssc.h b/product/sgi575/include/sgi575_ssc.h index 6d401e8f..186e9135 100644 --- a/product/sgi575/include/sgi575_ssc.h +++ b/product/sgi575/include/sgi575_ssc.h @@ -8,9 +8,10 @@ #ifndef SGI575_SSC_H #define SGI575_SSC_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief System Security Control (SSC) register definitions */ diff --git a/product/sgi575/mcp_romfw/config_log.c b/product/sgi575/mcp_romfw/config_log.c index ff4d82b7..1f9c2637 100644 --- a/product/sgi575/mcp_romfw/config_log.c +++ b/product/sgi575/mcp_romfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "mcp_sgi575_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <mcp_sgi575_mmap.h> /* * PL011 module diff --git a/product/sgi575/mcp_romfw/config_sgi575_rom.c b/product/sgi575/mcp_romfw/config_sgi575_rom.c index 866a1375..899172a0 100644 --- a/product/sgi575/mcp_romfw/config_sgi575_rom.c +++ b/product/sgi575/mcp_romfw/config_sgi575_rom.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "mcp_sgi575_mmap_mcp.h" + #include <mod_sgi575_rom.h> -#include <mcp_sgi575_mmap_mcp.h> + +#include <fwk_module.h> const struct fwk_module_config config_sgi575_rom = { .data = &((struct sgi575_rom_config) { diff --git a/product/sgi575/mcp_romfw/fmw_memory.h b/product/sgi575/mcp_romfw/fmw_memory.h index 6f7a0f16..813cb43c 100644 --- a/product/sgi575/mcp_romfw/fmw_memory.h +++ b/product/sgi575/mcp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <mcp_system_mmap_mcp.h> +#include "mcp_system_mmap_mcp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c index 3a2cefd8..0e7cefaa 100644 --- a/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c +++ b/product/sgi575/module/sgi575_rom/src/mod_sgi575_rom.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include <mod_log.h> +#include <mod_sgi575_rom.h> + +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_log.h> -#include <mod_sgi575_rom.h> + +#include <stdint.h> +#include <string.h> static const struct sgi575_rom_config *rom_config; static struct mod_log_api *log_api; diff --git a/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c b/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c index b6f567ea..1b0bae42 100644 --- a/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c +++ b/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c @@ -8,15 +8,14 @@ * SGI575 System Support. */ -#include <stdint.h> -#include <fwk_assert.h> -#include <fmw_cmsis.h> -#include <fwk_id.h> -#include <fwk_interrupt.h> -#include <fwk_macros.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> -#include <fwk_notification.h> +#include "config_clock.h" +#include "scp_sgi575_irq.h" +#include "scp_sgi575_mmap.h" +#include "scp_sgi575_scmi.h" +#include "sgi575_core.h" +#include "sgi575_pik_scp.h" +#include "sgi575_sds.h" + #include <mod_clock.h> #include <mod_log.h> #include <mod_power_domain.h> @@ -25,13 +24,21 @@ #include <mod_sds.h> #include <mod_sgi575_system.h> #include <mod_system_power.h> -#include <scp_sgi575_irq.h> -#include <scp_sgi575_mmap.h> -#include <scp_sgi575_scmi.h> -#include <sgi575_core.h> -#include <sgi575_pik_scp.h> -#include <sgi575_sds.h> -#include <config_clock.h> + +#include <fwk_assert.h> +#include <fwk_event.h> +#include <fwk_id.h> +#include <fwk_interrupt.h> +#include <fwk_macros.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> +#include <fwk_notification.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* SCMI services required to enable the messaging stack */ static unsigned int scmi_notification_table[] = { diff --git a/product/sgi575/scp_ramfw/config_apcontext.c b/product/sgi575/scp_ramfw/config_apcontext.c index b27ef22c..51a93ac1 100644 --- a/product/sgi575/scp_ramfw/config_apcontext.c +++ b/product/sgi575/scp_ramfw/config_apcontext.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_software_mmap.h" + +#include <mod_apcontext.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_apcontext.h> -#include <scp_software_mmap.h> -#include <config_clock.h> /* * AP Context module configuration diff --git a/product/sgi575/scp_ramfw/config_armv7m_mpu.c b/product/sgi575/scp_ramfw/config_armv7m_mpu.c index 3e8f4c37..4f55fbb6 100644 --- a/product/sgi575/scp_ramfw/config_armv7m_mpu.c +++ b/product/sgi575/scp_ramfw/config_armv7m_mpu.c @@ -5,11 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_mmap.h" +#include "scp_sgi575_mmap_scp.h" + +#include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_armv7m_mpu.h> -#include <scp_sgi575_mmap.h> -#include <scp_sgi575_mmap_scp.h> + +#include <fmw_cmsis.h> static const ARM_MPU_Region_t regions[] = { { /* 0x0000_0000 - 0xFFFF_FFFF */ diff --git a/product/sgi575/scp_ramfw/config_clock.c b/product/sgi575/scp_ramfw/config_clock.c index 471c6438..c8cdf9d4 100644 --- a/product/sgi575/scp_ramfw/config_clock.c +++ b/product/sgi575/scp_ramfw/config_clock.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "config_clock.h" +#include "config_power_domain.h" +#include "sgi575_core.h" + #include <mod_clock.h> #include <mod_css_clock.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> -#include <sgi575_core.h> -#include <system_clock.h> -#include <config_clock.h> -#include <config_power_domain.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_IDX_INTERCONNECT] = { diff --git a/product/sgi575/scp_ramfw/config_cmn600.c b/product/sgi575/scp_ramfw/config_cmn600.c index 3df9bf38..a2e3e11b 100644 --- a/product/sgi575/scp_ramfw/config_cmn600.c +++ b/product/sgi575/scp_ramfw/config_cmn600.c @@ -5,12 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_sgi575_mmap.h" + +#include <mod_cmn600.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_cmn600.h> -#include <scp_sgi575_mmap.h> -#include <config_clock.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> /* * CMN600 nodes diff --git a/product/sgi575/scp_ramfw/config_css_clock.c b/product/sgi575/scp_ramfw/config_css_clock.c index a0238af7..243072f7 100644 --- a/product/sgi575/scp_ramfw/config_css_clock.c +++ b/product/sgi575/scp_ramfw/config_css_clock.c @@ -5,16 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" + +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_pik_clock.h> -#include <mod_system_pll.h> -#include <scp_sgi575_pik.h> -#include <config_clock.h> + +#include <stdbool.h> static const struct mod_css_clock_rate rate_table_cpu_group_0[] = { { diff --git a/product/sgi575/scp_ramfw/config_ddr_phy500.c b/product/sgi575/scp_ramfw/config_ddr_phy500.c index 56671e4e..b2376ef0 100644 --- a/product/sgi575/scp_ramfw/config_ddr_phy500.c +++ b/product/sgi575/scp_ramfw/config_ddr_phy500.c @@ -5,11 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "scp_system_mmap.h" + +#include <mod_ddr_phy500.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ddr_phy500.h> -#include <scp_system_mmap.h> + +#include <stdbool.h> /* Default configuration values for DDR PHY500 devices. */ static const struct mod_ddr_phy500_reg ddr_reg_val = { diff --git a/product/sgi575/scp_ramfw/config_dmc620.c b/product/sgi575/scp_ramfw/config_dmc620.c index c26cfd7f..1f306b60 100644 --- a/product/sgi575/scp_ramfw/config_dmc620.c +++ b/product/sgi575/scp_ramfw/config_dmc620.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_system_mmap.h" + +#include <mod_dmc620.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_dmc620.h> -#include <scp_system_mmap.h> -#include <config_clock.h> #define COL_BITS 2 #define BANK_BITS 4 diff --git a/product/sgi575/scp_ramfw/config_dvfs.c b/product/sgi575/scp_ramfw/config_dvfs.c index d064ecee..f19d4e93 100644 --- a/product/sgi575/scp_ramfw/config_dvfs.c +++ b/product/sgi575/scp_ramfw/config_dvfs.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" + +#include <mod_dvfs.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_dvfs.h> -#include <config_clock.h> static struct mod_dvfs_opp opps[] = { { diff --git a/product/sgi575/scp_ramfw/config_log.c b/product/sgi575/scp_ramfw/config_log.c index 395ee117..39c86f36 100644 --- a/product/sgi575/scp_ramfw/config_log.c +++ b/product/sgi575/scp_ramfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <scp_sgi575_mmap.h> /* * PL011 module diff --git a/product/sgi575/scp_ramfw/config_mhu.c b/product/sgi575/scp_ramfw/config_mhu.c index b44bc7cd..6b6c5dab 100644 --- a/product/sgi575/scp_ramfw/config_mhu.c +++ b/product/sgi575/scp_ramfw/config_mhu.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_irq.h" +#include "scp_sgi575_mhu.h" +#include "scp_sgi575_mmap.h" + +#include <mod_mhu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu.h> -#include <scp_sgi575_irq.h> -#include <scp_sgi575_mhu.h> -#include <scp_sgi575_mmap.h> static const struct fwk_element mhu_element_table[] = { [SCP_SGI575_MHU_DEVICE_IDX_SCP_AP_S] = { diff --git a/product/sgi575/scp_ramfw/config_mock_psu.c b/product/sgi575/scp_ramfw/config_mock_psu.c index 7da38aa5..039d6b68 100644 --- a/product/sgi575/scp_ramfw/config_mock_psu.c +++ b/product/sgi575/scp_ramfw/config_mock_psu.c @@ -5,9 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_mock_psu.h> + +#include <stdbool.h> static const struct fwk_element element_table[] = { { diff --git a/product/sgi575/scp_ramfw/config_pik_clock.c b/product/sgi575/scp_ramfw/config_pik_clock.c index 2aca7e98..a1fe384f 100644 --- a/product/sgi575/scp_ramfw/config_pik_clock.c +++ b/product/sgi575/scp_ramfw/config_pik_clock.c @@ -5,15 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_sgi575_pik.h" +#include "sgi575_pik_cpu.h" +#include "sgi575_pik_scp.h" +#include "sgi575_pik_system.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <scp_sgi575_pik.h> -#include <sgi575_pik_system.h> -#include <system_clock.h> -#include <config_clock.h> + +#include <stdbool.h> /* * Rate lookup tables diff --git a/product/sgi575/scp_ramfw/config_power_domain.c b/product/sgi575/scp_ramfw/config_power_domain.c index 1d403998..e63839b5 100644 --- a/product/sgi575/scp_ramfw/config_power_domain.c +++ b/product/sgi575/scp_ramfw/config_power_domain.c @@ -5,21 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdio.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v0.h" +#include "sgi575_core.h" +#include "sgi575_power_domain.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <mod_system_power.h> -#include <sgi575_power_domain.h> -#include <sgi575_core.h> -#include <config_ppu_v0.h> -#include <config_power_domain.h> + +#include <stdint.h> +#include <stdio.h> +#include <string.h> /* Maximum power domain name size including the null terminator */ #define PD_NAME_SIZE 12 diff --git a/product/sgi575/scp_ramfw/config_ppu_v0.c b/product/sgi575/scp_ramfw/config_ppu_v0.c index e10507c0..425f0047 100644 --- a/product/sgi575/scp_ramfw/config_ppu_v0.c +++ b/product/sgi575/scp_ramfw/config_ppu_v0.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_ppu_v0.h" +#include "scp_sgi575_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v0.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ppu_v0.h> -#include <scp_sgi575_irq.h> -#include <scp_sgi575_mmap.h> -#include <config_ppu_v0.h> static struct fwk_element ppu_v0_element_table[] = { [PPU_V0_ELEMENT_IDX_DBGTOP] = { diff --git a/product/sgi575/scp_ramfw/config_ppu_v1.c b/product/sgi575/scp_ramfw/config_ppu_v1.c index 28592828..e37596e5 100644 --- a/product/sgi575/scp_ramfw/config_ppu_v1.c +++ b/product/sgi575/scp_ramfw/config_ppu_v1.c @@ -5,21 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdio.h> -#include <string.h> +#include "config_power_domain.h" +#include "scp_sgi575_mmap.h" +#include "sgi575_core.h" + +#include <mod_cmn600.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_assert.h> #include <fwk_element.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_cmn600.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <scp_sgi575_irq.h> -#include <scp_sgi575_mmap.h> -#include <sgi575_core.h> -#include <config_power_domain.h> + +#include <stdio.h> +#include <string.h> /* Maximum PPU core name size including the null terminator */ #define PPU_CORE_NAME_SIZE 12 diff --git a/product/sgi575/scp_ramfw/config_psu.c b/product/sgi575/scp_ramfw/config_psu.c index bfe3e318..4001ba30 100644 --- a/product/sgi575/scp_ramfw/config_psu.c +++ b/product/sgi575/scp_ramfw/config_psu.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> +#include <mod_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_mock_psu.h> -#include <mod_psu.h> static const struct fwk_element element_table[] = { { diff --git a/product/sgi575/scp_ramfw/config_scmi.c b/product/sgi575/scp_ramfw/config_scmi.c index 223296ae..dd0e59e5 100644 --- a/product/sgi575/scp_ramfw/config_scmi.c +++ b/product/sgi575/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <internal/scmi.h> -#include <mod_scmi.h> -#include <mod_smt.h> -#include <scp_sgi575_scmi.h> static const struct fwk_element service_table[] = { [SCP_SGI575_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/sgi575/scp_ramfw/config_scmi_apcore.c b/product/sgi575/scp_ramfw/config_scmi_apcore.c index 7ad84548..88e84192 100644 --- a/product/sgi575/scp_ramfw/config_scmi_apcore.c +++ b/product/sgi575/scp_ramfw/config_scmi_apcore.c @@ -5,12 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> +#include "scp_sgi575_pik.h" +#include "sgi575_core.h" +#include "sgi575_pik_cpu.h" + +#include <mod_scmi_apcore.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_scmi_apcore.h> -#include <scp_sgi575_pik.h> -#include <sgi575_core.h> + +#include <stdint.h> static const struct mod_scmi_apcore_reset_register_group reset_reg_group_table[] = { diff --git a/product/sgi575/scp_ramfw/config_scmi_perf.c b/product/sgi575/scp_ramfw/config_scmi_perf.c index a82724b6..842e5469 100644 --- a/product/sgi575/scp_ramfw/config_scmi_perf.c +++ b/product/sgi575/scp_ramfw/config_scmi_perf.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> -#include <fwk_module.h> +#include "scp_sgi575_scmi.h" + #include <mod_scmi_perf.h> -#include <scp_sgi575_scmi.h> + +#include <fwk_module.h> + +#include <stddef.h> +#include <stdint.h> static const struct mod_scmi_perf_domain_config domains[] = { [0] = { diff --git a/product/sgi575/scp_ramfw/config_scmi_system_power.c b/product/sgi575/scp_ramfw/config_scmi_system_power.c index 61bf73e0..821cb7d2 100644 --- a/product/sgi575/scp_ramfw/config_scmi_system_power.c +++ b/product/sgi575/scp_ramfw/config_scmi_system_power.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + const struct fwk_module_config config_scmi_system_power = { .data = &((struct mod_scmi_system_power_config) { .system_view = MOD_SCMI_SYSTEM_VIEW_FULL, diff --git a/product/sgi575/scp_ramfw/config_sds.c b/product/sgi575/scp_ramfw/config_sds.c index cd355da7..09bbad4c 100644 --- a/product/sgi575/scp_ramfw/config_sds.c +++ b/product/sgi575/scp_ramfw/config_sds.c @@ -5,20 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> +#include "config_clock.h" +#include "scp_sgi575_mmap.h" +#include "scp_sgi575_pik.h" +#include "scp_software_mmap.h" +#include "sgi575_pik_scp.h" +#include "sgi575_sds.h" +#include "sgi575_ssc.h" + +#include <mod_sds.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 <mod_sds.h> -#include <scp_software_mmap.h> -#include <scp_sgi575_mmap.h> -#include <scp_sgi575_pik.h> -#include <scp_system_mmap.h> -#include <sgi575_sds.h> -#include <sgi575_ssc.h> -#include <config_clock.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static const uint32_t feature_flags = 0x00000000; diff --git a/product/sgi575/scp_ramfw/config_sensor.c b/product/sgi575/scp_ramfw/config_sensor.c index f5db7a21..6bf75c79 100644 --- a/product/sgi575/scp_ramfw/config_sensor.c +++ b/product/sgi575/scp_ramfw/config_sensor.c @@ -5,12 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_system_mmap.h" + +#include <mod_reg_sensor.h> +#include <mod_sensor.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_reg_sensor.h> -#include <mod_sensor.h> -#include <scp_system_mmap.h> + +#include <stdint.h> enum REG_SENSOR_DEVICES { REG_SENSOR_DEV_SOC_TEMP, diff --git a/product/sgi575/scp_ramfw/config_smt.c b/product/sgi575/scp_ramfw/config_smt.c index 426d1711..8912b0de 100644 --- a/product/sgi575/scp_ramfw/config_smt.c +++ b/product/sgi575/scp_ramfw/config_smt.c @@ -5,17 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_power_domain.h" +#include "scp_sgi575_mhu.h" +#include "scp_sgi575_scmi.h" +#include "scp_software_mmap.h" +#include "sgi575_core.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <scp_software_mmap.h> -#include <scp_sgi575_mhu.h> -#include <scp_sgi575_scmi.h> -#include <sgi575_core.h> -#include <config_power_domain.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [SCP_SGI575_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/sgi575/scp_ramfw/config_ssc.c b/product/sgi575/scp_ramfw/config_ssc.c index 96cfc1d6..322a52d0 100644 --- a/product/sgi575/scp_ramfw/config_ssc.c +++ b/product/sgi575/scp_ramfw/config_ssc.c @@ -5,10 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> +#include "scp_sgi575_mmap.h" + #include <mod_ssc.h> -#include <scp_sgi575_mmap.h> + +#include <fwk_module.h> + +#include <stddef.h> const struct fwk_module_config config_ssc = { .get_element_table = NULL, diff --git a/product/sgi575/scp_ramfw/config_system_info.c b/product/sgi575/scp_ramfw/config_system_info.c index 08884553..95f509eb 100644 --- a/product/sgi575/scp_ramfw/config_system_info.c +++ b/product/sgi575/scp_ramfw/config_system_info.c @@ -5,10 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_ssc.h> +#include <mod_system_info.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_info.h> -#include <mod_ssc.h> + +#include <stddef.h> const struct fwk_module_config config_system_info = { .get_element_table = NULL, diff --git a/product/sgi575/scp_ramfw/config_system_pll.c b/product/sgi575/scp_ramfw/config_system_pll.c index d36f1792..83ca02a5 100644 --- a/product/sgi575/scp_ramfw/config_system_pll.c +++ b/product/sgi575/scp_ramfw/config_system_pll.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_sgi575_pik.h" +#include "scp_system_mmap.h" +#include "sgi575_pik_scp.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <scp_sgi575_pik.h> -#include <scp_system_mmap.h> -#include <sgi575_pik_scp.h> -#include <config_clock.h> static const struct fwk_element system_pll_element_table[] = { [CLOCK_PLL_IDX_CPU0] = { diff --git a/product/sgi575/scp_ramfw/config_system_power.c b/product/sgi575/scp_ramfw/config_system_power.c index 5a75b79a..209416b7 100644 --- a/product/sgi575/scp_ramfw/config_system_power.c +++ b/product/sgi575/scp_ramfw/config_system_power.c @@ -5,16 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_irq.h" +#include "sgi575_core.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_sgi575_system.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_ppu_v1.h> -#include <mod_sgi575_system.h> -#include <mod_system_power.h> -#include <scp_sgi575_irq.h> -#include <sgi575_core.h> + +#include <stdint.h> static const uint8_t system_power_to_sys_ppu0_state[] = { [MOD_PD_STATE_ON] = (uint8_t)MOD_PD_STATE_ON, diff --git a/product/sgi575/scp_ramfw/config_timer.c b/product/sgi575/scp_ramfw/config_timer.c index 793b1ec7..9da1db21 100644 --- a/product/sgi575/scp_ramfw/config_timer.c +++ b/product/sgi575/scp_ramfw/config_timer.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "scp_sgi575_irq.h" +#include "scp_sgi575_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <scp_sgi575_irq.h> -#include <scp_sgi575_mmap.h> -#include <system_clock.h> -#include <config_clock.h> /* * Generic timer driver config diff --git a/product/sgi575/scp_ramfw/fmw_memory.h b/product/sgi575/scp_ramfw/fmw_memory.h index 939b25aa..d5732096 100644 --- a/product/sgi575/scp_ramfw/fmw_memory.h +++ b/product/sgi575/scp_ramfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_system_mmap_scp.h> +#include "scp_system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/sgi575/scp_ramfw/rtx_config.c b/product/sgi575/scp_ramfw/rtx_config.c index 6e64ef50..5223a01c 100644 --- a/product/sgi575/scp_ramfw/rtx_config.c +++ b/product/sgi575/scp_ramfw/rtx_config.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <cmsis_compiler.h> +#include "system_clock.h" + #include <rtx_lib.c> #include <rtx_os.h> -#include <system_clock.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/sgi575/scp_romfw/config_gtimer.c b/product/sgi575/scp_romfw/config_gtimer.c index 074a76ff..4c304b65 100644 --- a/product/sgi575/scp_romfw/config_gtimer.c +++ b/product/sgi575/scp_romfw/config_gtimer.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_gtimer.h> -#include <scp_sgi575_mmap.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/sgi575/scp_romfw/config_log.c b/product/sgi575/scp_romfw/config_log.c index 2bb737de..e0732005 100644 --- a/product/sgi575/scp_romfw/config_log.c +++ b/product/sgi575/scp_romfw/config_log.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "scp_sgi575_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <scp_system_mmap.h> /* * PL011 module diff --git a/product/sgi575/scp_romfw/config_sgi575_rom.c b/product/sgi575/scp_romfw/config_sgi575_rom.c index 1d282377..34d04946 100644 --- a/product/sgi575/scp_romfw/config_sgi575_rom.c +++ b/product/sgi575/scp_romfw/config_sgi575_rom.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "scp_sgi575_mmap_scp.h" +#include "scp_software_mmap.h" + #include <mod_sgi575_rom.h> -#include <scp_software_mmap.h> -#include <scp_sgi575_mmap_scp.h> + +#include <fwk_module.h> const struct fwk_module_config config_sgi575_rom = { .data = &((struct sgi575_rom_config) { diff --git a/product/sgi575/scp_romfw/fmw_memory.h b/product/sgi575/scp_romfw/fmw_memory.h index e9ca2cdc..382f9cdb 100644 --- a/product/sgi575/scp_romfw/fmw_memory.h +++ b/product/sgi575/scp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_system_mmap_scp.h> +#include "scp_system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/sgm775/include/sgm775_pik.h b/product/sgm775/include/sgm775_pik.h index 863d9c29..732b8ad2 100644 --- a/product/sgm775/include/sgm775_pik.h +++ b/product/sgm775/include/sgm775_pik.h @@ -8,14 +8,14 @@ #ifndef SGM775_PIK_H #define SGM775_PIK_H -#include <sgm775_mmap.h> -#include <sgm775_pik_cpu.h> -#include <sgm775_pik_debug.h> -#include <sgm775_pik_dpu.h> -#include <sgm775_pik_gpu.h> -#include <sgm775_pik_scp.h> -#include <sgm775_pik_system.h> -#include <sgm775_pik_vpu.h> +#include "sgm775_mmap.h" +#include "sgm775_pik_cpu.h" +#include "sgm775_pik_debug.h" +#include "sgm775_pik_dpu.h" +#include "sgm775_pik_gpu.h" +#include "sgm775_pik_scp.h" +#include "sgm775_pik_system.h" +#include "sgm775_pik_vpu.h" #define PIK_CLUS0 ((struct pik_cpu_reg_v8_2 *) PIK_CLUS0_BASE) #define PIK_CLUS1 ((struct pik_cpu_reg_v8_2 *) PIK_CLUS1_BASE) diff --git a/product/sgm775/include/sgm775_pik_cpu.h b/product/sgm775/include/sgm775_pik_cpu.h index afca4dd3..aa8d560b 100644 --- a/product/sgm775/include/sgm775_pik_cpu.h +++ b/product/sgm775/include/sgm775_pik_cpu.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_CPU_H #define SGM775_PIK_CPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + #define PE_COUNT_MAX 16 /*! diff --git a/product/sgm775/include/sgm775_pik_debug.h b/product/sgm775/include/sgm775_pik_debug.h index 08f57c62..280719ed 100644 --- a/product/sgm775/include/sgm775_pik_debug.h +++ b/product/sgm775/include/sgm775_pik_debug.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_DEBUG_H #define SGM775_PIK_DEBUG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Debug register definitions */ diff --git a/product/sgm775/include/sgm775_pik_dpu.h b/product/sgm775/include/sgm775_pik_dpu.h index be453c56..dfed445f 100644 --- a/product/sgm775/include/sgm775_pik_dpu.h +++ b/product/sgm775/include/sgm775_pik_dpu.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_DPU_H #define SGM775_PIK_DPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief DPU PIK register definitions */ diff --git a/product/sgm775/include/sgm775_pik_gpu.h b/product/sgm775/include/sgm775_pik_gpu.h index 2a0050fc..51c3fd43 100644 --- a/product/sgm775/include/sgm775_pik_gpu.h +++ b/product/sgm775/include/sgm775_pik_gpu.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_GPU_H #define SGM775_PIK_GPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief GPU PIK register definitions */ diff --git a/product/sgm775/include/sgm775_pik_scp.h b/product/sgm775/include/sgm775_pik_scp.h index da85d434..45a3e57c 100644 --- a/product/sgm775/include/sgm775_pik_scp.h +++ b/product/sgm775/include/sgm775_pik_scp.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_SCP_H #define SGM775_PIK_SCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief SCP PIK register definitions */ diff --git a/product/sgm775/include/sgm775_pik_system.h b/product/sgm775/include/sgm775_pik_system.h index 350f5ab1..a19f0029 100644 --- a/product/sgm775/include/sgm775_pik_system.h +++ b/product/sgm775/include/sgm775_pik_system.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_SYSTEM_H #define SGM775_PIK_SYSTEM_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief System PIK register definitions */ diff --git a/product/sgm775/include/sgm775_pik_vpu.h b/product/sgm775/include/sgm775_pik_vpu.h index 9b8e0193..ba48f493 100644 --- a/product/sgm775/include/sgm775_pik_vpu.h +++ b/product/sgm775/include/sgm775_pik_vpu.h @@ -8,9 +8,10 @@ #ifndef SGM775_PIK_VPU_H #define SGM775_PIK_VPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief VPU PIK register definitions */ diff --git a/product/sgm775/include/sgm775_ssc.h b/product/sgm775/include/sgm775_ssc.h index 06a8beea..36a24549 100644 --- a/product/sgm775/include/sgm775_ssc.h +++ b/product/sgm775/include/sgm775_ssc.h @@ -8,9 +8,10 @@ #ifndef SGM775_SSC_H #define SGM775_SSC_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief System Security Control (SSC) register definitions */ diff --git a/product/sgm775/include/software_mmap.h b/product/sgm775/include/software_mmap.h index ca9338bc..0c21ec8e 100644 --- a/product/sgm775/include/software_mmap.h +++ b/product/sgm775/include/software_mmap.h @@ -11,8 +11,9 @@ #ifndef SOFTWARE_MMAP_H #define SOFTWARE_MMAP_H +#include "system_mmap.h" + #include <fwk_macros.h> -#include <system_mmap.h> /* * The 4KiB AP/SCP Shared memory at the base of Trusted SRAM is used for several diff --git a/product/sgm775/include/system_mmap.h b/product/sgm775/include/system_mmap.h index d6b6cf73..c00a5275 100644 --- a/product/sgm775/include/system_mmap.h +++ b/product/sgm775/include/system_mmap.h @@ -8,7 +8,7 @@ #ifndef SYSTEM_MMAP_H #define SYSTEM_MMAP_H -#include <sgm775_mmap.h> +#include "sgm775_mmap.h" #define DMC_EXTERNAL0 (SYS0_BASE + 0x3FBE0000) #define DMC_EXTERNAL1 (SYS0_BASE + 0x3FBF0000) diff --git a/product/sgm775/include/system_mmap_scp.h b/product/sgm775/include/system_mmap_scp.h index 820118dc..0c31c4fa 100644 --- a/product/sgm775/include/system_mmap_scp.h +++ b/product/sgm775/include/system_mmap_scp.h @@ -13,7 +13,7 @@ #ifndef SYSTEM_MMAP_SCP_H #define SYSTEM_MMAP_SCP_H -#include <sgm775_mmap_scp.h> +#include "sgm775_mmap_scp.h" #define SCP_ROM_SIZE (64 * 1024) #define SCP_RAM_SIZE (128 * 1024) diff --git a/product/sgm775/module/sgm775_ddr_phy500/include/mod_sgm775_ddr_phy500.h b/product/sgm775/module/sgm775_ddr_phy500/include/mod_sgm775_ddr_phy500.h index 730f725b..14fb9ffa 100644 --- a/product/sgm775/module/sgm775_ddr_phy500/include/mod_sgm775_ddr_phy500.h +++ b/product/sgm775/module/sgm775_ddr_phy500/include/mod_sgm775_ddr_phy500.h @@ -1,4 +1,4 @@ - /* +/* * Arm SCP/MCP Software * Copyright (c) 2015-2020, Arm Limited and Contributors. All rights reserved. * @@ -10,10 +10,11 @@ #ifndef MOD_SGM775_DDR_PHY500_H #define MOD_SGM775_DDR_PHY500_H -#include <stdint.h> #include <fwk_macros.h> #include <fwk_module.h> +#include <stdint.h> + /*! * \addtogroup GroupSGM775Module SGM775 Product Modules * @{ diff --git a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c index 8e296bf4..16a5002c 100644 --- a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c +++ b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c @@ -8,14 +8,17 @@ * SGM775 DDR-PHY500 module */ +#include <mod_log.h> +#include <mod_sgm775_ddr_phy500.h> +#include <mod_sgm775_dmc500.h> + #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_sgm775_ddr_phy500.h> -#include <mod_sgm775_dmc500.h> + +#include <stddef.h> static struct mod_log_api *log_api; diff --git a/product/sgm775/module/sgm775_dmc500/include/mod_sgm775_dmc500.h b/product/sgm775/module/sgm775_dmc500/include/mod_sgm775_dmc500.h index fa627aa7..707ad078 100644 --- a/product/sgm775/module/sgm775_dmc500/include/mod_sgm775_dmc500.h +++ b/product/sgm775/module/sgm775_dmc500/include/mod_sgm775_dmc500.h @@ -11,12 +11,15 @@ #ifndef MOD_SGM775_DMC500_H #define MOD_SGM775_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 GroupSGM775Module SGM775 Product Modules * @{ diff --git a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c index a681b872..a35ac437 100644 --- a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c +++ b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c @@ -8,12 +8,16 @@ * SGM775 DMC-500 module. */ +#include <mod_log.h> +#include <mod_sgm775_dmc500.h> +#include <mod_timer.h> + #include <fwk_assert.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_sgm775_dmc500.h> + +#include <stddef.h> #define COL_BITS 1 #define BANK_BITS 0 diff --git a/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c b/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c index be5e3074..819b3b2b 100644 --- a/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c +++ b/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c @@ -8,18 +8,28 @@ * SGM775 System Support. */ -#include <fmw_cmsis.h> +#include "sgm775_scmi.h" +#include "sgm775_sds.h" + +#include <mod_power_domain.h> +#include <mod_scmi.h> +#include <mod_sds.h> +#include <mod_sgm775_system.h> +#include <mod_system_power.h> + #include <fwk_assert.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 <mod_scmi.h> -#include <mod_sds.h> -#include <mod_system_power.h> -#include <mod_sgm775_system.h> -#include <sgm775_scmi.h> -#include <sgm775_sds.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t feature_flags = SGM775_SDS_FEATURE_FIRMWARE_MASK; static fwk_id_t sds_feature_availability_id = diff --git a/product/sgm775/scp_ramfw/config_clock.c b/product/sgm775/scp_ramfw/config_clock.c index a28bdb81..fccc0678 100644 --- a/product/sgm775/scp_ramfw/config_clock.c +++ b/product/sgm775/scp_ramfw/config_clock.c @@ -5,18 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "clock_devices.h" +#include "config_power_domain.h" +#include "sgm775_core.h" + #include <mod_clock.h> #include <mod_css_clock.h> -#include <mod_system_pll.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> -#include <config_power_domain.h> -#include <clock_devices.h> -#include <sgm775_core.h> +#include <mod_system_pll.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static struct fwk_element clock_dev_desc_table[] = { [CLOCK_DEV_IDX_BIG] = { diff --git a/product/sgm775/scp_ramfw/config_css_clock.c b/product/sgm775/scp_ramfw/config_css_clock.c index b525ef59..4957d557 100644 --- a/product/sgm775/scp_ramfw/config_css_clock.c +++ b/product/sgm775/scp_ramfw/config_css_clock.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_system_pll.h> -#include <mod_pik_clock.h> -#include <sgm775_pik.h> + +#include <stdbool.h> +#include <stddef.h> static const struct mod_css_clock_rate rate_table_cpu_group_big[] = { { diff --git a/product/sgm775/scp_ramfw/config_debugger_cli.c b/product/sgm775/scp_ramfw/config_debugger_cli.c index 3fae1c7d..e32b945e 100644 --- a/product/sgm775/scp_ramfw/config_debugger_cli.c +++ b/product/sgm775/scp_ramfw/config_debugger_cli.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <config_timer.h> + #include <mod_debugger_cli.h> + #include <fwk_module_idx.h> -#include <config_timer.h> /* * Data for the debugger CLI module configuration diff --git a/product/sgm775/scp_ramfw/config_dvfs.c b/product/sgm775/scp_ramfw/config_dvfs.c index 50f22bd9..1c01c851 100644 --- a/product/sgm775/scp_ramfw/config_dvfs.c +++ b/product/sgm775/scp_ramfw/config_dvfs.c @@ -5,15 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_dvfs.h" +#include "config_timer.h" + +#include <mod_dvfs.h> +#include <mod_sid.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 <config_dvfs.h> -#include <config_timer.h> -#include <mod_dvfs.h> -#include <mod_sid.h> +#include <fwk_status.h> + +#include <stddef.h> static const struct mod_dvfs_domain_config cpu_group_little = { .psu_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, 0), diff --git a/product/sgm775/scp_ramfw/config_log.c b/product/sgm775/scp_ramfw/config_log.c index 00ce578b..21f0db3a 100644 --- a/product/sgm775/scp_ramfw/config_log.c +++ b/product/sgm775/scp_ramfw/config_log.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "system_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <system_mmap.h> -#include <clock_devices.h> + +#include <stddef.h> /* * PL011 module diff --git a/product/sgm775/scp_ramfw/config_mhu.c b/product/sgm775/scp_ramfw/config_mhu.c index 7ff932f7..38094c61 100644 --- a/product/sgm775/scp_ramfw/config_mhu.c +++ b/product/sgm775/scp_ramfw/config_mhu.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_irq.h" +#include "sgm775_mhu.h" +#include "sgm775_mmap.h" + +#include <mod_mhu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu.h> -#include <sgm775_irq.h> -#include <sgm775_mhu.h> -#include <sgm775_mmap.h> static const struct fwk_element mhu_element_table[] = { [SGM775_MHU_DEVICE_IDX_S] = { diff --git a/product/sgm775/scp_ramfw/config_mock_psu.c b/product/sgm775/scp_ramfw/config_mock_psu.c index 13c44db4..e9f72d0d 100644 --- a/product/sgm775/scp_ramfw/config_mock_psu.c +++ b/product/sgm775/scp_ramfw/config_mock_psu.c @@ -5,10 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_mock_psu.h" + +#include <mod_mock_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_mock_psu.h> -#include <config_mock_psu.h> + +#include <stdbool.h> +#include <stddef.h> static const struct fwk_element element_table[] = { [CONFIG_MOCK_PSU_ELEMENT_IDX_CPU_GROUP_LITTLE] = { diff --git a/product/sgm775/scp_ramfw/config_pik_clock.c b/product/sgm775/scp_ramfw/config_pik_clock.c index 06f03347..de2ef26c 100644 --- a/product/sgm775/scp_ramfw/config_pik_clock.c +++ b/product/sgm775/scp_ramfw/config_pik_clock.c @@ -5,13 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_pik.h" +#include "sgm775_pik_cpu.h" +#include "sgm775_pik_dpu.h" +#include "sgm775_pik_gpu.h" +#include "sgm775_pik_system.h" +#include "sgm775_pik_vpu.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <sgm775_pik.h> -#include <system_clock.h> + +#include <stdbool.h> +#include <stddef.h> /* * Rate lookup tables diff --git a/product/sgm775/scp_ramfw/config_power_domain.c b/product/sgm775/scp_ramfw/config_power_domain.c index 3bda5673..cf0316a5 100644 --- a/product/sgm775/scp_ramfw/config_power_domain.c +++ b/product/sgm775/scp_ramfw/config_power_domain.c @@ -5,19 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v0.h" +#include "sgm775_core.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <config_power_domain.h> -#include <config_ppu_v0.h> -#include <mod_system_power.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <sgm775_core.h> + +#include <stdint.h> +#include <string.h> static const char *core_pd_name_table[SGM775_CORE_PER_CLUSTER_MAX] = { "CLUS0CORE0", "CLUS0CORE1", "CLUS0CORE2", "CLUS0CORE3", diff --git a/product/sgm775/scp_ramfw/config_ppu_v0.c b/product/sgm775/scp_ramfw/config_ppu_v0.c index da29ffe1..25a1451c 100644 --- a/product/sgm775/scp_ramfw/config_ppu_v0.c +++ b/product/sgm775/scp_ramfw/config_ppu_v0.c @@ -5,12 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_ppu_v0.h" +#include "sgm775_irq.h" +#include "sgm775_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v0.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ppu_v0.h> -#include <config_ppu_v0.h> -#include <sgm775_irq.h> -#include <sgm775_mmap.h> + +#include <stdbool.h> +#include <stddef.h> static struct fwk_element sgm775_ppu_v0_element_table[] = { [PPU_V0_ELEMENT_IDX_DBGTOP] = { diff --git a/product/sgm775/scp_ramfw/config_ppu_v1.c b/product/sgm775/scp_ramfw/config_ppu_v1.c index ceca4d35..dbbc3438 100644 --- a/product/sgm775/scp_ramfw/config_ppu_v1.c +++ b/product/sgm775/scp_ramfw/config_ppu_v1.c @@ -5,17 +5,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include "config_power_domain.h" +#include "sgm775_core.h" +#include "sgm775_irq.h" +#include "sgm775_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <sgm775_core.h> -#include <sgm775_irq.h> -#include <sgm775_mmap.h> -#include <config_power_domain.h> + +#include <stddef.h> +#include <stdint.h> static const char *core_pd_name_table[SGM775_CORE_PER_CLUSTER_MAX] = { "CLUS0CORE0", "CLUS0CORE1", "CLUS0CORE2", "CLUS0CORE3", diff --git a/product/sgm775/scp_ramfw/config_psu.c b/product/sgm775/scp_ramfw/config_psu.c index d86103ff..758722ab 100644 --- a/product/sgm775/scp_ramfw/config_psu.c +++ b/product/sgm775/scp_ramfw/config_psu.c @@ -5,13 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_mock_psu.h" +#include "config_psu.h" + +#include <mod_mock_psu.h> +#include <mod_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_mock_psu.h> -#include <mod_psu.h> -#include <config_mock_psu.h> -#include <config_psu.h> + +#include <stddef.h> static const struct fwk_element element_table[] = { [CONFIG_PSU_ELEMENT_IDX_CPU_GROUP_LITTLE] = { diff --git a/product/sgm775/scp_ramfw/config_scmi.c b/product/sgm775/scp_ramfw/config_scmi.c index 45379688..0ae6f73b 100644 --- a/product/sgm775/scp_ramfw/config_scmi.c +++ b/product/sgm775/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <sgm775_scmi.h> -#include <mod_scmi.h> -#include <internal/scmi.h> -#include <mod_smt.h> static const struct fwk_element service_table[] = { [SGM775_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/sgm775/scp_ramfw/config_scmi_apcore.c b/product/sgm775/scp_ramfw/config_scmi_apcore.c index 64d9efde..9690c9ad 100644 --- a/product/sgm775/scp_ramfw/config_scmi_apcore.c +++ b/product/sgm775/scp_ramfw/config_scmi_apcore.c @@ -5,12 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> +#include "sgm775_core.h" +#include "sgm775_pik.h" +#include "sgm775_pik_cpu.h" + +#include <mod_scmi_apcore.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_scmi_apcore.h> -#include <sgm775_core.h> -#include <sgm775_pik.h> + +#include <stdint.h> static const struct mod_scmi_apcore_reset_register_group reset_reg_group_table[] = { diff --git a/product/sgm775/scp_ramfw/config_scmi_clock.c b/product/sgm775/scp_ramfw/config_scmi_clock.c index 23b84a43..62f7b887 100644 --- a/product/sgm775/scp_ramfw/config_scmi_clock.c +++ b/product/sgm775/scp_ramfw/config_scmi_clock.c @@ -5,14 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> +#include "clock_devices.h" +#include "sgm775_scmi.h" + +#include <mod_scmi_clock.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi_clock.h> -#include <sgm775_scmi.h> -#include <clock_devices.h> static const struct mod_scmi_clock_device agent_device_table_ospm[] = { { diff --git a/product/sgm775/scp_ramfw/config_scmi_perf.c b/product/sgm775/scp_ramfw/config_scmi_perf.c index dac85e84..f130573a 100644 --- a/product/sgm775/scp_ramfw/config_scmi_perf.c +++ b/product/sgm775/scp_ramfw/config_scmi_perf.c @@ -5,13 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <config_dvfs.h> -#include <sgm775_scmi.h> +#include "config_dvfs.h" +#include "sgm775_scmi.h" + #include <mod_scmi_perf.h> +#include <fwk_module.h> + +#include <stddef.h> +#include <stdint.h> + static const struct mod_scmi_perf_domain_config domains[] = { [DVFS_ELEMENT_IDX_LITTLE] = { .permissions = &(const uint32_t[]) { diff --git a/product/sgm775/scp_ramfw/config_scmi_system_power.c b/product/sgm775/scp_ramfw/config_scmi_system_power.c index 3302ccba..59f81c1a 100644 --- a/product/sgm775/scp_ramfw/config_scmi_system_power.c +++ b/product/sgm775/scp_ramfw/config_scmi_system_power.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + +#include <stddef.h> + struct fwk_module_config config_scmi_system_power = { .get_element_table = NULL, .data = &((struct mod_scmi_system_power_config) { diff --git a/product/sgm775/scp_ramfw/config_sds.c b/product/sgm775/scp_ramfw/config_sds.c index b6e15150..fdb294bb 100644 --- a/product/sgm775/scp_ramfw/config_sds.c +++ b/product/sgm775/scp_ramfw/config_sds.c @@ -5,16 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "clock_devices.h" +#include "sgm775_mmap.h" +#include "sgm775_sds.h" + +#include <mod_sds.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 <mod_sds.h> -#include <sgm775_mmap.h> -#include <sgm775_sds.h> -#include <clock_devices.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t feature_flags = 0x00000000; static const uint32_t version_packed = FWK_BUILD_VERSION; diff --git a/product/sgm775/scp_ramfw/config_sensor.c b/product/sgm775/scp_ramfw/config_sensor.c index 11cfabe8..b0f5c968 100644 --- a/product/sgm775/scp_ramfw/config_sensor.c +++ b/product/sgm775/scp_ramfw/config_sensor.c @@ -5,13 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include "system_mmap.h" + +#include <mod_reg_sensor.h> +#include <mod_sensor.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_reg_sensor.h> -#include <mod_sensor.h> -#include <system_mmap.h> + +#include <stddef.h> +#include <stdint.h> enum REG_SENSOR_DEVICES { REG_SENSOR_DEV_SOC_TEMP, diff --git a/product/sgm775/scp_ramfw/config_sgm775_ddr_phy500.c b/product/sgm775/scp_ramfw/config_sgm775_ddr_phy500.c index 0669579c..1f3f1fdb 100644 --- a/product/sgm775/scp_ramfw/config_sgm775_ddr_phy500.c +++ b/product/sgm775/scp_ramfw/config_sgm775_ddr_phy500.c @@ -5,10 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "system_mmap.h" + +#include <mod_sgm775_ddr_phy500.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_sgm775_ddr_phy500.h> -#include <system_mmap.h> + +#include <stddef.h> /* Table of DDR PHY500 element descriptions. */ static struct fwk_element sgm775_ddr_phy500_element_table[] = { diff --git a/product/sgm775/scp_ramfw/config_sgm775_dmc500.c b/product/sgm775/scp_ramfw/config_sgm775_dmc500.c index e255a623..b19a7c87 100644 --- a/product/sgm775/scp_ramfw/config_sgm775_dmc500.c +++ b/product/sgm775/scp_ramfw/config_sgm775_dmc500.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "system_mmap.h" + +#include <mod_sgm775_dmc500.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_sgm775_dmc500.h> -#include <system_mmap.h> static struct fwk_element sgm775_dmc500_element_table[] = { [0] = { .name = "DMC500-0", diff --git a/product/sgm775/scp_ramfw/config_smt.c b/product/sgm775/scp_ramfw/config_smt.c index 4353ffc1..1803ee9f 100644 --- a/product/sgm775/scp_ramfw/config_smt.c +++ b/product/sgm775/scp_ramfw/config_smt.c @@ -5,19 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_power_domain.h" +#include "sgm775_core.h" +#include "sgm775_mhu.h" +#include "sgm775_scmi.h" +#include "software_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_smt.h> -#include <sgm775_core.h> -#include <sgm775_mhu.h> -#include <sgm775_scmi.h> -#include <config_power_domain.h> -#include <clock_devices.h> -#include <software_mmap.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [SGM775_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/sgm775/scp_ramfw/config_system_pll.c b/product/sgm775/scp_ramfw/config_system_pll.c index 7429ec71..5c7b568d 100644 --- a/product/sgm775/scp_ramfw/config_system_pll.c +++ b/product/sgm775/scp_ramfw/config_system_pll.c @@ -5,13 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_pik.h" +#include "sgm775_pik_scp.h" +#include "system_mmap.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <sgm775_pik.h> -#include <system_mmap.h> + +#include <stdbool.h> +#include <stddef.h> static const struct fwk_element system_pll_element_table[] = { { diff --git a/product/sgm775/scp_ramfw/config_system_power.c b/product/sgm775/scp_ramfw/config_system_power.c index 7a9dac8b..7cd7e72b 100644 --- a/product/sgm775/scp_ramfw/config_system_power.c +++ b/product/sgm775/scp_ramfw/config_system_power.c @@ -5,14 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_ppu_v0.h" +#include "sgm775_irq.h" + +#include <mod_power_domain.h> +#include <mod_sgm775_system.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <sgm775_irq.h> -#include <config_ppu_v0.h> -#include <mod_system_power.h> -#include <mod_sgm775_system.h> + +#include <stdint.h> /* * The DPU/GPU/VPU PPUs in this list are there as a temporary workaround, until diff --git a/product/sgm775/scp_ramfw/config_timer.c b/product/sgm775/scp_ramfw/config_timer.c index 75f3f33c..76ef9a71 100644 --- a/product/sgm775/scp_ramfw/config_timer.c +++ b/product/sgm775/scp_ramfw/config_timer.c @@ -5,17 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "config_timer.h" +#include "sgm775_irq.h" +#include "sgm775_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <sgm775_mmap.h> -#include <sgm775_irq.h> -#include <config_timer.h> -#include <clock_devices.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/sgm775/scp_ramfw/fmw_memory.h b/product/sgm775/scp_ramfw/fmw_memory.h index 03e02eb0..61f70d45 100644 --- a/product/sgm775/scp_ramfw/fmw_memory.h +++ b/product/sgm775/scp_ramfw/fmw_memory.h @@ -8,7 +8,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <system_mmap_scp.h> +#include "system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION diff --git a/product/sgm775/scp_ramfw/rtx_config.c b/product/sgm775/scp_ramfw/rtx_config.c index 6a750bf0..995d049a 100644 --- a/product/sgm775/scp_ramfw/rtx_config.c +++ b/product/sgm775/scp_ramfw/rtx_config.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <cmsis_compiler.h> -#include <rtx_os.h> -#include <system_clock.h> +#include "system_clock.h" #include <rtx_lib.c> +#include <rtx_os.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/sgm775/scp_romfw/config_bootloader.c b/product/sgm775/scp_romfw/config_bootloader.c index 57799a59..75d4e75d 100644 --- a/product/sgm775/scp_romfw/config_bootloader.c +++ b/product/sgm775/scp_romfw/config_bootloader.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_macros.h> -#include <fwk_module.h> +#include "sgm775_mmap.h" +#include "sgm775_mmap_scp.h" +#include "sgm775_sds.h" +#include "system_mmap_scp.h" + #include <mod_bootloader.h> -#include <system_mmap.h> -#include <system_mmap_scp.h> -#include <sgm775_sds.h> + +#include <fwk_module.h> static const struct mod_bootloader_config bootloader_module_config = { .source_base = TRUSTED_RAM_BASE, diff --git a/product/sgm775/scp_romfw/config_clock.c b/product/sgm775/scp_romfw/config_clock.c index ff300552..565fc96a 100644 --- a/product/sgm775/scp_romfw/config_clock.c +++ b/product/sgm775/scp_romfw/config_clock.c @@ -5,16 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "clock_devices.h" + #include <mod_clock.h> #include <mod_css_clock.h> -#include <mod_system_pll.h> #include <mod_msys_rom.h> #include <mod_pik_clock.h> -#include <clock_devices.h> +#include <mod_system_pll.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_DEV_IDX_BIG] = { diff --git a/product/sgm775/scp_romfw/config_css_clock.c b/product/sgm775/scp_romfw/config_css_clock.c index 46fae20f..c029ad3b 100644 --- a/product/sgm775/scp_romfw/config_css_clock.c +++ b/product/sgm775/scp_romfw/config_css_clock.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_system_pll.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_system_pll.h> -#include <mod_pik_clock.h> + +#include <stdbool.h> static const struct mod_css_clock_rate rate_table_cpu_group_big[] = { { diff --git a/product/sgm775/scp_romfw/config_log.c b/product/sgm775/scp_romfw/config_log.c index bd634fab..b29e352a 100644 --- a/product/sgm775/scp_romfw/config_log.c +++ b/product/sgm775/scp_romfw/config_log.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "system_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <system_mmap.h> -#include <clock_devices.h> + +#include <stddef.h> /* * PL011 module diff --git a/product/sgm775/scp_romfw/config_msys_rom.c b/product/sgm775/scp_romfw/config_msys_rom.c index 85b726a8..0f59e210 100644 --- a/product/sgm775/scp_romfw/config_msys_rom.c +++ b/product/sgm775/scp_romfw/config_msys_rom.c @@ -5,13 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "software_mmap.h" + +#include <mod_msys_rom.h> + #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_msys_rom.h> -#include <software_mmap.h> -#include <sgm775_mmap_scp.h> -#include <sgm775_core.h> const struct fwk_module_config config_msys_rom = { .data = &((struct msys_rom_config) { diff --git a/product/sgm775/scp_romfw/config_pik_clock.c b/product/sgm775/scp_romfw/config_pik_clock.c index 3d09f133..9a6bd87e 100644 --- a/product/sgm775/scp_romfw/config_pik_clock.c +++ b/product/sgm775/scp_romfw/config_pik_clock.c @@ -5,12 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_pik.h" +#include "sgm775_pik_cpu.h" +#include "sgm775_pik_gpu.h" +#include "sgm775_pik_system.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <sgm775_pik.h> -#include <system_clock.h> + +#include <stdbool.h> /* * Rate lookup tables. diff --git a/product/sgm775/scp_romfw/config_ppu_v0.c b/product/sgm775/scp_romfw/config_ppu_v0.c index fbe0b744..f57036f0 100644 --- a/product/sgm775/scp_romfw/config_ppu_v0.c +++ b/product/sgm775/scp_romfw/config_ppu_v0.c @@ -5,11 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_irq.h" +#include "sgm775_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v0.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ppu_v0.h> -#include <sgm775_irq.h> -#include <sgm775_mmap.h> + +#include <stdbool.h> static struct fwk_element sgm775_ppu_v0_element_table[] = { { diff --git a/product/sgm775/scp_romfw/config_ppu_v1.c b/product/sgm775/scp_romfw/config_ppu_v1.c index 4f620ee2..70decf23 100644 --- a/product/sgm775/scp_romfw/config_ppu_v1.c +++ b/product/sgm775/scp_romfw/config_ppu_v1.c @@ -5,16 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include "sgm775_mmap.h" + +#include <mod_msys_rom.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_interrupt.h> -#include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_msys_rom.h> -#include <mod_ppu_v1.h> -#include <sgm775_irq.h> -#include <sgm775_mmap.h> static struct fwk_element sgm775_ppu_v1_element_table[] = { { diff --git a/product/sgm775/scp_romfw/config_sds.c b/product/sgm775/scp_romfw/config_sds.c index 9f4f3efc..fd71ceb7 100644 --- a/product/sgm775/scp_romfw/config_sds.c +++ b/product/sgm775/scp_romfw/config_sds.c @@ -5,19 +5,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "clock_devices.h" +#include "sgm775_mmap.h" +#include "sgm775_pik.h" +#include "sgm775_pik_scp.h" +#include "sgm775_sds.h" +#include "sgm775_ssc.h" +#include "system_mmap.h" + +#include <mod_sds.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 <mod_sds.h> -#include <sgm775_mmap.h> -#include <sgm775_sds.h> -#include <sgm775_ssc.h> -#include <sgm775_pik.h> -#include <system_mmap.h> -#include <clock_devices.h> + +#include <stdbool.h> +#include <stdint.h> static const struct mod_sds_config sds_module_config = { .region_base_address = TRUSTED_RAM_BASE, diff --git a/product/sgm775/scp_romfw/config_system_pll.c b/product/sgm775/scp_romfw/config_system_pll.c index 4d3dd381..377f39b4 100644 --- a/product/sgm775/scp_romfw/config_system_pll.c +++ b/product/sgm775/scp_romfw/config_system_pll.c @@ -5,12 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_pik.h" +#include "sgm775_pik_scp.h" +#include "system_mmap.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <sgm775_pik.h> -#include <system_mmap.h> + +#include <stdbool.h> +#include <stddef.h> static const struct fwk_element system_pll_element_table[] = { { diff --git a/product/sgm775/scp_romfw/config_timer.c b/product/sgm775/scp_romfw/config_timer.c index 8ba86d5e..d6ac6c17 100644 --- a/product/sgm775/scp_romfw/config_timer.c +++ b/product/sgm775/scp_romfw/config_timer.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "sgm775_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <sgm775_mmap.h> -#include <clock_devices.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/sgm775/scp_romfw/fmw_memory.h b/product/sgm775/scp_romfw/fmw_memory.h index 2ab23458..2c1acfb5 100644 --- a/product/sgm775/scp_romfw/fmw_memory.h +++ b/product/sgm775/scp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <system_mmap_scp.h> +#include "system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/sgm775/src/config_sid.c b/product/sgm775/src/config_sid.c index 068f6df8..30809cff 100644 --- a/product/sgm775/src/config_sid.c +++ b/product/sgm775/src/config_sid.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm775_mmap.h" +#include "sgm775_ssc.h" + +#include <mod_sid.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_sid.h> -#include <sgm775_mmap.h> -#include <sgm775_ssc.h> static const struct fwk_element subsystem_table[] = { { diff --git a/product/sgm775/src/config_system_info.c b/product/sgm775/src/config_system_info.c index 6fc99805..23a2b480 100644 --- a/product/sgm775/src/config_system_info.c +++ b/product/sgm775/src/config_system_info.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_macros.h> +#include <mod_sid.h> +#include <mod_system_info.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_info.h> -#include <mod_sid.h> + +#include <stddef.h> const struct fwk_module_config config_system_info = { .get_element_table = NULL, diff --git a/product/sgm775/src/sgm775_core.c b/product/sgm775/src/sgm775_core.c index 8e619355..8cac171c 100644 --- a/product/sgm775/src/sgm775_core.c +++ b/product/sgm775/src/sgm775_core.c @@ -5,8 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <sgm775_pik.h> -#include <sgm775_core.h> +#include "sgm775_core.h" +#include "sgm775_pik.h" +#include "sgm775_pik_cpu.h" unsigned int sgm775_core_get_count(void) { diff --git a/product/sgm776/include/sgm776_pik.h b/product/sgm776/include/sgm776_pik.h index bdb57c11..3b1fc73b 100644 --- a/product/sgm776/include/sgm776_pik.h +++ b/product/sgm776/include/sgm776_pik.h @@ -8,14 +8,14 @@ #ifndef SGM776_PIK_H #define SGM776_PIK_H -#include <sgm776_mmap.h> -#include <sgm776_pik_cpu.h> -#include <sgm776_pik_debug.h> -#include <sgm776_pik_dpu.h> -#include <sgm776_pik_scp.h> -#include <sgm776_pik_gpu.h> -#include <sgm776_pik_system.h> -#include <sgm776_pik_vpu.h> +#include "sgm776_mmap.h" +#include "sgm776_pik_cpu.h" +#include "sgm776_pik_debug.h" +#include "sgm776_pik_dpu.h" +#include "sgm776_pik_gpu.h" +#include "sgm776_pik_scp.h" +#include "sgm776_pik_system.h" +#include "sgm776_pik_vpu.h" #define PIK_CLUS0 ((struct pik_cpu_reg *) PIK_CLUS0_BASE) #define PIK_CLUS1 ((struct pik_cpu_reg *) PIK_CLUS1_BASE) diff --git a/product/sgm776/include/sgm776_pik_cpu.h b/product/sgm776/include/sgm776_pik_cpu.h index 34cdd146..63f0fe8f 100644 --- a/product/sgm776/include/sgm776_pik_cpu.h +++ b/product/sgm776/include/sgm776_pik_cpu.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_CPU_H #define SGM776_PIK_CPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + #define PE_COUNT_MAX 16 /*! diff --git a/product/sgm776/include/sgm776_pik_debug.h b/product/sgm776/include/sgm776_pik_debug.h index 5421fae9..063e08df 100644 --- a/product/sgm776/include/sgm776_pik_debug.h +++ b/product/sgm776/include/sgm776_pik_debug.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_DEBUG_H #define SGM776_PIK_DEBUG_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief Debug register definitions */ diff --git a/product/sgm776/include/sgm776_pik_dpu.h b/product/sgm776/include/sgm776_pik_dpu.h index fd3ebdce..7130a198 100644 --- a/product/sgm776/include/sgm776_pik_dpu.h +++ b/product/sgm776/include/sgm776_pik_dpu.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_DPU_H #define SGM776_PIK_DPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief DPU PIK register definitions */ diff --git a/product/sgm776/include/sgm776_pik_gpu.h b/product/sgm776/include/sgm776_pik_gpu.h index f10af96b..7a86a26a 100644 --- a/product/sgm776/include/sgm776_pik_gpu.h +++ b/product/sgm776/include/sgm776_pik_gpu.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_GPU_H #define SGM776_PIK_GPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief GPU PIK register definitions */ diff --git a/product/sgm776/include/sgm776_pik_scp.h b/product/sgm776/include/sgm776_pik_scp.h index ae2258db..aec2f798 100644 --- a/product/sgm776/include/sgm776_pik_scp.h +++ b/product/sgm776/include/sgm776_pik_scp.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_SCP_H #define SGM776_PIK_SCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief SCP PIK register definitions */ diff --git a/product/sgm776/include/sgm776_pik_system.h b/product/sgm776/include/sgm776_pik_system.h index 3099713b..83d355ad 100644 --- a/product/sgm776/include/sgm776_pik_system.h +++ b/product/sgm776/include/sgm776_pik_system.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_SYSTEM_H #define SGM776_PIK_SYSTEM_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief System PIK register definitions */ diff --git a/product/sgm776/include/sgm776_pik_vpu.h b/product/sgm776/include/sgm776_pik_vpu.h index 66269146..08fb537e 100644 --- a/product/sgm776/include/sgm776_pik_vpu.h +++ b/product/sgm776/include/sgm776_pik_vpu.h @@ -8,9 +8,10 @@ #ifndef SGM776_PIK_VPU_H #define SGM776_PIK_VPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief VPU PIK register definitions */ diff --git a/product/sgm776/include/software_mmap.h b/product/sgm776/include/software_mmap.h index 081a54a6..3504a596 100644 --- a/product/sgm776/include/software_mmap.h +++ b/product/sgm776/include/software_mmap.h @@ -11,8 +11,9 @@ #ifndef SOFTWARE_MMAP_H #define SOFTWARE_MMAP_H +#include "system_mmap.h" + #include <fwk_macros.h> -#include <system_mmap.h> /* * The 4KiB AP/SCP Shared memory at the base of Trusted SRAM is used for several diff --git a/product/sgm776/include/system_mmap.h b/product/sgm776/include/system_mmap.h index 92594402..350627de 100644 --- a/product/sgm776/include/system_mmap.h +++ b/product/sgm776/include/system_mmap.h @@ -8,7 +8,7 @@ #ifndef SYSTEM_MMAP_H #define SYSTEM_MMAP_H -#include <sgm776_mmap.h> +#include "sgm776_mmap.h" #define DMC_EXTERNAL0 (SYS0_BASE + 0x3FBE0000) #define DMC_EXTERNAL1 (SYS0_BASE + 0x3FBF0000) diff --git a/product/sgm776/include/system_mmap_scp.h b/product/sgm776/include/system_mmap_scp.h index 4cb4d053..98ccb505 100644 --- a/product/sgm776/include/system_mmap_scp.h +++ b/product/sgm776/include/system_mmap_scp.h @@ -13,7 +13,7 @@ #ifndef SYSTEM_MMAP_SCP_H #define SYSTEM_MMAP_SCP_H -#include <sgm776_mmap_scp.h> +#include "sgm776_mmap_scp.h" #define SCP_ROM_SIZE (64 * 1024) #define SCP_RAM_SIZE (128 * 1024) diff --git a/product/sgm776/module/sgm776_system/src/mod_sgm776_system.c b/product/sgm776/module/sgm776_system/src/mod_sgm776_system.c index cfbba969..85fc6c35 100644 --- a/product/sgm776/module/sgm776_system/src/mod_sgm776_system.c +++ b/product/sgm776/module/sgm776_system/src/mod_sgm776_system.c @@ -8,10 +8,15 @@ * sgm776 System Support. */ -#include <fmw_cmsis.h> -#include <fwk_module.h> -#include <mod_system_power.h> +#include <mod_power_domain.h> #include <mod_sgm776_system.h> +#include <mod_system_power.h> + +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_status.h> + +#include <fmw_cmsis.h> /* * Functions fulfilling the framework's module interface diff --git a/product/sgm776/scp_ramfw/config_clock.c b/product/sgm776/scp_ramfw/config_clock.c index 2994ffd0..8267de25 100644 --- a/product/sgm776/scp_ramfw/config_clock.c +++ b/product/sgm776/scp_ramfw/config_clock.c @@ -5,17 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "clock_devices.h" +#include "config_power_domain.h" +#include "sgm776_core.h" + #include <mod_clock.h> #include <mod_css_clock.h> -#include <mod_system_pll.h> #include <mod_pik_clock.h> #include <mod_power_domain.h> -#include <config_power_domain.h> -#include <clock_devices.h> -#include <sgm776_core.h> +#include <mod_system_pll.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_DEV_IDX_BIG] = { diff --git a/product/sgm776/scp_ramfw/config_css_clock.c b/product/sgm776/scp_ramfw/config_css_clock.c index 183d9334..982e9f37 100644 --- a/product/sgm776/scp_ramfw/config_css_clock.c +++ b/product/sgm776/scp_ramfw/config_css_clock.c @@ -5,17 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_sid.h> +#include <mod_system_pll.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 <mod_css_clock.h> -#include <mod_system_pll.h> -#include <mod_pik_clock.h> -#include <mod_sid.h> -#include <sgm776_pik.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> static const struct mod_css_clock_rate rate_table_cpu_group_big[] = { { diff --git a/product/sgm776/scp_ramfw/config_ddr_phy500.c b/product/sgm776/scp_ramfw/config_ddr_phy500.c index 61ddcebb..b7d68e32 100644 --- a/product/sgm776/scp_ramfw/config_ddr_phy500.c +++ b/product/sgm776/scp_ramfw/config_ddr_phy500.c @@ -4,10 +4,13 @@ * * SPDX-License-Identifier: BSD-3-Clause */ +#include "system_mmap.h" + +#include <mod_ddr_phy500.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_ddr_phy500.h> -#include <system_mmap.h> /* Default configuration values for DDR PHY500 devices. */ static const struct mod_ddr_phy500_reg ddr_reg_val = { diff --git a/product/sgm776/scp_ramfw/config_dmc500.c b/product/sgm776/scp_ramfw/config_dmc500.c index 97380a8f..13fb7a4f 100644 --- a/product/sgm776/scp_ramfw/config_dmc500.c +++ b/product/sgm776/scp_ramfw/config_dmc500.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "system_mmap.h" + +#include <mod_dmc500.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_dmc500.h> -#include <system_mmap.h> #define COL_BITS 1 #define BANK_BITS 0 diff --git a/product/sgm776/scp_ramfw/config_dvfs.c b/product/sgm776/scp_ramfw/config_dvfs.c index ca4a24a9..4edcf464 100644 --- a/product/sgm776/scp_ramfw/config_dvfs.c +++ b/product/sgm776/scp_ramfw/config_dvfs.c @@ -5,14 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_dvfs.h" + +#include <mod_dvfs.h> +#include <mod_sid.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 <config_dvfs.h> -#include <mod_dvfs.h> -#include <mod_sid.h> +#include <fwk_status.h> static const struct mod_dvfs_domain_config cpu_group_little = { .psu_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PSU, 0), diff --git a/product/sgm776/scp_ramfw/config_log.c b/product/sgm776/scp_ramfw/config_log.c index c3e6978e..c9b92a68 100644 --- a/product/sgm776/scp_ramfw/config_log.c +++ b/product/sgm776/scp_ramfw/config_log.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "system_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <system_mmap.h> -#include <clock_devices.h> + +#include <stddef.h> /* * PL011 module diff --git a/product/sgm776/scp_ramfw/config_mhu.c b/product/sgm776/scp_ramfw/config_mhu.c index 9ba401fe..c065b828 100644 --- a/product/sgm776/scp_ramfw/config_mhu.c +++ b/product/sgm776/scp_ramfw/config_mhu.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_irq.h" +#include "sgm776_mhu.h" +#include "sgm776_mmap.h" + +#include <mod_mhu2.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu2.h> -#include <sgm776_irq.h> -#include <sgm776_mhu.h> -#include <sgm776_mmap.h> static const struct fwk_element mhu_element_table[] = { [SGM776_MHU_DEVICE_IDX_S] = { diff --git a/product/sgm776/scp_ramfw/config_mock_psu.c b/product/sgm776/scp_ramfw/config_mock_psu.c index b6b104da..84e2d70b 100644 --- a/product/sgm776/scp_ramfw/config_mock_psu.c +++ b/product/sgm776/scp_ramfw/config_mock_psu.c @@ -5,9 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_mock_psu.h> + +#include <stdbool.h> static const struct fwk_element element_table[] = { { diff --git a/product/sgm776/scp_ramfw/config_pik_clock.c b/product/sgm776/scp_ramfw/config_pik_clock.c index d09b5f2c..64dc64ec 100644 --- a/product/sgm776/scp_ramfw/config_pik_clock.c +++ b/product/sgm776/scp_ramfw/config_pik_clock.c @@ -5,15 +5,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_pik.h" +#include "sgm776_pik_cpu.h" +#include "sgm776_pik_dpu.h" +#include "sgm776_pik_gpu.h" +#include "sgm776_pik_system.h" +#include "sgm776_pik_vpu.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> +#include <mod_sid.h> + #include <fwk_assert.h> #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <mod_sid.h> -#include <sgm776_pik.h> -#include <system_clock.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> /* * Rate lookup tables diff --git a/product/sgm776/scp_ramfw/config_power_domain.c b/product/sgm776/scp_ramfw/config_power_domain.c index d68aa4fc..4857ba84 100644 --- a/product/sgm776/scp_ramfw/config_power_domain.c +++ b/product/sgm776/scp_ramfw/config_power_domain.c @@ -5,19 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v1.h" +#include "sgm776_core.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <config_power_domain.h> -#include <config_ppu_v1.h> -#include <mod_system_power.h> -#include <mod_ppu_v1.h> -#include <mod_power_domain.h> -#include <sgm776_core.h> + +#include <stdint.h> +#include <string.h> static const char *core_pd_name_table[SGM776_CORE_PER_CLUSTER_MAX] = { "CLUS0CORE0", "CLUS0CORE1", "CLUS0CORE2", "CLUS0CORE3", diff --git a/product/sgm776/scp_ramfw/config_ppu_v1.c b/product/sgm776/scp_ramfw/config_ppu_v1.c index 1319c751..dddfcf7b 100644 --- a/product/sgm776/scp_ramfw/config_ppu_v1.c +++ b/product/sgm776/scp_ramfw/config_ppu_v1.c @@ -5,20 +5,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v1.h" +#include "sgm776_core.h" +#include "sgm776_irq.h" +#include "sgm776_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_power_domain.h> -#include <mod_ppu_v1.h> -#include <sgm776_core.h> -#include <sgm776_irq.h> -#include <sgm776_mmap.h> -#include <config_power_domain.h> -#include <config_ppu_v1.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> static const char *core_pd_name_table[SGM776_CORE_PER_CLUSTER_MAX] = { "CLUS0CORE0", "CLUS0CORE1", "CLUS0CORE2", "CLUS0CORE3", diff --git a/product/sgm776/scp_ramfw/config_psu.c b/product/sgm776/scp_ramfw/config_psu.c index e9ebbdc0..3a91a791 100644 --- a/product/sgm776/scp_ramfw/config_psu.c +++ b/product/sgm776/scp_ramfw/config_psu.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_mock_psu.h> +#include <mod_psu.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_mock_psu.h> -#include <mod_psu.h> static const struct fwk_element element_table[] = { { diff --git a/product/sgm776/scp_ramfw/config_scmi.c b/product/sgm776/scp_ramfw/config_scmi.c index e4841117..e4744b57 100644 --- a/product/sgm776/scp_ramfw/config_scmi.c +++ b/product/sgm776/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <sgm776_scmi.h> -#include <mod_scmi.h> -#include <internal/scmi.h> -#include <mod_smt.h> static const struct fwk_element service_table[] = { [SGM776_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/sgm776/scp_ramfw/config_scmi_apcore.c b/product/sgm776/scp_ramfw/config_scmi_apcore.c index cfdfe5a2..522e7f2d 100644 --- a/product/sgm776/scp_ramfw/config_scmi_apcore.c +++ b/product/sgm776/scp_ramfw/config_scmi_apcore.c @@ -5,12 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> +#include "sgm776_core.h" +#include "sgm776_pik.h" +#include "sgm776_pik_cpu.h" + +#include <mod_scmi_apcore.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_scmi_apcore.h> -#include <sgm776_core.h> -#include <sgm776_pik.h> + +#include <stdint.h> static const struct mod_scmi_apcore_reset_register_group reset_reg_group_table[] = { diff --git a/product/sgm776/scp_ramfw/config_scmi_clock.c b/product/sgm776/scp_ramfw/config_scmi_clock.c index 27368930..cc38feac 100644 --- a/product/sgm776/scp_ramfw/config_scmi_clock.c +++ b/product/sgm776/scp_ramfw/config_scmi_clock.c @@ -5,14 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> +#include "clock_devices.h" +#include "sgm776_scmi.h" + +#include <mod_scmi_clock.h> + +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi_clock.h> -#include <sgm776_scmi.h> -#include <clock_devices.h> static const struct mod_scmi_clock_device agent_device_table_ospm[] = { { diff --git a/product/sgm776/scp_ramfw/config_scmi_perf.c b/product/sgm776/scp_ramfw/config_scmi_perf.c index e1dd43dc..3120b6e9 100644 --- a/product/sgm776/scp_ramfw/config_scmi_perf.c +++ b/product/sgm776/scp_ramfw/config_scmi_perf.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <config_dvfs.h> -#include <sgm776_scmi.h> +#include "config_dvfs.h" +#include "sgm776_scmi.h" + #include <mod_scmi_perf.h> +#include <fwk_module.h> + +#include <stdint.h> + static const struct mod_scmi_perf_domain_config domains[] = { [DVFS_ELEMENT_IDX_LITTLE] = { .permissions = &(const uint32_t[]) { diff --git a/product/sgm776/scp_ramfw/config_scmi_system_power.c b/product/sgm776/scp_ramfw/config_scmi_system_power.c index 3302ccba..59f81c1a 100644 --- a/product/sgm776/scp_ramfw/config_scmi_system_power.c +++ b/product/sgm776/scp_ramfw/config_scmi_system_power.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + +#include <stddef.h> + struct fwk_module_config config_scmi_system_power = { .get_element_table = NULL, .data = &((struct mod_scmi_system_power_config) { diff --git a/product/sgm776/scp_ramfw/config_sds.c b/product/sgm776/scp_ramfw/config_sds.c index 95d68157..c2edf131 100644 --- a/product/sgm776/scp_ramfw/config_sds.c +++ b/product/sgm776/scp_ramfw/config_sds.c @@ -5,16 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <assert.h> -#include <stdint.h> +#include "clock_devices.h" +#include "sgm776_mmap.h" +#include "sgm776_sds.h" + +#include <mod_sds.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_sds.h> -#include <sgm776_mmap.h> -#include <sgm776_sds.h> -#include <clock_devices.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t feature_flags = SGM776_SDS_FEATURE_FIRMWARE_MASK; static const uint32_t version_packed = FWK_BUILD_VERSION; diff --git a/product/sgm776/scp_ramfw/config_sensor.c b/product/sgm776/scp_ramfw/config_sensor.c index 75c77a59..65cb7a16 100644 --- a/product/sgm776/scp_ramfw/config_sensor.c +++ b/product/sgm776/scp_ramfw/config_sensor.c @@ -5,13 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include "system_mmap.h" + +#include <mod_reg_sensor.h> +#include <mod_sensor.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_reg_sensor.h> -#include <mod_sensor.h> -#include <system_mmap.h> + +#include <stddef.h> +#include <stdint.h> enum REG_SENSOR_DEVICES { REG_SENSOR_DEV_SOC_TEMP, diff --git a/product/sgm776/scp_ramfw/config_smt.c b/product/sgm776/scp_ramfw/config_smt.c index ee9fb7a4..2025b06a 100644 --- a/product/sgm776/scp_ramfw/config_smt.c +++ b/product/sgm776/scp_ramfw/config_smt.c @@ -5,20 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_power_domain.h" +#include "sgm776_core.h" +#include "sgm776_mhu.h" +#include "sgm776_scmi.h" +#include "software_mmap.h" + +#include <mod_mhu2.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_mhu2.h> -#include <mod_smt.h> -#include <sgm776_core.h> -#include <sgm776_mhu.h> -#include <sgm776_scmi.h> -#include <config_power_domain.h> -#include <clock_devices.h> -#include <software_mmap.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [SGM776_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/sgm776/scp_ramfw/config_system_pll.c b/product/sgm776/scp_ramfw/config_system_pll.c index 829ed8f3..6f0f5f90 100644 --- a/product/sgm776/scp_ramfw/config_system_pll.c +++ b/product/sgm776/scp_ramfw/config_system_pll.c @@ -5,13 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_pik.h" +#include "sgm776_pik_scp.h" +#include "system_mmap.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <sgm776_pik.h> -#include <system_mmap.h> + +#include <stdbool.h> +#include <stddef.h> static const struct fwk_element system_pll_element_table[] = { { diff --git a/product/sgm776/scp_ramfw/config_system_power.c b/product/sgm776/scp_ramfw/config_system_power.c index 9edfbe3f..e40ead53 100644 --- a/product/sgm776/scp_ramfw/config_system_power.c +++ b/product/sgm776/scp_ramfw/config_system_power.c @@ -5,15 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_ppu_v1.h" +#include "sgm776_irq.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> +#include <mod_sgm776_system.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <sgm776_irq.h> -#include <config_ppu_v1.h> -#include <mod_ppu_v1.h> -#include <mod_system_power.h> -#include <mod_sgm776_system.h> + +#include <stdint.h> /* * The DPU/GPU/VPU PPUs in this list are there as a temporary workaround, until diff --git a/product/sgm776/scp_ramfw/config_timer.c b/product/sgm776/scp_ramfw/config_timer.c index 69c5720e..04cadb85 100644 --- a/product/sgm776/scp_ramfw/config_timer.c +++ b/product/sgm776/scp_ramfw/config_timer.c @@ -5,16 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "sgm776_irq.h" +#include "sgm776_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <sgm776_mmap.h> -#include <sgm776_irq.h> -#include <clock_devices.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/sgm776/scp_ramfw/fmw_memory.h b/product/sgm776/scp_ramfw/fmw_memory.h index 03e02eb0..61f70d45 100644 --- a/product/sgm776/scp_ramfw/fmw_memory.h +++ b/product/sgm776/scp_ramfw/fmw_memory.h @@ -8,7 +8,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <system_mmap_scp.h> +#include "system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION diff --git a/product/sgm776/scp_ramfw/rtx_config.c b/product/sgm776/scp_ramfw/rtx_config.c index 12842cd8..2689510f 100644 --- a/product/sgm776/scp_ramfw/rtx_config.c +++ b/product/sgm776/scp_ramfw/rtx_config.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <cmsis_compiler.h> -#include <rtx_os.h> -#include <system_clock.h> +#include "system_clock.h" #include <rtx_lib.c> +#include <rtx_os.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/sgm776/scp_romfw/config_bootloader.c b/product/sgm776/scp_romfw/config_bootloader.c index f9177984..7d45d044 100644 --- a/product/sgm776/scp_romfw/config_bootloader.c +++ b/product/sgm776/scp_romfw/config_bootloader.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_macros.h> -#include <fwk_module.h> +#include "sgm776_mmap.h" +#include "sgm776_mmap_scp.h" +#include "sgm776_sds.h" +#include "system_mmap_scp.h" + #include <mod_bootloader.h> -#include <system_mmap.h> -#include <system_mmap_scp.h> -#include <sgm776_sds.h> + +#include <fwk_module.h> static const struct mod_bootloader_config bootloader_module_config = { .source_base = TRUSTED_RAM_BASE, diff --git a/product/sgm776/scp_romfw/config_clock.c b/product/sgm776/scp_romfw/config_clock.c index 0f796d0c..9bb62d18 100644 --- a/product/sgm776/scp_romfw/config_clock.c +++ b/product/sgm776/scp_romfw/config_clock.c @@ -5,16 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "clock_devices.h" + #include <mod_clock.h> #include <mod_css_clock.h> -#include <mod_system_pll.h> #include <mod_msys_rom.h> #include <mod_pik_clock.h> -#include <clock_devices.h> +#include <mod_system_pll.h> + +#include <fwk_element.h> +#include <fwk_id.h> +#include <fwk_module.h> +#include <fwk_module_idx.h> static const struct fwk_element clock_dev_desc_table[] = { [CLOCK_DEV_IDX_BIG] = { diff --git a/product/sgm776/scp_romfw/config_css_clock.c b/product/sgm776/scp_romfw/config_css_clock.c index 69b50e20..8b42b357 100644 --- a/product/sgm776/scp_romfw/config_css_clock.c +++ b/product/sgm776/scp_romfw/config_css_clock.c @@ -5,15 +5,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_css_clock.h> +#include <mod_pik_clock.h> +#include <mod_sid.h> +#include <mod_system_pll.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 <mod_css_clock.h> -#include <mod_system_pll.h> -#include <mod_pik_clock.h> -#include <mod_sid.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> static const struct mod_css_clock_rate rate_table_cpu_group_big[] = { { diff --git a/product/sgm776/scp_romfw/config_log.c b/product/sgm776/scp_romfw/config_log.c index 959c1aa4..2094d98c 100644 --- a/product/sgm776/scp_romfw/config_log.c +++ b/product/sgm776/scp_romfw/config_log.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "system_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <system_mmap.h> -#include <clock_devices.h> + +#include <stddef.h> /* * PL011 module diff --git a/product/sgm776/scp_romfw/config_msys_rom.c b/product/sgm776/scp_romfw/config_msys_rom.c index 8da6fcc3..eab1c8bc 100644 --- a/product/sgm776/scp_romfw/config_msys_rom.c +++ b/product/sgm776/scp_romfw/config_msys_rom.c @@ -5,12 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "software_mmap.h" + +#include <mod_msys_rom.h> + #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_msys_rom.h> -#include <sgm776_mmap_scp.h> -#include <software_mmap.h> const struct fwk_module_config config_msys_rom = { .data = &((struct msys_rom_config) { diff --git a/product/sgm776/scp_romfw/config_pik_clock.c b/product/sgm776/scp_romfw/config_pik_clock.c index f42d2d1b..b8a674b0 100644 --- a/product/sgm776/scp_romfw/config_pik_clock.c +++ b/product/sgm776/scp_romfw/config_pik_clock.c @@ -5,15 +5,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_pik.h" +#include "sgm776_pik_cpu.h" +#include "sgm776_pik_gpu.h" +#include "sgm776_pik_system.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> +#include <mod_sid.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 <mod_pik_clock.h> -#include <mod_sid.h> -#include <sgm776_pik.h> -#include <system_clock.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> /* * Rate lookup tables. diff --git a/product/sgm776/scp_romfw/config_ppu_v1.c b/product/sgm776/scp_romfw/config_ppu_v1.c index 3d12d9cc..528d1f9d 100644 --- a/product/sgm776/scp_romfw/config_ppu_v1.c +++ b/product/sgm776/scp_romfw/config_ppu_v1.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include "sgm776_irq.h" +#include "sgm776_mmap.h" + +#include <mod_msys_rom.h> +#include <mod_power_domain.h> +#include <mod_ppu_v1.h> + #include <fwk_element.h> -#include <fwk_mm.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_msys_rom.h> -#include <mod_ppu_v1.h> -#include <sgm776_irq.h> -#include <sgm776_mmap.h> + +#include <stdbool.h> static struct fwk_element sgm776_ppu_v1_element_table[] = { { diff --git a/product/sgm776/scp_romfw/config_sds.c b/product/sgm776/scp_romfw/config_sds.c index ffae2b24..b6d832ab 100644 --- a/product/sgm776/scp_romfw/config_sds.c +++ b/product/sgm776/scp_romfw/config_sds.c @@ -5,19 +5,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "sgm776_mmap.h" +#include "sgm776_pik.h" +#include "sgm776_pik_scp.h" +#include "sgm776_sds.h" +#include "system_mmap.h" + +#include <mod_sds.h> +#include <mod_sid.h> + #include <fwk_assert.h> -#include <stdint.h> #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_sds.h> -#include <mod_sid.h> -#include <sgm776_mmap.h> -#include <sgm776_sds.h> -#include <sgm776_pik.h> -#include <system_mmap.h> -#include <clock_devices.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stdint.h> static const uint32_t version_packed = FWK_BUILD_VERSION; static struct sgm776_sds_platid platid; diff --git a/product/sgm776/scp_romfw/config_system_pll.c b/product/sgm776/scp_romfw/config_system_pll.c index 01beaf6c..b77b5cc0 100644 --- a/product/sgm776/scp_romfw/config_system_pll.c +++ b/product/sgm776/scp_romfw/config_system_pll.c @@ -5,12 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_pik.h" +#include "sgm776_pik_scp.h" +#include "system_mmap.h" + +#include <mod_system_pll.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_system_pll.h> -#include <sgm776_pik.h> -#include <system_mmap.h> + +#include <stdbool.h> static const struct fwk_element system_pll_element_table[] = { { diff --git a/product/sgm776/scp_romfw/config_timer.c b/product/sgm776/scp_romfw/config_timer.c index 62d2d523..b73a1533 100644 --- a/product/sgm776/scp_romfw/config_timer.c +++ b/product/sgm776/scp_romfw/config_timer.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "clock_devices.h" +#include "sgm776_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <sgm776_mmap.h> -#include <clock_devices.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/sgm776/scp_romfw/fmw_memory.h b/product/sgm776/scp_romfw/fmw_memory.h index 2ab23458..2c1acfb5 100644 --- a/product/sgm776/scp_romfw/fmw_memory.h +++ b/product/sgm776/scp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <system_mmap_scp.h> +#include "system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/sgm776/src/config_sid.c b/product/sgm776/src/config_sid.c index 8cd12d71..de443429 100644 --- a/product/sgm776/src/config_sid.c +++ b/product/sgm776/src/config_sid.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "sgm776_mmap.h" +#include "sgm776_sid.h" + +#include <mod_sid.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_module.h> -#include <mod_sid.h> -#include <sgm776_mmap.h> -#include <sgm776_sid.h> static const struct fwk_element subsystem_table[] = { { diff --git a/product/sgm776/src/config_system_info.c b/product/sgm776/src/config_system_info.c index 6fc99805..23a2b480 100644 --- a/product/sgm776/src/config_system_info.c +++ b/product/sgm776/src/config_system_info.c @@ -5,11 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_macros.h> +#include <mod_sid.h> +#include <mod_system_info.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_system_info.h> -#include <mod_sid.h> + +#include <stddef.h> const struct fwk_module_config config_system_info = { .get_element_table = NULL, diff --git a/product/sgm776/src/sgm776_core.c b/product/sgm776/src/sgm776_core.c index d78df954..c038949d 100644 --- a/product/sgm776/src/sgm776_core.c +++ b/product/sgm776/src/sgm776_core.c @@ -5,8 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <sgm776_pik.h> -#include <sgm776_core.h> +#include "sgm776_core.h" +#include "sgm776_pik.h" +#include "sgm776_pik_cpu.h" unsigned int sgm776_core_get_count(void) { diff --git a/product/synquacer/include/mmu500.h b/product/synquacer/include/mmu500.h index ef452ce4..41cb073e 100644 --- a/product/synquacer/include/mmu500.h +++ b/product/synquacer/include/mmu500.h @@ -8,9 +8,10 @@ #ifndef MMU500_H #define MMU500_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + #define SMMU_NUMSMRG 16 #define SMMU_NUMCB 8 diff --git a/product/synquacer/include/pik_cpu.h b/product/synquacer/include/pik_cpu.h index b931abb0..9c392431 100644 --- a/product/synquacer/include/pik_cpu.h +++ b/product/synquacer/include/pik_cpu.h @@ -8,9 +8,10 @@ #ifndef PIK_CPU_H #define PIK_CPU_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief CPU PIK register definitions */ diff --git a/product/synquacer/include/pik_scp.h b/product/synquacer/include/pik_scp.h index 45aaaaf4..7e01a113 100644 --- a/product/synquacer/include/pik_scp.h +++ b/product/synquacer/include/pik_scp.h @@ -8,9 +8,10 @@ #ifndef PIK_SCP_H #define PIK_SCP_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \brief SCP PIK register definitions */ diff --git a/product/synquacer/include/pik_system.h b/product/synquacer/include/pik_system.h index 63f4de89..711a03c3 100644 --- a/product/synquacer/include/pik_system.h +++ b/product/synquacer/include/pik_system.h @@ -8,9 +8,10 @@ #ifndef PIK_SYSTEM_H #define PIK_SYSTEM_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + typedef struct { FWK_R uint32_t RESERVED0[512]; FWK_RW uint32_t PPUCLK_CTRL; diff --git a/product/synquacer/include/synquacer_common.h b/product/synquacer/include/synquacer_common.h index 768f4695..d6dec2a1 100644 --- a/product/synquacer/include/synquacer_common.h +++ b/product/synquacer/include/synquacer_common.h @@ -9,8 +9,11 @@ #define SYNQUACER_COMMON_H #ifdef HAS_RTOS -#include <cmsis_os2.h> +# include <cmsis_os2.h> #endif + +#include <fmw_cmsis.h> + #include <stdbool.h> #include <stdint.h> diff --git a/product/synquacer/include/synquacer_config.h b/product/synquacer/include/synquacer_config.h index fee27dcc..80c4765a 100644 --- a/product/synquacer/include/synquacer_config.h +++ b/product/synquacer/include/synquacer_config.h @@ -8,9 +8,10 @@ #ifndef SYNQUACER_CONFIG_H #define SYNQUACER_CONFIG_H +#include "synquacer_mmap.h" + #include <stdbool.h> #include <stdint.h> -#include <synquacer_mmap.h> #define THRESHOLD_TYPE_UNR (0) #define THRESHOLD_TYPE_UCR (1) diff --git a/product/synquacer/include/synquacer_debug.h b/product/synquacer/include/synquacer_debug.h index cef4f679..31de5fad 100644 --- a/product/synquacer/include/synquacer_debug.h +++ b/product/synquacer/include/synquacer_debug.h @@ -8,12 +8,14 @@ #ifndef SYNQUACER_DEBUG_H #define SYNQUACER_DEBUG_H -#include <stdbool.h> -#include <stdint.h> -#include <fwk_assert.h> #include <mod_log.h> #include <mod_synquacer_system.h> +#include <fwk_assert.h> + +#include <stdbool.h> +#include <stdint.h> + #ifdef SYNQUACER_LOG_GROUP_ERROR #define SYNQUACER_DEV_LOG_ERROR(...) \ synquacer_system_ctx.log_api->log(MOD_LOG_GROUP_ERROR, __VA_ARGS__) diff --git a/product/synquacer/include/synquacer_mmap.h b/product/synquacer/include/synquacer_mmap.h index 38f67259..7a7b4104 100644 --- a/product/synquacer/include/synquacer_mmap.h +++ b/product/synquacer/include/synquacer_mmap.h @@ -8,8 +8,8 @@ #ifndef SYNQUACER_MMAP_H #define SYNQUACER_MMAP_H -#include <synquacer_common.h> -#include <synquacer_pik.h> +#include "synquacer_common.h" +#include "synquacer_pik.h" #define PERIPH_BASE UINT32_C(0x44000000) #define POWER_PERIPH_BASE UINT32_C(0x50000000) diff --git a/product/synquacer/include/synquacer_pik.h b/product/synquacer/include/synquacer_pik.h index 26bbae42..3910c7c6 100644 --- a/product/synquacer/include/synquacer_pik.h +++ b/product/synquacer/include/synquacer_pik.h @@ -8,16 +8,20 @@ #ifndef SYNQUACER_PIK_H #define SYNQUACER_PIK_H -#include <stdint.h> -#include <fmw_cmsis.h> -#include <fwk_macros.h> -#include <synquacer_irq.h> -#include <synquacer_mmap.h> -#include <pik_cpu.h> -#include <pik_scp.h> -#include <pik_system.h> +#include "pik_cpu.h" +#include "pik_scp.h" +#include "pik_system.h" +#include "synquacer_irq.h" +#include "synquacer_mmap.h" + #include <ppu_v0.h> +#include <fwk_macros.h> + +#include <fmw_cmsis.h> + +#include <stdint.h> + #define PIK_SCP_BASE (POWER_PERIPH_BASE + 0x00000) #define PIK_DEBUG_BASE (POWER_PERIPH_BASE + 0x20000) #define PIK_SYSTEM_BASE (POWER_PERIPH_BASE + 0x40000) diff --git a/product/synquacer/module/ccn512/include/internal/ccn512.h b/product/synquacer/module/ccn512/include/internal/ccn512.h index 854f51bb..6d314dcc 100644 --- a/product/synquacer/module/ccn512/include/internal/ccn512.h +++ b/product/synquacer/module/ccn512/include/internal/ccn512.h @@ -8,9 +8,10 @@ #ifndef INTERNAL_CCN512_H #define INTERNAL_CCN512_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /* * CCN5xx miscellaneous node (MN) registers */ diff --git a/product/synquacer/module/ccn512/include/mod_ccn512.h b/product/synquacer/module/ccn512/include/mod_ccn512.h index e6c310d1..b43279e7 100644 --- a/product/synquacer/module/ccn512/include/mod_ccn512.h +++ b/product/synquacer/module/ccn512/include/mod_ccn512.h @@ -8,10 +8,12 @@ #ifndef MOD_CCN512_H #define MOD_CCN512_H -#include <stdint.h> +#include <internal/ccn512.h> + #include <fwk_id.h> #include <fwk_macros.h> -#include <internal/ccn512.h> + +#include <stdint.h> /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules diff --git a/product/synquacer/module/ccn512/src/mod_ccn512.c b/product/synquacer/module/ccn512/src/mod_ccn512.c index f6186aee..403589f7 100644 --- a/product/synquacer/module/ccn512/src/mod_ccn512.c +++ b/product/synquacer/module/ccn512/src/mod_ccn512.c @@ -5,16 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "synquacer_ddr.h" + +#include <internal/ccn512.h> + +#include <mod_ccn512.h> +#include <mod_log.h> + #include <fwk_assert.h> -#include <fwk_mm.h> +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_ccn512.h> -#include <mod_log.h> -#include <synquacer_ddr.h> -#include <synquacer_mmap.h> -#include <sysdef_option.h> + +#include <fmw_cmsis.h> + +#include <stddef.h> +#include <stdint.h> static struct mod_log_api *log_api; diff --git a/product/synquacer/module/f_i2c/include/i2c_api.h b/product/synquacer/module/f_i2c/include/i2c_api.h index c57216ff..45ecf222 100644 --- a/product/synquacer/module/f_i2c/include/i2c_api.h +++ b/product/synquacer/module/f_i2c/include/i2c_api.h @@ -8,10 +8,11 @@ #ifndef I2C_API_H #define I2C_API_H -#include <stdint.h> #include <internal/i2c_depend.h> #include <internal/i2c_driver.h> +#include <stdint.h> + #define I2C_MP_START_ADDR 0x50 I2C_ERR_t f_i2c_api_recv_data( diff --git a/product/synquacer/module/f_i2c/include/internal/i2c_depend.h b/product/synquacer/module/f_i2c/include/internal/i2c_depend.h index bd8bad92..3f78206b 100644 --- a/product/synquacer/module/f_i2c/include/internal/i2c_depend.h +++ b/product/synquacer/module/f_i2c/include/internal/i2c_depend.h @@ -8,9 +8,10 @@ #ifndef INTERNAL_I2C_DEPEND_H #define INTERNAL_I2C_DEPEND_H -#include <stdint.h> #include <internal/i2c_driver.h> +#include <stdint.h> + typedef enum { I2C_EN_CH0, I2C_EN_CH1, I2C_EN_CH2 } I2C_EN_CH_t; I2C_ST_PACKET_INFO_t *i2c_get_channel_structure(I2C_EN_CH_t ch); diff --git a/product/synquacer/module/f_i2c/include/internal/i2c_reg_access.h b/product/synquacer/module/f_i2c/include/internal/i2c_reg_access.h index cfe1e026..8b713cdf 100644 --- a/product/synquacer/module/f_i2c/include/internal/i2c_reg_access.h +++ b/product/synquacer/module/f_i2c/include/internal/i2c_reg_access.h @@ -8,9 +8,10 @@ #ifndef INTERNAL_I2C_REG_ACCESS_H #define INTERNAL_I2C_REG_ACCESS_H -#include <stdint.h> #include <internal/i2c_driver.h> +#include <stdint.h> + /* F_I2C Register Write */ void f_i2c_write_BSR(I2C_ST_PACKET_INFO_t *packet_info, uint8_t value); void f_i2c_write_BCR(I2C_ST_PACKET_INFO_t *packet_info, uint8_t value); diff --git a/product/synquacer/module/f_i2c/include/mod_f_i2c.h b/product/synquacer/module/f_i2c/include/mod_f_i2c.h index 4295010c..4545ea30 100644 --- a/product/synquacer/module/f_i2c/include/mod_f_i2c.h +++ b/product/synquacer/module/f_i2c/include/mod_f_i2c.h @@ -8,10 +8,15 @@ #ifndef MOD_F_I2C_H #define MOD_F_I2C_H -#include <stdint.h> -#include <fwk_id.h> #include <i2c_api.h> +#include <internal/i2c_depend.h> +#include <internal/i2c_driver.h> + +#include <fwk_id.h> + +#include <stdint.h> + /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules * @{ diff --git a/product/synquacer/module/f_i2c/src/i2c_api.c b/product/synquacer/module/f_i2c/src/i2c_api.c index 4e2207fd..a5fcf304 100644 --- a/product/synquacer/module/f_i2c/src/i2c_api.c +++ b/product/synquacer/module/f_i2c/src/i2c_api.c @@ -5,9 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <i2c_api.h> + +#include <internal/i2c_depend.h> +#include <internal/i2c_driver.h> + #include <stdbool.h> #include <stdio.h> -#include <i2c_api.h> #define FILE_GRP_ID DBG_DRV_I2C #define MASTER_CODE_VAL 0x04 diff --git a/product/synquacer/module/f_i2c/src/i2c_depend.c b/product/synquacer/module/f_i2c/src/i2c_depend.c index dd7a4460..7375bb03 100644 --- a/product/synquacer/module/f_i2c/src/i2c_depend.c +++ b/product/synquacer/module/f_i2c/src/i2c_depend.c @@ -5,12 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdio.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <i2c_api.h> +#include "synquacer_debug.h" +#include "synquacer_mmap.h" + #include <internal/i2c_depend.h> +#include <internal/i2c_driver.h> + +#include <fwk_macros.h> + +#include <stdio.h> typedef unsigned int ADDR_T; diff --git a/product/synquacer/module/f_i2c/src/i2c_driver.c b/product/synquacer/module/f_i2c/src/i2c_driver.c index 9e50c87e..08ec2c67 100644 --- a/product/synquacer/module/f_i2c/src/i2c_driver.c +++ b/product/synquacer/module/f_i2c/src/i2c_driver.c @@ -5,14 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> -#include <fmw_cmsis.h> #include <internal/i2c_driver.h> #include <internal/i2c_reg.h> #include <internal/i2c_reg_access.h> +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> + #define FILE_GRP_ID DBG_DRV_I2C #define DEBUG_PrintError(...) diff --git a/product/synquacer/module/f_i2c/src/i2c_reg_access.c b/product/synquacer/module/f_i2c/src/i2c_reg_access.c index f773b6e4..788f3786 100644 --- a/product/synquacer/module/f_i2c/src/i2c_reg_access.c +++ b/product/synquacer/module/f_i2c/src/i2c_reg_access.c @@ -5,12 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> +#include <internal/i2c_driver.h> #include <internal/i2c_reg.h> #include <internal/i2c_reg_access.h> +#include <stdint.h> + static inline void i2c_write_reg( uint32_t base_addr, uint32_t reg_addr, diff --git a/product/synquacer/module/f_i2c/src/mod_f_i2c.c b/product/synquacer/module/f_i2c/src/mod_f_i2c.c index 6c03d660..29d15c0b 100644 --- a/product/synquacer/module/f_i2c/src/mod_f_i2c.c +++ b/product/synquacer/module/f_i2c/src/mod_f_i2c.c @@ -5,15 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_assert.h> -#include <fwk_mm.h> +#include <i2c_api.h> + +#include <mod_f_i2c.h> + +#include <fwk_id.h> #include <fwk_module.h> -#include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_f_i2c.h> -#include <mod_log.h> -#include <i2c_api.h> static struct mod_f_i2c_api module_api = { .init = i2c_construction, diff --git a/product/synquacer/module/f_uart3/include/mod_f_uart3.h b/product/synquacer/module/f_uart3/include/mod_f_uart3.h index 900fb896..b151bbe9 100644 --- a/product/synquacer/module/f_uart3/include/mod_f_uart3.h +++ b/product/synquacer/module/f_uart3/include/mod_f_uart3.h @@ -8,9 +8,10 @@ #ifndef MOD_F_UART3_H #define MOD_F_UART3_H -#include <stdint.h> #include <fwk_id.h> +#include <stdint.h> + /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules * @{ diff --git a/product/synquacer/module/f_uart3/src/f_uart3.h b/product/synquacer/module/f_uart3/src/f_uart3.h index c2bea72a..c032fb42 100644 --- a/product/synquacer/module/f_uart3/src/f_uart3.h +++ b/product/synquacer/module/f_uart3/src/f_uart3.h @@ -8,9 +8,10 @@ #ifndef F_UART3_H #define F_UART3_H -#include <stdint.h> #include <fwk_macros.h> +#include <stdint.h> + /* Normal mode registers */ struct f_uart3_reg { FWK_RW uint32_t RFR_TFR; /* R->RFR, W->TFR */ diff --git a/product/synquacer/module/f_uart3/src/mod_f_uart3.c b/product/synquacer/module/f_uart3/src/mod_f_uart3.c index e33184b2..075602f8 100644 --- a/product/synquacer/module/f_uart3/src/mod_f_uart3.c +++ b/product/synquacer/module/f_uart3/src/mod_f_uart3.c @@ -5,16 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fmw_cmsis.h> -#include <fwk_assert.h> +#include <f_uart3.h> + +#include <mod_f_uart3.h> +#include <mod_log.h> + +#include <fwk_id.h> #include <fwk_mm.h> #include <fwk_module.h> -#include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_f_uart3.h> -#include <mod_log.h> -#include <f_uart3.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stddef.h> static const struct mod_f_uart3_device_config **device_config_table; diff --git a/product/synquacer/module/hsspi/include/internal/hsspi_api.h b/product/synquacer/module/hsspi/include/internal/hsspi_api.h index 0d9a5e5e..bf1e2e78 100644 --- a/product/synquacer/module/hsspi/include/internal/hsspi_api.h +++ b/product/synquacer/module/hsspi/include/internal/hsspi_api.h @@ -8,9 +8,10 @@ #ifndef INTERNAL_HSSPI_API_H #define INTERNAL_HSSPI_API_H +#include <internal/hsspi_driver.h> + #include <stdbool.h> #include <stdint.h> -#include <internal/hsspi_driver.h> struct HSSPI_clk_config { HSSPI_EN_MCTRL_CDSS_t clk_sel; diff --git a/product/synquacer/module/hsspi/include/internal/hsspi_driver.h b/product/synquacer/module/hsspi/include/internal/hsspi_driver.h index fe06ec55..dadd1781 100644 --- a/product/synquacer/module/hsspi/include/internal/hsspi_driver.h +++ b/product/synquacer/module/hsspi/include/internal/hsspi_driver.h @@ -8,10 +8,12 @@ #ifndef INTERNAL_HSSPI_DRIVER_H #define INTERNAL_HSSPI_DRIVER_H -#include <stdint.h> -#include <synquacer_mmap.h> +#include "synquacer_mmap.h" + #include <internal/reg_HSSPI.h> +#include <stdint.h> + #define MEM_HSSPI_BYTE(var) ((volatile uint8_t *)(var)) #define MEM_HSSPI_HALF(var) ((volatile uint16_t *)(var)) #define MEM_HSSPI_WORD(var) ((volatile uint32_t *)(var)) diff --git a/product/synquacer/module/hsspi/include/mod_hsspi.h b/product/synquacer/module/hsspi/include/mod_hsspi.h index 99b6b2ea..801c2d1b 100644 --- a/product/synquacer/module/hsspi/include/mod_hsspi.h +++ b/product/synquacer/module/hsspi/include/mod_hsspi.h @@ -8,9 +8,11 @@ #ifndef MOD_HSSPI_H #define MOD_HSSPI_H -#include <stdint.h> -#include <fwk_id.h> #include <internal/hsspi_api.h> + +#include <fwk_id.h> + +#include <stdint.h> /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules * @{ diff --git a/product/synquacer/module/hsspi/src/hsspi_api.c b/product/synquacer/module/hsspi/src/hsspi_api.c index a3b7fccd..304255ce 100644 --- a/product/synquacer/module/hsspi/src/hsspi_api.c +++ b/product/synquacer/module/hsspi/src/hsspi_api.c @@ -5,13 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include "synquacer_debug.h" +#include "synquacer_mmap.h" + #include <internal/hsspi_api.h> #include <internal/hsspi_driver.h> +#include <internal/reg_HSSPI.h> + +#include <stdbool.h> #define FILE_GRP_ID DBG_DRV_HSSPI #define xcpb_bridge_mode_set(enable) diff --git a/product/synquacer/module/hsspi/src/hsspi_driver.c b/product/synquacer/module/hsspi/src/hsspi_driver.c index 6dc75e2c..0e5c01a2 100644 --- a/product/synquacer/module/hsspi/src/hsspi_driver.c +++ b/product/synquacer/module/hsspi/src/hsspi_driver.c @@ -5,16 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "synquacer_debug.h" +#include "synquacer_mmap.h" -#include <fmw_cmsis.h> #include <cmsis_os2.h> -#include <synquacer_debug.h> - #include <internal/hsspi_driver.h> #include <internal/reg_HSSPI.h> +#include <fmw_cmsis.h> + +#include <stddef.h> +#include <stdint.h> + static const uint16_t m_awcCommandList_NULL[] = { /* DATA[15:8] CONT[3] TRP[2:1] DEC[0] */ MAKE_CSDC(0x07, 0, HSSPI_EN_TRP_MBM, 1), /* EndOfList */ diff --git a/product/synquacer/module/hsspi/src/mod_hsspi.c b/product/synquacer/module/hsspi/src/mod_hsspi.c index f44b3a2c..b889881f 100644 --- a/product/synquacer/module/hsspi/src/mod_hsspi.c +++ b/product/synquacer/module/hsspi/src/mod_hsspi.c @@ -5,18 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <fmw_cmsis.h> -#include <fwk_assert.h> -#include <fwk_mm.h> +#include <internal/hsspi_api.h> + +#include <mod_hsspi.h> + +#include <fwk_id.h> #include <fwk_module.h> -#include <fwk_notification.h> #include <fwk_status.h> -#include <mod_clock.h> -#include <mod_hsspi.h> -#include <mod_log.h> -#include <internal/hsspi_api.h> static struct mod_hsspi_api module_api = { .hsspi_init = HSSPI_init, diff --git a/product/synquacer/module/ppu_v0_synquacer/include/mod_ppu_v0.h b/product/synquacer/module/ppu_v0_synquacer/include/mod_ppu_v0.h index a9eebf91..89d1492d 100644 --- a/product/synquacer/module/ppu_v0_synquacer/include/mod_ppu_v0.h +++ b/product/synquacer/module/ppu_v0_synquacer/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 GroupSYNQUACERModule SYNQUACER Product Modules diff --git a/product/synquacer/module/ppu_v0_synquacer/include/ppu_v0.h b/product/synquacer/module/ppu_v0_synquacer/include/ppu_v0.h index c216f224..d4509c37 100644 --- a/product/synquacer/module/ppu_v0_synquacer/include/ppu_v0.h +++ b/product/synquacer/module/ppu_v0_synquacer/include/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/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c b/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c index 25738752..2b637265 100644 --- a/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c +++ b/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c @@ -8,21 +8,26 @@ * Power State Management PPU v0 driver. */ -#include <stdint.h> +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_ppu_v0.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 <mod_log.h> -#include <mod_power_domain.h> -#include <mod_ppu_v0.h> + +#include <stddef.h> +#include <stdint.h> #if BUILD_HAS_MOD_SYSTEM_POWER -#include <mod_system_power.h> +# include <mod_system_power.h> #endif #include <ppu_v0.h> +#include <fwk_status.h> + /* Power domain context */ struct ppu_v0_pd_ctx { /* Power domain configuration data */ diff --git a/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c b/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c index 2c8961fb..19e43b41 100644 --- a/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c +++ b/product/synquacer/module/ppu_v0_synquacer/src/ppu_v0.c @@ -5,10 +5,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stddef.h> +#include <ppu_v0.h> + #include <fwk_assert.h> #include <fwk_status.h> -#include <ppu_v0.h> + +#include <stddef.h> void ppu_v0_init(struct ppu_v0_reg *ppu) { diff --git a/product/synquacer/module/scmi_vendor_ext/include/internal/scmi_vendor_ext.h b/product/synquacer/module/scmi_vendor_ext/include/internal/scmi_vendor_ext.h index b9cfd6b1..eedbd48b 100644 --- a/product/synquacer/module/scmi_vendor_ext/include/internal/scmi_vendor_ext.h +++ b/product/synquacer/module/scmi_vendor_ext/include/internal/scmi_vendor_ext.h @@ -11,6 +11,8 @@ #ifndef INTERNAL_SCMI_VENDOR_EXT_H #define INTERNAL_SCMI_VENDOR_EXT_H +#include <stdint.h> + /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules * @{ diff --git a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c index d0e3cb48..1aeb169c 100644 --- a/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c +++ b/product/synquacer/module/scmi_vendor_ext/src/mod_scmi_vendor_ext.c @@ -5,20 +5,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <string.h> +#include "synquacer_ddr.h" + +#include <ddr_init.h> + +#include <internal/scmi.h> +#include <internal/scmi_vendor_ext.h> + +#include <mod_log.h> +#include <mod_scmi.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 <mod_log.h> -#include <mod_scmi.h> -#include <ddr_init.h> -#include <synquacer_ddr.h> -#include <internal/scmi.h> -#include <internal/scmi_vendor_ext.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> struct scmi_vendor_ext_ctx { const struct mod_scmi_from_protocol_api *scmi_api; diff --git a/product/synquacer/module/synquacer_memc/include/ddr_init.h b/product/synquacer/module/synquacer_memc/include/ddr_init.h index ff31fe26..077f3bf0 100644 --- a/product/synquacer/module/synquacer_memc/include/ddr_init.h +++ b/product/synquacer/module/synquacer_memc/include/ddr_init.h @@ -8,14 +8,20 @@ #ifndef DDR_INIT_H #define DDR_INIT_H -#include <stdint.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> +#include "synquacer_debug.h" +#include "synquacer_mmap.h" + #include <cmsis_os.h> +#include <cmsis_os2.h> #include <internal/reg_DDRPHY_CONFIG.h> #include <internal/reg_DMC520.h> +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> + #define printf(...) SYNQUACER_DEV_LOG_INFO("[DDR] " __VA_ARGS__) #define pr_err(...) SYNQUACER_DEV_LOG_ERROR("[DDR] " __VA_ARGS__) diff --git a/product/synquacer/module/synquacer_memc/include/mod_synquacer_memc.h b/product/synquacer/module/synquacer_memc/include/mod_synquacer_memc.h index 45d0fcd4..e2c44ce6 100644 --- a/product/synquacer/module/synquacer_memc/include/mod_synquacer_memc.h +++ b/product/synquacer/module/synquacer_memc/include/mod_synquacer_memc.h @@ -8,10 +8,11 @@ #ifndef MOD_SYNQUACER_MEMC_H #define MOD_SYNQUACER_MEMC_H -#include <stdint.h> #include <fwk_id.h> #include <fwk_macros.h> +#include <stdint.h> + /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules * @{ diff --git a/product/synquacer/module/synquacer_memc/include/synquacer_ddr.h b/product/synquacer/module/synquacer_memc/include/synquacer_ddr.h index c8aafb61..fb653ca6 100644 --- a/product/synquacer/module/synquacer_memc/include/synquacer_ddr.h +++ b/product/synquacer/module/synquacer_memc/include/synquacer_ddr.h @@ -8,6 +8,8 @@ #ifndef SYNQUACER_DDR_H #define SYNQUACER_DDR_H +#include "synquacer_mmap.h" + #include <stdbool.h> #include <stdint.h> diff --git a/product/synquacer/module/synquacer_memc/src/ddr_init.c b/product/synquacer/module/synquacer_memc/src/ddr_init.c index dfaeb1e1..ff046014 100644 --- a/product/synquacer/module/synquacer_memc/src/ddr_init.c +++ b/product/synquacer/module/synquacer_memc/src/ddr_init.c @@ -5,12 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <synquacer_config.h> -#include <synquacer_ddr.h> +#include "synquacer_config.h" +#include "synquacer_ddr.h" + #include <boot_ctl.h> #include <ddr_init.h> +#include <internal/reg_DDRPHY_CONFIG.h> +#include <internal/reg_DMC520.h> + +#include <stdint.h> + extern void usleep_en(uint32_t usec); int ddr_init_mc0_mp(REG_ST_DMC520 *REG_DMC520); diff --git a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c index 49fc0436..7eeb3624 100644 --- a/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c +++ b/product/synquacer/module/synquacer_memc/src/mod_synquacer_memc.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_assert.h> +#include "synquacer_ddr.h" + +#include <mod_log.h> +#include <mod_synquacer_memc.h> + +#include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> -#include <mod_log.h> -#include <mod_synquacer_memc.h> -#include <synquacer_ddr.h> const struct mod_f_i2c_api *f_i2c_api; static struct mod_log_api *log_api; diff --git a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c index 31778694..1b66eb10 100644 --- a/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c +++ b/product/synquacer/module/synquacer_memc/src/synquacer_ddr.c @@ -5,23 +5,30 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <string.h> -#include <fwk_status.h> -#include <mod_f_i2c.h> -#include <synquacer_config.h> -#include <synquacer_ddr.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <internal/reg_DMA330.h> +#include "low_level_access.h" +#include "mmu500.h" +#include "synquacer_config.h" +#include "synquacer_ddr.h" +#include "synquacer_debug.h" +#include "synquacer_mmap.h" + #include <cmsis_os2.h> #include <ddr_init.h> -#include <i2c_api.h> -#include <low_level_access.h> -#include <mmu500.h> #include <sysdef_option.h> +#include <internal/i2c_depend.h> +#include <internal/i2c_driver.h> +#include <internal/reg_DMA330.h> + +#include <mod_f_i2c.h> + +#include <fwk_assert.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> + extern const struct mod_f_i2c_api *f_i2c_api; #define CONFIG_DDR_ERROR_FORCE_STOP diff --git a/product/synquacer/module/synquacer_pik_clock/include/mod_synquacer_pik_clock.h b/product/synquacer/module/synquacer_pik_clock/include/mod_synquacer_pik_clock.h index 428d42d5..8247b980 100644 --- a/product/synquacer/module/synquacer_pik_clock/include/mod_synquacer_pik_clock.h +++ b/product/synquacer/module/synquacer_pik_clock/include/mod_synquacer_pik_clock.h @@ -8,9 +8,11 @@ #ifndef MOD_SYNQUACER_PIK_CLOCK_H #define MOD_SYNQUACER_PIK_CLOCK_H -#include <stdint.h> #include <fwk_element.h> +#include <stdbool.h> +#include <stdint.h> + /*! * \addtogroup GroupSYNQUACERModule SYNQUACER Product Modules * @{ diff --git a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c index cb3e01ac..8f542fc9 100644 --- a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c +++ b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c @@ -5,19 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdlib.h> -#include <fwk_assert.h> -#include <fwk_element.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_power_domain.h> #include <mod_synquacer_pik_clock.h> +#include <fwk_id.h> +#include <fwk_mm.h> +#include <fwk_module.h> +#include <fwk_status.h> + +#include <stdint.h> +#include <stdlib.h> + /* * Masks for single-source clock divider control. */ diff --git a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c index a0c445db..56bc8246 100644 --- a/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c +++ b/product/synquacer/module/synquacer_rom/src/mod_synquacer_rom.c @@ -5,15 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include <mod_log.h> +#include <mod_synquacer_rom.h> + +#include <fwk_event.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_status.h> #include <fwk_thread.h> -#include <mod_log.h> -#include <mod_synquacer_rom.h> + +#include <stdint.h> +#include <string.h> void synquacer_system_init(void); diff --git a/product/synquacer/module/synquacer_rom/src/synquacer_init.c b/product/synquacer/module/synquacer_rom/src/synquacer_init.c index 63fbfdd0..e5f3237b 100644 --- a/product/synquacer/module/synquacer_rom/src/synquacer_init.c +++ b/product/synquacer/module/synquacer_rom/src/synquacer_init.c @@ -5,11 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include "low_level_access.h" +#include "pik_scp.h" +#include "pik_system.h" +#include "synquacer_mmap.h" + #include <ppu_v0.h> +#include <fwk_macros.h> + +#include <stdbool.h> +#include <stdint.h> + void fw_clk_init(void); void fw_sysoc_init(void); void fw_lpcm_init(void); diff --git a/product/synquacer/module/synquacer_system/include/internal/crg11.h b/product/synquacer/module/synquacer_system/include/internal/crg11.h index f8a1d65e..bdfe1a9a 100644 --- a/product/synquacer/module/synquacer_system/include/internal/crg11.h +++ b/product/synquacer/module/synquacer_system/include/internal/crg11.h @@ -8,10 +8,12 @@ #ifndef INTERNAL_CRG11_H #define INTERNAL_CRG11_H +#include "synquacer_mmap.h" + +#include <cmsis_os2.h> + #include <stdbool.h> #include <stdint.h> -#include <synquacer_mmap.h> -#include <cmsis_os2.h> /* CRG11 is only used to reboot system */ #define CRG11_CRSWR(crg11_top_reg_addr) (crg11_top_reg_addr + 0x0024U) diff --git a/product/synquacer/module/synquacer_system/include/internal/gpio.h b/product/synquacer/module/synquacer_system/include/internal/gpio.h index a235f98b..37f8c2e5 100644 --- a/product/synquacer/module/synquacer_system/include/internal/gpio.h +++ b/product/synquacer/module/synquacer_system/include/internal/gpio.h @@ -8,8 +8,9 @@ #ifndef INTERNAL_GPIO_H #define INTERNAL_GPIO_H +#include "synquacer_mmap.h" + #include <stdint.h> -#include <synquacer_mmap.h> #define PRMUX_MAX_IDX CONFIG_SOC_PRMUX_MAX_IDX #define GPIO_MAX_IDX 3 diff --git a/product/synquacer/module/synquacer_system/include/internal/smmu_wrapper.h b/product/synquacer/module/synquacer_system/include/internal/smmu_wrapper.h index 377785cf..c5bddbdb 100644 --- a/product/synquacer/module/synquacer_system/include/internal/smmu_wrapper.h +++ b/product/synquacer/module/synquacer_system/include/internal/smmu_wrapper.h @@ -8,8 +8,8 @@ #ifndef INTERNAL_SMMU_WRAPPER_H #define INTERNAL_SMMU_WRAPPER_H -#include <synquacer_debug.h> -#include <synquacer_mmap.h> +#include "synquacer_debug.h" +#include "synquacer_mmap.h" #ifdef CONFIG_SCB_USE_PCIE_INTERCONNECT diff --git a/product/synquacer/module/synquacer_system/include/internal/synquacer_pd.h b/product/synquacer/module/synquacer_system/include/internal/synquacer_pd.h index 2745000c..427f5407 100644 --- a/product/synquacer/module/synquacer_system/include/internal/synquacer_pd.h +++ b/product/synquacer/module/synquacer_system/include/internal/synquacer_pd.h @@ -8,9 +8,10 @@ #ifndef INTERNAL_SYNQUACER_PD_H #define INTERNAL_SYNQUACER_PD_H -#include <internal/reset.h> #include <ppu_v0.h> +#include <internal/reset.h> + #define PD_TIMEOUT_MS 200 #define PD_CHECK_CYCLE_MS 1 diff --git a/product/synquacer/module/synquacer_system/include/internal/synquacer_ppu_driver.h b/product/synquacer/module/synquacer_system/include/internal/synquacer_ppu_driver.h index 7f1d3a78..f5b016be 100644 --- a/product/synquacer/module/synquacer_system/include/internal/synquacer_ppu_driver.h +++ b/product/synquacer/module/synquacer_system/include/internal/synquacer_ppu_driver.h @@ -10,6 +10,8 @@ #include <internal/reg_PPU.h> +#include <stdint.h> + #define PPU_INT_PPU0 20 #define PPU_INT_PPU1 21 #define PPU_INT_PPU2 22 diff --git a/product/synquacer/module/synquacer_system/include/internal/transaction_sw.h b/product/synquacer/module/synquacer_system/include/internal/transaction_sw.h index c9fc5cc5..e5f8458a 100644 --- a/product/synquacer/module/synquacer_system/include/internal/transaction_sw.h +++ b/product/synquacer/module/synquacer_system/include/internal/transaction_sw.h @@ -8,6 +8,8 @@ #ifndef INTERNAL_TRANSACTION_SW_H #define INTERNAL_TRANSACTION_SW_H +#include <stdint.h> + void set_transactionsw_off( uint32_t transactionsw_reg_addr, uint32_t disable_bit); diff --git a/product/synquacer/module/synquacer_system/include/sysdef_option.h b/product/synquacer/module/synquacer_system/include/sysdef_option.h index 7f5512c3..4ab27601 100644 --- a/product/synquacer/module/synquacer_system/include/sysdef_option.h +++ b/product/synquacer/module/synquacer_system/include/sysdef_option.h @@ -8,6 +8,9 @@ #ifndef SYSDEF_OPTION_H #define SYSDEF_OPTION_H +#include <stdbool.h> +#include <stdint.h> + #define NIC_CONFIG_NUM 6 #define I2C_TEG_START_ADDR 0x51 diff --git a/product/synquacer/module/synquacer_system/src/boot_ctl.c b/product/synquacer/module/synquacer_system/src/boot_ctl.c index c5b150a1..b4e577d1 100644 --- a/product/synquacer/module/synquacer_system/src/boot_ctl.c +++ b/product/synquacer/module/synquacer_system/src/boot_ctl.c @@ -5,11 +5,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "low_level_access.h" +#include "synquacer_mmap.h" -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include <stdint.h> #define REG_ADDR_OFFSET_BOOT_REMAP UINT32_C(0x000) #define REG_ADDR_OFFSET_BOOT_FE UINT32_C(0x004) diff --git a/product/synquacer/module/synquacer_system/src/gpio.c b/product/synquacer/module/synquacer_system/src/gpio.c index 550ffba3..3d96be8b 100644 --- a/product/synquacer/module/synquacer_system/src/gpio.c +++ b/product/synquacer/module/synquacer_system/src/gpio.c @@ -5,13 +5,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include "low_level_access.h" +#include "synquacer_debug.h" +#include "synquacer_mmap.h" + #include <sysdef_option.h> #include <internal/gpio.h> +#include <fwk_macros.h> + +#include <stddef.h> +#include <stdint.h> + static const uint8_t prmux_pingrp[] = CONFIG_SCB_PRMUX_PINGRP; static const uint8_t gpio_direction[] = CONFIG_SCB_GPIO_DIRECTION; static const uint8_t gpio_function[] = CONFIG_SCB_GPIO_FUNCTION; diff --git a/product/synquacer/module/synquacer_system/src/load_secure_fw.c b/product/synquacer/module/synquacer_system/src/load_secure_fw.c index b187a7b1..2c666513 100644 --- a/product/synquacer/module/synquacer_system/src/load_secure_fw.c +++ b/product/synquacer/module/synquacer_system/src/load_secure_fw.c @@ -5,15 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> +#include "synquacer_debug.h" +#include "synquacer_mmap.h" -#include <fwk_assert.h> +#include <ddr_init.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> +#include <fwk_assert.h> +#include <fwk_macros.h> -#include <ddr_init.h> +#include <stdint.h> +#include <string.h> struct fip_toc_header_s { uint32_t name; diff --git a/product/synquacer/module/synquacer_system/src/mmu500.c b/product/synquacer/module/synquacer_system/src/mmu500.c index cd2f4567..2e700891 100644 --- a/product/synquacer/module/synquacer_system/src/mmu500.c +++ b/product/synquacer/module/synquacer_system/src/mmu500.c @@ -5,8 +5,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <synquacer_debug.h> -#include <mmu500.h> +#include "mmu500.h" +#include "synquacer_debug.h" void SMMU_setup_PMU(MMU500_Type_t *SMMU) { diff --git a/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c b/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c index 5208dfe7..173f5341 100644 --- a/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c +++ b/product/synquacer/module/synquacer_system/src/mod_synquacer_system.c @@ -5,28 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include <mod_log.h> +#include <mod_power_domain.h> +#include <mod_synquacer_system.h> +#include <mod_system_power.h> -#include <fwk_assert.h> +#include <fwk_event.h> #include <fwk_id.h> -#include <fwk_interrupt.h> -#include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> #include <fwk_multi_thread.h> -#include <fwk_notification.h> - -#include <mod_ccn512.h> -#include <mod_clock.h> -#include <mod_f_i2c.h> -#include <mod_hsspi.h> -#include <mod_log.h> -#include <mod_power_domain.h> -#include <mod_synquacer_system.h> -#include <mod_system_power.h> -#include <mod_timer.h> +#include <fwk_status.h> +#include <fwk_thread.h> -#include <synquacer_mmap.h> +#include <stdbool.h> struct synquacer_system_ctx synquacer_system_ctx; const struct fwk_module_config config_synquacer_system = { 0 }; diff --git a/product/synquacer/module/synquacer_system/src/nic400.c b/product/synquacer/module/synquacer_system/src/nic400.c index 600b0b2c..be145a41 100644 --- a/product/synquacer/module/synquacer_system/src/nic400.c +++ b/product/synquacer/module/synquacer_system/src/nic400.c @@ -5,14 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "low_level_access.h" +#include "synquacer_debug.h" +#include "synquacer_mmap.h" -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include <sysdef_option.h> #include <internal/nic400.h> -#include <sysdef_option.h> + +#include <fwk_macros.h> + +#include <stdint.h> #define NIC_TOP_ADDR_SEC_REG (0x00000008) #define NIC_SEC_REG_OFFSET (0x04) diff --git a/product/synquacer/module/synquacer_system/src/pmu_driver.c b/product/synquacer/module/synquacer_system/src/pmu_driver.c index cbee93d5..129b542f 100644 --- a/product/synquacer/module/synquacer_system/src/pmu_driver.c +++ b/product/synquacer/module/synquacer_system/src/pmu_driver.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include "low_level_access.h" +#include "synquacer_common.h" +#include "synquacer_mmap.h" #include <internal/pmu.h> +#include <stdint.h> + #define CONFIG_SOC_REG_ADDR_PMU_CTL (CONFIG_SOC_REG_ADDR_PMU_TOP + 0) #define CONFIG_SOC_REG_ADDR_PMU_INT_EN (CONFIG_SOC_REG_ADDR_PMU_TOP + 0x8U) #define CONFIG_SOC_REG_ADDR_PMU_INT_ST (CONFIG_SOC_REG_ADDR_PMU_TOP + 0xCU) diff --git a/product/synquacer/module/synquacer_system/src/smmu_config.c b/product/synquacer/module/synquacer_system/src/smmu_config.c index 8d664e74..8119a034 100644 --- a/product/synquacer/module/synquacer_system/src/smmu_config.c +++ b/product/synquacer/module/synquacer_system/src/smmu_config.c @@ -5,15 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <string.h> - -#include <synquacer_config.h> -#include <synquacer_mmap.h> -#include <mmu500.h> +#include "mmu500.h" +#include "synquacer_config.h" +#include "synquacer_debug.h" +#include "synquacer_mmap.h" #include <internal/smmu_wrapper.h> +#include <stdint.h> +#include <string.h> + typedef struct { uint64_t desc[0x1000 / 8]; } smmu_granule4kb_desc_t; diff --git a/product/synquacer/module/synquacer_system/src/synquacer_main.c b/product/synquacer/module/synquacer_system/src/synquacer_main.c index 73b1e9b5..dd700f7e 100644 --- a/product/synquacer/module/synquacer_system/src/synquacer_main.c +++ b/product/synquacer/module/synquacer_system/src/synquacer_main.c @@ -5,34 +5,36 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <string.h> +#include "low_level_access.h" +#include "pik_system.h" +#include "synquacer_common.h" +#include "synquacer_config.h" +#include "synquacer_debug.h" +#include "synquacer_mmap.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 <boot_ctl.h> +#include <sysdef_option.h> + +#include <internal/crg11.h> +#include <internal/gpio.h> +#include <internal/nic400.h> +#include <internal/thermal_sensor.h> #include <mod_f_i2c.h> #include <mod_hsspi.h> #include <mod_power_domain.h> #include <mod_synquacer_system.h> -#include <synquacer_config.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <config_power_domain.h> -#include <low_level_access.h> +#include <fwk_assert.h> +#include <fwk_id.h> +#include <fwk_module_idx.h> +#include <fwk_status.h> -#include <internal/crg11.h> -#include <internal/gpio.h> -#include <internal/nic400.h> -#include <internal/thermal_sensor.h> -#include <boot_ctl.h> -#include <sysdef_option.h> +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> +#include <string.h> #define SEC_OVERRIDE_CONVERT_MASK UINT32_C(0x3) diff --git a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c index 788915bb..83e952ac 100644 --- a/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c +++ b/product/synquacer/module/synquacer_system/src/synquacer_pd_manage.c @@ -5,24 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> - -#include <fmw_cmsis.h> -#include <fwk_status.h> - -#include <synquacer_core.h> -#include <synquacer_debug.h> -#include <synquacer_mmap.h> +#include "low_level_access.h" +#include "synquacer_debug.h" -#include <low_level_access.h> +#include <cmsis_os2.h> #include <internal/pmu.h> +#include <internal/reg_PPU.h> #include <internal/reset.h> #include <internal/synquacer_pd.h> #include <internal/synquacer_ppu_driver.h> #include <internal/transaction_sw.h> +#include <fwk_macros.h> + +#include <stdbool.h> +#include <stdint.h> + #define SCB_DIV_ROUND_UP(NUMERATOR, DENOMINATOR) \ (((NUMERATOR) + (DENOMINATOR)-1) / (DENOMINATOR)) #define POWER_CONV_MS_TO_PWR_ON_CYC(MS) \ diff --git a/product/synquacer/module/synquacer_system/src/sysdef_option.c b/product/synquacer/module/synquacer_system/src/sysdef_option.c index 00855adf..f1e42b40 100644 --- a/product/synquacer/module/synquacer_system/src/sysdef_option.c +++ b/product/synquacer/module/synquacer_system/src/sysdef_option.c @@ -5,15 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> - -#include <synquacer_mmap.h> -#include <low_level_access.h> #include <sysdef_option.h> #include <internal/nic400.h> +#include <fwk_macros.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> + #define SYNQUACER_CHIP_VER_MP UINT32_C(1) static const uint32_t nic_config_mp[NIC_CONFIG_NUM] = { diff --git a/product/synquacer/module/synquacer_system/src/sysoc.c b/product/synquacer/module/synquacer_system/src/sysoc.c index 10fd4f13..0f5135e9 100644 --- a/product/synquacer/module/synquacer_system/src/sysoc.c +++ b/product/synquacer/module/synquacer_system/src/sysoc.c @@ -5,18 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> +#include "low_level_access.h" +#include "synquacer_debug.h" +#include "synquacer_mmap.h" -#include <fwk_status.h> - -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include <cmsis_os2.h> #include <internal/reset.h> #include <internal/sysoc.h> +#include <fwk_assert.h> +#include <fwk_macros.h> +#include <fwk_status.h> + +#include <stdbool.h> +#include <stddef.h> +#include <stdint.h> + #define MAIN_BUS_RESET_BIT (0x1) #define REG_ADDR_RSTSTA (0) diff --git a/product/synquacer/module/synquacer_system/src/thermal_sensor.c b/product/synquacer/module/synquacer_system/src/thermal_sensor.c index 04819a8f..22081642 100644 --- a/product/synquacer/module/synquacer_system/src/thermal_sensor.c +++ b/product/synquacer/module/synquacer_system/src/thermal_sensor.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_status.h> -#include <cmsis_os2.h> +#include "low_level_access.h" +#include "synquacer_debug.h" -#include <synquacer_debug.h> -#include <low_level_access.h> +#include <cmsis_os2.h> #include <sysdef_option.h> #include <internal/thermal_sensor.h> +#include <fwk_status.h> + +#include <stdint.h> + #define DELAY_COUNTER 10 int thermal_enable(void) diff --git a/product/synquacer/module/synquacer_system/src/transaction_sw.c b/product/synquacer/module/synquacer_system/src/transaction_sw.c index 74ae2115..33b5c8ef 100644 --- a/product/synquacer/module/synquacer_system/src/transaction_sw.c +++ b/product/synquacer/module/synquacer_system/src/transaction_sw.c @@ -5,12 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <synquacer_debug.h> -#include <synquacer_mmap.h> -#include <low_level_access.h> +#include "low_level_access.h" +#include "synquacer_common.h" +#include "synquacer_debug.h" #include <internal/transaction_sw.h> +#include <stdint.h> + #define STATUS_ADDR 4 void set_transactionsw_off( diff --git a/product/synquacer/scp_ramfw/config_armv7m_mpu.c b/product/synquacer/scp_ramfw/config_armv7m_mpu.c index a0dbb9b5..d251a1d1 100644 --- a/product/synquacer/scp_ramfw/config_armv7m_mpu.c +++ b/product/synquacer/scp_ramfw/config_armv7m_mpu.c @@ -5,9 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_armv7m_mpu.h> + +#include <fmw_cmsis.h> + +#include <stdint.h> #define ROM_BASE 0x00000000UL #define AP_RAM_BASE UINT32_C(0xA4000000) diff --git a/product/synquacer/scp_ramfw/config_ccn512.c b/product/synquacer/scp_ramfw/config_ccn512.c index d8a58dcf..290870b6 100644 --- a/product/synquacer/scp_ramfw/config_ccn512.c +++ b/product/synquacer/scp_ramfw/config_ccn512.c @@ -5,11 +5,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> -#include <fwk_module.h> -#include <fwk_module_idx.h> +#include "synquacer_mmap.h" + #include <mod_ccn512.h> -#include <synquacer_mmap.h> + +#include <fwk_module.h> + +#include <stddef.h> /* * CCN512 module diff --git a/product/synquacer/scp_ramfw/config_css_clock.c b/product/synquacer/scp_ramfw/config_css_clock.c index 3af5418a..150d63c5 100644 --- a/product/synquacer/scp_ramfw/config_css_clock.c +++ b/product/synquacer/scp_ramfw/config_css_clock.c @@ -7,12 +7,7 @@ #include <fwk_element.h> #include <fwk_id.h> -#include <fwk_macros.h> #include <fwk_module.h> -#include <fwk_module_idx.h> -#include <mod_css_clock.h> -#include <mod_pik_clock.h> -#include <config_clock.h> static const struct fwk_element css_clock_element_table[] = { [0] = { 0 }, diff --git a/product/synquacer/scp_ramfw/config_f_i2c.c b/product/synquacer/scp_ramfw/config_f_i2c.c index 2d2d1493..a62844bc 100644 --- a/product/synquacer/scp_ramfw/config_f_i2c.c +++ b/product/synquacer/scp_ramfw/config_f_i2c.c @@ -5,11 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> #include <fwk_module.h> -#include <fwk_module_idx.h> -#include <mod_f_i2c.h> -#include <synquacer_mmap.h> + +#include <stddef.h> /* Configuration of the F_I2C module. */ const struct fwk_module_config config_f_i2c = { diff --git a/product/synquacer/scp_ramfw/config_hsspi.c b/product/synquacer/scp_ramfw/config_hsspi.c index 52168ae6..0cafc1c0 100644 --- a/product/synquacer/scp_ramfw/config_hsspi.c +++ b/product/synquacer/scp_ramfw/config_hsspi.c @@ -5,11 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> #include <fwk_module.h> -#include <fwk_module_idx.h> -#include <mod_hsspi.h> -#include <synquacer_mmap.h> + +#include <stddef.h> /* Configuration of the HSSPI module. */ const struct fwk_module_config config_hsspi = { diff --git a/product/synquacer/scp_ramfw/config_log_f_uart3.c b/product/synquacer/scp_ramfw/config_log_f_uart3.c index 5a018fc6..8e62dd32 100644 --- a/product/synquacer/scp_ramfw/config_log_f_uart3.c +++ b/product/synquacer/scp_ramfw/config_log_f_uart3.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "synquacer_mmap.h" + +#include <mod_f_uart3.h> +#include <mod_log.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_f_uart3.h> -#include <mod_log.h> -#include <synquacer_mmap.h> /* * F_UART3 module diff --git a/product/synquacer/scp_ramfw/config_log_pl011.c b/product/synquacer/scp_ramfw/config_log_pl011.c index d0a939c8..4d04d0c4 100644 --- a/product/synquacer/scp_ramfw/config_log_pl011.c +++ b/product/synquacer/scp_ramfw/config_log_pl011.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "synquacer_mmap.h" + +#include <mod_log.h> +#include <mod_pl011.h> + #include <fwk_banner.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_log.h> -#include <mod_pl011.h> -#include <synquacer_mmap.h> /* * PL011 module diff --git a/product/synquacer/scp_ramfw/config_mhu.c b/product/synquacer/scp_ramfw/config_mhu.c index 122ee276..7b614851 100644 --- a/product/synquacer/scp_ramfw/config_mhu.c +++ b/product/synquacer/scp_ramfw/config_mhu.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_mhu.h" +#include "synquacer_irq.h" +#include "synquacer_mmap.h" + +#include <mod_mhu.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> -#include <mod_mhu.h> -#include <synquacer_irq.h> -#include <synquacer_mmap.h> -#include <config_mhu.h> static const struct fwk_element mhu_element_table[] = { [SCP_SYNQUACER_MHU_DEVICE_IDX_SCP_AP_S] = { diff --git a/product/synquacer/scp_ramfw/config_pik_clock.c b/product/synquacer/scp_ramfw/config_pik_clock.c index 6969e922..04ae5dae 100644 --- a/product/synquacer/scp_ramfw/config_pik_clock.c +++ b/product/synquacer/scp_ramfw/config_pik_clock.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "pik_cpu.h" +#include "synquacer_mmap.h" +#include "system_clock.h" + +#include <mod_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_pik_clock.h> -#include <synquacer_core.h> -#include <synquacer_mmap.h> -#include <config_clock.h> -#include <system_clock.h> + +#include <stdbool.h> +#include <stdint.h> #define PIK_DEBUG_TRACECLK_CTRL UINT32_C(0x0810) #define PIK_DEBUG_TRACECLK_DIV1 UINT32_C(0x0814) diff --git a/product/synquacer/scp_ramfw/config_power_domain.c b/product/synquacer/scp_ramfw/config_power_domain.c index 3a75e570..e98555ea 100644 --- a/product/synquacer/scp_ramfw/config_power_domain.c +++ b/product/synquacer/scp_ramfw/config_power_domain.c @@ -5,21 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdio.h> -#include <string.h> +#include "config_power_domain.h" +#include "config_ppu_v0.h" +#include "synquacer_core.h" + +#include <mod_power_domain.h> +#include <mod_system_power.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_power_domain.h> -#include <mod_ppu_v0.h> -#include <mod_system_power.h> -#include <synquacer_core.h> -#include <synquacer_irq.h> -#include <config_power_domain.h> -#include <config_ppu_v0.h> + +#include <stdint.h> +#include <stdio.h> +#include <string.h> /* Maximum power domain name size including the null terminator */ #define PD_NAME_SIZE 12 diff --git a/product/synquacer/scp_ramfw/config_ppu_v0_synquacer.c b/product/synquacer/scp_ramfw/config_ppu_v0_synquacer.c index 466d7209..bc325786 100644 --- a/product/synquacer/scp_ramfw/config_ppu_v0_synquacer.c +++ b/product/synquacer/scp_ramfw/config_ppu_v0_synquacer.c @@ -5,19 +5,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> -#include <stdio.h> -#include <string.h> +#include "synquacer_core.h" +#include "synquacer_mmap.h" + +#include <mod_power_domain.h> +#include <mod_ppu_v0.h> + #include <fwk_element.h> +#include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_macros.h> #include <fwk_mm.h> #include <fwk_module.h> -#include <mod_ppu_v0.h> -#include <synquacer_core.h> -#include <synquacer_irq.h> -#include <synquacer_mmap.h> -#include <config_ppu_v0.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> #define PPU_V0_NAME_SIZE (12) diff --git a/product/synquacer/scp_ramfw/config_scmi.c b/product/synquacer/scp_ramfw/config_scmi.c index 082b796e..9605311c 100644 --- a/product/synquacer/scp_ramfw/config_scmi.c +++ b/product/synquacer/scp_ramfw/config_scmi.c @@ -5,15 +5,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_scmi.h" + +#include <internal/scmi.h> + +#include <mod_scmi.h> +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_scmi.h> -#include <mod_smt.h> -#include <internal/scmi.h> -#include <config_scmi.h> static const struct fwk_element service_table[] = { [SCP_SYNQUACER_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/synquacer/scp_ramfw/config_scmi_apcore.c b/product/synquacer/scp_ramfw/config_scmi_apcore.c index c13afc7b..0410383b 100644 --- a/product/synquacer/scp_ramfw/config_scmi_apcore.c +++ b/product/synquacer/scp_ramfw/config_scmi_apcore.c @@ -5,12 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> +#include "pik_cpu.h" +#include "synquacer_core.h" +#include "synquacer_mmap.h" + +#include <mod_scmi_apcore.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_scmi_apcore.h> -#include <synquacer_core.h> -#include <synquacer_pik.h> + +#include <stdint.h> static const struct mod_scmi_apcore_reset_register_group reset_reg_group_table[] = { diff --git a/product/synquacer/scp_ramfw/config_scmi_system_power.c b/product/synquacer/scp_ramfw/config_scmi_system_power.c index 3e7c579f..1b9720fa 100644 --- a/product/synquacer/scp_ramfw/config_scmi_system_power.c +++ b/product/synquacer/scp_ramfw/config_scmi_system_power.c @@ -5,10 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> #include <mod_scmi_system_power.h> #include <mod_system_power.h> +#include <fwk_module.h> + const struct fwk_module_config config_scmi_system_power = { .data = &((struct mod_scmi_system_power_config){ .system_view = MOD_SCMI_SYSTEM_VIEW_FULL, diff --git a/product/synquacer/scp_ramfw/config_smt.c b/product/synquacer/scp_ramfw/config_smt.c index 92bde9dc..7fa6b8ce 100644 --- a/product/synquacer/scp_ramfw/config_smt.c +++ b/product/synquacer/scp_ramfw/config_smt.c @@ -5,17 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdint.h> +#include "config_mhu.h" +#include "config_power_domain.h" +#include "config_scmi.h" +#include "synquacer_core.h" +#include "synquacer_mmap.h" + +#include <mod_smt.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_smt.h> -#include <synquacer_core.h> -#include <synquacer_mmap.h> -#include <config_mhu.h> -#include <config_power_domain.h> -#include <config_scmi.h> + +#include <stdint.h> static const struct fwk_element smt_element_table[] = { [SCP_SYNQUACER_SCMI_SERVICE_IDX_PSCI] = { diff --git a/product/synquacer/scp_ramfw/config_synquacer_memc.c b/product/synquacer/scp_ramfw/config_synquacer_memc.c index 668c5519..ff2e3497 100644 --- a/product/synquacer/scp_ramfw/config_synquacer_memc.c +++ b/product/synquacer/scp_ramfw/config_synquacer_memc.c @@ -5,10 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_element.h> #include <fwk_module.h> -#include <fwk_module_idx.h> -#include <mod_synquacer_memc.h> + +#include <stddef.h> /* Configuration of the SynQuacerMEMC module. */ const struct fwk_module_config config_synquacer_memc = { diff --git a/product/synquacer/scp_ramfw/config_system_power.c b/product/synquacer/scp_ramfw/config_system_power.c index 4573f1c9..f6c2af4a 100644 --- a/product/synquacer/scp_ramfw/config_system_power.c +++ b/product/synquacer/scp_ramfw/config_system_power.c @@ -5,14 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_ppu_v0.h" + +#include <mod_power_domain.h> +#include <mod_synquacer_system.h> +#include <mod_system_power.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_interrupt.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_synquacer_system.h> -#include <mod_system_power.h> -#include <config_ppu_v0.h> + +#include <stdint.h> static const struct mod_system_power_ext_ppu_config ext_ppus[] = { { diff --git a/product/synquacer/scp_ramfw/config_timer.c b/product/synquacer/scp_ramfw/config_timer.c index aa709be0..70d87d50 100644 --- a/product/synquacer/scp_ramfw/config_timer.c +++ b/product/synquacer/scp_ramfw/config_timer.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "synquacer_irq.h" +#include "synquacer_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <synquacer_irq.h> -#include <synquacer_mmap.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/synquacer/scp_ramfw/fmw_memory.h b/product/synquacer/scp_ramfw/fmw_memory.h index 15f8d897..2b9aa12d 100644 --- a/product/synquacer/scp_ramfw/fmw_memory.h +++ b/product/synquacer/scp_ramfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_system_mmap_scp.h> +#include "scp_system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION diff --git a/product/synquacer/scp_ramfw/rtx_config.c b/product/synquacer/scp_ramfw/rtx_config.c index 4304145e..775680a9 100644 --- a/product/synquacer/scp_ramfw/rtx_config.c +++ b/product/synquacer/scp_ramfw/rtx_config.c @@ -5,13 +5,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <stdbool.h> -#include <stdint.h> -#include <synquacer_debug.h> -#include <cmsis_compiler.h> +#include "synquacer_debug.h" +#include "system_clock.h" + #include <rtx_lib.c> #include <rtx_os.h> -#include <system_clock.h> + +#include <fmw_cmsis.h> + +#include <stdbool.h> +#include <stdint.h> /* * Required by RTX to configure the SysTick timer. diff --git a/product/synquacer/scp_romfw/config_armv7m_mpu.c b/product/synquacer/scp_romfw/config_armv7m_mpu.c index a0dbb9b5..d251a1d1 100644 --- a/product/synquacer/scp_romfw/config_armv7m_mpu.c +++ b/product/synquacer/scp_romfw/config_armv7m_mpu.c @@ -5,9 +5,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <mod_armv7m_mpu.h> + #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_armv7m_mpu.h> + +#include <fmw_cmsis.h> + +#include <stdint.h> #define ROM_BASE 0x00000000UL #define AP_RAM_BASE UINT32_C(0xA4000000) diff --git a/product/synquacer/scp_romfw/config_log_f_uart3.c b/product/synquacer/scp_romfw/config_log_f_uart3.c index 9c2841e0..95f00784 100644 --- a/product/synquacer/scp_romfw/config_log_f_uart3.c +++ b/product/synquacer/scp_romfw/config_log_f_uart3.c @@ -5,13 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "synquacer_mmap.h" + +#include <mod_f_uart3.h> +#include <mod_log.h> + #include <fwk_banner.h> +#include <fwk_element.h> +#include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_f_uart3.h> -#include <mod_log.h> -#include <synquacer_mmap.h> /* * F_UART3 module diff --git a/product/synquacer/scp_romfw/config_synquacer_pik_clock.c b/product/synquacer/scp_romfw/config_synquacer_pik_clock.c index 933ea24a..caef18fc 100644 --- a/product/synquacer/scp_romfw/config_synquacer_pik_clock.c +++ b/product/synquacer/scp_romfw/config_synquacer_pik_clock.c @@ -5,15 +5,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "config_clock.h" +#include "pik_scp.h" +#include "pik_system.h" +#include "synquacer_mmap.h" +#include "system_clock.h" + +#include <mod_synquacer_pik_clock.h> + #include <fwk_element.h> #include <fwk_id.h> #include <fwk_macros.h> #include <fwk_module.h> -#include <mod_synquacer_pik_clock.h> -#include <synquacer_core.h> -#include <synquacer_mmap.h> -#include <config_clock.h> -#include <system_clock.h> + +#include <stdbool.h> /* * Rate lookup tables diff --git a/product/synquacer/scp_romfw/config_synquacer_rom.c b/product/synquacer/scp_romfw/config_synquacer_rom.c index 30c4ddd4..a7bd1fc5 100644 --- a/product/synquacer/scp_romfw/config_synquacer_rom.c +++ b/product/synquacer/scp_romfw/config_synquacer_rom.c @@ -5,9 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <fwk_module.h> +#include "scp_system_mmap_scp.h" + #include <mod_synquacer_rom.h> -#include <scp_system_mmap_scp.h> + +#include <fwk_module.h> const struct fwk_module_config config_synquacer_rom = { .data = &((struct synquacer_rom_config){ diff --git a/product/synquacer/scp_romfw/config_timer.c b/product/synquacer/scp_romfw/config_timer.c index aa709be0..70d87d50 100644 --- a/product/synquacer/scp_romfw/config_timer.c +++ b/product/synquacer/scp_romfw/config_timer.c @@ -5,15 +5,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include "synquacer_irq.h" +#include "synquacer_mmap.h" +#include "system_clock.h" + +#include <mod_gtimer.h> +#include <mod_timer.h> + +#include <fwk_element.h> #include <fwk_id.h> #include <fwk_module.h> #include <fwk_module_idx.h> -#include <mod_clock.h> -#include <mod_gtimer.h> -#include <mod_timer.h> -#include <synquacer_irq.h> -#include <synquacer_mmap.h> -#include <system_clock.h> /* * Generic timer driver config diff --git a/product/synquacer/scp_romfw/fmw_memory.h b/product/synquacer/scp_romfw/fmw_memory.h index e9ca2cdc..382f9cdb 100644 --- a/product/synquacer/scp_romfw/fmw_memory.h +++ b/product/synquacer/scp_romfw/fmw_memory.h @@ -11,7 +11,7 @@ #ifndef FMW_MEMORY_H #define FMW_MEMORY_H -#include <scp_system_mmap_scp.h> +#include "scp_system_mmap_scp.h" #define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION |