mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-31 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: rename mesh_access_incoming_pdu_t into mesh_unsegemented_incoming_pdu_t

Browse Source
This commit is contained in:
Matthias Ringwald 2020-03-14 15:20:17 +01:00
parent 2ae11e2ce9
commit e3bfb018e7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/mesh_lower_transport.c
View File

@ -177,7 +177,7 @@ static int lower_transport_outgoing_trasnmission_complete;
// deliver to higher layer
static mesh_pdu_t * mesh_lower_transport_higher_layer_pdu;
static btstack_linked_list_t mesh_lower_transport_queued_for_higher_layer;
static mesh_access_incoming_pdu_t lower_transport_access_incoming_singleton;
static mesh_unsegmented_incoming_pdu_t lower_transport_access_incoming_singleton;
static void mesh_lower_transport_process_segment_acknowledgement_message(mesh_network_pdu_t *network_pdu){
if (lower_transport_outgoing_pdu == NULL) return;
@ -246,7 +246,7 @@ static void mesh_lower_transport_deliver_to_higher_layer(void){
} else {
// unsegmented access pdu
mesh_lower_transport_higher_layer_pdu = (mesh_pdu_t *) &lower_transport_access_incoming_singleton;
lower_transport_access_incoming_singleton.pdu_header.pdu_type = MESH_PDU_TYPE_ACCESS_INCOMING;
lower_transport_access_incoming_singleton.pdu_header.pdu_type = MESH_PDU_TYPE_UNSEGMENTED_INCOMING;
btstack_linked_list_add(&lower_transport_access_incoming_singleton.segments, (btstack_linked_item_t*) network_pdu);
}
break;
@ -653,7 +653,7 @@ void mesh_lower_transport_message_processed_by_higher_layer(mesh_pdu_t * pdu){
mesh_lower_transport_report_segments_as_processed((mesh_message_pdu_t *) pdu);
mesh_message_pdu_free((mesh_message_pdu_t *) pdu);
break;
case MESH_PDU_TYPE_ACCESS_INCOMING:
case MESH_PDU_TYPE_UNSEGMENTED_INCOMING:
mesh_network_message_processed_by_higher_layer((mesh_network_pdu_t *) btstack_linked_list_pop(&lower_transport_access_incoming_singleton.segments));
break;
default:

4
src/mesh/mesh_network.h
View File

@ -70,7 +70,7 @@ typedef enum {
MESH_PDU_TYPE_NETWORK = 0,
MESH_PDU_TYPE_TRANSPORT,
MESH_PDU_TYPE_MESSAGE,
MESH_PDU_TYPE_ACCESS_INCOMING,
MESH_PDU_TYPE_UNSEGMENTED_INCOMING,
} mesh_pdu_type_t;
typedef struct mesh_pdu {
@ -190,7 +190,7 @@ typedef struct {
// pdu segments
uint16_t len;
btstack_linked_list_t segments;
} mesh_access_incoming_pdu_t;
} mesh_unsegmented_incoming_pdu_t;
typedef enum {
MESH_KEY_REFRESH_NOT_ACTIVE = 0,

8
src/mesh/mesh_upper_transport.c
View File

@ -137,7 +137,7 @@ static void mesh_upper_transport_validate_segmented_message(void);
static void mesh_upper_transport_run(void);
static int crypto_active;
static mesh_access_incoming_pdu_t * incoming_unsegmented_pdu_raw;
static mesh_unsegmented_incoming_pdu_t * incoming_unsegmented_pdu_raw;
static mesh_network_pdu_t * incoming_network_pdu_decoded;
static mesh_transport_pdu_t incoming_transport_pdu_singleton;
static mesh_transport_pdu_t * incoming_transport_pdu_raw;
@ -1015,7 +1015,7 @@ static void mesh_upper_transport_run(void){
mesh_network_pdu_t * network_pdu;
mesh_transport_pdu_t * transport_pdu;
mesh_message_pdu_t * message_pdu;
mesh_access_incoming_pdu_t * unsegmented_pdu;
mesh_unsegmented_incoming_pdu_t * unsegmented_pdu;
switch (pdu->pdu_type){
case MESH_PDU_TYPE_NETWORK:
network_pdu = (mesh_network_pdu_t *) pdu;
@ -1028,8 +1028,8 @@ static void mesh_upper_transport_run(void){
break;
}
break;
case MESH_PDU_TYPE_ACCESS_INCOMING:
unsegmented_pdu = (mesh_access_incoming_pdu_t *) pdu;
case MESH_PDU_TYPE_UNSEGMENTED_INCOMING:
unsegmented_pdu = (mesh_unsegmented_incoming_pdu_t *) pdu;
network_pdu = (mesh_network_pdu_t *) btstack_linked_list_get_first_item(&unsegmented_pdu->segments);
btstack_assert(network_pdu != NULL);
// control?