cleanup: include/: move misc/util.h to sys/util.h

move misc/util.h to sys/util.h and create a shim for backward-compatibility. No functional changes to the headers. A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES. Related to zephyrproject-rtos#16539 Signed-off-by: Anas Nashif <[email protected]>
mlaz · Jun 28, 2019 · a2fd7d7 · a2fd7d7
1 parent d222553
commit a2fd7d7
Show file tree

Hide file tree

Showing 295 changed files with 1,103 additions and 1,088 deletions.
diff --git a/arch/arc/core/cache.c b/arch/arc/core/cache.c
@@ -15,7 +15,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <toolchain.h>
 #include <cache.h>
 #include <linker/linker-defs.h>

diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <kernel.h>
 #include <kernel_internal.h>
 #include <zephyr/types.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <sys/dlist.h>
 #endif
 

diff --git a/arch/arm/core/cortex_m/scb.c b/arch/arm/core/cortex_m/scb.c
@@ -16,7 +16,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <arch/arm/cortex_m/cmsis.h>
 
 /**

diff --git a/arch/arm/core/cortex_m/vector_table.h b/arch/arm/core/cortex_m/vector_table.h
@@ -29,7 +29,7 @@ extern "C" {
 
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 GTEXT(__start)
 GTEXT(_vector_table)

diff --git a/arch/nios2/include/kernel_arch_data.h b/arch/nios2/include/kernel_arch_data.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <kernel.h>
 #include <kernel_internal.h>
 #include <zephyr/types.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <sys/dlist.h>
 #endif
 

diff --git a/arch/riscv32/include/kernel_arch_data.h b/arch/riscv32/include/kernel_arch_data.h
@@ -27,7 +27,7 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
 #include <zephyr/types.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <sys/dlist.h>
 #include <kernel_internal.h>
 

diff --git a/arch/x86/core/ia32/cache.c b/arch/x86/core/ia32/cache.c
@@ -12,7 +12,7 @@
 
 #include <kernel.h>
 #include <arch/cpu.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <toolchain.h>
 #include <cache.h>
 #include <cache_private.h>

diff --git a/arch/x86/include/kernel_arch_data.h b/arch/x86/include/kernel_arch_data.h
@@ -31,7 +31,7 @@
 #include <asm_inline.h>
 #include <exception.h>
 #include <kernel_arch_thread.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #ifndef _ASMLANGUAGE
 #include <kernel.h>
@@ -110,7 +110,7 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <misc/util.h>
+#include <sys/util.h>
 
 #ifdef _THREAD_WRAPPER_REQUIRED
 extern void z_x86_thread_entry_wrapper(k_thread_entry_t entry,

diff --git a/arch/xtensa/core/xtensa_intgen.py b/arch/xtensa/core/xtensa_intgen.py
@@ -94,7 +94,7 @@ def emit_int_handler(ints):
 
 # Re-include the core-isa header and be sure our definitions match, for sanity
 cprint("#include <xtensa/config/core-isa.h>")
-cprint("#include <misc/util.h>")
+cprint("#include <sys/util.h>")
 cprint("#include <sw_isr_table.h>")
 cprint("")
 for l in ints_by_lvl:

diff --git a/arch/xtensa/include/kernel_arch_data.h b/arch/xtensa/include/kernel_arch_data.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <kernel_internal.h>
 #include <zephyr/types.h>
 #include <sys/dlist.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 /* Bitmask definitions for the struct k_thread->flags bit field */
 

diff --git a/boards/posix/native_posix/hw_models_top.c b/boards/posix/native_posix/hw_models_top.c
@@ -21,7 +21,7 @@
 #include "posix_soc_if.h"
 #include "posix_arch_internal.h"
 #include "sdl_events.h"
-#include <misc/util.h>
+#include <sys/util.h>
 
 
 static u64_t simu_time; /* The actual time as known by the HW models */

diff --git a/boards/posix/native_posix/main.c b/boards/posix/native_posix/main.c
@@ -29,7 +29,7 @@
 #include <soc.h>
 #include "hw_models_top.h"
 #include <stdlib.h>
-#include "misc/util.h"
+#include <sys/util.h>
 #include "cmdline.h"
 
 void posix_exit(int exit_code)

diff --git a/boards/posix/native_posix/timer_model.c b/boards/posix/native_posix/timer_model.c
@@ -27,7 +27,7 @@
 #include "board_soc.h"
 #include "zephyr/types.h"
 #include "posix_trace.h"
-#include "misc/util.h"
+#include <sys/util.h>
 #include "cmdline.h"
 #include "soc.h"
 

diff --git a/boards/posix/nrf52_bsim/board_soc.h b/boards/posix/nrf52_bsim/board_soc.h
@@ -20,7 +20,7 @@
 #define _POSIX_NRF52_BOARD_SOC_H
 
 #include <toolchain.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #include <stdint.h>
 #include <stdbool.h>

diff --git a/drivers/adc/adc_intel_quark_se_c1000_ss.c b/drivers/adc/adc_intel_quark_se_c1000_ss.c
@@ -21,7 +21,7 @@
 #include <soc.h>
 #include <drivers/adc.h>
 #include <arch/cpu.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"

diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c
@@ -14,7 +14,7 @@
 
 #include <errno.h>
 #include <sys/__assert.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <device.h>
 #include <init.h>
 #include <soc.h>

diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#include <misc/util.h>
+#include <sys/util.h>
 
 #include <device.h>
 #include <drivers/i2c.h>

diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c
@@ -14,7 +14,7 @@
 
 #include <init.h>
 #include <drivers/uart.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <sys/byteorder.h>
 #include <string.h>
 

diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
@@ -13,7 +13,7 @@
 
 #include <init.h>
 #include <drivers/uart.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <sys/byteorder.h>
 #include <misc/stack.h>
 #include <sys/printk.h>

diff --git a/drivers/bluetooth/hci/ipm_stm32wb.c b/drivers/bluetooth/hci/ipm_stm32wb.c
@@ -8,7 +8,7 @@
 
 
 #include <init.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_driver.h>

diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
@@ -10,7 +10,7 @@
 #include <init.h>
 #include <drivers/spi.h>
 #include <sys/byteorder.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_driver.h>

diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
@@ -9,7 +9,7 @@
 #include <zephyr.h>
 #include <device.h>
 #include <init.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <sys/byteorder.h>
 
 #include <errno.h>

diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
@@ -6,7 +6,7 @@
 
 #include <clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <string.h>
 #include <kernel.h>
 #include <soc.h>

diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c
@@ -14,7 +14,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/arm_clock_control.h>
 
 #define MAINCLK_BASE_FREQ 24000000

diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 

diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c
@@ -6,7 +6,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 
 /**

diff --git a/drivers/clock_control/clock_stm32f0_f3.c b/drivers/clock_control/clock_stm32f0_f3.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 

diff --git a/drivers/clock_control/clock_stm32f1.c b/drivers/clock_control/clock_stm32f1.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 

diff --git a/drivers/clock_control/clock_stm32f2_f4_f7.c b/drivers/clock_control/clock_stm32f2_f4_f7.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 

diff --git a/drivers/clock_control/clock_stm32l0_l1.c b/drivers/clock_control/clock_stm32l0_l1.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 

diff --git a/drivers/clock_control/clock_stm32l4_wb.c b/drivers/clock_control/clock_stm32l4_wb.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <clock_control/stm32_clock_control.h>
 #include "clock_stm32_ll_common.h"
 

diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c
@@ -13,7 +13,7 @@
 
 #include <clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <kernel.h>
 #include <soc.h>
 #include <drivers/counter.h>

diff --git a/drivers/counter/counter_qmsi_aonpt.c b/drivers/counter/counter_qmsi_aonpt.c
@@ -12,7 +12,7 @@
 #include <drivers/counter.h>
 #include <power/power.h>
 #include <soc.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #include "qm_aon_counters.h"
 #include "qm_isr.h"

diff --git a/drivers/counter/counter_rtc_qmsi.c b/drivers/counter/counter_rtc_qmsi.c
@@ -13,7 +13,7 @@
 #include <kernel.h>
 #include <power/power.h>
 #include <soc.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #include "qm_isr.h"
 #include "qm_rtc.h"

diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h
@@ -10,7 +10,7 @@
 
 #include <drivers/i2c.h>
 #include <kernel.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 /* Configuration Read Only Registers */
 #define ATAES_SERIALNUM_REG	0xF000

diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/display/grove_lcd_rgb.c
@@ -11,7 +11,7 @@
 
 #include <drivers/i2c.h>
 #include <display/grove_lcd.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
 #include <logging/log.h>

diff --git a/drivers/dma/dma_stm32f4x.c b/drivers/dma/dma_stm32f4x.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <soc.h>
 #include <string.h>
-#include <misc/util.h>
+#include <sys/util.h>
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
 #include <logging/log.h>

diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c
@@ -10,7 +10,7 @@
 #include <random/rand32.h>
 #include <init.h>
 #include <sys/__assert.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <errno.h>
 #include <soc.h>
 #include <sys/printk.h>

diff --git a/drivers/entropy/fake_entropy_native_posix.c b/drivers/entropy/fake_entropy_native_posix.c
@@ -14,7 +14,7 @@
 #include "device.h"
 #include <drivers/entropy.h>
 #include "init.h"
-#include "misc/util.h"
+#include <sys/util.h>
 #include <stdlib.h>
 #include <string.h>
 #include "posix_trace.h"

diff --git a/drivers/ethernet/eth_dw_priv.h b/drivers/ethernet/eth_dw_priv.h
@@ -12,7 +12,7 @@
 #include <pci/pci_mgr.h>
 #endif /* CONFIG_PCI */
 
-#include <misc/util.h>
+#include <sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c
@@ -20,7 +20,7 @@
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <device.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <kernel.h>
 #include <net/net_pkt.h>
 #include <net/net_if.h>

diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
@@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <device.h>
 #include <sys/__assert.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <net/net_pkt.h>

diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <kernel.h>
 #include <device.h>
 #include <sys/__assert.h>
-#include <misc/util.h>
+#include <sys/util.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <net/net_pkt.h>