Skip to content
Permalink
Browse files

cleanup: include/: move atomic.h to sys/atomic.h

move atomic.h to sys/atomic.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 25, 2019
1 parent 52e0efa commit e1e05a2eace431daa61e68f3f6793f95d42a3165
Showing with 531 additions and 516 deletions.
  1. +1 −1 arch/arm/include/kernel_arch_data.h
  2. +1 −1 drivers/adc/adc_context.h
  3. +1 −1 drivers/can/can_mcux_flexcan.c
  4. +1 −1 drivers/clock_control/nrf_power_clock.c
  5. +1 −1 drivers/console/uart_console.c
  6. +1 −1 drivers/entropy/entropy_nrf5.c
  7. +1 −1 drivers/ieee802154/ieee802154_cc1200.h
  8. +1 −1 drivers/ieee802154/ieee802154_cc2520.h
  9. +1 −1 drivers/ieee802154/ieee802154_mcr20a.h
  10. +1 −1 ext/hal/nordic/nrfx_glue.h
  11. +4 −459 include/atomic.h
  12. +1 −1 include/bluetooth/l2cap.h
  13. +1 −1 include/kernel_includes.h
  14. +1 −1 include/logging/log_msg.h
  15. +1 −1 include/misc/mutex.h
  16. +1 −1 include/net/ethernet.h
  17. +1 −1 include/net/net_context.h
  18. +1 −1 include/shell/shell_log_backend.h
  19. +1 −1 include/shell/shell_uart.h
  20. +1 −1 include/spinlock.h
  21. +470 −0 include/sys/atomic.h
  22. +1 −1 kernel/atomic_c.c
  23. +1 −1 kernel/device.c
  24. +1 −1 kernel/include/kernel_structs.h
  25. +1 −1 kernel/thread.c
  26. +1 −1 lib/cmsis_rtos_v1/cmsis_thread.c
  27. +1 −1 lib/cmsis_rtos_v2/thread.c
  28. +1 −1 lib/posix/mqueue.c
  29. +1 −1 lib/posix/pthread.c
  30. +1 −1 subsys/bluetooth/common/rpa.c
  31. +1 −1 subsys/bluetooth/controller/hci/hci.c
  32. +1 −1 subsys/bluetooth/controller/hci/hci_driver.c
  33. +1 −1 subsys/bluetooth/host/a2dp.c
  34. +1 −1 subsys/bluetooth/host/att.c
  35. +1 −1 subsys/bluetooth/host/avdtp.c
  36. +1 −1 subsys/bluetooth/host/conn.c
  37. +1 −1 subsys/bluetooth/host/gatt.c
  38. +1 −1 subsys/bluetooth/host/hci_core.c
  39. +1 −1 subsys/bluetooth/host/hci_ecc.c
  40. +1 −1 subsys/bluetooth/host/hci_raw.c
  41. +1 −1 subsys/bluetooth/host/hfp_hf.c
  42. +1 −1 subsys/bluetooth/host/keys.c
  43. +1 −1 subsys/bluetooth/host/keys_br.c
  44. +1 −1 subsys/bluetooth/host/l2cap.c
  45. +1 −1 subsys/bluetooth/host/l2cap_br.c
  46. +1 −1 subsys/bluetooth/host/mesh/net.c
  47. +1 −1 subsys/bluetooth/host/mesh/prov.c
  48. +1 −1 subsys/bluetooth/host/rfcomm.c
  49. +1 −1 subsys/bluetooth/host/smp.c
  50. +1 −1 subsys/bluetooth/host/smp_null.c
  51. +1 −1 subsys/logging/log_core.c
  52. +1 −1 subsys/power/pm_ctrl.c
  53. +1 −1 subsys/random/rand32_entropy_device.c
  54. +1 −1 subsys/random/rand32_timer.c
  55. +1 −1 subsys/shell/shell.c
  56. +1 −1 tests/bluetooth/tester/src/gap.c
  57. +1 −1 tests/kernel/common/src/atomic.c
  58. +1 −1 tests/kernel/mem_pool/mem_pool_threadsafe/src/main.c
  59. +1 −1 tests/kernel/mem_slab/mslab_threadsafe/src/test_mslab_threadsafe.c
@@ -34,7 +34,7 @@ extern "C" {
#include <kernel_internal.h>
#include <zephyr/types.h>
#include <misc/dlist.h>
#include <atomic.h>
#include <sys/atomic.h>
#endif

#ifndef _ASMLANGUAGE
@@ -9,7 +9,7 @@
#define ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_

#include <adc.h>
#include <atomic.h>
#include <sys/atomic.h>

#ifdef __cplusplus
extern "C" {
@@ -5,7 +5,7 @@
*/

#include <zephyr.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <can.h>
#include <clock_control.h>
#include <device.h>
@@ -7,7 +7,7 @@

#include <soc.h>
#include <errno.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <device.h>
#include <clock_control.h>
#include <misc/__assert.h>
@@ -28,7 +28,7 @@
#include <drivers/console/uart_console.h>
#include <toolchain.h>
#include <linker/sections.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <misc/printk.h>
#ifdef CONFIG_UART_CONSOLE_MCUMGR
#include "mgmt/serial.h"
@@ -6,7 +6,7 @@
*/

#include <entropy.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <soc.h>
#include "nrf_rng.h"

@@ -10,7 +10,7 @@
#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_H_

#include <linker/sections.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <spi.h>

#include <ieee802154/cc1200.h>
@@ -10,7 +10,7 @@
#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_H_

#include <linker/sections.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <spi.h>

#include <ieee802154/cc2520.h>
@@ -11,7 +11,7 @@
#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_H_

#include <linker/sections.h>
#include <atomic.h>
#include <sys/atomic.h>
#include <spi.h>

/* Runtime context structure
@@ -151,7 +151,7 @@ extern "C" {

//------------------------------------------------------------------------------

#include <atomic.h>
#include <sys/atomic.h>

/** @brief Atomic 32-bit unsigned type. */
#define nrfx_atomic_t atomic_t

0 comments on commit e1e05a2

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