espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-02 21:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/hw: Fix compilation of nrf51 driver

Browse Source 
Compiling repos/apache-mynewt-nimble/nimble/drivers/nrf51/src/ble_hw.c
Error: repos/apache-mynewt-nimble/nimble/drivers/nrf51/src/ble_hw.c: In function 'ble_hw_get_public_addr':
repos/apache-mynewt-nimble/nimble/drivers/nrf51/src/ble_hw.c:69:23: error: passing argument 2 of 'memcpy'
     discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers]
     memcpy(addr->val, &NRF_FICR->DEVICEADDR[0], 4);
                       ^
In file included from repos/apache-mynewt-nimble/nimble/drivers/nrf51/src/ble_hw.c:22:0:
repos/apache-mynewt-core/libc/baselibc/include/string.h:19:16: note: expected 'const void *' but argument is
     of type 'const volatile uint32_t * {aka const volatile long unsigned int *}'
 __extern void *memcpy(void *, const void *, size_t);
                ^~~~~~
repos/apache-mynewt-nimble/nimble/drivers/nrf51/src/ble_hw.c:70:27: error: passing argument 2 of 'memcpy'
     discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers]
     memcpy(&addr->val[4], &NRF_FICR->DEVICEADDR[1], 2);
                           ^
In file included from repos/apache-mynewt-nimble/nimble/drivers/nrf51/src/ble_hw.c:22:0:
repos/apache-mynewt-core/libc/baselibc/include/string.h:19:16: note: expected 'const void *' but argument is
     of type 'const volatile uint32_t * {aka const volatile long unsigned int *}'
 __extern void *memcpy(void *, const void *, size_t);
                ^~~~~~
This commit is contained in:
Szymon Janc
2019-03-29 16:31:14 +01:00
parent 5d5e44a063
commit 884a8b088f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/drivers/nrf51/src/ble_hw.c
+7 -2
View File
@@ -60,14 +60,19 @@ uint8_t g_nrf_num_irks;
int
ble_hw_get_public_addr(ble_addr_t *addr)
{
uint32_t addr_high;
uint32_t addr_low;
/* Does FICR have a public address */
if ((NRF_FICR->DEVICEADDRTYPE & 1) != 0) {
return -1;
}
/* Copy into device address. We can do this because we know platform */
memcpy(addr->val, &NRF_FICR->DEVICEADDR[0], 4);
memcpy(&addr->val[4], &NRF_FICR->DEVICEADDR[1], 2);
addr_low = NRF_FICR->DEVICEADDR[0];
addr_high = NRF_FICR->DEVICEADDR[1];
memcpy(addr->val, &addr_low, 4);
memcpy(&addr->val[4], &addr_high, 2);
addr->type = BLE_ADDR_PUBLIC;
return 0;