1
0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-01 22:20:58 +00:00

mesh: pb_gatt_init without device uuid

This commit is contained in:
Matthias Ringwald 2019-07-12 15:37:18 +02:00
parent d0e44c14ee
commit 54274a7650
5 changed files with 5 additions and 8 deletions

@ -118,6 +118,6 @@ void mesh_node_set_device_uuid(const uint8_t * device_uuid){
* @brief Get Device UUID * @brief Get Device UUID
*/ */
const uint8_t * mesh_node_get_device_uuid(void){ const uint8_t * mesh_node_get_device_uuid(void){
return &mesh_node_get_device_uuid; return mesh_node_device_uuid;
} }

@ -55,7 +55,6 @@ static union {
uint8_t segmentation_buffer[MESH_PROV_MAX_PROXY_PDU]; uint8_t segmentation_buffer[MESH_PROV_MAX_PROXY_PDU];
} sar_buffer; } sar_buffer;
static const uint8_t * pb_gatt_own_device_uuid;
static const uint8_t * proxy_pdu; static const uint8_t * proxy_pdu;
static uint16_t proxy_pdu_size; static uint16_t proxy_pdu_size;
@ -179,8 +178,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
* Setup mesh provisioning service * Setup mesh provisioning service
* @param device_uuid * @param device_uuid
*/ */
void pb_gatt_init(const uint8_t * device_uuid){ void pb_gatt_init(void){
pb_gatt_own_device_uuid = device_uuid;
// setup mesh provisioning service // setup mesh provisioning service
mesh_provisioning_service_server_init(); mesh_provisioning_service_server_init();
mesh_provisioning_service_server_register_packet_handler(packet_handler); mesh_provisioning_service_server_register_packet_handler(packet_handler);

@ -50,9 +50,8 @@ extern "C" {
/** /**
* Setup mesh provisioning service * Setup mesh provisioning service
* @param device_uuid
*/ */
void pb_gatt_init(const uint8_t * device_uuid); void pb_gatt_init(void);
/** /**
* Register listener for Provisioning PDUs and events: MESH_PB_TRANSPORT_LINK_OPEN, MESH_PB_TRANSPORT_LINK_CLOSED, MESH_SUBEVENT_CAN_SEND_NOW * Register listener for Provisioning PDUs and events: MESH_PB_TRANSPORT_LINK_OPEN, MESH_PB_TRANSPORT_LINK_CLOSED, MESH_SUBEVENT_CAN_SEND_NOW

@ -826,7 +826,7 @@ void provisioning_device_init(const uint8_t * device_uuid){
pb_adv_init(device_uuid); pb_adv_init(device_uuid);
pb_adv_register_packet_handler(&provisioning_handle_pdu); pb_adv_register_packet_handler(&provisioning_handle_pdu);
// setup PB GATT // setup PB GATT
pb_gatt_init(device_uuid); pb_gatt_init();
pb_gatt_register_packet_handler(&provisioning_handle_pdu); pb_gatt_register_packet_handler(&provisioning_handle_pdu);
pb_transport_cid = MESH_PB_TRANSPORT_INVALID_CID; pb_transport_cid = MESH_PB_TRANSPORT_INVALID_CID;

@ -106,7 +106,7 @@ static uint16_t pdu_size;
* @param DeviceUUID * @param DeviceUUID
*/ */
void pb_adv_init(const uint8_t * device_uuid){} void pb_adv_init(const uint8_t * device_uuid){}
void pb_gatt_init(const uint8_t * device_uuid){} void pb_gatt_init(void){}
/** /**
* Close Link * Close Link