Skip to content
Permalink
Browse files

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

move misc/__assert.h to sys/__assert.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 #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 26, 2019
1 parent 7435e5e commit 5eb90ec1695632370e7d6b194cb06913581d44d7
Showing with 280 additions and 265 deletions.
  1. +1 −1 arch/arc/core/cache.c
  2. +1 −1 arch/arc/core/irq_manage.c
  3. +1 −1 arch/arm/core/cortex_m/mpu/nxp_mpu.c
  4. +1 −1 arch/arm/core/irq_manage.c
  5. +1 −1 arch/arm/core/thread_abort.c
  6. +1 −1 arch/common/sw_isr_common.c
  7. +1 −1 arch/nios2/core/cache.c
  8. +1 −1 arch/x86/core/ia32/irq_manage.c
  9. +1 −1 arch/xtensa/core/irq_manage.c
  10. +1 −1 drivers/adc/adc_sam_afec.c
  11. +1 −1 drivers/clock_control/nrf_power_clock.c
  12. +1 −1 drivers/clock_control/quark_se_clock_control.c
  13. +1 −1 drivers/console/ipm_console_receiver.c
  14. +1 −1 drivers/dma/dma_sam_xdmac.c
  15. +1 −1 drivers/entropy/entropy_stm32.c
  16. +1 −1 drivers/ethernet/eth_dw.c
  17. +1 −1 drivers/ethernet/eth_sam_gmac.c
  18. +1 −1 drivers/ethernet/eth_smsc911x.c
  19. +1 −1 drivers/ethernet/eth_stm32_hal.c
  20. +1 −1 drivers/flash/flash_stm32wbx.c
  21. +1 −1 drivers/flash/soc_flash_nrf.c
  22. +1 −1 drivers/gpio/gpio_cc13xx_cc26xx.c
  23. +1 −1 drivers/gpio/gpio_dw.c
  24. +1 −1 drivers/gpio/gpio_intel_apl.c
  25. +1 −1 drivers/i2c/i2c_sam_twi.c
  26. +1 −1 drivers/i2c/i2c_sam_twihs.c
  27. +1 −1 drivers/i2s/i2s_cavs.c
  28. +1 −1 drivers/i2s/i2s_sam_ssc.c
  29. +1 −1 drivers/interrupt_controller/exti_stm32.c
  30. +1 −1 drivers/interrupt_controller/loapic_intr.c
  31. +1 −1 drivers/interrupt_controller/system_apic.c
  32. +1 −1 drivers/ipm/ipm_quark_se.c
  33. +1 −1 drivers/pinmux/pinmux_cc13xx_cc26xx.c
  34. +1 −1 drivers/pinmux/pinmux_cc2650.c
  35. +1 −1 drivers/sensor/adt7420/adt7420.c
  36. +1 −1 drivers/sensor/adxl362/adxl362.c
  37. +1 −1 drivers/sensor/adxl372/adxl372.c
  38. +1 −1 drivers/sensor/ak8975/ak8975.c
  39. +1 −1 drivers/sensor/amg88xx/amg88xx.c
  40. +1 −1 drivers/sensor/ams_iAQcore/iAQcore.c
  41. +1 −1 drivers/sensor/apds9960/apds9960.c
  42. +1 −1 drivers/sensor/bma280/bma280.c
  43. +1 −1 drivers/sensor/bmc150_magn/bmc150_magn.c
  44. +1 −1 drivers/sensor/bme280/bme280.c
  45. +1 −1 drivers/sensor/bme680/bme680.c
  46. +1 −1 drivers/sensor/bmi160/bmi160.c
  47. +1 −1 drivers/sensor/bmm150/bmm150.h
  48. +1 −1 drivers/sensor/ccs811/ccs811.c
  49. +1 −1 drivers/sensor/ens210/ens210.c
  50. +1 −1 drivers/sensor/fxas21002/fxas21002.c
  51. +1 −1 drivers/sensor/fxos8700/fxos8700.c
  52. +1 −1 drivers/sensor/hmc5883l/hmc5883l.c
  53. +1 −1 drivers/sensor/hmc5883l/hmc5883l_trigger.c
  54. +1 −1 drivers/sensor/hts221/hts221.c
  55. +1 −1 drivers/sensor/hts221/hts221_trigger.c
  56. +1 −1 drivers/sensor/isl29035/isl29035.c
  57. +1 −1 drivers/sensor/lis2dh/lis2dh.c
  58. +1 −1 drivers/sensor/lis2ds12/lis2ds12.c
  59. +1 −1 drivers/sensor/lis2ds12/lis2ds12_trigger.c
  60. +1 −1 drivers/sensor/lis2dw12/lis2dw12.c
  61. +1 −1 drivers/sensor/lis2mdl/lis2mdl.c
  62. +1 −1 drivers/sensor/lis3mdl/lis3mdl.c
  63. +1 −1 drivers/sensor/lis3mdl/lis3mdl_trigger.c
  64. +1 −1 drivers/sensor/lps22hb/lps22hb.c
  65. +1 −1 drivers/sensor/lps25hb/lps25hb.c
  66. +1 −1 drivers/sensor/lsm6ds0/lsm6ds0.c
  67. +1 −1 drivers/sensor/lsm6dsl/lsm6dsl.c
  68. +1 −1 drivers/sensor/lsm6dsl/lsm6dsl_shub.c
  69. +1 −1 drivers/sensor/lsm6dsl/lsm6dsl_trigger.c
  70. +1 −1 drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
  71. +1 −1 drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
  72. +1 −1 drivers/sensor/max44009/max44009.c
  73. +1 −1 drivers/sensor/mcp9808/mcp9808.c
  74. +1 −1 drivers/sensor/mcp9808/mcp9808_trigger.c
  75. +1 −1 drivers/sensor/ms5837/ms5837.c
  76. +1 −1 drivers/sensor/sht3xd/sht3xd.c
  77. +1 −1 drivers/sensor/sx9500/sx9500.c
  78. +1 −1 drivers/sensor/th02/th02.c
  79. +1 −1 drivers/sensor/ti_hdc/ti_hdc.c
  80. +1 −1 drivers/sensor/tmp007/tmp007.c
  81. +1 −1 drivers/sensor/tmp112/tmp112.c
  82. +1 −1 drivers/sensor/vl53l0x/vl53l0x.c
  83. +1 −1 drivers/serial/uart_cc13xx_cc26xx.c
  84. +1 −1 drivers/serial/uart_cmsdk_apb.c
  85. +1 −1 drivers/serial/uart_imx.c
  86. +1 −1 drivers/serial/uart_nsim.c
  87. +1 −1 drivers/serial/uart_psoc6.c
  88. +1 −1 drivers/serial/uart_sam.c
  89. +1 −1 drivers/serial/uart_sam0.c
  90. +1 −1 drivers/serial/uart_stellaris.c
  91. +1 −1 drivers/serial/uart_stm32.c
  92. +1 −1 drivers/serial/usart_sam.c
  93. +1 −1 drivers/spi/spi_intel.c
  94. +1 −1 ext/hal/ti/simplelink/kernel/zephyr/dpl/ClockP_zephyr.c
  95. +1 −1 ext/hal/ti/simplelink/kernel/zephyr/dpl/HwiP_zephyr.c
  96. +1 −1 ext/hal/ti/simplelink/kernel/zephyr/dpl/MutexP_zephyr.c
  97. +1 −1 ext/hal/ti/simplelink/kernel/zephyr/dpl/SemaphoreP_zephyr.c
  98. +1 −1 ext/hal/ti/simplelink/kernel/zephyr/dpl/dpl.c
  99. +1 −1 include/crypto/cipher.h
  100. +1 −1 include/drivers/clock_control.h
  101. +1 −1 include/drivers/gpio.h
  102. +1 −1 include/kernel_includes.h
  103. +4 −118 include/misc/__assert.h
  104. +1 −1 include/misc/byteorder.h
  105. +1 −1 include/net/net_core.h
  106. +1 −1 include/net/net_mgmt.h
  107. +1 −1 include/spinlock.h
  108. +129 −0 include/sys/__assert.h
  109. +1 −1 kernel/mem_domain.c
  110. +1 −1 kernel/mempool.c
  111. +1 −1 kernel/pipes.c
  112. +1 −1 kernel/poll.c
  113. +1 −1 kernel/stack.c
  114. +1 −1 kernel/thread_abort.c
  115. +1 −1 lib/libc/minimal/include/assert.h
  116. +1 −1 lib/os/assert.c
  117. +1 −1 lib/os/mempool.c
  118. +1 −1 samples/basic/threads/src/main.c
  119. +1 −1 samples/philosophers/src/main.c
  120. +1 −1 samples/portability/cmsis_rtos_v1/philosophers/src/main.c
  121. +1 −1 samples/portability/cmsis_rtos_v2/philosophers/src/main.c
  122. +1 −1 samples/sensor/adt7420/src/main.c
  123. +1 −1 samples/sensor/ti_hdc/src/main.c
  124. +1 −1 samples/sensor/tmp112/src/main.c
  125. +1 −1 soc/arc/quark_se_c1000_ss/power.c
  126. +1 −1 soc/arm/atmel_sam/common/soc_gpio.c
  127. +1 −1 soc/arm/atmel_sam/common/soc_pmc.c
  128. +1 −1 soc/x86/intel_quark/quark_se/power.c
  129. +1 −1 soc/x86/intel_quark/quark_se/soc.c
  130. +1 −1 soc/x86/intel_quark/quark_x1000/soc.c
  131. +1 −1 subsys/bluetooth/host/conn.c
  132. +1 −1 subsys/bluetooth/host/hci_core.c
  133. +1 −1 subsys/bluetooth/host/sdp.c
  134. +1 −1 subsys/dfu/boot/mcuboot.c
  135. +1 −1 subsys/disk/disk_access.c
  136. +1 −1 subsys/disk/disk_access_flash.c
  137. +1 −1 subsys/disk/disk_access_ram.c
  138. +1 −1 subsys/fs/fat_fs.c
  139. +1 −1 subsys/fs/nffs_fs.c
  140. +1 −1 subsys/net/l2/openthread/openthread.c
  141. +1 −1 subsys/net/lib/openthread/platform/radio.c
  142. +1 −1 subsys/power/device_pm.c
  143. +1 −1 subsys/usb/class/mass_storage.c
  144. +1 −1 subsys/usb/usb_descriptor.c
  145. +1 −1 subsys/usb/usb_device.c
  146. +1 −1 tests/kernel/fifo/fifo_timeout/src/main.c
  147. +1 −1 tests/kernel/tickless/tickless/src/timestamps.c
  148. +1 −1 tests/lib/c_lib/src/main.c
  149. +1 −1 tests/subsys/fs/fat_fs_dual_drive/src/disk_access_test_drv.c
@@ -21,7 +21,7 @@
#include <linker/linker-defs.h>
#include <arch/arc/v2/aux_regs.h>
#include <kernel_internal.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <init.h>
#include <stdbool.h>

@@ -19,7 +19,7 @@

#include <kernel.h>
#include <arch/cpu.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <toolchain.h>
#include <linker/sections.h>
#include <sw_isr_table.h>
@@ -10,7 +10,7 @@
#include <soc.h>
#include "arm_core_mpu_dev.h"
#include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <linker/linker-defs.h>

#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
@@ -17,7 +17,7 @@
#include <kernel.h>
#include <arch/cpu.h>
#include <arch/arm/cortex_m/cmsis.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <toolchain.h>
#include <linker/sections.h>
#include <sw_isr_table.h>
@@ -23,7 +23,7 @@
#include <ksched.h>
#include <kswap.h>
#include <wait_q.h>
#include <misc/__assert.h>
#include <sys/__assert.h>

extern void z_thread_single_abort(struct k_thread *thread);

@@ -6,7 +6,7 @@

#include <sw_isr_table.h>
#include <arch/cpu.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
/*
* Common code for arches that use software ISR tables (CONFIG_GEN_ISR_TABLES)
*/
@@ -5,7 +5,7 @@
*/

#include <arch/cpu.h>
#include <misc/__assert.h>
#include <sys/__assert.h>


/**
@@ -17,7 +17,7 @@
#include <kernel.h>
#include <arch/cpu.h>
#include <kernel_structs.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/printk.h>
#include <irq.h>
#include <debug/tracing.h>
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <xtensa_api.h>
#include <kernel_arch_data.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
/*
* @internal
*
@@ -13,7 +13,7 @@
*/

#include <errno.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/util.h>
#include <device.h>
#include <init.h>
@@ -10,7 +10,7 @@
#include <sys/atomic.h>
#include <device.h>
#include <drivers/clock_control.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <nrf_clock.h>
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
#include <nrf_power.h>
@@ -9,7 +9,7 @@
#include <kernel.h>
#include <arch/cpu.h>

#include <misc/__assert.h>
#include <sys/__assert.h>
#include <soc.h>
#include <device.h>
#include <init.h>
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <drivers/ipm.h>
#include <console/ipm_console.h>
#include <misc/__assert.h>
#include <sys/__assert.h>

static void ipm_console_thread(void *arg1, void *arg2, void *arg3)
{
@@ -9,7 +9,7 @@
*/

#include <errno.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <device.h>
#include <init.h>
#include <string.h>
@@ -9,7 +9,7 @@
#include <drivers/entropy.h>
#include <random/rand32.h>
#include <init.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/util.h>
#include <errno.h>
#include <soc.h>
@@ -14,7 +14,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#include <errno.h>
#include <init.h>
#include <kernel.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <net/net_core.h>
#include <net/net_pkt.h>
#include <stdbool.h>
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);

#include <kernel.h>
#include <device.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/util.h>
#include <errno.h>
#include <stdbool.h>
@@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#include <errno.h>
#include <init.h>
#include <kernel.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <net/net_core.h>
#include <net/net_pkt.h>
#include <stdbool.h>
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);

#include <kernel.h>
#include <device.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/util.h>
#include <errno.h>
#include <stdbool.h>
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>
#include <misc/__assert.h>
#include <sys/__assert.h>

#include "flash_stm32.h"

@@ -17,7 +17,7 @@
#include <nrfx_nvmc.h>

#if defined(CONFIG_SOC_FLASH_NRF_RADIO_SYNC)
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <bluetooth/hci.h>
#include "controller/hal/ticker.h"
#include "controller/ticker/ticker.h"
@@ -5,7 +5,7 @@
*/

#include <zephyr/types.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <device.h>
#include <errno.h>
#include <drivers/gpio.h>
@@ -15,7 +15,7 @@
#include <sys/sys_io.h>
#include <init.h>
#include <misc/util.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <drivers/clock_control.h>

#ifdef CONFIG_SHARED_IRQ
@@ -25,7 +25,7 @@
#include <drivers/gpio.h>
#include <soc.h>
#include <sys/sys_io.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/slist.h>
#include <misc/speculation.h>

@@ -13,7 +13,7 @@
*/

#include <errno.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <stdbool.h>
#include <kernel.h>
#include <device.h>
@@ -12,7 +12,7 @@


#include <errno.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <kernel.h>
#include <device.h>
#include <init.h>
@@ -14,7 +14,7 @@

#include <errno.h>
#include <string.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <kernel.h>
#include <device.h>
#include <init.h>
@@ -19,7 +19,7 @@

#include <errno.h>
#include <string.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <kernel.h>
#include <device.h>
#include <init.h>
@@ -18,7 +18,7 @@
*/
#include <device.h>
#include <soc.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include "exti_stm32.h"

#if defined(CONFIG_SOC_SERIES_STM32F0X) || \
@@ -12,7 +12,7 @@
#include <arch/cpu.h>
#include <zephyr/types.h>
#include <string.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <arch/x86/msr.h>

#include <toolchain.h>
@@ -10,7 +10,7 @@
*
*/

#include <misc/__assert.h>
#include <sys/__assert.h>
#include <kernel.h>
#include <arch/cpu.h>
#include <drivers/interrupt_controller/ioapic.h>
@@ -14,7 +14,7 @@
#include <drivers/ipm.h>
#include <arch/cpu.h>
#include <misc/printk.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <errno.h>
#include "ipm_quark_se.h"

@@ -6,7 +6,7 @@

#include <device.h>
#include <errno.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <drivers/pinmux.h>

#include <driverlib/ioc.h>
@@ -50,7 +50,7 @@
* 0x38 - RF Core SMI command link in
*/

#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/util.h>
#include <toolchain.h>
#include <device.h>
@@ -10,7 +10,7 @@
#include <misc/util.h>
#include <kernel.h>
#include <drivers/sensor.h>
#include <misc/__assert.h>
#include <sys/__assert.h>

#include "adt7420.h"

@@ -11,7 +11,7 @@
#include <init.h>
#include <drivers/gpio.h>
#include <misc/byteorder.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <drivers/spi.h>
#include <logging/log.h>

@@ -10,7 +10,7 @@
#include <init.h>
#include <drivers/gpio.h>
#include <misc/printk.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <stdlib.h>
#include <drivers/spi.h>
#include <drivers/i2c.h>
@@ -8,7 +8,7 @@
#include <drivers/i2c.h>
#include <kernel.h>
#include <drivers/sensor.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/byteorder.h>
#include <misc/util.h>
#include <logging/log.h>
@@ -12,7 +12,7 @@
#include <misc/util.h>
#include <kernel.h>
#include <drivers/sensor.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <logging/log.h>

#include "amg88xx.h"
@@ -10,7 +10,7 @@
#include <misc/byteorder.h>
#include <misc/util.h>
#include <drivers/sensor.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <logging/log.h>

#include "iAQcore.h"
@@ -12,7 +12,7 @@
#include <device.h>
#include <drivers/sensor.h>
#include <drivers/i2c.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <misc/byteorder.h>
#include <init.h>
#include <kernel.h>
@@ -7,7 +7,7 @@
#include <drivers/i2c.h>
#include <init.h>
#include <drivers/sensor.h>
#include <misc/__assert.h>
#include <sys/__assert.h>
#include <logging/log.h>

#include "bma280.h"
@@ -14,7 +14,7 @@
#include <device.h>
#include <init.h>
#include <misc/byteorder.h>
#include <misc/__assert.h>
#include <sys/__assert.h>

#include <drivers/gpio.h>
#include <logging/log.h>
@@ -12,7 +12,7 @@
#include <init.h>
#include <drivers/gpio.h>
#include <misc/byteorder.h>
#include <misc/__assert.h>
#include <sys/__assert.h>

#ifdef DT_BOSCH_BME280_BUS_I2C
#include <drivers/i2c.h>

0 comments on commit 5eb90ec

Please sign in to comment.
You can’t perform that action at this time.