You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/07/08 21:20:06 UTC
[19/50] [abbrv] incubator-mynewt-core git commit: nordic MCUs;
bug fix for bsp_hw_id(). It was copying 2nd half of the id from wrong
registers.
nordic MCUs; bug fix for bsp_hw_id().
It was copying 2nd half of the id from wrong registers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/e221e1e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e221e1e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e221e1e6
Branch: refs/heads/master
Commit: e221e1e620fef2e8adc814198ec9e2f24f0f8748
Parents: 712374a
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Jun 23 18:00:28 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Jun 23 18:00:28 2016 -0700
----------------------------------------------------------------------
hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c | 2 +-
hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e221e1e6/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c b/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
index 81279ac..cda946a 100644
--- a/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
+++ b/hw/mcu/nordic/nrf51xxx/src/nrf51_hw_id.c
@@ -42,7 +42,7 @@ bsp_hw_id(uint8_t *id, int max_len)
len = cnt;
cnt = min(sizeof(NRF_FICR->DEVICEADDR), max_len - len);
- memcpy(id + len, (void *)NRF_FICR->DEVICEID, cnt);
+ memcpy(id + len, (void *)NRF_FICR->DEVICEADDR, cnt);
return len + cnt;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/e221e1e6/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c b/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
index 9042153..e982993 100644
--- a/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
+++ b/hw/mcu/nordic/nrf52xxx/src/nrf52_hw_id.c
@@ -42,7 +42,7 @@ bsp_hw_id(uint8_t *id, int max_len)
len = cnt;
cnt = min(sizeof(NRF_FICR->DEVICEADDR), max_len - len);
- memcpy(id + len, (void *)NRF_FICR->DEVICEID, cnt);
+ memcpy(id + len, (void *)NRF_FICR->DEVICEADDR, cnt);
return len + cnt;
}