Skip to content
Permalink
Browse files

cleanup: include/: move flash.h to drivers/flash.h

move flash.h to drivers/flash.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 969f8f1 commit fe051a9055b7c92242abc71a49ca2fa17f312775
Showing with 335 additions and 320 deletions.
  1. +1 −1 drivers/flash/flash_gecko.c
  2. +1 −1 drivers/flash/flash_handlers.c
  3. +1 −1 drivers/flash/flash_native_posix.c
  4. +1 −1 drivers/flash/flash_page_layout.c
  5. +1 −1 drivers/flash/flash_sam.c
  6. +1 −1 drivers/flash/flash_sam0.c
  7. +1 −1 drivers/flash/flash_shell.c
  8. +1 −1 drivers/flash/flash_simulator.c
  9. +1 −1 drivers/flash/flash_stm32.c
  10. +1 −1 drivers/flash/flash_stm32f0x.c
  11. +1 −1 drivers/flash/flash_stm32f3x.c
  12. +1 −1 drivers/flash/flash_stm32f4x.c
  13. +1 −1 drivers/flash/flash_stm32f7x.c
  14. +1 −1 drivers/flash/flash_stm32l4x.c
  15. +1 −1 drivers/flash/flash_stm32wbx.c
  16. +1 −1 drivers/flash/soc_flash_mcux.c
  17. +1 −1 drivers/flash/soc_flash_nios2_qspi.c
  18. +1 −1 drivers/flash/soc_flash_nrf.c
  19. +1 −1 drivers/flash/soc_flash_qmsi.c
  20. +1 −1 drivers/flash/soc_flash_rv32m1.c
  21. +1 −1 drivers/flash/spi_flash_w25qxxdv.c
  22. +1 −1 drivers/flash/spi_nor.c
  23. +283 −0 include/drivers/flash.h
  24. +4 −272 include/flash.h
  25. +1 −1 lib/updatehub/shell.c
  26. +1 −1 lib/updatehub/updatehub.c
  27. +1 −1 lib/updatehub/updatehub_firmware.h
  28. +1 −1 samples/boards/reel_board/mesh_badge/src/reel_board.c
  29. +1 −1 samples/drivers/flash_shell/src/main.c
  30. +1 −1 samples/drivers/soc_flash_nrf/src/main.c
  31. +1 −1 samples/drivers/spi_flash/src/main.c
  32. +1 −1 samples/mpu/mpu_test/src/main.c
  33. +1 −1 samples/subsys/nvs/src/main.c
  34. +1 −1 subsys/dfu/boot/mcuboot.c
  35. +1 −1 subsys/dfu/img_util/flash_img.c
  36. +1 −1 subsys/disk/disk_access_flash.c
  37. +1 −1 subsys/fs/nffs_fs.c
  38. +1 −1 subsys/fs/nvs/nvs.c
  39. +1 −1 subsys/net/lib/openthread/platform/flash.c
  40. +1 −1 subsys/storage/flash_map/flash_map.c
  41. +1 −1 subsys/usb/class/usb_dfu.c
  42. +1 −1 tests/boards/altera_max10/qspi/src/qspi_flash.c
  43. +1 −1 tests/boards/intel_s1000_crb/src/spi_flash.c
  44. +1 −1 tests/drivers/flash_simulator/src/main.c
  45. +1 −1 tests/subsys/fs/multi-fs/src/nffs_test_utils.c
  46. +1 −1 tests/subsys/fs/multi-fs/src/test_ram_backend.c
  47. +1 −1 tests/subsys/fs/nffs_fs_api/common/nffs_test_utils.c
  48. +1 −1 tests/subsys/fs/nffs_fs_api/ram_backend/test_ram_backend.c
  49. +1 −1 tests/subsys/fs/nvs/src/main.c
  50. +1 −1 tests/subsys/storage/flash_map/src/main.c
@@ -10,7 +10,7 @@
#include <kernel.h>
#include <device.h>
#include <em_msc.h>
#include <flash.h>
#include <drivers/flash.h>
#include <soc.h>

#define LOG_LEVEL CONFIG_FLASH_LOG_LEVEL
@@ -5,7 +5,7 @@
*/

#include <syscall_handler.h>
#include <flash.h>
#include <drivers/flash.h>

Z_SYSCALL_HANDLER(flash_read, dev, offset, data, len)
{
@@ -5,7 +5,7 @@
*/

#include <device.h>
#include <flash.h>
#include <drivers/flash.h>

#include <unistd.h>
#include <sys/types.h>
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <flash.h>
#include <drivers/flash.h>

static int flash_get_page_info(struct device *dev, off_t offs,
bool use_addr, struct flash_pages_info *info)
@@ -5,7 +5,7 @@
*/

#include <device.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <kernel.h>
#include <soc.h>
@@ -9,7 +9,7 @@
LOG_MODULE_REGISTER(flash_sam0);

#include <device.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <kernel.h>
#include <soc.h>
@@ -11,7 +11,7 @@

#include <stdlib.h>
#include <string.h>
#include "flash.h"
#include <drivers/flash.h>
#include <soc.h>

#define FLASH_SHELL_MODULE "flash"
@@ -5,7 +5,7 @@
*/

#include <device.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <kernel.h>
#include <misc/util.h>
@@ -8,7 +8,7 @@
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>

@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>

@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>

@@ -7,7 +7,7 @@
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>

@@ -8,7 +8,7 @@
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>

@@ -13,7 +13,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>

@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <init.h>
#include <soc.h>
#include <misc/__assert.h>
@@ -7,7 +7,7 @@
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <errno.h>
#include <init.h>
#include <soc.h>
@@ -12,7 +12,7 @@
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <errno.h>
#include <init.h>
#include <soc.h>
@@ -12,7 +12,7 @@
#include <device.h>
#include <init.h>
#include <soc.h>
#include <flash.h>
#include <drivers/flash.h>
#include <string.h>
#include <nrfx_nvmc.h>

@@ -9,7 +9,7 @@
#include <device.h>
#include <init.h>

#include <flash.h>
#include <drivers/flash.h>
#include <misc/util.h>
#include "flash_priv.h"

@@ -7,7 +7,7 @@
#include <kernel.h>
#include <device.h>
#include <string.h>
#include <flash.h>
#include <drivers/flash.h>
#include <errno.h>
#include <init.h>
#include <soc.h>
@@ -6,7 +6,7 @@

#include <errno.h>

#include <flash.h>
#include <drivers/flash.h>
#include <spi.h>
#include <init.h>
#include <string.h>
@@ -7,7 +7,7 @@
*/

#include <errno.h>
#include <flash.h>
#include <drivers/flash.h>
#include <spi.h>
#include <init.h>
#include <string.h>

0 comments on commit fe051a9

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