mesh: move src/ble/mesh to src/mesh

src/btstack_memory.h

@@ -75,7 +75,7 @@ extern "C" {
 #endif
 
 #ifdef ENABLE_MESH
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 #include "mesh_keys.h"
 #include "mesh_virtual_addresses.h"
 #endif

src/mesh/adv_bearer.c

@@ -41,7 +41,7 @@
 
 #include <string.h>
 
-#include "ble/mesh/adv_bearer.h"
+#include "mesh/adv_bearer.h"
 #include "ble/core.h"
 #include "bluetooth.h"
 #include "bluetooth_data_types.h"

src/mesh/beacon.c

@@ -39,9 +39,9 @@
 
 #include <string.h>
 
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/gatt_bearer.h"
 #include "ble/core.h"
 #include "bluetooth.h"
 #include "bluetooth_data_types.h"

src/mesh/gatt_bearer.c

@@ -41,7 +41,7 @@
 
 #include "ble/gatt-service/mesh_proxy_service_server.h"
 #include "ble/att_server.h"
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/gatt_bearer.h"
 #include "ble/core.h"
 #include "bluetooth.h"
 #include "bluetooth_data_types.h"

src/mesh/mesh_lower_transport.c

@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/beacon.h"
+#include "mesh/beacon.h"
 #include "btstack_util.h"
 #include "btstack_memory.h"
 #include "mesh_peer.h"

src/mesh/mesh_lower_transport.h

@@ -46,7 +46,7 @@ extern "C"
 #endif
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 
 typedef enum {
     MESH_TRANSPORT_OPCODE_ACK = 0,

src/mesh/mesh_network.c

@@ -41,9 +41,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/pb_adv.h"
+#include "mesh/beacon.h"
 #include "provisioning.h"
 #include "provisioning_device.h"
 #include "mesh_keys.h"
@@ -51,7 +51,7 @@
 #include "btstack_memory.h"
 
 #ifdef ENABLE_MESH_GATT_BEARER
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/gatt_bearer.h"
 #endif
 
 // configuration

src/mesh/mesh_upper_transport.c

@@ -40,9 +40,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/mesh_lower_transport.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/beacon.h"
+#include "mesh/mesh_lower_transport.h"
+#include "mesh/mesh_upper_transport.h"
 #include "btstack_util.h"
 #include "btstack_memory.h"
 #include "mesh_peer.h"

src/mesh/mesh_upper_transport.h

@@ -47,7 +47,7 @@ extern "C"
 
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 
 void mesh_transport_init();
 

src/mesh/pb_adv.c

@@ -41,8 +41,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/beacon.h"
 #include "provisioning.h"
 #include "btstack_util.h"
 #include "btstack_debug.h"

src/mesh/pb_gatt.c

@@ -42,7 +42,7 @@
 #include "btstack_util.h"
 #include "btstack_debug.h"
 #include "btstack_event.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "ble/att_server.h"

test/mesh/CMakeLists.txt

@@ -18,8 +18,8 @@ include_directories(.)
 
 file(GLOB SOURCES_SRC       "../../src/*.c"                     "../../src/*.h" "../../example/sco_demo_util.c" "../../example/sco_demo_util.h")
 file(GLOB SOURCES_BLE       "../../src/ble/*.c"                 "../../src/ble/*.h")
-file(GLOB SOURCES_MESH      "../../src/ble/mesh/*.c"            "../../src/ble/mesh/*.h" )
 file(GLOB SOURCES_GATT      "../../src/ble/gatt-service/*.c"    "../../src/ble/gatt-service/*.h")
+file(GLOB SOURCES_MESH      "../../src/mesh/*.c"                "../../src/mesh/*.h" )
 file(GLOB SOURCES_UECC      "../../3rd-party/micro-ecc/uECC.c"  "../../3rd-party/micro-ecc/uECC.h")
 file(GLOB SOURCES_POSIX     "../../platform/posix/*.c"          "../../platform/posix/*.h")
 file(GLOB SOURCES_LIBUSB    "../../platform/libusb/*.c"         "../../platform/libusb/*.h")

test/mesh/Makefile

@@ -35,7 +35,7 @@ CFLAGS  += -g -DUNIT_TEST -Wall \
 	-I$(BTSTACK_ROOT)/test/rijndael \
 
 VPATH += ${BTSTACK_ROOT}/test/rijndael
-VPATH += ${BTSTACK_ROOT}/src/ble/mesh
+VPATH += ${BTSTACK_ROOT}/src/mesh
 VPATH += ${BTSTACK_ROOT}/src/classic
 VPATH += ${BTSTACK_ROOT}/platform/posix
 VPATH += ${BTSTACK_ROOT}/platform/embedded

test/mesh/mesh.c

@@ -41,14 +41,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/gatt_bearer.h"
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/mesh_crypto.h"
-#include "ble/mesh/mesh_lower_transport.h"
-#include "ble/mesh/mesh_upper_transport.h"
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/gatt_bearer.h"
+#include "mesh/beacon.h"
+#include "mesh/mesh_crypto.h"
+#include "mesh/mesh_lower_transport.h"
+#include "mesh/mesh_upper_transport.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "provisioning_device.h"

test/mesh/mesh_access.c

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_access.h"
 #include "btstack_memory.h"
 #include "btstack_debug.h"

test/mesh/mesh_access.h

@@ -40,7 +40,7 @@
 
 #include <stdint.h>
 #include "btstack_linked_list.h"
-#include "ble/mesh/mesh_lower_transport.h"
+#include "mesh/mesh_lower_transport.h"
 #include "mesh_keys.h"
 #include "bluetooth_company_id.h"
 

test/mesh/mesh_configuration_server.c

@@ -41,19 +41,19 @@
 #include <stdio.h>
 #include "mesh_configuration_server.h"
 #include "btstack_util.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"
 #include "bluetooth_company_id.h"
 #include "btstack_memory.h"
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/mesh_crypto.h"
 #include "mesh_virtual_addresses.h"
 #include "btstack_debug.h"
 #include "btstack_tlv.h"
 #include "mesh_proxy.h"
-#include "ble/mesh/gatt_bearer.h"
+#include "mesh/gatt_bearer.h"
 
 #define MESH_HEARTBEAT_FEATURES_SUPPORTED_MASK 0x000f
 

test/mesh/mesh_foundation.h

@@ -47,7 +47,7 @@ extern "C"
 
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 
 #define MESH_TTL_MAX 0x7f
 #define MESH_FOUNDATION_STATE_NOT_SUPPORTED 2

test/mesh/mesh_generic_client.c

@@ -42,8 +42,8 @@
 #include "mesh_generic_client.h"
 #include "btstack_util.h"
 #include "mesh_generic_model.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"

test/mesh/mesh_generic_level_server.c

@@ -42,8 +42,8 @@
 #include "mesh_generic_level_server.h"
 #include "btstack_util.h"
 #include "mesh_generic_model.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"

test/mesh/mesh_generic_server.c

@@ -42,8 +42,8 @@
 #include "mesh_generic_server.h"
 #include "btstack_util.h"
 #include "mesh_generic_model.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_upper_transport.h"
 #include "mesh_keys.h"
 #include "mesh_access.h"
 #include "mesh_foundation.h"

test/mesh/mesh_keys.h

@@ -47,8 +47,8 @@ extern "C"
 
 
 #include <stdint.h>
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/adv_bearer.h"
+#include "mesh/mesh_network.h"
+#include "mesh/adv_bearer.h"
 
 
 typedef enum {

test/mesh/mesh_message_test.c

@@ -5,12 +5,13 @@
 
 #include "bluetooth_data_types.h"
 #include "bluetooth_gatt.h"
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/gatt_bearer.h"
-#include "ble/mesh/mesh_crypto.h"
-#include "ble/mesh/mesh_network.h"
-#include "ble/mesh/mesh_lower_transport.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh_peer.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/gatt_bearer.h"
+#include "mesh/mesh_crypto.h"
+#include "mesh/mesh_network.h"
+#include "mesh/mesh_lower_transport.h"
+#include "mesh/mesh_upper_transport.h"
 #include "btstack_util.h"
 #include "provisioning.h"
 #include "btstack_memory.h"

test/mesh/mesh_peer.c

@@ -4,8 +4,8 @@
 
 #include "btstack_memory.h"
 #include "btstack_util.h"
-#include "ble/mesh/beacon.h"
-#include "ble/mesh/mesh_upper_transport.h"
+#include "mesh/beacon.h"
+#include "mesh/mesh_upper_transport.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

test/mesh/mesh_peer.h

@@ -38,7 +38,11 @@
 #ifndef __MESH_PEER_H
 #define __MESH_PEER_H
 
-#include "ble/mesh/mesh_network.h"
+#if defined __cplusplus
+extern "C" {
+#endif
+
+#include "mesh/mesh_network.h"
 
 // mesh seq auth validation
 typedef struct {
@@ -61,6 +65,10 @@ typedef struct {
 mesh_peer_t * mesh_peer_for_addr(uint16_t address);
 
 // reset seq auth == replay protection
-void mesh_seq_auth_reset();
+void mesh_seq_auth_reset(void);
+
+#if defined __cplusplus
+}
+#endif
 
 #endif //__MESH_PEER_H

test/mesh/mesh_proxy.c

@@ -39,8 +39,8 @@
 
 #include <string.h>
 
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/mesh_crypto.h"
 #include "bluetooth_company_id.h"
 #include "bluetooth_data_types.h"
 #include "bluetooth_gatt.h"

test/mesh/provisioner.c

@@ -41,9 +41,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/adv_bearer.h"
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/beacon.h"
+#include "mesh/adv_bearer.h"
+#include "mesh/pb_adv.h"
+#include "mesh/beacon.h"
 #include "provisioning.h"
 #include "provisioning_provisioner.h"
 #include "btstack.h"

test/mesh/provisioning_device.c

@@ -42,10 +42,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/mesh_crypto.h"
 #include "classic/rfcomm.h" // for crc8
 #include "btstack.h"
 #include "provisioning.h"

test/mesh/provisioning_device_test.cpp

@@ -39,8 +39,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "provisioning_device.h"

test/mesh/provisioning_provisioner.c

@@ -41,8 +41,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/mesh_crypto.h"
+#include "mesh/pb_adv.h"
+#include "mesh/mesh_crypto.h"
 #include "classic/rfcomm.h" // for crc8
 #include "btstack.h"
 #include "provisioning.h"

test/mesh/provisioning_provisioner_test.cpp

@@ -39,8 +39,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ble/mesh/pb_adv.h"
-#include "ble/mesh/pb_gatt.h"
+#include "mesh/pb_adv.h"
+#include "mesh/pb_gatt.h"
 #include "ble/gatt-service/mesh_provisioning_service_server.h"
 #include "provisioning.h"
 #include "provisioning_provisioner.h"

tool/btstack_memory_generator.py

@@ -83,7 +83,7 @@ extern "C" {
 #endif
 
 #ifdef ENABLE_MESH
-#include "ble/mesh/mesh_network.h"
+#include "mesh/mesh_network.h"
 #include "mesh_keys.h"
 #include "mesh_virtual_addresses.h"
 #endif