You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2017/04/07 16:43:56 UTC
[1/2] incubator-mynewt-core git commit: sys/reboot;
if fcb_init() sees data it does not recognize in the flash area
allocated to it, erase that area.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop fe4b763a9 -> dbbb3be14
sys/reboot; if fcb_init() sees data it does not recognize in
the flash area allocated to it, erase that area.
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/5155897f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5155897f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5155897f
Branch: refs/heads/develop
Commit: 5155897f8cf7d022332255239c02384b578d2d68
Parents: fe4b763
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Apr 7 09:41:08 2017 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Apr 7 09:41:08 2017 -0700
----------------------------------------------------------------------
sys/reboot/src/log_reboot.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5155897f/sys/reboot/src/log_reboot.c
----------------------------------------------------------------------
diff --git a/sys/reboot/src/log_reboot.c b/sys/reboot/src/log_reboot.c
index b795e1c..c645338 100644
--- a/sys/reboot/src/log_reboot.c
+++ b/sys/reboot/src/log_reboot.c
@@ -98,7 +98,11 @@ reboot_init_handler(int log_store_type, uint8_t entries)
rc = fcb_init(fcbp);
if (rc) {
- return rc;
+ flash_area_erase(ptr, 0, ptr->fa_size);
+ rc = fcb_init(fcbp);
+ if (rc) {
+ return rc;
+ }
}
reboot_log_handler = (struct log_handler *)&log_fcb_handler;
if (rc) {
[2/2] incubator-mynewt-core git commit: net/ip/mn_socket;
fix a typo in address conversion with v6.
Posted by ma...@apache.org.
net/ip/mn_socket; fix a typo in address conversion with v6.
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/dbbb3be1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/dbbb3be1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/dbbb3be1
Branch: refs/heads/develop
Commit: dbbb3be14c9a691ed1865b41da2a8437736863c3
Parents: 5155897
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Apr 7 09:43:00 2017 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Apr 7 09:43:00 2017 -0700
----------------------------------------------------------------------
net/ip/mn_socket/src/mn_socket_aconv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/dbbb3be1/net/ip/mn_socket/src/mn_socket_aconv.c
----------------------------------------------------------------------
diff --git a/net/ip/mn_socket/src/mn_socket_aconv.c b/net/ip/mn_socket/src/mn_socket_aconv.c
index d88bb2c..3713f5c 100644
--- a/net/ip/mn_socket/src/mn_socket_aconv.c
+++ b/net/ip/mn_socket/src/mn_socket_aconv.c
@@ -85,7 +85,7 @@ mn_inet_ntop(int af, const void *src_v, void *dst, int len)
for (i = 0; i < sizeof(*a6); i += 2) {
memcpy(&u16, &a6->s_addr[i], 2);
u16 = htons(u16);
- rc += snprintf(dst + rc, len - rc, "%x", 16);
+ rc += snprintf(dst + rc, len - rc, "%x", u16);
if (rc >= len) {
return NULL;
}