1 files changed, 4 insertions, 38 deletions

diff --git a/src/libs/mynewt-nimble/nimble/host/mesh/src/foundation.h b/src/libs/mynewt-nimble/nimble/host/mesh/src/foundation.h
index ee615ae9..012afbbb 100644
--- a/src/libs/mynewt-nimble/nimble/host/mesh/src/foundation.h
+++ b/src/libs/mynewt-nimble/nimble/host/mesh/src/foundation.h
@@ -115,57 +115,23 @@
 #define STATUS_UNSPECIFIED                 0x10
 #define STATUS_INVALID_BINDING             0x11
 
-enum {
-	BT_MESH_VA_CHANGED,	/* Label information changed */
-};
-
-struct label {
-	u16_t ref;
-	u16_t addr;
-	u8_t  uuid[16];
-	atomic_t flags[1];
-};
-
 void bt_mesh_cfg_reset(void);
 
-void bt_mesh_heartbeat(u16_t src, u16_t dst, u8_t hops, u16_t feat);
-
-void bt_mesh_attention(struct bt_mesh_model *model, u8_t time);
-
-struct label *get_label(u16_t index);
-
-u8_t *bt_mesh_label_uuid_get(u16_t addr);
-
-struct bt_mesh_hb_pub *bt_mesh_hb_pub_get(void);
-void bt_mesh_hb_pub_disable(void);
-struct bt_mesh_cfg_srv *bt_mesh_cfg_get(void);
-
-u8_t bt_mesh_net_transmit_get(void);
-u8_t bt_mesh_relay_get(void);
-u8_t bt_mesh_friend_get(void);
-u8_t bt_mesh_relay_retransmit_get(void);
-u8_t bt_mesh_beacon_get(void);
-u8_t bt_mesh_gatt_proxy_get(void);
-u8_t bt_mesh_default_ttl_get(void);
-
-void bt_mesh_subnet_del(struct bt_mesh_subnet *sub, bool store);
-
-struct bt_mesh_app_key *bt_mesh_app_key_alloc(u16_t app_idx);
-void bt_mesh_app_key_del(struct bt_mesh_app_key *key, bool store);
+void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time);
 
 static inline void key_idx_pack(struct os_mbuf *buf,
-				u16_t idx1, u16_t idx2)
+				uint16_t idx1, uint16_t idx2)
 {
 	net_buf_simple_add_le16(buf, idx1 | ((idx2 & 0x00f) << 12));
 	net_buf_simple_add_u8(buf, idx2 >> 4);
 }
 
 static inline void key_idx_unpack(struct os_mbuf *buf,
-				  u16_t *idx1, u16_t *idx2)
+				  uint16_t *idx1, uint16_t *idx2)
 {
 	*idx1 = sys_get_le16(&buf->om_data[0]) & 0xfff;
 	*idx2 = sys_get_le16(&buf->om_data[1]) >> 4;
-	net_buf_simple_pull(buf, 3);
+	net_buf_simple_pull_mem(buf, 3);
 }
 
 #endif