diff --git a/src/ble/gatt-service/mesh_provisioning_service_server.c b/src/ble/gatt-service/mesh_provisioning_service_server.c index 21f78daab..e9f4b1f69 100644 --- a/src/ble/gatt-service/mesh_provisioning_service_server.c +++ b/src/ble/gatt-service/mesh_provisioning_service_server.c @@ -76,14 +76,14 @@ static mesh_provisioning_t mesh_provisioning; static void mesh_provisioning_service_emit_link_open(hci_con_handle_t con_handle, uint8_t status){ - uint8_t event[7] = { HCI_EVENT_MESH_META, 5, MESH_PB_TRANSPORT_LINK_OPEN, status}; + uint8_t event[7] = { HCI_EVENT_MESH_META, 5, MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN, status}; little_endian_store_16(event, 4, con_handle); event[6] = PB_TYPE_GATT; mesh_provisioning_service_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } static void mesh_provisioning_service_emit_link_close(hci_con_handle_t con_handle, uint8_t reason){ - uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_PB_TRANSPORT_LINK_CLOSED}; + uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED}; little_endian_store_16(event, 4, con_handle); mesh_provisioning_service_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } diff --git a/src/ble/gatt-service/mesh_proxy_service_server.c b/src/ble/gatt-service/mesh_proxy_service_server.c index 0c2354ac3..a4f83356c 100644 --- a/src/ble/gatt-service/mesh_proxy_service_server.c +++ b/src/ble/gatt-service/mesh_proxy_service_server.c @@ -76,13 +76,13 @@ static mesh_proxy_t mesh_proxy; static void mesh_proxy_service_emit_connected(hci_con_handle_t con_handle){ - uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_PROXY_CONNECTED}; + uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_SUBEVENT_PROXY_CONNECTED}; little_endian_store_16(event, 4, con_handle); mesh_proxy_service_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } static void mesh_proxy_service_emit_disconnected(hci_con_handle_t con_handle){ - uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_PROXY_DISCONNECTED}; + uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_SUBEVENT_PROXY_DISCONNECTED}; little_endian_store_16(event, 4, con_handle); mesh_proxy_service_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } diff --git a/src/ble/mesh/gatt_bearer.c b/src/ble/mesh/gatt_bearer.c index 8cb40fbb4..9785f053e 100644 --- a/src/ble/mesh/gatt_bearer.c +++ b/src/ble/mesh/gatt_bearer.c @@ -242,12 +242,12 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe switch (hci_event_packet_get_type(packet)) { case HCI_EVENT_MESH_META: switch (hci_event_mesh_meta_get_subevent_code(packet)){ - case MESH_PROXY_CONNECTED: + case MESH_SUBEVENT_PROXY_CONNECTED: gatt_bearer_mtu = ATT_DEFAULT_MTU; - gatt_bearer_con_handle = mesh_proxy_connected_event_get_con_handle(packet); + gatt_bearer_con_handle = mesh_subevent_proxy_connected_get_con_handle(packet); gatt_bearer_emit_event_for_all(packet, size); break; - case MESH_PROXY_DISCONNECTED: + case MESH_SUBEVENT_PROXY_DISCONNECTED: gatt_bearer_con_handle = HCI_CON_HANDLE_INVALID; gatt_bearer_emit_event_for_all(packet, size); break; diff --git a/src/ble/mesh/pb_adv.c b/src/ble/mesh/pb_adv.c index 244998f37..ba4a6ae81 100644 --- a/src/ble/mesh/pb_adv.c +++ b/src/ble/mesh/pb_adv.c @@ -134,19 +134,19 @@ static uint32_t pb_adv_random(void){ } static void pb_adv_emit_pdu_sent(uint8_t status){ - uint8_t event[] = { HCI_EVENT_MESH_META, 2, MESH_PB_TRANSPORT_PDU_SENT, status}; + uint8_t event[] = { HCI_EVENT_MESH_META, 2, MESH_SUBEVENT_PB_TRANSPORT_PDU_SENT, status}; pb_adv_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } static void pb_adv_emit_link_open(uint8_t status, uint16_t pb_adv_cid){ - uint8_t event[7] = { HCI_EVENT_MESH_META, 5, MESH_PB_TRANSPORT_LINK_OPEN, status}; + uint8_t event[7] = { HCI_EVENT_MESH_META, 5, MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN, status}; little_endian_store_16(event, 4, pb_adv_cid); event[6] = PB_TYPE_ADV; pb_adv_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } static void pb_adv_emit_link_close(uint16_t pb_adv_cid, uint8_t reason){ - uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_PB_TRANSPORT_LINK_CLOSED}; + uint8_t event[5] = { HCI_EVENT_MESH_META, 3, MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED}; little_endian_store_16(event, 4, pb_adv_cid); pb_adv_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } diff --git a/src/ble/mesh/pb_gatt.c b/src/ble/mesh/pb_gatt.c index 277f490a7..f4a3db0a4 100644 --- a/src/ble/mesh/pb_gatt.c +++ b/src/ble/mesh/pb_gatt.c @@ -68,7 +68,7 @@ static btstack_packet_handler_t pb_gatt_packet_handler; static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size); static void pb_gatt_emit_pdu_sent(uint8_t status){ - uint8_t event[] = {HCI_EVENT_MESH_META, 2, MESH_PB_TRANSPORT_PDU_SENT, status}; + uint8_t event[] = {HCI_EVENT_MESH_META, 2, MESH_SUBEVENT_PB_TRANSPORT_PDU_SENT, status}; pb_gatt_packet_handler(HCI_EVENT_PACKET, 0, event, sizeof(event)); } @@ -132,8 +132,8 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe switch (hci_event_packet_get_type(packet)) { case HCI_EVENT_MESH_META: switch (hci_event_mesh_meta_get_subevent_code(packet)){ - case MESH_PB_TRANSPORT_LINK_OPEN: - case MESH_PB_TRANSPORT_LINK_CLOSED: + case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN: + case MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED: // Forward link open/close pb_gatt_mtu = ATT_DEFAULT_MTU; pb_gatt_packet_handler(HCI_EVENT_PACKET, 0, packet, size); diff --git a/src/btstack_defines.h b/src/btstack_defines.h index b1edf5146..9b061ce80 100644 --- a/src/btstack_defines.h +++ b/src/btstack_defines.h @@ -2330,7 +2330,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param status */ -#define MESH_PB_TRANSPORT_PDU_SENT 0x02 +#define MESH_SUBEVENT_PB_TRANSPORT_PDU_SENT 0x02 /** * @format 1121 @@ -2339,7 +2339,7 @@ typedef uint8_t sm_key_t[16]; * @param pb_transport_cid * @param pb_type */ -#define MESH_PB_TRANSPORT_LINK_OPEN 0x03 +#define MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN 0x03 /** * @format 112 @@ -2347,7 +2347,7 @@ typedef uint8_t sm_key_t[16]; * @param status * @param pb_transport_cid */ -#define MESH_PB_TRANSPORT_LINK_CLOSED 0x04 +#define MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED 0x04 /** * @format 121 @@ -2355,7 +2355,7 @@ typedef uint8_t sm_key_t[16]; * @param pb_transport_cid * @param attention_time in seconds */ -#define MESH_PB_PROV_ATTENTION_TIMER 0x10 +#define MESH_SUBEVENT_PB_PROV_ATTENTION_TIMER 0x10 /** * Device Role @@ -2363,7 +2363,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_START_EMIT_PUBLIC_KEY_OOB 0x11 +#define MESH_SUBEVENT_PB_PROV_START_EMIT_PUBLIC_KEY_OOB 0x11 /** * Device Role @@ -2371,7 +2371,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_STOP_EMIT_PUBLIC_KEY_OOB 0x12 +#define MESH_SUBEVENT_PB_PROV_STOP_EMIT_PUBLIC_KEY_OOB 0x12 /** * Device Role @@ -2379,7 +2379,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_INPUT_OOB_REQUEST 0x13 +#define MESH_SUBEVENT_PB_PROV_INPUT_OOB_REQUEST 0x13 /** * Device Role @@ -2388,7 +2388,7 @@ typedef uint8_t sm_key_t[16]; * @param pb_transport_cid * @param output_oob number */ -#define MESH_PB_PROV_START_EMIT_OUTPUT_OOB 0x15 +#define MESH_SUBEVENT_PB_PROV_START_EMIT_OUTPUT_OOB 0x15 /** * Device Role @@ -2396,7 +2396,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_STOP_EMIT_OUTPUT_OOB 0x16 +#define MESH_SUBEVENT_PB_PROV_STOP_EMIT_OUTPUT_OOB 0x16 /** * Provisioner Role @@ -2404,7 +2404,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_START_RECEIVE_PUBLIC_KEY_OOB 0x17 +#define MESH_SUBEVENT_PB_PROV_START_RECEIVE_PUBLIC_KEY_OOB 0x17 /** * Provisioner Role @@ -2412,7 +2412,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_STOP_RECEIVE_PUBLIC_KEY_OOB 0x18 +#define MESH_SUBEVENT_PB_PROV_STOP_RECEIVE_PUBLIC_KEY_OOB 0x18 /** * Provisioner Role @@ -2420,7 +2420,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_OUTPUT_OOB_REQUEST 0x19 +#define MESH_SUBEVENT_PB_PROV_OUTPUT_OOB_REQUEST 0x19 /** * Provisioner Role @@ -2429,7 +2429,7 @@ typedef uint8_t sm_key_t[16]; * @param pb_transport_cid * @param output_oob number */ -#define MESH_PB_PROV_START_EMIT_INPUT_OOB 0x1a +#define MESH_SUBEVENT_PB_PROV_START_EMIT_INPUT_OOB 0x1a /** * Provisioner Role @@ -2437,7 +2437,7 @@ typedef uint8_t sm_key_t[16]; * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_STOP_EMIT_INPUT_OOB 0x1b +#define MESH_SUBEVENT_PB_PROV_STOP_EMIT_INPUT_OOB 0x1b /** * Provisioner Role @@ -2453,14 +2453,14 @@ typedef uint8_t sm_key_t[16]; * @param input_oob_size * @param input_oob_action */ -#define MESH_PB_PROV_CAPABILITIES 0x1c +#define MESH_SUBEVENT_PB_PROV_CAPABILITIES 0x1c /** * @format 12 * @param subevent_code * @param pb_transport_cid */ -#define MESH_PB_PROV_COMPLETE 0x1d +#define MESH_SUBEVENT_PB_PROV_COMPLETE 0x1d /** * @format 11H @@ -2468,21 +2468,21 @@ typedef uint8_t sm_key_t[16]; * @param status * @param con_handle */ -#define MESH_PROXY_CONNECTED 0x20 +#define MESH_SUBEVENT_PROXY_CONNECTED 0x20 /** * @format 1H * @param subevent_code * @param con_handle */ -#define MESH_PROXY_PDU_SENT 0x21 +#define MESH_SUBEVENT_PROXY_PDU_SENT 0x21 /** * @format 1H * @param subevent_code * @param con_handle */ -#define MESH_PROXY_DISCONNECTED 0x22 +#define MESH_SUBEVENT_PROXY_DISCONNECTED 0x22 /** * @format 1H diff --git a/src/btstack_event.h b/src/btstack_event.h index c4d83f881..73a311650 100644 --- a/src/btstack_event.h +++ b/src/btstack_event.h @@ -3258,331 +3258,6 @@ static inline uint8_t gap_event_inquiry_complete_get_status(const uint8_t * even return event[2]; } -/** - * @brief Get field status from event MESH_PB_TRANSPORT_PDU_SENT_EVENT - * @param event packet - * @return status - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_transport_pdu_sent_event_get_status(const uint8_t * event){ - return event[3]; -} - -/** - * @brief Get field status from event MESH_PB_TRANSPORT_LINK_OPEN_EVENT - * @param event packet - * @return status - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_transport_link_open_event_get_status(const uint8_t * event){ - return event[3]; -} -/** - * @brief Get field pb_transport_cid from event MESH_PB_TRANSPORT_LINK_OPEN_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_transport_link_open_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 4); -} -/** - * @brief Get field pb_type from event MESH_PB_TRANSPORT_LINK_OPEN_EVENT - * @param event packet - * @return pb_type - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_transport_link_open_event_get_pb_type(const uint8_t * event){ - return event[6]; -} - -/** - * @brief Get field status from event MESH_PB_TRANSPORT_LINK_CLOSED_EVENT - * @param event packet - * @return status - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_transport_link_closed_event_get_status(const uint8_t * event){ - return event[3]; -} -/** - * @brief Get field pb_transport_cid from event MESH_PB_TRANSPORT_LINK_CLOSED_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_transport_link_closed_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 4); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_ATTENTION_TIMER_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_attention_timer_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} -/** - * @brief Get field attention_time from event MESH_PB_PROV_ATTENTION_TIMER_EVENT - * @param event packet - * @return attention_time - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_prov_attention_timer_event_get_attention_time(const uint8_t * event){ - return event[5]; -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_START_EMIT_PUBLIC_KEY_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_start_emit_public_key_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_STOP_EMIT_PUBLIC_KEY_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_stop_emit_public_key_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_INPUT_OOB_REQUEST_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_input_oob_request_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_START_EMIT_OUTPUT_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_start_emit_output_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} -/** - * @brief Get field output_oob from event MESH_PB_PROV_START_EMIT_OUTPUT_OOB_EVENT - * @param event packet - * @return output_oob - * @note: btstack_type 4 - */ -static inline uint32_t mesh_pb_prov_start_emit_output_oob_event_get_output_oob(const uint8_t * event){ - return little_endian_read_32(event, 5); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_STOP_EMIT_OUTPUT_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_stop_emit_output_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_START_RECEIVE_PUBLIC_KEY_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_start_receive_public_key_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_STOP_RECEIVE_PUBLIC_KEY_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_stop_receive_public_key_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_OUTPUT_OOB_REQUEST_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_output_oob_request_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_START_EMIT_INPUT_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_start_emit_input_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} -/** - * @brief Get field output_oob from event MESH_PB_PROV_START_EMIT_INPUT_OOB_EVENT - * @param event packet - * @return output_oob - * @note: btstack_type 4 - */ -static inline uint32_t mesh_pb_prov_start_emit_input_oob_event_get_output_oob(const uint8_t * event){ - return little_endian_read_32(event, 5); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_STOP_EMIT_INPUT_OOB_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_stop_emit_input_oob_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_capabilities_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} -/** - * @brief Get field num_elements from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return num_elements - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_prov_capabilities_event_get_num_elements(const uint8_t * event){ - return event[5]; -} -/** - * @brief Get field algorithms from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return algorithms - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_capabilities_event_get_algorithms(const uint8_t * event){ - return little_endian_read_16(event, 6); -} -/** - * @brief Get field public_key from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return public_key - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_prov_capabilities_event_get_public_key(const uint8_t * event){ - return event[8]; -} -/** - * @brief Get field static_oob_type from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return static_oob_type - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_prov_capabilities_event_get_static_oob_type(const uint8_t * event){ - return event[9]; -} -/** - * @brief Get field output_oob_size from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return output_oob_size - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_prov_capabilities_event_get_output_oob_size(const uint8_t * event){ - return event[10]; -} -/** - * @brief Get field output_oob_action from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return output_oob_action - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_capabilities_event_get_output_oob_action(const uint8_t * event){ - return little_endian_read_16(event, 11); -} -/** - * @brief Get field input_oob_size from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return input_oob_size - * @note: btstack_type 1 - */ -static inline uint8_t mesh_pb_prov_capabilities_event_get_input_oob_size(const uint8_t * event){ - return event[13]; -} -/** - * @brief Get field input_oob_action from event MESH_PB_PROV_CAPABILITIES_EVENT - * @param event packet - * @return input_oob_action - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_capabilities_event_get_input_oob_action(const uint8_t * event){ - return little_endian_read_16(event, 14); -} - -/** - * @brief Get field pb_transport_cid from event MESH_PB_PROV_COMPLETE_EVENT - * @param event packet - * @return pb_transport_cid - * @note: btstack_type 2 - */ -static inline uint16_t mesh_pb_prov_complete_event_get_pb_transport_cid(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field status from event MESH_PROXY_CONNECTED_EVENT - * @param event packet - * @return status - * @note: btstack_type 1 - */ -static inline uint8_t mesh_proxy_connected_event_get_status(const uint8_t * event){ - return event[3]; -} -/** - * @brief Get field con_handle from event MESH_PROXY_CONNECTED_EVENT - * @param event packet - * @return con_handle - * @note: btstack_type H - */ -static inline hci_con_handle_t mesh_proxy_connected_event_get_con_handle(const uint8_t * event){ - return little_endian_read_16(event, 4); -} - -/** - * @brief Get field con_handle from event MESH_PROXY_PDU_SENT_EVENT - * @param event packet - * @return con_handle - * @note: btstack_type H - */ -static inline hci_con_handle_t mesh_proxy_pdu_sent_event_get_con_handle(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - -/** - * @brief Get field con_handle from event MESH_PROXY_DISCONNECTED_EVENT - * @param event packet - * @return con_handle - * @note: btstack_type H - */ -static inline hci_con_handle_t mesh_proxy_disconnected_event_get_con_handle(const uint8_t * event){ - return little_endian_read_16(event, 3); -} - /** * @brief Get field status from event HCI_SUBEVENT_LE_CONNECTION_COMPLETE * @param event packet @@ -7543,6 +7218,331 @@ static inline uint16_t map_subevent_parsing_done_get_map_cid(const uint8_t * eve } +/** + * @brief Get field status from event MESH_SUBEVENT_PB_TRANSPORT_PDU_SENT + * @param event packet + * @return status + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_transport_pdu_sent_get_status(const uint8_t * event){ + return event[3]; +} + +/** + * @brief Get field status from event MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN + * @param event packet + * @return status + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_transport_link_open_get_status(const uint8_t * event){ + return event[3]; +} +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_transport_link_open_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 4); +} +/** + * @brief Get field pb_type from event MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN + * @param event packet + * @return pb_type + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_transport_link_open_get_pb_type(const uint8_t * event){ + return event[6]; +} + +/** + * @brief Get field status from event MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED + * @param event packet + * @return status + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_transport_link_closed_get_status(const uint8_t * event){ + return event[3]; +} +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_transport_link_closed_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 4); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_ATTENTION_TIMER + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_attention_timer_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} +/** + * @brief Get field attention_time from event MESH_SUBEVENT_PB_PROV_ATTENTION_TIMER + * @param event packet + * @return attention_time + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_prov_attention_timer_get_attention_time(const uint8_t * event){ + return event[5]; +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_START_EMIT_PUBLIC_KEY_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_start_emit_public_key_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_STOP_EMIT_PUBLIC_KEY_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_stop_emit_public_key_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_INPUT_OOB_REQUEST + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_input_oob_request_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_START_EMIT_OUTPUT_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_start_emit_output_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} +/** + * @brief Get field output_oob from event MESH_SUBEVENT_PB_PROV_START_EMIT_OUTPUT_OOB + * @param event packet + * @return output_oob + * @note: btstack_type 4 + */ +static inline uint32_t mesh_subevent_pb_prov_start_emit_output_oob_get_output_oob(const uint8_t * event){ + return little_endian_read_32(event, 5); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_STOP_EMIT_OUTPUT_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_stop_emit_output_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_START_RECEIVE_PUBLIC_KEY_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_start_receive_public_key_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_STOP_RECEIVE_PUBLIC_KEY_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_stop_receive_public_key_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_OUTPUT_OOB_REQUEST + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_output_oob_request_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_START_EMIT_INPUT_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_start_emit_input_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} +/** + * @brief Get field output_oob from event MESH_SUBEVENT_PB_PROV_START_EMIT_INPUT_OOB + * @param event packet + * @return output_oob + * @note: btstack_type 4 + */ +static inline uint32_t mesh_subevent_pb_prov_start_emit_input_oob_get_output_oob(const uint8_t * event){ + return little_endian_read_32(event, 5); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_STOP_EMIT_INPUT_OOB + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_stop_emit_input_oob_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_capabilities_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} +/** + * @brief Get field num_elements from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return num_elements + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_prov_capabilities_get_num_elements(const uint8_t * event){ + return event[5]; +} +/** + * @brief Get field algorithms from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return algorithms + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_capabilities_get_algorithms(const uint8_t * event){ + return little_endian_read_16(event, 6); +} +/** + * @brief Get field public_key from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return public_key + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_prov_capabilities_get_public_key(const uint8_t * event){ + return event[8]; +} +/** + * @brief Get field static_oob_type from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return static_oob_type + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_prov_capabilities_get_static_oob_type(const uint8_t * event){ + return event[9]; +} +/** + * @brief Get field output_oob_size from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return output_oob_size + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_prov_capabilities_get_output_oob_size(const uint8_t * event){ + return event[10]; +} +/** + * @brief Get field output_oob_action from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return output_oob_action + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_capabilities_get_output_oob_action(const uint8_t * event){ + return little_endian_read_16(event, 11); +} +/** + * @brief Get field input_oob_size from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return input_oob_size + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_pb_prov_capabilities_get_input_oob_size(const uint8_t * event){ + return event[13]; +} +/** + * @brief Get field input_oob_action from event MESH_SUBEVENT_PB_PROV_CAPABILITIES + * @param event packet + * @return input_oob_action + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_capabilities_get_input_oob_action(const uint8_t * event){ + return little_endian_read_16(event, 14); +} + +/** + * @brief Get field pb_transport_cid from event MESH_SUBEVENT_PB_PROV_COMPLETE + * @param event packet + * @return pb_transport_cid + * @note: btstack_type 2 + */ +static inline uint16_t mesh_subevent_pb_prov_complete_get_pb_transport_cid(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field status from event MESH_SUBEVENT_PROXY_CONNECTED + * @param event packet + * @return status + * @note: btstack_type 1 + */ +static inline uint8_t mesh_subevent_proxy_connected_get_status(const uint8_t * event){ + return event[3]; +} +/** + * @brief Get field con_handle from event MESH_SUBEVENT_PROXY_CONNECTED + * @param event packet + * @return con_handle + * @note: btstack_type H + */ +static inline hci_con_handle_t mesh_subevent_proxy_connected_get_con_handle(const uint8_t * event){ + return little_endian_read_16(event, 4); +} + +/** + * @brief Get field con_handle from event MESH_SUBEVENT_PROXY_PDU_SENT + * @param event packet + * @return con_handle + * @note: btstack_type H + */ +static inline hci_con_handle_t mesh_subevent_proxy_pdu_sent_get_con_handle(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + +/** + * @brief Get field con_handle from event MESH_SUBEVENT_PROXY_DISCONNECTED + * @param event packet + * @return con_handle + * @note: btstack_type H + */ +static inline hci_con_handle_t mesh_subevent_proxy_disconnected_get_con_handle(const uint8_t * event){ + return little_endian_read_16(event, 3); +} + /** * @brief Get field con_handle from event MESH_SUBEVENT_MESSAGE_SENT * @param event packet diff --git a/test/mesh/mesh.c b/test/mesh/mesh.c index 5d05341e8..0ed7990d0 100644 --- a/test/mesh/mesh.c +++ b/test/mesh/mesh.c @@ -447,23 +447,23 @@ static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t cha switch(packet[0]){ case HCI_EVENT_MESH_META: switch(packet[2]){ - case MESH_PB_TRANSPORT_LINK_OPEN: + case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN: printf("Provisioner link opened"); - pb_transport_cid = mesh_pb_transport_link_open_event_get_pb_transport_cid(packet); + pb_transport_cid = mesh_subevent_pb_transport_link_open_get_pb_transport_cid(packet); break; - case MESH_PB_TRANSPORT_LINK_CLOSED: + case MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED: pb_transport_cid = MESH_PB_TRANSPORT_INVALID_CID; break; - case MESH_PB_PROV_ATTENTION_TIMER: + case MESH_SUBEVENT_PB_PROV_ATTENTION_TIMER: printf("Attention Timer: %u\n", packet[3]); break; - case MESH_PB_PROV_INPUT_OOB_REQUEST: + case MESH_SUBEVENT_PB_PROV_INPUT_OOB_REQUEST: printf("Enter passphrase: "); fflush(stdout); ui_chars_for_pin = 1; ui_pin_offset = 0; break; - case MESH_PB_PROV_COMPLETE: + case MESH_SUBEVENT_PB_PROV_COMPLETE: printf("Provisioning complete\n"); memcpy(provisioning_data.device_key, provisioning_device_data_get_device_key(), 16); @@ -2765,7 +2765,7 @@ static void mesh_proxy_packet_handler_network_pdu(uint8_t packet_type, uint16_t case MESH_SUBEVENT_MESSAGE_SENT: mesh_gatt_handle_event(packet_type, channel, packet, size); break; - case MESH_PROXY_CONNECTED: + case MESH_SUBEVENT_PROXY_CONNECTED: printf("mesh: MESH_PROXY_CONNECTED\n"); printf("+ Setup Secure Network Beacon\n"); mesh_secure_network_beacon[0] = BEACON_TYPE_SECURE_NETWORK; diff --git a/test/mesh/mesh_provisioning_device.c b/test/mesh/mesh_provisioning_device.c index b53fa2bbf..295c3f0db 100644 --- a/test/mesh/mesh_provisioning_device.c +++ b/test/mesh/mesh_provisioning_device.c @@ -135,7 +135,7 @@ static void mesh_message_handler (uint8_t packet_type, uint16_t channel, uint8_t switch(packet[0]){ case HCI_EVENT_MESH_META: switch(packet[2]){ - case MESH_PB_PROV_COMPLETE: + case MESH_SUBEVENT_PB_PROV_COMPLETE: printf("Provisioning complete\n"); network_key = provisioning_device_data_get_network_key(); diff --git a/test/mesh/mesh_proxy_server.c b/test/mesh/mesh_proxy_server.c index 503d028f1..b6abc7414 100644 --- a/test/mesh/mesh_proxy_server.c +++ b/test/mesh/mesh_proxy_server.c @@ -264,7 +264,7 @@ static void packet_handler_for_mesh_network_pdu(uint8_t packet_type, uint16_t ch switch (hci_event_packet_get_type(packet)){ case HCI_EVENT_MESH_META: switch (hci_event_mesh_meta_get_subevent_code(packet)){ - case MESH_PB_TRANSPORT_LINK_OPEN: + case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN: printf("mesh_proxy_server: MESH_PB_TRANSPORT_LINK_OPEN\n"); printf("+ Setup Secure Network Beacon\n"); mesh_secure_network_beacon[0] = BEACON_TYPE_SECURE_NETWORK; diff --git a/test/mesh/provisioner.c b/test/mesh/provisioner.c index 38949ce21..9324aa424 100644 --- a/test/mesh/provisioner.c +++ b/test/mesh/provisioner.c @@ -161,20 +161,20 @@ static void mesh_message_handler (uint8_t packet_type, uint16_t channel, uint8_t switch(packet[0]){ case HCI_EVENT_MESH_META: switch(packet[2]){ - case MESH_PB_TRANSPORT_LINK_OPEN: + case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN: printf("Provisioner link opened"); break; - case MESH_PB_PROV_CAPABILITIES: + case MESH_SUBEVENT_PB_PROV_CAPABILITIES: printf("// Provisioner capabilities\n"); - public_oob = mesh_pb_prov_capabilities_event_get_public_key(packet); + public_oob = mesh_subevent_pb_prov_capabilities_get_public_key(packet); if (public_oob){ printf("PTS supports Public OOB, select Public OOB\n"); } else { printf("PTS does not supports Public OOB, select No Public OOB\n"); } - auth_static_oob = mesh_pb_prov_capabilities_event_get_static_oob_type(packet); - auth_input_oob_action = mesh_pb_prov_capabilities_event_get_input_oob_action(packet); - auth_output_oob_action = mesh_pb_prov_capabilities_event_get_output_oob_action(packet); + auth_static_oob = mesh_subevent_pb_prov_capabilities_get_static_oob_type(packet); + auth_input_oob_action = mesh_subevent_pb_prov_capabilities_get_input_oob_action(packet); + auth_output_oob_action = mesh_subevent_pb_prov_capabilities_get_output_oob_action(packet); if (auth_output_oob_action){ auth_method = 0x02; // Output OOB // find output action @@ -182,7 +182,7 @@ static void mesh_message_handler (uint8_t packet_type, uint16_t channel, uint8_t for (i=0;i<5;i++){ if (auth_output_oob_action & (1<