Skip to content
Permalink
Browse files

Bluetooth: Mesh: Move under subsys/bluetooth/mesh

We've already got GATT services in subsys/bluetooth/services so
subsys/bluetooth/mesh is a more natural place. Aditionally this aims
to fix the Kconfig dependencies to be able to use mesh together with
BT_CUSTOM (i.e. a custom, potentially non-HCI, host stack).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information...
jhedberg committed Jul 9, 2019
1 parent c7633de commit 408703e8dd724d3f330875c091c25e8cab8fb7d7
Showing with 8 additions and 9 deletions.
  1. +1 −0 subsys/bluetooth/CMakeLists.txt
  2. +2 −0 subsys/bluetooth/Kconfig
  3. +0 −2 subsys/bluetooth/host/CMakeLists.txt
  4. +0 −2 subsys/bluetooth/host/Kconfig
  5. 0 subsys/bluetooth/{host → }/mesh/CMakeLists.txt
  6. 0 subsys/bluetooth/{host → }/mesh/Kconfig
  7. 0 subsys/bluetooth/{host → }/mesh/TODO
  8. 0 subsys/bluetooth/{host → }/mesh/access.c
  9. 0 subsys/bluetooth/{host → }/mesh/access.h
  10. +1 −1 subsys/bluetooth/{host → }/mesh/adv.c
  11. 0 subsys/bluetooth/{host → }/mesh/adv.h
  12. 0 subsys/bluetooth/{host → }/mesh/beacon.c
  13. 0 subsys/bluetooth/{host → }/mesh/beacon.h
  14. 0 subsys/bluetooth/{host → }/mesh/cfg_cli.c
  15. +1 −1 subsys/bluetooth/{host → }/mesh/cfg_srv.c
  16. 0 subsys/bluetooth/{host → }/mesh/crypto.c
  17. 0 subsys/bluetooth/{host → }/mesh/crypto.h
  18. 0 subsys/bluetooth/{host → }/mesh/foundation.h
  19. 0 subsys/bluetooth/{host → }/mesh/friend.c
  20. 0 subsys/bluetooth/{host → }/mesh/friend.h
  21. 0 subsys/bluetooth/{host → }/mesh/health_cli.c
  22. 0 subsys/bluetooth/{host → }/mesh/health_srv.c
  23. 0 subsys/bluetooth/{host → }/mesh/lpn.c
  24. 0 subsys/bluetooth/{host → }/mesh/lpn.h
  25. 0 subsys/bluetooth/{host → }/mesh/main.c
  26. 0 subsys/bluetooth/{host → }/mesh/mesh.h
  27. 0 subsys/bluetooth/{host → }/mesh/net.c
  28. 0 subsys/bluetooth/{host → }/mesh/net.h
  29. +2 −2 subsys/bluetooth/{host → }/mesh/prov.c
  30. 0 subsys/bluetooth/{host → }/mesh/prov.h
  31. 0 subsys/bluetooth/{host → }/mesh/proxy.c
  32. 0 subsys/bluetooth/{host → }/mesh/proxy.h
  33. 0 subsys/bluetooth/{host → }/mesh/settings.c
  34. 0 subsys/bluetooth/{host → }/mesh/settings.h
  35. 0 subsys/bluetooth/{host → }/mesh/shell.c
  36. 0 subsys/bluetooth/{host → }/mesh/test.c
  37. 0 subsys/bluetooth/{host → }/mesh/test.h
  38. +1 −1 subsys/bluetooth/{host → }/mesh/transport.c
  39. 0 subsys/bluetooth/{host → }/mesh/transport.h
@@ -8,6 +8,7 @@ add_subdirectory(common)
add_subdirectory_ifdef(CONFIG_BT_HCI host)
add_subdirectory_ifdef(CONFIG_BT_SHELL shell)
add_subdirectory_ifdef(CONFIG_BT_CONN services)
add_subdirectory_ifdef(CONFIG_BT_MESH mesh)

if(CONFIG_BT_CTLR)
if(CONFIG_BT_LL_SW OR CONFIG_BT_LL_SW_SPLIT)
@@ -145,4 +145,6 @@ source "subsys/bluetooth/shell/Kconfig"

endif # BT_HCI

source "subsys/bluetooth/mesh/Kconfig"

endif # BT
@@ -55,5 +55,3 @@ if(CONFIG_BT_HCI_HOST)
endif()
endif()
endif()

add_subdirectory_ifdef(CONFIG_BT_MESH mesh)
@@ -135,8 +135,6 @@ config BT_RX_PRIO

if BT_HCI_HOST

source "subsys/bluetooth/host/mesh/Kconfig"

config BT_HOST_CRYPTO
# Hidden option that compiles in random number generation and AES
# encryption support using TinyCrypt library if this is not provided
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -21,7 +21,7 @@
#define LOG_MODULE_NAME bt_mesh_adv
#include "common/log.h"

#include "../hci_core.h"
#include "host/hci_core.h"

#include "adv.h"
#include "net.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -22,7 +22,7 @@
#define LOG_MODULE_NAME bt_mesh_cfg_srv
#include "common/log.h"

#include "../testing.h"
#include "host/testing.h"

#include "mesh.h"
#include "adv.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -22,8 +22,8 @@
#define LOG_MODULE_NAME bt_mesh_prov
#include "common/log.h"

#include "../ecc.h"
#include "../testing.h"
#include "host/ecc.h"
#include "host/testing.h"

#include "crypto.h"
#include "adv.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -22,7 +22,7 @@
#define LOG_MODULE_NAME bt_mesh_transport
#include "common/log.h"

#include "../testing.h"
#include "host/testing.h"

#include "crypto.h"
#include "adv.h"
File renamed without changes.

0 comments on commit 408703e

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