You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by na...@apache.org on 2021/05/27 08:20:33 UTC
[mynewt-nimble] 06/31: Revert "bttester: Add lpn_cb"
This is an automated email from the ASF dual-hosted git repository.
naraj pushed a commit to branch revert-958-mesh_sync_march21
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 04bede30262b489a42970433087083c89d9105ad
Author: Michał Narajowski <mi...@codecoup.pl>
AuthorDate: Thu May 27 10:20:19 2021 +0200
Revert "bttester: Add lpn_cb"
This reverts commit 0fba723f06ab652a35f6bc02dd21d9a85e119e72.
---
apps/bttester/src/bttester.h | 21 --------------------
apps/bttester/src/mesh.c | 37 ------------------------------------
nimble/host/mesh/include/mesh/mesh.h | 1 -
3 files changed, 59 deletions(-)
diff --git a/apps/bttester/src/bttester.h b/apps/bttester/src/bttester.h
index 4a8fc47..6761681 100644
--- a/apps/bttester/src/bttester.h
+++ b/apps/bttester/src/bttester.h
@@ -997,27 +997,6 @@ struct mesh_invalid_bearer_ev {
#define MESH_EV_INCOMP_TIMER_EXP 0x88
-#define MESH_EV_LPN_ESTABLISHED 0x8b
-struct mesh_lpn_established_ev {
- uint16_t net_idx;
- uint16_t friend_addr;
- uint8_t queue_size;
- uint8_t recv_win;
-} __packed;
-
-#define MESH_EV_LPN_TERMINATED 0x8c
-struct mesh_lpn_terminated_ev {
- uint16_t net_idx;
- uint16_t friend_addr;
-} __packed;
-
-#define MESH_EV_LPN_POLLED 0x8d
-struct mesh_lpn_polled_ev {
- uint16_t net_idx;
- uint16_t friend_addr;
- uint8_t retry;
-} __packed;
-
void tester_init(void);
void tester_rsp(uint8_t service, uint8_t opcode, uint8_t index, uint8_t status);
void tester_send(uint8_t service, uint8_t opcode, uint8_t index, uint8_t *data,
diff --git a/apps/bttester/src/mesh.c b/apps/bttester/src/mesh.c
index 87bdbea..1ad322f 100644
--- a/apps/bttester/src/mesh.c
+++ b/apps/bttester/src/mesh.c
@@ -937,48 +937,11 @@ static struct bt_test_cb bt_test_cb = {
.mesh_trans_incomp_timer_exp = incomp_timer_exp_cb,
};
-static void lpn_established(uint16_t friend_addr)
-{
-
- struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
- struct mesh_lpn_established_ev ev = { lpn->sub->net_idx, friend_addr, lpn->queue_size,
- lpn->recv_win };
-
- SYS_LOG_DBG("Friendship (as LPN) established with "
- "Friend 0x%04x Queue Size %d Receive Window %d",
- friend_addr, lpn->queue_size, lpn->recv_win);
-
- tester_send(BTP_SERVICE_ID_MESH, MESH_EV_LPN_ESTABLISHED,
- CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
-}
-
-static void lpn_terminated(uint16_t friend_addr)
-{
- struct bt_mesh_lpn *lpn = &bt_mesh.lpn;
- struct mesh_lpn_terminated_ev ev = { lpn->sub->net_idx, friend_addr };
-
- SYS_LOG_DBG("Friendship (as LPN) lost with Friend "
- "0x%04x", friend_addr);
-
- tester_send(BTP_SERVICE_ID_MESH, MESH_EV_LPN_TERMINATED,
- CONTROLLER_INDEX, (uint8_t *) &ev, sizeof(ev));
-}
-
-void lpn_cb(uint16_t friend_addr, bool established)
-{
- if (established) {
- lpn_established(friend_addr);
- } else {
- lpn_terminated(friend_addr);
- }
-}
-
uint8_t tester_init_mesh(void)
{
health_pub_init();
if (IS_ENABLED(CONFIG_BT_TESTING)) {
- bt_mesh_lpn_set_cb(lpn_cb);
bt_test_cb_register(&bt_test_cb);
}
diff --git a/nimble/host/mesh/include/mesh/mesh.h b/nimble/host/mesh/include/mesh/mesh.h
index 83390ec..b9bc24f 100644
--- a/nimble/host/mesh/include/mesh/mesh.h
+++ b/nimble/host/mesh/include/mesh/mesh.h
@@ -27,6 +27,5 @@
#include "cfg.h"
#include "heartbeat.h"
#include "../src/app_keys.h"
-#include "../src/net.h"
#endif /* __BT_MESH_H */