Skip to content

Commit cbf2d56

Browse files
committed
chore(i3c): use boolean for binary result functions
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent d485a08 commit cbf2d56

2 files changed

Lines changed: 48 additions & 48 deletions

File tree

libraries/I3C/src/I3C.cpp

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -676,13 +676,13 @@ bool I3CBus::isI3CDeviceReady(uint8_t dynAddr, uint32_t trials, uint32_t timeout
676676
// Low-level CCC helpers
677677
// ============================================================================
678678

679-
int I3CBus::cccBroadcastWrite(uint8_t cccId,
679+
bool I3CBus::cccBroadcastWrite(uint8_t cccId,
680680
const uint8_t *data,
681681
uint16_t length,
682682
bool withDefByte,
683683
uint32_t timeout)
684684
{
685-
int result = -1;
685+
bool result = false;
686686

687687
if (_initialized) {
688688
uint32_t controlBuffer[0xFF];
@@ -712,11 +712,11 @@ int I3CBus::cccBroadcastWrite(uint8_t cccId,
712712
if (st == HAL_OK) {
713713
st = HAL_I3C_Ctrl_TransmitCCC(&_hi3c, &context, timeout);
714714
if (st == HAL_OK) {
715-
result = 0;
715+
result = true;
716716
} else {
717717
uint32_t err = HAL_I3C_GetError(&_hi3c);
718718
if ((err & HAL_I3C_ERROR_CE2) != 0U) {
719-
result = 0;
719+
result = true;
720720
}
721721
}
722722
}
@@ -725,14 +725,14 @@ int I3CBus::cccBroadcastWrite(uint8_t cccId,
725725
return result;
726726
}
727727

728-
int I3CBus::cccDirectWrite(uint8_t targetAddr,
728+
bool I3CBus::cccDirectWrite(uint8_t targetAddr,
729729
uint8_t cccId,
730730
const uint8_t *data,
731731
uint16_t length,
732732
bool withDefByte,
733733
uint32_t timeout)
734734
{
735-
int result = -1;
735+
bool result = false;
736736

737737
if (_initialized) {
738738
uint32_t controlBuffer[0xFF];
@@ -767,21 +767,21 @@ int I3CBus::cccDirectWrite(uint8_t targetAddr,
767767
if (st == HAL_OK) {
768768
st = HAL_I3C_Ctrl_TransmitCCC(&_hi3c, &context, timeout);
769769
if (st == HAL_OK) {
770-
result = 0;
770+
result = true;
771771
}
772772
}
773773
}
774774

775775
return result;
776776
}
777777

778-
int I3CBus::cccDirectRead(uint8_t targetAddr,
778+
bool I3CBus::cccDirectRead(uint8_t targetAddr,
779779
uint8_t cccId,
780780
uint8_t *rxData,
781781
uint16_t rxLength,
782782
uint32_t timeout)
783783
{
784-
int result = -1;
784+
bool result = false;
785785

786786
if (_initialized && (rxData != nullptr) && (rxLength != 0U)) {
787787
uint32_t controlBuffer[0xFF];
@@ -812,7 +812,7 @@ int I3CBus::cccDirectRead(uint8_t targetAddr,
812812
if (st == HAL_OK) {
813813
st = HAL_I3C_Ctrl_ReceiveCCC(&_hi3c, &context, timeout);
814814
if (st == HAL_OK) {
815-
result = 0;
815+
result = true;
816816
}
817817
}
818818
}
@@ -824,13 +824,13 @@ int I3CBus::cccDirectRead(uint8_t targetAddr,
824824
// CCC direct-read helpers
825825
// ============================================================================
826826

827-
int I3CBus::getbcr(uint8_t dynAddr, uint8_t &bcr, uint32_t timeout)
827+
bool I3CBus::getbcr(uint8_t dynAddr, uint8_t &bcr, uint32_t timeout)
828828
{
829-
int result = 0;
829+
bool result = false;
830830
uint8_t rxData[1] = {0};
831831

832-
int rc = cccDirectRead(dynAddr, I3C_CCC_GETBCR_DIR, rxData, 1U, timeout);
833-
if (rc != 0) {
832+
bool rc = cccDirectRead(dynAddr, I3C_CCC_GETBCR_DIR, rxData, 1U, timeout);
833+
if (rc) {
834834
result = rc;
835835
} else {
836836
bcr = rxData[0];
@@ -839,13 +839,13 @@ int I3CBus::getbcr(uint8_t dynAddr, uint8_t &bcr, uint32_t timeout)
839839
return result;
840840
}
841841

842-
int I3CBus::getdcr(uint8_t dynAddr, uint8_t &dcr, uint32_t timeout)
842+
bool I3CBus::getdcr(uint8_t dynAddr, uint8_t &dcr, uint32_t timeout)
843843
{
844-
int result = 0;
844+
bool result = false;
845845
uint8_t rxData[1] = {0};
846846

847-
int rc = cccDirectRead(dynAddr, I3C_CCC_GETDCR_DIR, rxData, 1U, timeout);
848-
if (rc != 0) {
847+
bool rc = cccDirectRead(dynAddr, I3C_CCC_GETDCR_DIR, rxData, 1U, timeout);
848+
if (rc) {
849849
result = rc;
850850
} else {
851851
dcr = rxData[0];
@@ -854,13 +854,13 @@ int I3CBus::getdcr(uint8_t dynAddr, uint8_t &dcr, uint32_t timeout)
854854
return result;
855855
}
856856

857-
int I3CBus::getpid(uint8_t dynAddr, uint64_t &pid, uint32_t timeout)
857+
bool I3CBus::getpid(uint8_t dynAddr, uint64_t &pid, uint32_t timeout)
858858
{
859-
int result = 0;
859+
bool result = false;
860860
uint8_t rxData[6] = {0};
861861

862-
int rc = cccDirectRead(dynAddr, I3C_CCC_GETPID_DIR, rxData, 6U, timeout);
863-
if (rc != 0) {
862+
bool rc = cccDirectRead(dynAddr, I3C_CCC_GETPID_DIR, rxData, 6U, timeout);
863+
if (rc) {
864864
result = rc;
865865
} else {
866866
pid = 0ULL;
@@ -879,24 +879,24 @@ int I3CBus::getpid(uint8_t dynAddr, uint64_t &pid, uint32_t timeout)
879879
// 9. High-level CCC commands
880880
// ============================================================================
881881

882-
int I3CBus::resetDynamicAddresses()
882+
bool I3CBus::resetDynamicAddresses()
883883
{
884884
return cccBroadcastWrite(I3C_CCC_RSTDAA_BCAST, nullptr, 0U, false, 1000U);
885885
}
886886

887-
int I3CBus::disableEvents(const uint8_t *pCCCData, uint16_t length)
887+
bool I3CBus::disableEvents(const uint8_t *pCCCData, uint16_t length)
888888
{
889889
return cccBroadcastWrite(I3C_CCC_DISEC_BCAST, pCCCData, length, length > 0U, 1000U);
890890
}
891891

892-
int I3CBus::assignAllStaticAsDynamic()
892+
bool I3CBus::assignAllStaticAsDynamic()
893893
{
894894
return cccBroadcastWrite(I3C_CCC_SETAASA_BCAST, nullptr, 0U, false, 1000U);
895895
}
896896

897-
int I3CBus::assignDynamicAddress(uint8_t staticAddr7, uint8_t dynAddr7)
897+
bool I3CBus::assignDynamicAddress(uint8_t staticAddr7, uint8_t dynAddr7)
898898
{
899-
int result = -1;
899+
bool result = false;
900900

901901
if (_initialized) {
902902
uint8_t daByte = static_cast<uint8_t>((dynAddr7 & 0x7FU) << 1);
@@ -906,15 +906,15 @@ int I3CBus::assignDynamicAddress(uint8_t staticAddr7, uint8_t dynAddr7)
906906
return result;
907907
}
908908

909-
int I3CBus::disecAll()
909+
bool I3CBus::disecAll()
910910
{
911911
const uint8_t evAll = I3C_CCC_EVT_ALL;
912912
return disableEvents(&evAll, 1U);
913913
}
914914

915-
int I3CBus::rstactWholeTarget()
915+
bool I3CBus::rstactWholeTarget()
916916
{
917-
int result = -1;
917+
bool result = false;
918918

919919
if (_initialized) {
920920
uint8_t defByte = I3C_CCC_RSTACT_RESET_WHOLE_TARGET;
@@ -928,9 +928,9 @@ int I3CBus::rstactWholeTarget()
928928
return result;
929929
}
930930

931-
int I3CBus::rstactPeripheralOnly()
931+
bool I3CBus::rstactPeripheralOnly()
932932
{
933-
int result = -1;
933+
bool result = false;
934934

935935
if (_initialized) {
936936
uint8_t defByte = I3C_CCC_RSTACT_PERIPHERAL_ONLY;
@@ -960,7 +960,7 @@ int I3CBus::setEvents(uint8_t dynAddr,
960960
return result;
961961
}
962962

963-
int I3CBus::enecHotJoin()
963+
bool I3CBus::enecHotJoin()
964964
{
965965
uint8_t evHj = I3C_CCC_EVT_HJ;
966966
return cccBroadcastWrite(I3C_CCC_ENEC_BCAST, &evHj, 1U, true, 1000U);
@@ -1136,7 +1136,7 @@ int I3CBus::assignKnownDevices(const I3CKnownDevice *knownDevices,
11361136
continue;
11371137
}
11381138

1139-
if (assignDynamicAddress(kd.staticAddr, dyn) == 0) {
1139+
if (assignDynamicAddress(kd.staticAddr, dyn)) {
11401140
markAddrUsed(dyn);
11411141

11421142
if (count < maxDiscovered) {

libraries/I3C/src/I3C.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,14 @@ class I3CBus {
296296
// ------------------------------------------------------------------------
297297
// CCC broadcast & direct commands
298298
// ------------------------------------------------------------------------
299-
int resetDynamicAddresses();
300-
int disableEvents(const uint8_t *pCCCData, uint16_t length);
301-
int assignAllStaticAsDynamic();
302-
int assignDynamicAddress(uint8_t staticAddr, uint8_t dynAddr);
299+
bool resetDynamicAddresses();
300+
bool disableEvents(const uint8_t *pCCCData, uint16_t length);
301+
bool assignAllStaticAsDynamic();
302+
bool assignDynamicAddress(uint8_t staticAddr, uint8_t dynAddr);
303303

304-
int getbcr(uint8_t dynAddr, uint8_t &bcr, uint32_t timeout = 1000U);
305-
int getdcr(uint8_t dynAddr, uint8_t &dcr, uint32_t timeout = 1000U);
306-
int getpid(uint8_t dynAddr, uint64_t &pid, uint32_t timeout = 1000U);
304+
bool getbcr(uint8_t dynAddr, uint8_t &bcr, uint32_t timeout = 1000U);
305+
bool getdcr(uint8_t dynAddr, uint8_t &dcr, uint32_t timeout = 1000U);
306+
bool getpid(uint8_t dynAddr, uint64_t &pid, uint32_t timeout = 1000U);
307307

308308
// ------------------------------------------------------------------------
309309
// Discovery and dynamic address assignment
@@ -470,10 +470,10 @@ class I3CBus {
470470
// ------------------------------------------------------------------------
471471
// Bus sequencing helpers
472472
// ------------------------------------------------------------------------
473-
int disecAll();
474-
int enecHotJoin();
475-
int rstactPeripheralOnly();
476-
int rstactWholeTarget();
473+
bool disecAll();
474+
bool enecHotJoin();
475+
bool rstactPeripheralOnly();
476+
bool rstactWholeTarget();
477477

478478
int assignKnownDevices(const I3CKnownDevice *knownDevices,
479479
size_t numKnownDevices,
@@ -495,20 +495,20 @@ class I3CBus {
495495
// ------------------------------------------------------------------------
496496
// Low-level CCC helpers
497497
// ------------------------------------------------------------------------
498-
int cccBroadcastWrite(uint8_t cccId,
498+
bool cccBroadcastWrite(uint8_t cccId,
499499
const uint8_t *data,
500500
uint16_t length,
501501
bool withDefByte,
502502
uint32_t timeout = 1000U);
503503

504-
int cccDirectWrite(uint8_t targetAddr,
504+
bool cccDirectWrite(uint8_t targetAddr,
505505
uint8_t cccId,
506506
const uint8_t *data,
507507
uint16_t length,
508508
bool withDefByte,
509509
uint32_t timeout = 1000U);
510510

511-
int cccDirectRead(uint8_t targetAddr,
511+
bool cccDirectRead(uint8_t targetAddr,
512512
uint8_t cccId,
513513
uint8_t *rxData,
514514
uint16_t rxLength,

0 commit comments

Comments
 (0)