Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zephyr: update include paths to use <zephyr/...> #210

Merged
merged 2 commits into from
May 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/system/zephyr/alloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef __METAL_ZEPHYR_ALLOC__H__
#define __METAL_ZEPHYR_ALLOC__H__

#include <kernel.h>
#include <zephyr/kernel.h>
#include <stdlib.h>

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/assert.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef __METAL_ZEPHYR_ASSERT__H__
#define __METAL_ZEPHYR_ASSERT__H__

#include <zephyr.h>
#include <zephyr/kernel.h>

/**
* @brief Assertion macro for Zephyr-based applications.
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef __METAL_ZEPHYR_CACHE__H__
#define __METAL_ZEPHYR_CACHE__H__

#include <cache.h>
#include <zephyr/cache.h>
#include <metal/utilities.h>

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <stdarg.h>
#include <metal/log.h>
#include <zephyr.h>
#include <zephyr/kernel.h>

static const char * const level_strs[] = {
"metal: emergency: ",
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/mutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define __METAL_ZEPHYR_MUTEX__H__

#include <metal/atomic.h>
#include <kernel.h>
#include <zephyr/kernel.h>

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/sleep.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef __METAL_ZEPHYR_SLEEP__H__
#define __METAL_ZEPHYR_SLEEP__H__

#include <kernel.h>
#include <zephyr/kernel.h>

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <metal/io.h>
#include <metal/sys.h>

#include <sys/arch_interface.h>
#include <zephyr/sys/arch_interface.h>

/**
* @brief poll function until some event happens
Expand Down
2 changes: 1 addition & 1 deletion lib/system/zephyr/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

#include <metal/time.h>
#include <kernel.h>
#include <zephyr/kernel.h>

unsigned long long metal_get_timestamp(void)
{
Expand Down
2 changes: 1 addition & 1 deletion test/system/zephyr/alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <metal/errno.h>
#include <metal/log.h>
#include <metal/sys.h>
#include <sys/printk.h>
#include <zephyr/sys/printk.h>
#include "metal-test-internal.h"

static int alloc(void)
Expand Down
4 changes: 2 additions & 2 deletions test/system/zephyr/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

#include "metal-test-internal.h"
#include <kernel.h>
#include <zephyr/kernel.h>
#include <metal/log.h>
#include <sys/printk.h>
#include <zephyr/sys/printk.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
Expand Down