Skip to content

Commit 53ef68d

Browse files
Yuval Peresscarlescufi
Yuval Peress
authored and
carlescufi
committed
include: Prefix includes to use a scope
Move include paths and add new target_include_directories to support backwards compatibility: * /include -> /include/zephyr example: <irq.h> -> <zephyr/irq.h> Issue #41543 Signed-off-by: Yuval Peress <[email protected]>
1 parent 33c0995 commit 53ef68d

File tree

797 files changed

+233
-229
lines changed

Some content is hidden

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

797 files changed

+233
-229
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ zephyr_library_named(zephyr)
106106

107107
zephyr_include_directories(
108108
include
109+
include/zephyr
109110
${PROJECT_BINARY_DIR}/include/generated
110111
${USERINCLUDE}
111112
${STDINCLUDE}
@@ -131,7 +132,7 @@ zephyr_compile_definitions(
131132
__ZEPHYR__=1
132133
)
133134

134-
# Ensure that include/toolchain.h includes toolchain/other.h for all off-tree toolchains
135+
# Ensure that include/zephyr/toolchain.h includes toolchain/other.h for all off-tree toolchains
135136
if(TOOLCHAIN_USE_CUSTOM)
136137
zephyr_compile_definitions(__TOOLCHAIN_CUSTOM__)
137138
endif()
@@ -277,7 +278,7 @@ if(NOT CONFIG_ARCH_POSIX)
277278
# `zephyr_stdint.h` is not included for the POSIX (native) arch because it
278279
# compiles with the host toolchain/headers and there can be conflicts if we
279280
# arbitrarily redefine our own type system (see #37718).
280-
zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/toolchain/zephyr_stdint.h")
281+
zephyr_compile_options("SHELL: $<TARGET_PROPERTY:compiler,imacros> ${ZEPHYR_BASE}/include/zephyr/toolchain/zephyr_stdint.h")
281282
endif()
282283

283284
# Common toolchain-agnostic assembly flags

‎CODEOWNERS‎

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -526,97 +526,97 @@
526526
/dts/bindings/sensor/st* @avisconti
527527
/dts/common/ @galak
528528
/include/ @nashif @carlescufi @galak @MaureenHelm
529-
/include/drivers/*/*litex* @mateusz-holenko @kgugala @pgielda
530-
/include/drivers/adc.h @anangl
531-
/include/drivers/can.h @alexanderwachter @henrikbrixandersen
532-
/include/drivers/can/ @alexanderwachter @henrikbrixandersen
533-
/include/drivers/counter.h @nordic-krch
534-
/include/drivers/dac.h @martinjaeger
535-
/include/drivers/espi.h @albertofloyd @franciscomunoz @sjvasanth1
536-
/include/drivers/bluetooth/ @alwa-nordic @jhedberg @Vudentz
537-
/include/drivers/flash.h @nashif @carlescufi @galak @MaureenHelm @nvlsianpu
538-
/include/drivers/i2c_emul.h @sjg20
539-
/include/drivers/led/ht16k33.h @henrikbrixandersen
540-
/include/drivers/interrupt_controller/ @dcpleung @nashif
541-
/include/drivers/interrupt_controller/gic.h @stephanosio
542-
/include/drivers/modem/hl7800.h @LairdCP/zephyr
543-
/include/drivers/pcie/ @dcpleung
544-
/include/drivers/hwinfo.h @alexanderwachter
545-
/include/drivers/led.h @Mani-Sadhasivam
546-
/include/drivers/led_strip.h @mbolivar-nordic
547-
/include/drivers/sensor.h @MaureenHelm
548-
/include/drivers/spi.h @tbursztyka
549-
/include/drivers/lora.h @Mani-Sadhasivam
550-
/include/drivers/peci.h @albertofloyd @franciscomunoz @sjvasanth1
551-
/include/drivers/pm_cpu_ops.h @carlocaione
552-
/include/drivers/pm_cpu_ops/ @carlocaione
553-
/include/app_memory/ @dcpleung
554-
/include/arch/arc/ @abrodkin @ruuddw @evgeniy-paltsev
555-
/include/arch/arc/arch.h @abrodkin @ruuddw @evgeniy-paltsev
556-
/include/arch/arc/v2/irq.h @abrodkin @ruuddw @evgeniy-paltsev
557-
/include/arch/arm/aarch32/ @MaureenHelm @galak @ioannisg
558-
/include/arch/arm/aarch32/cortex_a_r/ @stephanosio
559-
/include/arch/arm64/ @carlocaione
560-
/include/arch/arm64/cortex_r/ @povergoing
561-
/include/arch/arm/aarch32/irq.h @carlocaione
562-
/include/arch/mips/ @frantony
563-
/include/arch/nios2/ @nashif
564-
/include/arch/nios2/arch.h @nashif
565-
/include/arch/posix/ @aescolar @daor-oti
566-
/include/arch/riscv/ @kgugala @pgielda
567-
/include/arch/x86/ @jhedberg @dcpleung
568-
/include/arch/common/ @andyross @nashif
569-
/include/arch/xtensa/ @andyross @dcpleung
570-
/include/arch/sparc/ @martin-aberg
571-
/include/sys/atomic.h @andyross
572-
/include/bluetooth/ @alwa-nordic @jhedberg @Vudentz
573-
/include/bluetooth/audio/ @alwa-nordic @jhedberg @Vudentz @Thalley @asbjornsabo
574-
/include/cache.h @carlocaione @andyross
575-
/include/canbus/ @alexanderwachter @henrikbrixandersen
576-
/include/tracing/ @nashif
577-
/include/debug/ @nashif
578-
/include/debug/coredump.h @dcpleung
579-
/include/debug/gdbstub.h @ceolin
580-
/include/device.h @tbursztyka @nashif
581-
/include/devicetree.h @galak
582-
/include/devicetree/can.h @henrikbrixandersen
583-
/include/dt-bindings/clock/kinetis_mcg.h @henrikbrixandersen
584-
/include/dt-bindings/clock/kinetis_scg.h @henrikbrixandersen
585-
/include/dt-bindings/ethernet/xlnx_gem.h @ibirnbaum
586-
/include/dt-bindings/pcie/ @dcpleung
587-
/include/dt-bindings/pwm/*it8xxx2* @RuibinChang
588-
/include/dt-bindings/usb/usb.h @galak
589-
/include/drivers/emul.h @sjg20
590-
/include/fs/ @nashif @nvlsianpu @de-nordic
591-
/include/init.h @nashif @andyross
592-
/include/irq.h @dcpleung @nashif @andyross
593-
/include/irq_offload.h @dcpleung @nashif @andyross
594-
/include/kernel.h @dcpleung @nashif @andyross
595-
/include/kernel_version.h @dcpleung @nashif @andyross
596-
/include/linker/app_smem*.ld @dcpleung @nashif
597-
/include/linker/ @dcpleung @nashif @andyross
598-
/include/logging/ @nordic-krch
599-
/include/lorawan/lorawan.h @Mani-Sadhasivam
600-
/include/mgmt/osdp.h @sidcha
601-
/include/net/ @rlubos @tbursztyka @pfalcon
602-
/include/net/buf.h @jhedberg @tbursztyka @pfalcon @rlubos
603-
/include/net/coap*.h @rlubos
604-
/include/net/lwm2m*.h @rlubos
605-
/include/net/mqtt.h @rlubos
606-
/include/net/net_pkt_filter.h @npitre
607-
/include/posix/ @pfalcon
608-
/include/pm/pm.h @nashif @ceolin
609-
/include/drivers/ptp_clock.h @tbursztyka
610-
/include/shared_irq.h @dcpleung @nashif @andyross
611-
/include/shell/ @jakub-uC @nordic-krch
612-
/include/shell/shell_mqtt.h @ycsin
613-
/include/sw_isr_table.h @dcpleung @nashif @andyross
614-
/include/sys_clock.h @dcpleung @nashif @andyross
615-
/include/sys/sys_io.h @dcpleung @nashif @andyross
616-
/include/sys/kobject.h @dcpleung @nashif
617-
/include/toolchain.h @dcpleung @andyross @nashif
618-
/include/toolchain/ @dcpleung @nashif @andyross
619-
/include/zephyr.h @dcpleung @nashif @andyross
529+
/include/zephyr/drivers/*/*litex* @mateusz-holenko @kgugala @pgielda
530+
/include/zephyr/drivers/adc.h @anangl
531+
/include/zephyr/drivers/can.h @alexanderwachter @henrikbrixandersen
532+
/include/zephyr/drivers/can/ @alexanderwachter @henrikbrixandersen
533+
/include/zephyr/drivers/counter.h @nordic-krch
534+
/include/zephyr/drivers/dac.h @martinjaeger
535+
/include/zephyr/drivers/espi.h @albertofloyd @franciscomunoz @sjvasanth1
536+
/include/zephyr/drivers/bluetooth/ @alwa-nordic @jhedberg @Vudentz
537+
/include/zephyr/drivers/flash.h @nashif @carlescufi @galak @MaureenHelm @nvlsianpu
538+
/include/zephyr/drivers/i2c_emul.h @sjg20
539+
/include/zephyr/drivers/led/ht16k33.h @henrikbrixandersen
540+
/include/zephyr/drivers/interrupt_controller/ @dcpleung @nashif
541+
/include/zephyr/drivers/interrupt_controller/gic.h @stephanosio
542+
/include/zephyr/drivers/modem/hl7800.h @LairdCP/zephyr
543+
/include/zephyr/drivers/pcie/ @dcpleung
544+
/include/zephyr/drivers/hwinfo.h @alexanderwachter
545+
/include/zephyr/drivers/led.h @Mani-Sadhasivam
546+
/include/zephyr/drivers/led_strip.h @mbolivar-nordic
547+
/include/zephyr/drivers/sensor.h @MaureenHelm
548+
/include/zephyr/drivers/spi.h @tbursztyka
549+
/include/zephyr/drivers/lora.h @Mani-Sadhasivam
550+
/include/zephyr/drivers/peci.h @albertofloyd @franciscomunoz @sjvasanth1
551+
/include/zephyr/drivers/pm_cpu_ops.h @carlocaione
552+
/include/zephyr/drivers/pm_cpu_ops/ @carlocaione
553+
/include/zephyr/app_memory/ @dcpleung
554+
/include/zephyr/arch/arc/ @abrodkin @ruuddw @evgeniy-paltsev
555+
/include/zephyr/arch/arc/arch.h @abrodkin @ruuddw @evgeniy-paltsev
556+
/include/zephyr/arch/arc/v2/irq.h @abrodkin @ruuddw @evgeniy-paltsev
557+
/include/zephyr/arch/arm/aarch32/ @MaureenHelm @galak @ioannisg
558+
/include/zephyr/arch/arm/aarch32/cortex_a_r/ @stephanosio
559+
/include/zephyr/arch/arm64/ @carlocaione
560+
/include/zephyr/arch/arm64/cortex_r/ @povergoing
561+
/include/zephyr/arch/arm/aarch32/irq.h @carlocaione
562+
/include/zephyr/arch/mips/ @frantony
563+
/include/zephyr/arch/nios2/ @nashif
564+
/include/zephyr/arch/nios2/arch.h @nashif
565+
/include/zephyr/arch/posix/ @aescolar @daor-oti
566+
/include/zephyr/arch/riscv/ @kgugala @pgielda
567+
/include/zephyr/arch/x86/ @jhedberg @dcpleung
568+
/include/zephyr/arch/common/ @andyross @nashif
569+
/include/zephyr/arch/xtensa/ @andyross @dcpleung
570+
/include/zephyr/arch/sparc/ @martin-aberg
571+
/include/zephyr/sys/atomic.h @andyross
572+
/include/zephyr/bluetooth/ @alwa-nordic @jhedberg @Vudentz
573+
/include/zephyr/bluetooth/audio/ @alwa-nordic @jhedberg @Vudentz @Thalley @asbjornsabo
574+
/include/zephyr/cache.h @carlocaione @andyross
575+
/include/zephyr/canbus/ @alexanderwachter @henrikbrixandersen
576+
/include/zephyr/tracing/ @nashif
577+
/include/zephyr/debug/ @nashif
578+
/include/zephyr/debug/coredump.h @dcpleung
579+
/include/zephyr/debug/gdbstub.h @ceolin
580+
/include/zephyr/device.h @tbursztyka @nashif
581+
/include/zephyr/devicetree.h @galak
582+
/include/zephyr/devicetree/can.h @henrikbrixandersen
583+
/include/zephyr/dt-bindings/clock/kinetis_mcg.h @henrikbrixandersen
584+
/include/zephyr/dt-bindings/clock/kinetis_scg.h @henrikbrixandersen
585+
/include/zephyr/dt-bindings/ethernet/xlnx_gem.h @ibirnbaum
586+
/include/zephyr/dt-bindings/pcie/ @dcpleung
587+
/include/zephyr/dt-bindings/pwm/*it8xxx2* @RuibinChang
588+
/include/zephyr/dt-bindings/usb/usb.h @galak
589+
/include/zephyr/drivers/emul.h @sjg20
590+
/include/zephyr/fs/ @nashif @nvlsianpu @de-nordic
591+
/include/zephyr/init.h @nashif @andyross
592+
/include/zephyr/irq.h @dcpleung @nashif @andyross
593+
/include/zephyr/irq_offload.h @dcpleung @nashif @andyross
594+
/include/zephyr/kernel.h @dcpleung @nashif @andyross
595+
/include/zephyr/kernel_version.h @dcpleung @nashif @andyross
596+
/include/zephyr/linker/app_smem*.ld @dcpleung @nashif
597+
/include/zephyr/linker/ @dcpleung @nashif @andyross
598+
/include/zephyr/logging/ @nordic-krch
599+
/include/zephyr/lorawan/lorawan.h @Mani-Sadhasivam
600+
/include/zephyr/mgmt/osdp.h @sidcha
601+
/include/zephyr/net/ @rlubos @tbursztyka @pfalcon
602+
/include/zephyr/net/buf.h @jhedberg @tbursztyka @pfalcon @rlubos
603+
/include/zephyr/net/coap*.h @rlubos
604+
/include/zephyr/net/lwm2m*.h @rlubos
605+
/include/zephyr/net/mqtt.h @rlubos
606+
/include/zephyr/net/net_pkt_filter.h @npitre
607+
/include/zephyr/posix/ @pfalcon
608+
/include/zephyr/pm/pm.h @nashif @ceolin
609+
/include/zephyr/drivers/ptp_clock.h @tbursztyka
610+
/include/zephyr/shared_irq.h @dcpleung @nashif @andyross
611+
/include/zephyr/shell/ @jakub-uC @nordic-krch
612+
/include/zephyr/shell/shell_mqtt.h @ycsin
613+
/include/zephyr/sw_isr_table.h @dcpleung @nashif @andyross
614+
/include/zephyr/sys_clock.h @dcpleung @nashif @andyross
615+
/include/zephyr/sys/sys_io.h @dcpleung @nashif @andyross
616+
/include/zephyr/sys/kobject.h @dcpleung @nashif
617+
/include/zephyr/toolchain.h @dcpleung @andyross @nashif
618+
/include/zephyr/toolchain/ @dcpleung @nashif @andyross
619+
/include/zephyr/zephyr.h @dcpleung @nashif @andyross
620620
/kernel/ @dcpleung @nashif @andyross
621621
/lib/smf/ @sambhurst
622622
/lib/util/ @carlescufi @jakub-uC

0 commit comments

Comments
 (0)