Skip to content
Draft
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ add_library(sof_options INTERFACE)

target_link_libraries(sof_options INTERFACE sof_public_headers)

# kernel-only headers, included as <sof/kernel/...>, not part of the public headers
target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/kernel/include)

if(BUILD_COUNTERS)
target_compile_definitions(sof_options INTERFACE BLD_COUNTERS=1)
else()
Expand Down
5 changes: 2 additions & 3 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

# include files
src/include/sof/drivers/dmic.h @singalsu
src/include/ipc/** @thesofproject/steering-committee
src/include/ipc/** @randerwang @tmleman @pblaszko
src/include/ipc4/** @randerwang @tmleman @pblaszko
Expand All @@ -22,8 +21,8 @@ src/include/sof/audio/mux.h @fkwasowi
src/include/sof/audio/up_down_mixer/* @abonislawski
src/include/sof/audio/codec_adapter/* @cujomalainey @abonislawski @dbaluta
src/include/sof/audio/module_adapter/* @ranj063 @jxstelter
src/include/sof/drivers/acp_dai_dma.h @bhiregoudar @sunilkumardommati
src/include/sof/drivers/afe* @yaochunhung
src/kernel/include/sof/kernel/drivers/acp_dai_dma.h @bhiregoudar @sunilkumardommati
src/kernel/include/sof/kernel/drivers/afe* @yaochunhung

# audio component
src/audio/src* @singalsu @abonislawski
Expand Down
6 changes: 3 additions & 3 deletions doc/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
* <td>
* - @ref zephyr/include/rtos/alloc.h "rtos/alloc.h"<br/>
* - @ref src/include/sof/lib/vregion.h "sof/lib/vregion.h"<br/>
* - @ref zephyr/include/sof/lib/regions_mm.h "sof/lib/regions_mm.h"<br/>
* - @ref zephyr/include/sof/lib/vpage.h "sof/lib/vpage.h"<br/>
* - @ref src/kernel/include/sof/kernel/lib/regions_mm.h "sof/kernel/lib/regions_mm.h"<br/>
* - @ref src/kernel/include/sof/kernel/lib/vpage.h "sof/kernel/lib/vpage.h"<br/>
Comment on lines +170 to +171

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking (doxygen CI failure): Updating these @ref targets (plus line 235 for platform.h) fails in CI because doc/sof.doxygen.in does not list @top_srcdir@/src/kernel/include/sof in INPUT:

--- a/doc/sof.doxygen.in
+++ b/doc/sof.doxygen.in
@@ -19,6 +19,7 @@ INPUT            = @top_srcdir@/src/include/ipc \
                    @top_srcdir@/src/include/kernel \
                    @top_srcdir@/src/include/user \
                    @top_srcdir@/src/include/sof \
+                   @top_srcdir@/src/kernel/include/sof \
                    @top_srcdir@/zephyr/include \

Note that once @top_srcdir@/src/kernel/include/sof is added to INPUT, Doxygen also flags the stale @file paths in the two pure-rename headers from commit 7 (WARN_AS_ERROR = FAIL_ON_WARNINGS):

  • src/kernel/include/sof/kernel/lib/regions_mm.h:9: change @file sof/lib/regions_mm.h -> @file sof/kernel/lib/regions_mm.h
  • src/kernel/include/sof/kernel/lib/vpage.h:5: change @file sof/lib/vpage.h -> @file sof/kernel/lib/vpage.h

Applying all three makes ninja -C docbuild doc pass cleanly.

* - @ref src/include/sof/lib/fast-get.h "sof/lib/fast-get.h"<br/>
* - @ref zephyr/include/sof/lib/memory.h "sof/lib/memory.h"
* </td>
Expand Down Expand Up @@ -232,7 +232,7 @@
* - @ref zephyr/include/sof/lib/dai.h "sof/lib/dai.h"<br/>
* - @ref zephyr/include/sof/lib/dma.h "sof/lib/dma.h"<br/>
* - @ref zephyr/include/sof/lib/pm_runtime.h "pm_runtime.h"<br/>
* - @ref src/include/sof/platform.h "sof/platform.h"
* - @ref src/kernel/include/sof/kernel/platform.h "sof/kernel/platform.h"
* </td>
* <td>
* Low-level peripheral drivers: Digital Audio Interfaces (I2S/SSP, SoundWire, DMIC/PDM, HDA),
Expand Down
2 changes: 1 addition & 1 deletion posix/include/rtos/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <rtos/clk.h>
#include <sof/lib/cpu.h>
#include <rtos/sof.h>
#include <sof/platform.h>
#include <sof/kernel/platform.h>
#include <stdint.h>

struct comp_dev;
Expand Down
7 changes: 1 addition & 6 deletions scripts/kernel_user_partition.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ src/audio/host-legacy.c
# LL and IPC threads, and their layout is in the user-space platform
# headers in src/platform.
[kernel-headers]
src/include/sof/drivers/*
src/include/sof/platform.h
src/include/sof/llext_manager.h
src/include/sof/ipc/driver.h
src/kernel/include/*
src/include/sof/lib/agent.h
src/include/sof/lib/cpu-clk-manager.h
src/include/sof/lib/perf_cnt.h
Expand All @@ -52,8 +49,6 @@ zephyr/include/sof/lib/io.h
zephyr/include/sof/lib/memory.h
zephyr/include/sof/lib/mm_heap.h
zephyr/include/sof/lib/pm_runtime.h
zephyr/include/sof/lib/regions_mm.h
zephyr/include/sof/lib/vpage.h

# Zephyr headers that only kernel code may include: kernel internals and
# driver APIs that are not system calls.
Expand Down
2 changes: 1 addition & 1 deletion src/debug/panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <rtos/interrupt.h>
#include <rtos/cache.h>
#include <sof/lib/mailbox.h>
#include <sof/platform.h>
#include <sof/kernel/platform.h>
#include <rtos/string.h>
#include <sof/trace/trace.h>
#include <ipc/trace.h>
Expand Down
Loading
Loading