ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9388 from SenRamakri/sen_ArmC6Fixes 

Fix for ARMc6 compiler errors
pull/9602/head
Martin Kojtal 2019-02-04 14:33:23 +01:00 committed by GitHub
parent 2526ac8420 2030d03590
commit 026000d4d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -851,7 +851,7 @@ void GenericGap::on_read_phy(
)
{
ble_error_t status = BLE_ERROR_NONE;
if (pal::hci_error_code_t::SUCCESS != hci_status) {
if (hci_status != pal::hci_error_code_t::SUCCESS) {
status = BLE_ERROR_UNSPECIFIED;
}
@ -868,7 +868,7 @@ void GenericGap::on_phy_update_complete(
)
{
ble_error_t status = BLE_ERROR_NONE;
if (pal::hci_error_code_t::SUCCESS != hci_status) {
if (hci_status != pal::hci_error_code_t::SUCCESS) {
status = BLE_ERROR_UNSPECIFIED;
}

2
features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp
View File

@ -730,7 +730,7 @@ bool CordioSecurityManager::sm_handler(const wsfMsgHdr_t* msg) {
case DM_SEC_ECC_KEY_IND: {
secEccMsg_t* evt = (secEccMsg_t*) msg;
DmSecSetEccKey(&evt->data.key);
memcpy(self._public_key_x, evt->data.key.pubKey_x, sizeof(_public_key_x));
memcpy(self._public_key_x, evt->data.key.pubKey_x, sizeof(self._public_key_x));
self._lesc_keys_generated = true;
return true;
}

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

@ -58,7 +58,7 @@ extern "C" {
/**@{*/
#if ((defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) && \
(!defined(__ICC8051__) || (__ICC8051__ == 0))) || \
defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__)
defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) || defined(__ARMCC_VERSION)
#include <stdint.h>
#else