Skip to content

Commit a503bdf

Browse files
committed
Minor tweaks for non-SAMD boards
1 parent edf20d9 commit a503bdf

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Diff for: src/bearssl/config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
*
155155
#define BR_ARMEL_CORTEXM_GCC 1
156156
*/
157-
#ifdef ARDUINO
157+
#if defined(ARDUINO) && defined(__arm__)
158158
#define BR_ARMEL_CORTEXM_GCC 1
159159
#endif
160160

Diff for: src/utility/ECCX08.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ int ECCX08Class::begin()
2828

2929
void ECCX08Class::end()
3030
{
31+
#ifdef WIRE_HAS_END
3132
_wire->end();
33+
#endif
3234
}
3335

3436
String ECCX08Class::serialNumber()
@@ -563,10 +565,10 @@ int ECCX08Class::sendCommand(uint8_t opcode, uint8_t param1, uint16_t param2, co
563565
int ECCX08Class::receiveResponse(void* response, size_t length)
564566
{
565567
int retries = 20;
566-
int responseSize = length + 3; // 1 for length header, 2 for CRC
568+
size_t responseSize = length + 3; // 1 for length header, 2 for CRC
567569
byte responseBuffer[responseSize];
568570

569-
while (_wire->requestFrom(_address, responseSize) != responseSize && retries--);
571+
while (_wire->requestFrom((uint8_t)_address, (size_t)responseSize, (bool)true) != responseSize && retries--);
570572

571573
responseBuffer[0] = _wire->read();
572574

0 commit comments

Comments
 (0)