Skip to content

Commit 29988d5

Browse files
pan-pan-
committed
BLE: Align naming of GattClient procedure control blocks.
1 parent 3061db2 commit 29988d5

File tree

2 files changed

+53
-53
lines changed

2 files changed

+53
-53
lines changed

‎features/FEATURE_BLE/ble/generic/GenericGattClient.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ class GenericGattClient : public GattClient {
115115
virtual ble_error_t reset(void);
116116

117117
private:
118-
struct procedure_control_block_t;
119-
struct discovery_control_block_t;
120-
struct read_control_block_t;
121-
struct write_control_block_t;
122-
struct descriptor_discovery_control_block_t;
118+
struct ProcedureControlBlock;
119+
struct DiscoveryControlBlock;
120+
struct ReadControlBlock;
121+
struct WriteControlBlock;
122+
struct DescriptorDiscoveryControlBlock;
123123

124-
procedure_control_block_t* get_control_block(Gap::Handle_t connection);
125-
const procedure_control_block_t* get_control_block(Gap::Handle_t connection) const;
126-
void insert_control_block(procedure_control_block_t* cb) const;
127-
void remove_control_block(procedure_control_block_t* cb) const;
124+
ProcedureControlBlock* get_control_block(Gap::Handle_t connection);
125+
const ProcedureControlBlock* get_control_block(Gap::Handle_t connection) const;
126+
void insert_control_block(ProcedureControlBlock* cb) const;
127+
void remove_control_block(ProcedureControlBlock* cb) const;
128128

129129
void on_termination(Gap::Handle_t connection_handle);
130130
void on_server_message_received(connection_handle_t, const pal::AttServerMessage&);
@@ -136,7 +136,7 @@ class GenericGattClient : public GattClient {
136136

137137
pal::GattClient* const _pal_client;
138138
ServiceDiscovery::TerminationCallback_t _termination_callback;
139-
mutable procedure_control_block_t* control_blocks;
139+
mutable ProcedureControlBlock* control_blocks;
140140
};
141141

142142
}

‎features/FEATURE_BLE/source/generic/GenericGattClient.cpp

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ enum procedure_type_t {
5555
/*
5656
* Base class for a procedure control block
5757
*/
58-
struct GenericGattClient::procedure_control_block_t {
58+
struct GenericGattClient::ProcedureControlBlock {
5959
/*
6060
* Base constructor for procedure control block.
6161
*/
62-
procedure_control_block_t(procedure_type_t type, Gap::Handle_t handle) :
62+
ProcedureControlBlock(procedure_type_t type, Gap::Handle_t handle) :
6363
type(type), connection_handle(handle), next(NULL) { }
6464

65-
virtual ~procedure_control_block_t() { }
65+
virtual ~ProcedureControlBlock() { }
6666

6767
/*
6868
* Entry point of the control block stack machine.
@@ -76,21 +76,21 @@ struct GenericGattClient::procedure_control_block_t {
7676

7777
procedure_type_t type;
7878
Gap::Handle_t connection_handle;
79-
procedure_control_block_t* next;
79+
ProcedureControlBlock* next;
8080
};
8181

8282

8383
/*
8484
* Procedure control block for the discovery process.
8585
*/
86-
struct GenericGattClient::discovery_control_block_t : public procedure_control_block_t {
87-
discovery_control_block_t(
86+
struct GenericGattClient::DiscoveryControlBlock : public ProcedureControlBlock {
87+
DiscoveryControlBlock(
8888
Gap::Handle_t handle,
8989
ServiceDiscovery::ServiceCallback_t service_callback,
9090
ServiceDiscovery::CharacteristicCallback_t characteristic_callback,
9191
UUID matching_service_uuid,
9292
UUID matching_characteristic_uuid
93-
) : procedure_control_block_t(COMPLETE_DISCOVERY_PROCEDURE, handle),
93+
) : ProcedureControlBlock(COMPLETE_DISCOVERY_PROCEDURE, handle),
9494
service_callback(service_callback),
9595
characteristic_callback(characteristic_callback),
9696
matching_service_uuid(matching_service_uuid),
@@ -99,7 +99,7 @@ struct GenericGattClient::discovery_control_block_t : public procedure_control_b
9999
done(false) {
100100
}
101101

102-
virtual ~discovery_control_block_t() {
102+
virtual ~DiscoveryControlBlock() {
103103
while(services_discovered) {
104104
service_t* tmp = services_discovered->next;
105105
delete services_discovered;
@@ -409,15 +409,15 @@ struct GenericGattClient::discovery_control_block_t : public procedure_control_b
409409
};
410410

411411

412-
struct GenericGattClient::read_control_block_t : public procedure_control_block_t {
413-
read_control_block_t(
412+
struct GenericGattClient::ReadControlBlock : public ProcedureControlBlock {
413+
ReadControlBlock(
414414
Gap::Handle_t connection_handle, uint16_t attribute_handle, uint16_t offset
415-
) : procedure_control_block_t(READ_PROCEDURE, connection_handle),
415+
) : ProcedureControlBlock(READ_PROCEDURE, connection_handle),
416416
attribute_handle(attribute_handle),
417417
offset(offset), current_offset(offset), data(NULL) {
418418
}
419419

420-
virtual ~read_control_block_t() {
420+
virtual ~ReadControlBlock() {
421421
if (data != NULL) {
422422
free(data);
423423
}
@@ -593,16 +593,16 @@ struct GenericGattClient::read_control_block_t : public procedure_control_block_
593593
/*
594594
* Control block for the write process
595595
*/
596-
struct GenericGattClient::write_control_block_t : public procedure_control_block_t {
597-
write_control_block_t(
596+
struct GenericGattClient::WriteControlBlock : public ProcedureControlBlock {
597+
WriteControlBlock(
598598
Gap::Handle_t connection_handle, uint16_t attribute_handle,
599599
uint8_t* data, uint16_t len
600-
) : procedure_control_block_t(WRITE_PROCEDURE, connection_handle),
600+
) : ProcedureControlBlock(WRITE_PROCEDURE, connection_handle),
601601
attribute_handle(attribute_handle), len(len), offset(0), data(data),
602602
prepare_success(false), status(BLE_ERROR_UNSPECIFIED), error_code(0xFF) {
603603
}
604604

605-
virtual ~write_control_block_t() {
605+
virtual ~WriteControlBlock() {
606606
free(data);
607607
}
608608

@@ -785,20 +785,20 @@ struct GenericGattClient::write_control_block_t : public procedure_control_block
785785
/*
786786
* Control block for the descriptor discovery process
787787
*/
788-
struct GenericGattClient::descriptor_discovery_control_block_t : public procedure_control_block_t {
789-
descriptor_discovery_control_block_t(
788+
struct GenericGattClient::DescriptorDiscoveryControlBlock : public ProcedureControlBlock {
789+
DescriptorDiscoveryControlBlock(
790790
const DiscoveredCharacteristic& characteristic,
791791
const CharacteristicDescriptorDiscovery::DiscoveryCallback_t& discoveryCallback,
792792
const CharacteristicDescriptorDiscovery::TerminationCallback_t& terminationCallback
793-
) : procedure_control_block_t(DESCRIPTOR_DISCOVERY_PROCEDURE, characteristic.getConnectionHandle()),
793+
) : ProcedureControlBlock(DESCRIPTOR_DISCOVERY_PROCEDURE, characteristic.getConnectionHandle()),
794794
characteristic(characteristic),
795795
discovery_cb(discoveryCallback),
796796
termination_cb(terminationCallback),
797797
next_handle(characteristic.getValueHandle() + 1),
798798
done(false) {
799799
}
800800

801-
virtual ~descriptor_discovery_control_block_t() { }
801+
virtual ~DescriptorDiscoveryControlBlock() { }
802802

803803
ble_error_t start(GenericGattClient* client) {
804804
return client->_pal_client->discover_characteristics_descriptors(
@@ -919,7 +919,7 @@ ble_error_t GenericGattClient::launchServiceDiscovery(
919919
return BLE_ERROR_NONE;
920920
}
921921

922-
discovery_control_block_t* discovery_pcb = new(std::nothrow) discovery_control_block_t(
922+
DiscoveryControlBlock* discovery_pcb = new(std::nothrow) DiscoveryControlBlock(
923923
connection_handle,
924924
service_callback,
925925
characteristic_callback,
@@ -959,7 +959,7 @@ ble_error_t GenericGattClient::launchServiceDiscovery(
959959
}
960960

961961
bool GenericGattClient::isServiceDiscoveryActive() const {
962-
procedure_control_block_t* pcb = control_blocks;
962+
ProcedureControlBlock* pcb = control_blocks;
963963

964964
while (pcb) {
965965
if (pcb->type == COMPLETE_DISCOVERY_PROCEDURE) {
@@ -973,10 +973,10 @@ bool GenericGattClient::isServiceDiscoveryActive() const {
973973

974974
void GenericGattClient::terminateServiceDiscovery()
975975
{
976-
procedure_control_block_t* pcb = control_blocks;
976+
ProcedureControlBlock* pcb = control_blocks;
977977
while (pcb) {
978978
if (pcb->type == COMPLETE_DISCOVERY_PROCEDURE) {
979-
static_cast<discovery_control_block_t*>(pcb)->done = true;
979+
static_cast<DiscoveryControlBlock*>(pcb)->done = true;
980980
}
981981
pcb = pcb->next;
982982
}
@@ -992,7 +992,7 @@ ble_error_t GenericGattClient::read(
992992
return BLE_ERROR_INVALID_STATE;
993993
}
994994

995-
read_control_block_t* read_pcb = new(std::nothrow) read_control_block_t(
995+
ReadControlBlock* read_pcb = new(std::nothrow) ReadControlBlock(
996996
connection_handle,
997997
attribute_handle,
998998
offset
@@ -1058,7 +1058,7 @@ ble_error_t GenericGattClient::write(
10581058
memcpy(data, value, length);
10591059
}
10601060

1061-
write_control_block_t* write_pcb = new(std::nothrow) write_control_block_t(
1061+
WriteControlBlock* write_pcb = new(std::nothrow) WriteControlBlock(
10621062
connection_handle,
10631063
attribute_handle,
10641064
data,
@@ -1126,8 +1126,8 @@ ble_error_t GenericGattClient::discoverCharacteristicDescriptors(
11261126
return BLE_ERROR_NONE;
11271127
}
11281128

1129-
descriptor_discovery_control_block_t* discovery_pcb =
1130-
new(std::nothrow) descriptor_discovery_control_block_t(
1129+
DescriptorDiscoveryControlBlock* discovery_pcb =
1130+
new(std::nothrow) DescriptorDiscoveryControlBlock(
11311131
characteristic,
11321132
discoveryCallback,
11331133
terminationCallback
@@ -1152,11 +1152,11 @@ ble_error_t GenericGattClient::discoverCharacteristicDescriptors(
11521152
bool GenericGattClient::isCharacteristicDescriptorDiscoveryActive(
11531153
const DiscoveredCharacteristic& characteristic
11541154
) const {
1155-
procedure_control_block_t* pcb = control_blocks;
1155+
ProcedureControlBlock* pcb = control_blocks;
11561156

11571157
while (pcb) {
11581158
if (pcb->type == DESCRIPTOR_DISCOVERY_PROCEDURE &&
1159-
static_cast<descriptor_discovery_control_block_t*>(pcb)->characteristic == characteristic) {
1159+
static_cast<DescriptorDiscoveryControlBlock*>(pcb)->characteristic == characteristic) {
11601160
return true;
11611161
}
11621162
pcb = pcb->next;
@@ -1168,12 +1168,12 @@ bool GenericGattClient::isCharacteristicDescriptorDiscoveryActive(
11681168
void GenericGattClient::terminateCharacteristicDescriptorDiscovery(
11691169
const DiscoveredCharacteristic& characteristic
11701170
) {
1171-
procedure_control_block_t* pcb = control_blocks;
1171+
ProcedureControlBlock* pcb = control_blocks;
11721172

11731173
while (pcb) {
11741174
if (pcb->type == DESCRIPTOR_DISCOVERY_PROCEDURE) {
1175-
descriptor_discovery_control_block_t* dpcb =
1176-
static_cast<descriptor_discovery_control_block_t*>(pcb);
1175+
DescriptorDiscoveryControlBlock* dpcb =
1176+
static_cast<DescriptorDiscoveryControlBlock*>(pcb);
11771177
if (dpcb->characteristic == characteristic) {
11781178
dpcb->done = true;
11791179
return;
@@ -1230,7 +1230,7 @@ void GenericGattClient::on_server_response(
12301230
connection_handle_t connection,
12311231
const AttServerMessage& message
12321232
) {
1233-
procedure_control_block_t* pcb = get_control_block(connection);
1233+
ProcedureControlBlock* pcb = get_control_block(connection);
12341234
if (pcb == NULL) {
12351235
return;
12361236
}
@@ -1270,44 +1270,44 @@ void GenericGattClient::on_server_event(connection_handle_t connection, const At
12701270
}
12711271

12721272
void GenericGattClient::on_transaction_timeout(connection_handle_t connection) {
1273-
procedure_control_block_t* pcb = get_control_block(connection);
1273+
ProcedureControlBlock* pcb = get_control_block(connection);
12741274
if (pcb == NULL) {
12751275
return;
12761276
}
12771277

12781278
pcb->handle_timeout_error(this);
12791279
}
12801280

1281-
GenericGattClient::procedure_control_block_t* GenericGattClient::get_control_block(Gap::Handle_t connection) {
1282-
procedure_control_block_t* it = control_blocks;
1281+
GenericGattClient::ProcedureControlBlock* GenericGattClient::get_control_block(Gap::Handle_t connection) {
1282+
ProcedureControlBlock* it = control_blocks;
12831283
while (it && it->connection_handle != connection) {
12841284
it = it->next;
12851285
}
12861286
return it;
12871287
}
12881288

1289-
const GenericGattClient::procedure_control_block_t* GenericGattClient::get_control_block(Gap::Handle_t connection) const {
1290-
procedure_control_block_t* it = control_blocks;
1289+
const GenericGattClient::ProcedureControlBlock* GenericGattClient::get_control_block(Gap::Handle_t connection) const {
1290+
ProcedureControlBlock* it = control_blocks;
12911291
while (it && it->connection_handle != connection) {
12921292
it = it->next;
12931293
}
12941294
return it;
12951295
}
12961296

1297-
void GenericGattClient::insert_control_block(procedure_control_block_t* cb) const {
1297+
void GenericGattClient::insert_control_block(ProcedureControlBlock* cb) const {
12981298
if (control_blocks == NULL) {
12991299
control_blocks = cb;
13001300
return;
13011301
}
13021302

1303-
procedure_control_block_t* current = control_blocks;
1303+
ProcedureControlBlock* current = control_blocks;
13041304
while (current->next) {
13051305
current = current->next;
13061306
}
13071307
current->next = cb;
13081308
}
13091309

1310-
void GenericGattClient::remove_control_block(procedure_control_block_t* cb) const {
1310+
void GenericGattClient::remove_control_block(ProcedureControlBlock* cb) const {
13111311
if (control_blocks == NULL) {
13121312
return;
13131313
}
@@ -1317,7 +1317,7 @@ void GenericGattClient::remove_control_block(procedure_control_block_t* cb) cons
13171317
return;
13181318
}
13191319

1320-
procedure_control_block_t* current = control_blocks;
1320+
ProcedureControlBlock* current = control_blocks;
13211321
while (current->next && current->next != cb) {
13221322
current = current->next;
13231323
}

0 commit comments

Comments
 (0)