Skip to content

Commit fb9b3bc

Browse files
gmarullcarlescufi
gmarull
authored and
carlescufi
committed
include: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all includes within include directory to the new prefix <zephyr/...>. Note that the conversion has been scripted, refer to #45388 for more details. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent a4eac53 commit fb9b3bc

File tree

403 files changed

+969
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+969
-969
lines changed

‎include/zephyr/app_memory/app_memdomain.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_
77
#define ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_
88

9-
#include <linker/linker-defs.h>
10-
#include <sys/dlist.h>
11-
#include <kernel.h>
9+
#include <zephyr/linker/linker-defs.h>
10+
#include <zephyr/sys/dlist.h>
11+
#include <zephyr/kernel.h>
1212

1313
#ifdef CONFIG_USERSPACE
1414

‎include/zephyr/app_memory/mem_domain.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#include <stdint.h>
1212
#include <stddef.h>
13-
#include <sys/dlist.h>
14-
#include <toolchain.h>
15-
#include <kernel/thread.h>
13+
#include <zephyr/sys/dlist.h>
14+
#include <zephyr/toolchain.h>
15+
#include <zephyr/kernel/thread.h>
1616

1717
#ifdef __cplusplus
1818
extern "C" {

‎include/zephyr/app_memory/partitions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define ZEPHYR_APP_MEMORY_PARTITIONS_H
99

1010
#ifdef CONFIG_USERSPACE
11-
#include <kernel.h> /* For struct k_mem_partition */
11+
#include <zephyr/kernel.h> /* For struct k_mem_partition */
1212

1313
#if defined(CONFIG_MBEDTLS)
1414
extern struct k_mem_partition k_mbedtls_partition;

‎include/zephyr/arch/arc/arc_addr_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
typedef unsigned long paddr_t;
2121
typedef void *vaddr_t;
2222
#else
23-
#include <arch/common/addr_types.h>
23+
#include <zephyr/arch/common/addr_types.h>
2424
#endif
2525

2626
#endif /* _ASMLANGUAGE */

‎include/zephyr/arch/arc/arch.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
#define ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_
1818

1919
#include <zephyr/devicetree.h>
20-
#include <sw_isr_table.h>
21-
#include <arch/common/ffs.h>
22-
#include <arch/arc/thread.h>
23-
#include <arch/common/sys_bitops.h>
20+
#include <zephyr/sw_isr_table.h>
21+
#include <zephyr/arch/common/ffs.h>
22+
#include <zephyr/arch/arc/thread.h>
23+
#include <zephyr/arch/common/sys_bitops.h>
2424
#include "sys-io-common.h"
2525

26-
#include <arch/arc/v2/exc.h>
27-
#include <arch/arc/v2/irq.h>
28-
#include <arch/arc/v2/misc.h>
29-
#include <arch/arc/v2/aux_regs.h>
30-
#include <arch/arc/v2/arcv2_irq_unit.h>
31-
#include <arch/arc/v2/asm_inline.h>
32-
#include <arch/arc/arc_addr_types.h>
33-
#include <arch/arc/v2/error.h>
26+
#include <zephyr/arch/arc/v2/exc.h>
27+
#include <zephyr/arch/arc/v2/irq.h>
28+
#include <zephyr/arch/arc/v2/misc.h>
29+
#include <zephyr/arch/arc/v2/aux_regs.h>
30+
#include <zephyr/arch/arc/v2/arcv2_irq_unit.h>
31+
#include <zephyr/arch/arc/v2/asm_inline.h>
32+
#include <zephyr/arch/arc/arc_addr_types.h>
33+
#include <zephyr/arch/arc/v2/error.h>
3434

3535
#ifdef CONFIG_ARC_CONNECT
36-
#include <arch/arc/v2/arc_connect.h>
36+
#include <zephyr/arch/arc/v2/arc_connect.h>
3737
#endif
3838

3939
#ifdef CONFIG_ISA_ARCV2
4040
#include "v2/sys_io.h"
4141
#ifdef CONFIG_ARC_HAS_SECURE
42-
#include <arch/arc/v2/secureshield/arc_secure.h>
42+
#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
4343
#endif
4444
#endif
4545

@@ -239,7 +239,7 @@ BUILD_ASSERT(CONFIG_PRIVILEGED_STACK_SIZE % Z_ARC_MPU_ALIGN == 0,
239239
#ifdef CONFIG_ARC_MPU
240240

241241
/* Legacy case: retain containing extern "C" with C++ */
242-
#include <arch/arc/v2/mpu/arc_mpu.h>
242+
#include <zephyr/arch/arc/v2/mpu/arc_mpu.h>
243243

244244
#define K_MEM_PARTITION_P_NA_U_NA AUX_MPU_ATTR_N
245245
#define K_MEM_PARTITION_P_RW_U_RW (AUX_MPU_ATTR_UW | AUX_MPU_ATTR_UR | \

‎include/zephyr/arch/arc/arch_inlines.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#ifndef _ASMLANGUAGE
1212

13-
#include <kernel_structs.h>
13+
#include <zephyr/kernel_structs.h>
1414

15-
#include <arch/arc/v2/aux_regs.h>
15+
#include <zephyr/arch/arc/v2/aux_regs.h>
1616

1717
static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
1818
{

‎include/zephyr/arch/arc/sys-io-common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#ifndef _ASMLANGUAGE
1111

12-
#include <toolchain.h>
13-
#include <sys/sys_io.h>
14-
#include <arch/arc/v2/aux_regs.h>
12+
#include <zephyr/toolchain.h>
13+
#include <zephyr/sys/sys_io.h>
14+
#include <zephyr/arch/arc/v2/aux_regs.h>
1515

1616
#include <zephyr/types.h>
1717
#include <stddef.h>

‎include/zephyr/arch/arc/syscall.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <stdbool.h>
2828

2929
#ifdef CONFIG_ISA_ARCV2
30-
#include <arch/arc/v2/aux_regs.h>
30+
#include <zephyr/arch/arc/v2/aux_regs.h>
3131
#endif
3232

3333
#ifdef __cplusplus

‎include/zephyr/arch/arc/v2/asm_inline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#if defined(__GNUC__)
18-
#include <arch/arc/v2/asm_inline_gcc.h>
18+
#include <zephyr/arch/arc/v2/asm_inline_gcc.h>
1919
#else
2020
#erro "you need to provide an asm_inline.h for your compiler"
2121
#endif

‎include/zephyr/arch/arc/v2/error.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_
1515
#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_
1616

17-
#include <arch/arc/syscall.h>
18-
#include <arch/arc/v2/exc.h>
17+
#include <zephyr/arch/arc/syscall.h>
18+
#include <zephyr/arch/arc/v2/exc.h>
1919
#include <stdbool.h>
2020

2121
#ifdef __cplusplus

0 commit comments

Comments
 (0)