Skip to content

Commit 026000d

Browse files
authored
Merge pull request #9388 from SenRamakri/sen_ArmC6Fixes
Fix for ARMc6 compiler errors
2 parents 2526ac8 + 2030d03 commit 026000d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

features/FEATURE_BLE/source/generic/GenericGap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ void GenericGap::on_read_phy(
851851
)
852852
{
853853
ble_error_t status = BLE_ERROR_NONE;
854-
if (pal::hci_error_code_t::SUCCESS != hci_status) {
854+
if (hci_status != pal::hci_error_code_t::SUCCESS) {
855855
status = BLE_ERROR_UNSPECIFIED;
856856
}
857857

@@ -868,7 +868,7 @@ void GenericGap::on_phy_update_complete(
868868
)
869869
{
870870
ble_error_t status = BLE_ERROR_NONE;
871-
if (pal::hci_error_code_t::SUCCESS != hci_status) {
871+
if (hci_status != pal::hci_error_code_t::SUCCESS) {
872872
status = BLE_ERROR_UNSPECIFIED;
873873
}
874874

features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ bool CordioSecurityManager::sm_handler(const wsfMsgHdr_t* msg) {
730730
case DM_SEC_ECC_KEY_IND: {
731731
secEccMsg_t* evt = (secEccMsg_t*) msg;
732732
DmSecSetEccKey(&evt->data.key);
733-
memcpy(self._public_key_x, evt->data.key.pubKey_x, sizeof(_public_key_x));
733+
memcpy(self._public_key_x, evt->data.key.pubKey_x, sizeof(self._public_key_x));
734734
self._lesc_keys_generated = true;
735735
return true;
736736
}

features/FEATURE_BLE/targets/TARGET_CORDIO/stack/cordio_stack/wsf/common/include/wsf_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extern "C" {
5858
/**@{*/
5959
#if ((defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) && \
6060
(!defined(__ICC8051__) || (__ICC8051__ == 0))) || \
61-
defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
61+
defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) || defined(__ARMCC_VERSION)
6262

6363
#include <stdint.h>
6464
#else

0 commit comments

Comments
 (0)