Skip to content

Commit fae1e36

Browse files
authored
Change non returning functions to void + spelling (#251)
1 parent 9bf21b7 commit fae1e36

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Diff for: src/utility/ATT.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
12721272
}
12731273
return;
12741274
}
1275-
// Check permssion
1275+
// Check permission
12761276
if((characteristic->permissions() &( BLEPermission::BLEEncryption >> 8)) > 0 &&
12771277
(getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
12781278
holdResponse = true;
@@ -1941,4 +1941,4 @@ int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolved
19411941
#if !defined(FAKE_ATT)
19421942
ATTClass ATTObj;
19431943
ATTClass& ATT = ATTObj;
1944-
#endif
1944+
#endif

Diff for: src/utility/HCI.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -460,14 +460,14 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
460460

461461
return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
462462
}
463-
int HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
463+
void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
464464
if(_storeIRK!=0){
465465
_storeIRK(address, peerIrk);
466466
}
467467
// Again... this should work
468468
// leAddResolvingAddress(addressType, address, peerIrk, localIrk);
469469
}
470-
int HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
470+
void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
471471
leStopResolvingAddresses();
472472

473473
struct __attribute__ ((packed)) AddDevice {
@@ -527,7 +527,7 @@ int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peer
527527
return res;
528528
}
529529

530-
int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
530+
void HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
531531
struct __attribute__ ((packed)) StoreLK {
532532
uint8_t nKeys;
533533
uint8_t BD_ADDR[6];
@@ -538,7 +538,7 @@ int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
538538
for(int i=0; i<16; i++) storeLK.LTK[15-i] = LK[i];
539539
HCI.sendCommand(OGF_HOST_CTL << 10 | 0x11, sizeof(storeLK), &storeLK);
540540
}
541-
int HCIClass::readStoredLKs(){
541+
void HCIClass::readStoredLKs(){
542542
uint8_t BD_ADDR[6];
543543
readStoredLK(BD_ADDR, 1);
544544
}

Diff for: src/utility/HCI.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ class HCIClass {
9999
virtual AuthReq localAuthreq();
100100
virtual uint8_t localIOCap();
101101

102-
virtual int saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
103-
virtual int leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
102+
virtual void saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
103+
virtual void leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
104104
virtual int leStopResolvingAddresses();
105105
virtual int leStartResolvingAddresses();
106106
virtual int leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress);
107107

108-
virtual int readStoredLKs();
108+
virtual void readStoredLKs();
109109
virtual int readStoredLK(uint8_t BD_ADDR[], uint8_t read_all = 0);
110-
virtual int writeLK(uint8_t peerAddress[], uint8_t LK[]);
110+
virtual void writeLK(uint8_t peerAddress[], uint8_t LK[]);
111111
virtual int tryResolveAddress(uint8_t* BDAddr, uint8_t* address);
112112

113113
virtual int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data);

0 commit comments

Comments
 (0)