Skip to content

Commit 1681166

Browse files
gmarullcarlescufi
authored andcommitted
arch: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all arch code 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 db50837 commit 1681166

File tree

180 files changed

+581
-581
lines changed

Some content is hidden

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

180 files changed

+581
-581
lines changed

arch/arc/arcmwdt/arcmwdt-dtr-stubs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <toolchain.h>
7+
#include <zephyr/toolchain.h>
88

99
__weak void *__dso_handle;
1010

arch/arc/core/arc_connect.c

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

13-
#include <kernel.h>
14-
#include <arch/cpu.h>
15-
#include <spinlock.h>
13+
#include <zephyr/kernel.h>
14+
#include <zephyr/arch/cpu.h>
15+
#include <zephyr/spinlock.h>
1616
#include <kernel_internal.h>
1717

1818
static struct k_spinlock arc_connect_spinlock;

arch/arc/core/arc_smp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* @brief codes required for ARC multicore and Zephyr smp support
1010
*
1111
*/
12-
#include <device.h>
13-
#include <kernel.h>
14-
#include <kernel_structs.h>
12+
#include <zephyr/device.h>
13+
#include <zephyr/kernel.h>
14+
#include <zephyr/kernel_structs.h>
1515
#include <ksched.h>
1616
#include <soc.h>
17-
#include <init.h>
17+
#include <zephyr/init.h>
1818

1919

2020
#ifndef IRQ_ICI

arch/arc/core/cache.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
* This module contains functions for manipulation of the d-cache.
1414
*/
1515

16-
#include <kernel.h>
17-
#include <arch/cpu.h>
18-
#include <sys/util.h>
19-
#include <toolchain.h>
20-
#include <cache.h>
21-
#include <linker/linker-defs.h>
22-
#include <arch/arc/v2/aux_regs.h>
16+
#include <zephyr/kernel.h>
17+
#include <zephyr/arch/cpu.h>
18+
#include <zephyr/sys/util.h>
19+
#include <zephyr/toolchain.h>
20+
#include <zephyr/cache.h>
21+
#include <zephyr/linker/linker-defs.h>
22+
#include <zephyr/arch/arc/v2/aux_regs.h>
2323
#include <kernel_internal.h>
24-
#include <sys/__assert.h>
25-
#include <init.h>
24+
#include <zephyr/sys/__assert.h>
25+
#include <zephyr/init.h>
2626
#include <stdbool.h>
2727

2828
#if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)

arch/arc/core/fatal.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
* ARCv2 CPUs.
1313
*/
1414

15-
#include <kernel.h>
15+
#include <zephyr/kernel.h>
1616
#include <offsets_short.h>
17-
#include <arch/cpu.h>
18-
#include <logging/log.h>
17+
#include <zephyr/arch/cpu.h>
18+
#include <zephyr/logging/log.h>
1919
#include <kernel_arch_data.h>
20-
#include <arch/arc/v2/exc.h>
20+
#include <zephyr/arch/arc/v2/exc.h>
2121

2222
LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
2323

arch/arc/core/fault.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
* Common fault handler for ARCv2 processors.
1212
*/
1313

14-
#include <toolchain.h>
15-
#include <linker/sections.h>
14+
#include <zephyr/toolchain.h>
15+
#include <zephyr/linker/sections.h>
1616
#include <inttypes.h>
1717

18-
#include <kernel.h>
18+
#include <zephyr/kernel.h>
1919
#include <kernel_internal.h>
20-
#include <kernel_structs.h>
21-
#include <exc_handle.h>
22-
#include <logging/log.h>
20+
#include <zephyr/kernel_structs.h>
21+
#include <zephyr/exc_handle.h>
22+
#include <zephyr/logging/log.h>
2323
LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
2424

2525
#ifdef CONFIG_USERSPACE

arch/arc/core/irq_manage.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* number from 16 to last IRQ number on the platform.
1818
*/
1919

20-
#include <kernel.h>
21-
#include <arch/cpu.h>
22-
#include <sys/__assert.h>
23-
#include <toolchain.h>
24-
#include <linker/sections.h>
25-
#include <sw_isr_table.h>
26-
#include <irq.h>
27-
#include <sys/printk.h>
20+
#include <zephyr/kernel.h>
21+
#include <zephyr/arch/cpu.h>
22+
#include <zephyr/sys/__assert.h>
23+
#include <zephyr/toolchain.h>
24+
#include <zephyr/linker/sections.h>
25+
#include <zephyr/sw_isr_table.h>
26+
#include <zephyr/irq.h>
27+
#include <zephyr/sys/printk.h>
2828

2929

3030
/*

arch/arc/core/irq_offload.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* @file Software interrupts utility code - ARC implementation
99
*/
1010

11-
#include <kernel.h>
12-
#include <irq_offload.h>
11+
#include <zephyr/kernel.h>
12+
#include <zephyr/irq_offload.h>
1313

1414
static irq_offload_routine_t offload_routine;
1515
static const void *offload_param;

arch/arc/core/mpu/arc_core_mpu.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <device.h>
8-
#include <init.h>
9-
#include <kernel.h>
7+
#include <zephyr/device.h>
8+
#include <zephyr/init.h>
9+
#include <zephyr/kernel.h>
1010
#include <soc.h>
11-
#include <arch/arc/v2/mpu/arc_core_mpu.h>
12-
#include <kernel_structs.h>
11+
#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
12+
#include <zephyr/kernel_structs.h>
1313

1414
/*
1515
* @brief Configure MPU for the thread

arch/arc/core/mpu/arc_mpu.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <device.h>
8-
#include <init.h>
9-
#include <kernel.h>
7+
#include <zephyr/device.h>
8+
#include <zephyr/init.h>
9+
#include <zephyr/kernel.h>
1010
#include <soc.h>
11-
#include <arch/arc/v2/aux_regs.h>
12-
#include <arch/arc/v2/mpu/arc_mpu.h>
13-
#include <arch/arc/v2/mpu/arc_core_mpu.h>
14-
#include <linker/linker-defs.h>
11+
#include <zephyr/arch/arc/v2/aux_regs.h>
12+
#include <zephyr/arch/arc/v2/mpu/arc_mpu.h>
13+
#include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
14+
#include <zephyr/linker/linker-defs.h>
1515

1616
#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
17-
#include <logging/log.h>
17+
#include <zephyr/logging/log.h>
1818
LOG_MODULE_REGISTER(mpu);
1919

2020
/**

0 commit comments

Comments
 (0)