michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsystems: migrate includes to <zephyr/...>

Browse source 
In order to bring consistency in-tree, migrate all subsystems code to
the new prefix <zephyr/...>. Note that the conversion has been scripted,
refer to zephyrproject-rtos#45388 for more details.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-05-06 11:12:04 +02:00 • committed by Carles Cufí
commit 5113c1418d
726 changed files with 2931 additions and 2931 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/testsuite/busy_sim/busy_sim.c
View file

@ -3,12 +3,12 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <drivers/entropy.h>
#include <drivers/counter.h>
#include <drivers/gpio.h>
#include <zephyr/drivers/entropy.h>
#include <zephyr/drivers/counter.h>
#include <zephyr/drivers/gpio.h>
#include "busy_sim.h"
#include <sys/ring_buffer.h>
#include <random/rand32.h>
#include <zephyr/sys/ring_buffer.h>
#include <zephyr/random/rand32.h>
#define BUFFER_SIZE 32

2
subsys/testsuite/coverage/coverage.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <stdio.h>
#include <stdint.h>
#include <errno.h>

10
subsys/testsuite/include/interrupt_util.h
View file

@ -10,7 +10,7 @@
#define MS_TO_US(ms) (ms * USEC_PER_MSEC)
#if defined(CONFIG_CPU_CORTEX_M)
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
static inline uint32_t get_available_nvic_line(uint32_t initial_offset)
{
@ -71,8 +71,8 @@ static inline void trigger_irq(int irq)
}
#elif defined(CONFIG_GIC)
#include <drivers/interrupt_controller/gic.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <zephyr/drivers/interrupt_controller/gic.h>
#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
static inline void trigger_irq(int irq)
{
@ -103,10 +103,10 @@ static inline void trigger_irq(int irq)
#elif defined(CONFIG_X86)
#ifdef CONFIG_X2APIC
#include <drivers/interrupt_controller/loapic.h>
#include <zephyr/drivers/interrupt_controller/loapic.h>
#define VECTOR_MASK 0xFF
#else
#include <sys/arch_interface.h>
#include <zephyr/sys/arch_interface.h>
#define LOAPIC_ICR_IPI_TEST 0x00004000U
#endif

8
subsys/testsuite/include/tc_util.h
View file

@ -9,13 +9,13 @@
#ifndef ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
#define ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <string.h>
#ifdef CONFIG_SHELL
#include <shell/shell.h>
#include <zephyr/shell/shell.h>
#endif
#include <sys/printk.h>
#include <zephyr/sys/printk.h>
#if defined CONFIG_ZTEST_TC_UTIL_USER_OVERRIDE
#include <tc_util_user_override.h>
@ -174,7 +174,7 @@ static inline void test_time_ms(void)
#endif
#if defined(CONFIG_ARCH_POSIX)
#include <logging/log_ctrl.h>
#include <zephyr/logging/log_ctrl.h>
#define TC_END_POST(result) do { \
LOG_PANIC(); \
posix_exit(result); \

6
subsys/testsuite/include/test_asm_inline_gcc.h
View file

@ -24,20 +24,20 @@ static inline void timestamp_serialize(void)
: "%eax", "%ebx", "%ecx", "%edx");
}
#elif defined(CONFIG_CPU_CORTEX_M)
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
static inline void timestamp_serialize(void)
{
/* isb is available in all Cortex-M */
__ISB();
}
#elif defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
#include <arch/arm/aarch32/cortex_a_r/cpu.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/cpu.h>
static inline void timestamp_serialize(void)
{
__ISB();
}
#elif defined(CONFIG_CPU_CORTEX_A) || defined(CONFIG_CPU_AARCH64_CORTEX_R)
#include <arch/arm64/cpu.h>
#include <zephyr/arch/arm64/cpu.h>
static inline void timestamp_serialize(void)
{
__ISB();

2
subsys/testsuite/include/timestamp.h
View file

@ -13,7 +13,7 @@
#ifndef _TIMESTAMP_H_
#define _TIMESTAMP_H_
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <limits.h>
#if defined(__GNUC__)

2
subsys/testsuite/ztest/include/zephyr/arch/cpu.h
View file

@ -51,7 +51,7 @@ static inline bool arch_irq_unlocked(unsigned int key)
}
#endif /* __cplusplus */
#include <sys/arch_interface.h>
#include <zephyr/sys/arch_interface.h>
#endif /* ZEPHYR_SUBSYS_TESTSUITE_ZTEST_INCLUDE_ARCH_CPU_H */

4
subsys/testsuite/ztest/include/ztest.h
View file

@ -53,10 +53,10 @@ typedef struct esf z_arch_esf_t;
#endif
#endif /* KERNEL */
#include <sys/printk.h>
#include <zephyr/sys/printk.h>
#define PRINT printk
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <ztest_assert.h>
#include <ztest_mock.h>

2
subsys/testsuite/ztest/include/ztest_error_hook.h
View file

@ -7,7 +7,7 @@
#ifndef ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
#define ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
#include <zephyr.h>
#include <zephyr/zephyr.h>
#if defined(CONFIG_ZTEST_FATAL_HOOK)

4
subsys/testsuite/ztest/include/ztest_test_deprecated.h
View file

@ -13,8 +13,8 @@
#ifndef ZEPHYR_TESTSUITE_ZTEST_TEST_H_
#define ZEPHYR_TESTSUITE_ZTEST_TEST_H_
#include <app_memory/app_memdomain.h>
#include <init.h>
#include <zephyr/app_memory/app_memdomain.h>
#include <zephyr/init.h>
#include <stdbool.h>
#ifdef __cplusplus

4
subsys/testsuite/ztest/include/ztest_test_new.h
View file

@ -13,8 +13,8 @@
#ifndef ZEPHYR_TESTSUITE_ZTEST_TEST_H_
#define ZEPHYR_TESTSUITE_ZTEST_TEST_H_
#include <app_memory/app_memdomain.h>
#include <init.h>
#include <zephyr/app_memory/app_memdomain.h>
#include <zephyr/init.h>
#include <stdbool.h>
#ifdef __cplusplus

4
subsys/testsuite/ztest/include/ztress.h
View file

@ -6,8 +6,8 @@
#ifndef TESTSUITE_ZTEST_INCLUDE_ZTRESS_H__
#define TESTSUITE_ZTEST_INCLUDE_ZTRESS_H__
#include <sys/util.h>
#include <kernel.h>
#include <zephyr/sys/util.h>
#include <zephyr/kernel.h>
/** @internal Internal ID's to distinguish context type. */
#define ZTRESS_ID_THREAD 0

8
subsys/testsuite/ztest/src/ztest.c
View file

@ -6,12 +6,12 @@
#include <ztest.h>
#include <stdio.h>
#include <app_memory/app_memdomain.h>
#include <zephyr/app_memory/app_memdomain.h>
#ifdef CONFIG_USERSPACE
#include <sys/libc-hooks.h>
#include <zephyr/sys/libc-hooks.h>
#endif
#include <sys/reboot.h>
#include <logging/log_ctrl.h>
#include <zephyr/sys/reboot.h>
#include <zephyr/logging/log_ctrl.h>
#ifdef KERNEL
static struct k_thread ztest_thread;

2
subsys/testsuite/ztest/src/ztest_error_hook.c
View file

@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <ztest.h>

8
subsys/testsuite/ztest/src/ztest_new.c
View file

@ -6,12 +6,12 @@
#include <ztest.h>
#include <stdio.h>
#include <app_memory/app_memdomain.h>
#include <zephyr/app_memory/app_memdomain.h>
#ifdef CONFIG_USERSPACE
#include <sys/libc-hooks.h>
#include <zephyr/sys/libc-hooks.h>
#endif
#include <sys/reboot.h>
#include <logging/log_ctrl.h>
#include <zephyr/sys/reboot.h>
#include <zephyr/logging/log_ctrl.h>
#ifdef KERNEL
static struct k_thread ztest_thread;

4
subsys/testsuite/ztest/src/ztress.c
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <ztress.h>
#include <sys/printk.h>
#include <random/rand32.h>
#include <zephyr/sys/printk.h>
#include <zephyr/random/rand32.h>
#include <string.h>