This is an automated email from the ASF dual-hosted git repository.
vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 0617b79 sys/log: Remove support for LOG_VERSION 2
new cbbc33d Merge pull request #2157 from vrahane/remove_log_version_2
0617b79 is described below
commit 0617b791afa74eea38b1c695d88c4612eebc48b8
Author: Vipul Rahane <[email protected]>
AuthorDate: Wed Jan 15 14:06:45 2020 -0800
sys/log: Remove support for LOG_VERSION 2
---
apps/metrics/syscfg.yml | 1 -
sys/log/common/include/log_common/log_common.h | 4 -
sys/log/full/include/log/log.h | 11 +--
sys/log/full/include/log/log_fcb_slot1.h | 106 -----------------------
sys/log/full/pkg.yml | 9 +-
sys/log/full/selftest/align1/syscfg.yml | 1 -
sys/log/full/selftest/align1_imghash/syscfg.yml | 1 -
sys/log/full/selftest/align2/syscfg.yml | 1 -
sys/log/full/selftest/align4/syscfg.yml | 1 -
sys/log/full/selftest/align8/syscfg.yml | 1 -
sys/log/full/selftest/fcb2_align1/syscfg.yml | 1 -
sys/log/full/selftest/fcb2_bookmarks/syscfg.yml | 1 -
sys/log/full/selftest/fcb2_watermarks/syscfg.yml | 1 -
sys/log/full/selftest/fcb_bookmarks/syscfg.yml | 1 -
sys/log/full/selftest/perlogidx/syscfg.yml | 1 -
sys/log/full/src/log.c | 14 ---
sys/log/full/src/log_cbmem.c | 16 ----
sys/log/full/src/log_console.c | 6 --
sys/log/full/src/log_fcb.c | 4 -
sys/log/full/src/log_fcb2.c | 4 -
sys/log/full/src/log_shell.c | 49 -----------
sys/log/stub/include/log/log.h | 3 -
sys/log/stub/include/log/log_fcb_slot1.h | 70 ---------------
sys/log/stub/src/log.c | 3 -
24 files changed, 3 insertions(+), 307 deletions(-)
diff --git a/apps/metrics/syscfg.yml b/apps/metrics/syscfg.yml
index 0732833..c6805ac 100644
--- a/apps/metrics/syscfg.yml
+++ b/apps/metrics/syscfg.yml
@@ -20,6 +20,5 @@
syscfg.vals:
LOG_FCB: 1
LOG_CLI: 1
- LOG_VERSION: 3
METRICS_CLI: 1
SHELL_TASK: 1
diff --git a/sys/log/common/include/log_common/log_common.h
b/sys/log/common/include/log_common/log_common.h
index ab6699e..9974fa2 100644
--- a/sys/log/common/include/log_common/log_common.h
+++ b/sys/log/common/include/log_common/log_common.h
@@ -30,8 +30,6 @@ extern "C" {
struct log;
#define LOG_VERSION_V3 3
-#define LOG_VERSION_V2 2
-#define LOG_VERSION_V1 1
#define LOG_TYPE_STREAM (0)
#define LOG_TYPE_MEMORY (1)
@@ -71,10 +69,8 @@ struct log;
#define LOG_MODULE_MAX (255)
#define LOG_ETYPE_STRING (0)
-#if MYNEWT_VAL(LOG_VERSION) > 2
#define LOG_ETYPE_CBOR (1)
#define LOG_ETYPE_BINARY (2)
-#endif
/* UTC Timestamp for Jan 2016 00:00:00 */
#define UTC01_01_2016 1451606400
diff --git a/sys/log/full/include/log/log.h b/sys/log/full/include/log/log.h
index 94ec227..7a1f98f 100644
--- a/sys/log/full/include/log/log.h
+++ b/sys/log/full/include/log/log.h
@@ -132,14 +132,7 @@ struct log_handler {
/* Flags used to indicate type of data in reserved payload*/
#define LOG_FLAGS_IMG_HASH (1 << 0)
-#if MYNEWT_VAL(LOG_VERSION) == 2
-struct log_entry_hdr {
- int64_t ue_ts;
- uint32_t ue_index;
- uint8_t ue_module;
- uint8_t ue_level;
-}__attribute__((__packed__));
-#elif MYNEWT_VAL(LOG_VERSION) == 3
+#if MYNEWT_VAL(LOG_VERSION) == 3
struct log_entry_hdr {
int64_t ue_ts;
uint32_t ue_index;
@@ -723,7 +716,6 @@ log_set_rotate_notify_cb(struct log *log,
log_notify_rotate_cb *cb);
int log_set_watermark(struct log *log, uint32_t index);
#endif
-#if MYNEWT_VAL(LOG_VERSION) > 2
/**
* Fill log current image hash
*
@@ -733,7 +725,6 @@ int log_set_watermark(struct log *log, uint32_t index);
*/
int
log_fill_current_img_hash(struct log_entry_hdr *hdr);
-#endif
/* Handler exports */
#if MYNEWT_VAL(LOG_CONSOLE)
diff --git a/sys/log/full/include/log/log_fcb_slot1.h
b/sys/log/full/include/log/log_fcb_slot1.h
deleted file mode 100644
index 2411a9f..0000000
--- a/sys/log/full/include/log/log_fcb_slot1.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef __SYS_LOG_FCB_SLOT1_H__
-#define __SYS_LOG_FCB_SLOT1_H__
-
-#include "syscfg/syscfg.h"
-
-#if MYNEWT_VAL(LOG_FCB_SLOT1)
-
-#include "log/log.h"
-#include "fcb/fcb.h"
-#include "cbmem/cbmem.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int (* log_fcb_slot1_reinit_fcb_fn) (struct fcb_log *arg);
-
-/*
- * Argument for log_fcb_slot1_handler
- *
- * log_fcb_slot1_init() shall be used to initialize this structure.
- */
-struct log_fcb_slot1 {
- struct os_mutex mutex;
-
- struct log *l_current;
- struct log l_fcb;
- struct log l_cbmem;
-
- log_fcb_slot1_reinit_fcb_fn fcb_reinit_fn;
-};
-
-/*
- * Initialize log data for log_fcb_slot1 handler
- *
- * fcb_arg and cbmem_arg are the same as for log_fcb and log_cbmem
respectively.
- * Both FCB and CBMEM handlers are switched internally depending on slot1 lock
- * state. If no cbmem_arg is given, logging when slot1 is locked will return an
- * error.
- *
- * Each time slot1 is unlocked, fcb_reinit_fn callback is called and FCB should
- * be reinitialized to allow proper logging there. This callback will be also
- * called by log_fcb_slot1_init() function thus it is not required to
initialize
- * FCB prior to calling this function.
- *
- * @param s1 Log data structure to initialize
- * @param fcb_arg Log data for log_fcb
- * @param cbmem_arg Log data for log_cbmem
- * @param fcb_reinit_fn Callback called to reinitialize FCB
- *
- */
-int log_fcb_slot1_init(struct log_fcb_slot1 *s1, struct fcb_log *fcb_arg,
- struct cbmem *cbmem_arg,
- log_fcb_slot1_reinit_fcb_fn fcb_reinit_fn);
-
-/*
- * Lock logging to slot1
- *
- * This will switch internal log handler to CBMEM (if available) instead of
FCB.
- * The existing data in FCB are not touched and should be read by application
- * prior to locking slot1 if necessary.
- */
-void log_fcb_slot1_lock(void);
-
-/*
- * Unlock logging to slot1
- *
- * This will switch internal log handler to FCB. A fcb_reinit_fn callback will
- * be called to let application reinitialize FCB. If CBMEM is available, all
- * entries will be copied to FCB automatically.
- */
-void log_fcb_slot1_unlock(void);
-
-/*
- * Check slot1 lock state
- *
- * @return slot1 lock state
- */
-bool log_fcb_slot1_is_locked(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif /* __SYS_LOG_FCB_SLOT1_H__ */
diff --git a/sys/log/full/pkg.yml b/sys/log/full/pkg.yml
index 9fe4dc0..d14d6d1 100644
--- a/sys/log/full/pkg.yml
+++ b/sys/log/full/pkg.yml
@@ -30,20 +30,18 @@ pkg.deps:
- "@apache-mynewt-core/sys/log/common"
- "@apache-mynewt-core/util/cbmem"
-pkg.deps.'LOG_CLI && LOG_VERSION > 2':
- - "@apache-mynewt-core/sys/log/util/log_cbor_reader"
-
pkg.deps.LOG_FCB:
- "@apache-mynewt-core/hw/hal"
- "@apache-mynewt-core/fs/fcb"
pkg.deps.LOG_FCB2:
- "@apache-mynewt-core/fs/fcb2"
pkg.deps.LOG_CLI:
+ - "@apache-mynewt-core/sys/log/util/log_cbor_reader"
- "@apache-mynewt-core/sys/shell"
- "@apache-mynewt-core/encoding/base64"
- "@apache-mynewt-core/encoding/tinycbor"
-pkg.deps.'LOG_CONSOLE && LOG_VERSION > 2':
+pkg.deps.LOG_CONSOLE:
- "@apache-mynewt-mcumgr/cborattr"
- "@apache-mynewt-core/encoding/tinycbor"
@@ -66,6 +64,3 @@ pkg.req_apis.LOG_STATS:
pkg.init:
log_init: 'MYNEWT_VAL(LOG_SYSINIT_STAGE_MAIN)'
-
-pkg.init.LOG_FCB_SLOT1:
- log_init_slot1: 'MYNEWT_VAL(LOG_SYSINIT_STAGE_SLOT1)'
diff --git a/sys/log/full/selftest/align1/syscfg.yml
b/sys/log/full/selftest/align1/syscfg.yml
index 1a01c7b..c328fb9 100644
--- a/sys/log/full/selftest/align1/syscfg.yml
+++ b/sys/log/full/selftest/align1/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 1
# The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
diff --git a/sys/log/full/selftest/align1_imghash/syscfg.yml
b/sys/log/full/selftest/align1_imghash/syscfg.yml
index 9183e33..cd33c3f 100644
--- a/sys/log/full/selftest/align1_imghash/syscfg.yml
+++ b/sys/log/full/selftest/align1_imghash/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 1
# The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
diff --git a/sys/log/full/selftest/align2/syscfg.yml
b/sys/log/full/selftest/align2/syscfg.yml
index 32dca69..f247b90 100644
--- a/sys/log/full/selftest/align2/syscfg.yml
+++ b/sys/log/full/selftest/align2/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 2
# The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
diff --git a/sys/log/full/selftest/align4/syscfg.yml
b/sys/log/full/selftest/align4/syscfg.yml
index 5b8b682..8e7d567 100644
--- a/sys/log/full/selftest/align4/syscfg.yml
+++ b/sys/log/full/selftest/align4/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 4
# The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
diff --git a/sys/log/full/selftest/align8/syscfg.yml
b/sys/log/full/selftest/align8/syscfg.yml
index a963208..e4cdf99 100644
--- a/sys/log/full/selftest/align8/syscfg.yml
+++ b/sys/log/full/selftest/align8/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 8
# The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
diff --git a/sys/log/full/selftest/fcb2_align1/syscfg.yml
b/sys/log/full/selftest/fcb2_align1/syscfg.yml
index 6dd29ba..2d20a19 100644
--- a/sys/log/full/selftest/fcb2_align1/syscfg.yml
+++ b/sys/log/full/selftest/fcb2_align1/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB2: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 1
# The mbuf append tests allocate lots of mbufs; ensure no exhaustion.
diff --git a/sys/log/full/selftest/fcb2_bookmarks/syscfg.yml
b/sys/log/full/selftest/fcb2_bookmarks/syscfg.yml
index fda1a78..9cdc55a 100644
--- a/sys/log/full/selftest/fcb2_bookmarks/syscfg.yml
+++ b/sys/log/full/selftest/fcb2_bookmarks/syscfg.yml
@@ -17,7 +17,6 @@
#
syscfg.vals:
- LOG_VERSION: 3
LOG_FCB2: 1
LOG_FCB_BOOKMARKS: 1
LOG_STATS: 1
diff --git a/sys/log/full/selftest/fcb2_watermarks/syscfg.yml
b/sys/log/full/selftest/fcb2_watermarks/syscfg.yml
index 90a22ee..eaaa26f 100644
--- a/sys/log/full/selftest/fcb2_watermarks/syscfg.yml
+++ b/sys/log/full/selftest/fcb2_watermarks/syscfg.yml
@@ -17,7 +17,6 @@
#
syscfg.vals:
- LOG_VERSION: 3
LOG_FCB2: 1
LOG_STORAGE_INFO: 1
LOG_STORAGE_WATERMARK: 1
diff --git a/sys/log/full/selftest/fcb_bookmarks/syscfg.yml
b/sys/log/full/selftest/fcb_bookmarks/syscfg.yml
index 9c83837..1c5b3a0 100644
--- a/sys/log/full/selftest/fcb_bookmarks/syscfg.yml
+++ b/sys/log/full/selftest/fcb_bookmarks/syscfg.yml
@@ -17,6 +17,5 @@
#
syscfg.vals:
- LOG_VERSION: 3
LOG_FCB: 1
LOG_FCB_BOOKMARKS: 1
diff --git a/sys/log/full/selftest/perlogidx/syscfg.yml
b/sys/log/full/selftest/perlogidx/syscfg.yml
index d166a44..b8f6781 100644
--- a/sys/log/full/selftest/perlogidx/syscfg.yml
+++ b/sys/log/full/selftest/perlogidx/syscfg.yml
@@ -18,7 +18,6 @@
syscfg.vals:
LOG_FCB: 1
- LOG_VERSION: 3
MCU_FLASH_MIN_WRITE_SIZE: 1
LOG_GLOBAL_IDX: 0
diff --git a/sys/log/full/src/log.c b/sys/log/full/src/log.c
index 30c676a..13e4a3d 100644
--- a/sys/log/full/src/log.c
+++ b/sys/log/full/src/log.c
@@ -325,14 +325,12 @@ log_read_hdr_walk(struct log *log, struct log_offset
*log_offset, const void *dp
arg->read_success = 1;
}
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (arg->hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
rc = log_fill_current_img_hash(arg->hdr);
if (!rc || rc == SYS_ENOTSUP) {
arg->read_success = 1;
}
}
-#endif
/* Abort the walk; only one header needed. */
return 1;
@@ -448,11 +446,9 @@ log_set_append_cb(struct log *log, log_append_cb *cb)
uint16_t
log_hdr_len(const struct log_entry_hdr *hdr)
{
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
return LOG_BASE_ENTRY_HDR_SIZE + LOG_IMG_HASHLEN;
}
-#endif
return LOG_BASE_ENTRY_HDR_SIZE;
}
@@ -470,7 +466,6 @@ log_chk_type(uint8_t etype)
rc = OS_OK;
-#if MYNEWT_VAL(LOG_VERSION) > 2
switch(etype) {
case LOG_ETYPE_STRING:
case LOG_ETYPE_BINARY:
@@ -480,7 +475,6 @@ log_chk_type(uint8_t etype)
rc = OS_ERROR;
break;
}
-#endif
return rc;
}
@@ -563,7 +557,6 @@ log_append_prepare(struct log *log, uint8_t module, uint8_t
level,
ue->ue_level = level;
ue->ue_module = module;
ue->ue_index = idx;
-#if MYNEWT_VAL(LOG_VERSION) > 2
ue->ue_etype = etype;
/* Clear flags before assigning */
ue->ue_flags = 0;
@@ -573,9 +566,6 @@ log_append_prepare(struct log *log, uint8_t module, uint8_t
level,
rc = 0;
}
#endif
-#else
- assert(etype == LOG_ETYPE_STRING);
-#endif
err:
return (rc);
@@ -970,7 +960,6 @@ log_read_hdr(struct log *log, const void *dptr, struct
log_entry_hdr *hdr)
return SYS_EIO;
}
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
bytes_read = log_read(log, dptr, hdr->ue_imghash,
LOG_BASE_ENTRY_HDR_SIZE, LOG_IMG_HASHLEN);
@@ -978,7 +967,6 @@ log_read_hdr(struct log *log, const void *dptr, struct
log_entry_hdr *hdr)
return SYS_EIO;
}
}
-#endif
return 0;
}
@@ -1121,7 +1109,6 @@ log_set_max_entry_len(struct log *log, uint16_t
max_entry_len)
log->l_max_entry_len = max_entry_len;
}
-#if MYNEWT_VAL(LOG_VERSION) > 2
int
log_fill_current_img_hash(struct log_entry_hdr *hdr)
{
@@ -1135,4 +1122,3 @@ log_fill_current_img_hash(struct log_entry_hdr *hdr)
return SYS_ENOTSUP;
}
-#endif
diff --git a/sys/log/full/src/log_cbmem.c b/sys/log/full/src/log_cbmem.c
index fefdbf4..31f163e 100644
--- a/sys/log/full/src/log_cbmem.c
+++ b/sys/log/full/src/log_cbmem.c
@@ -32,29 +32,21 @@ log_cbmem_append_body(struct log *log, const struct
log_entry_hdr *hdr,
.flat_buf = hdr,
.flat_len = LOG_BASE_ENTRY_HDR_SIZE,
},
-#if MYNEWT_VAL(LOG_VERSION) > 2
{
.flat_buf = hdr->ue_imghash,
.flat_len = 0,
},
-#endif
{
.flat_buf = body,
.flat_len = body_len,
},
},
-#if MYNEWT_VAL(LOG_VERSION) > 2
.count = 3,
-#else
- .count = 2,
-#endif
};
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
sg.entries[1].flat_len = LOG_IMG_HASHLEN;
}
-#endif
cbmem = (struct cbmem *) log->l_arg;
return cbmem_append_scat_gath(cbmem, &sg);
@@ -82,28 +74,20 @@ log_cbmem_append_mbuf_body(struct log *log, const struct
log_entry_hdr *hdr,
.flat_buf = hdr,
.flat_len = LOG_BASE_ENTRY_HDR_SIZE,
},
-#if MYNEWT_VAL(LOG_VERSION) > 2
{
.flat_buf = hdr->ue_imghash,
.flat_len = 0,
},
-#endif
{
.om = om,
},
},
-#if MYNEWT_VAL(LOG_VERSION) > 2
.count = 3,
-#else
- .count = 2,
-#endif
};
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
sg.entries[1].flat_len = LOG_IMG_HASHLEN;
}
-#endif
cbmem = (struct cbmem *) log->l_arg;
return cbmem_append_scat_gath(cbmem, &sg);
diff --git a/sys/log/full/src/log_console.c b/sys/log/full/src/log_console.c
index 4fa7ad3..c75f53e 100644
--- a/sys/log/full/src/log_console.c
+++ b/sys/log/full/src/log_console.c
@@ -24,7 +24,6 @@
#include <cbmem/cbmem.h>
#include <console/console.h>
#include "log/log.h"
-#if MYNEWT_VAL(LOG_VERSION) > 2
#include "tinycbor/cbor.h"
#include "tinycbor/cbor_buf_reader.h"
@@ -42,7 +41,6 @@ log_console_dump_cbor_entry(const void *dptr, uint16_t len)
console_write("\n", 1);
return 0;
}
-#endif
static struct log log_console;
@@ -58,12 +56,10 @@ log_console_print_hdr(const struct log_entry_hdr *hdr)
console_printf("[ts=%lluus, mod=%u level=%u ",
hdr->ue_ts, hdr->ue_module, hdr->ue_level);
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
console_printf("ih=0x%x%x%x%x", hdr->ue_imghash[0], hdr->ue_imghash[1],
hdr->ue_imghash[2], hdr->ue_imghash[3]);
}
-#endif
console_printf("]");
}
@@ -82,9 +78,7 @@ log_console_append_body(struct log *log, const struct
log_entry_hdr *hdr,
if (hdr->ue_etype != LOG_ETYPE_CBOR) {
console_write(body, body_len);
} else {
-#if MYNEWT_VAL(LOG_VERSION) > 2
log_console_dump_cbor_entry(body, body_len);
-#endif
}
return (0);
}
diff --git a/sys/log/full/src/log_fcb.c b/sys/log/full/src/log_fcb.c
index 3e8357f..5875b38 100644
--- a/sys/log/full/src/log_fcb.c
+++ b/sys/log/full/src/log_fcb.c
@@ -262,11 +262,9 @@ log_fcb_append_body(struct log *log, const struct
log_entry_hdr *hdr,
u8p = body;
memcpy(buf, hdr, LOG_BASE_ENTRY_HDR_SIZE);
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
memcpy(buf + LOG_BASE_ENTRY_HDR_SIZE, hdr->ue_imghash,
LOG_IMG_HASHLEN);
}
-#endif
memcpy(buf + hdr_len, u8p, hdr_alignment);
rc = flash_area_write(loc.fe_area, loc.fe_data_off, buf, chunk_sz);
@@ -358,7 +356,6 @@ log_fcb_append_mbuf_body(struct log *log, const struct
log_entry_hdr *hdr,
}
loc.fe_data_off += LOG_BASE_ENTRY_HDR_SIZE;
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
/* Write LOG_IMG_HASHLEN bytes of image hash */
rc = flash_area_write(loc.fe_area, loc.fe_data_off, hdr->ue_imghash,
@@ -368,7 +365,6 @@ log_fcb_append_mbuf_body(struct log *log, const struct
log_entry_hdr *hdr,
}
loc.fe_data_off += LOG_IMG_HASHLEN;
}
-#endif
rc = log_fcb_write_mbuf(&loc, om);
if (rc != 0) {
return rc;
diff --git a/sys/log/full/src/log_fcb2.c b/sys/log/full/src/log_fcb2.c
index 7689029..c8a5d07 100644
--- a/sys/log/full/src/log_fcb2.c
+++ b/sys/log/full/src/log_fcb2.c
@@ -257,11 +257,9 @@ log_fcb2_append_body(struct log *log, const struct
log_entry_hdr *hdr,
u8p = body;
memcpy(buf, hdr, LOG_BASE_ENTRY_HDR_SIZE);
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
memcpy(buf + LOG_BASE_ENTRY_HDR_SIZE, hdr->ue_imghash,
LOG_IMG_HASHLEN);
}
-#endif
memcpy(buf + hdr_len, u8p, hdr_alignment);
rc = fcb2_write(&loc, 0, buf, chunk_sz);
@@ -350,7 +348,6 @@ log_fcb2_append_mbuf_body(struct log *log, const struct
log_entry_hdr *hdr,
}
len = LOG_BASE_ENTRY_HDR_SIZE;
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (hdr->ue_flags & LOG_FLAGS_IMG_HASH) {
/* Write LOG_IMG_HASHLEN bytes of image hash */
rc = fcb2_write(&loc, len, hdr->ue_imghash, LOG_IMG_HASHLEN);
@@ -359,7 +356,6 @@ log_fcb2_append_mbuf_body(struct log *log, const struct
log_entry_hdr *hdr,
}
len += LOG_IMG_HASHLEN;
}
-#endif
rc = log_fcb2_write_mbuf(&loc, om, len);
if (rc != 0) {
return rc;
diff --git a/sys/log/full/src/log_shell.c b/sys/log/full/src/log_shell.c
index 1183c62..cedb1f9 100644
--- a/sys/log/full/src/log_shell.c
+++ b/sys/log/full/src/log_shell.c
@@ -30,17 +30,12 @@
#include "cbmem/cbmem.h"
#include "log/log.h"
-#if MYNEWT_VAL(LOG_FCB_SLOT1)
-#include "log/log_fcb_slot1.h"
-#endif
#include "shell/shell.h"
#include "console/console.h"
#include "base64/hex.h"
-#if MYNEWT_VAL(LOG_VERSION) > 2
#include "tinycbor/cbor.h"
#include "tinycbor/compilersupport_p.h"
#include "log_cbor_reader/log_cbor_reader.h"
-#endif
static int
shell_log_dump_entry(struct log *log, struct log_offset *log_offset,
@@ -49,7 +44,6 @@ shell_log_dump_entry(struct log *log, struct log_offset
*log_offset,
char data[128 + 1];
int dlen;
int rc = 0;
-#if MYNEWT_VAL(LOG_VERSION) > 2
struct CborParser cbor_parser;
struct CborValue cbor_value;
struct log_cbor_reader cbor_reader;
@@ -58,9 +52,6 @@ shell_log_dump_entry(struct log *log, struct log_offset
*log_offset,
int blksz;
bool read_data = ueh->ue_etype != LOG_ETYPE_CBOR;
bool read_hash = ueh->ue_flags & LOG_FLAGS_IMG_HASH;
-#else
- bool read_data = true;
-#endif
dlen = min(len, 128);
@@ -72,17 +63,12 @@ shell_log_dump_entry(struct log *log, struct log_offset
*log_offset,
data[rc] = 0;
}
-#if MYNEWT_VAL(LOG_VERSION) > 2
if (read_hash) {
console_printf("[ih=0x%x%x%x%x]", ueh->ue_imghash[0],
ueh->ue_imghash[1],
ueh->ue_imghash[2], ueh->ue_imghash[3]);
}
console_printf(" [%llu] ", ueh->ue_ts);
-#endif
-#if MYNEWT_VAL(LOG_VERSION) <= 2
- console_write(data, strlen(data));
-#else
switch (ueh->ue_etype) {
case LOG_ETYPE_STRING:
console_write(data, strlen(data));
@@ -105,7 +91,6 @@ shell_log_dump_entry(struct log *log, struct log_offset
*log_offset,
console_write("...", 3);
}
}
-#endif
console_write("\n", 1);
return 0;
@@ -163,40 +148,6 @@ err:
return (rc);
}
-#if MYNEWT_VAL(LOG_FCB_SLOT1)
-int
-shell_log_slot1_cmd(int argc, char **argv)
-{
- const struct flash_area *fa;
- int rc;
-
- if (argc == 1) {
- console_printf("slot1 state is: %s\n",
- log_fcb_slot1_is_locked() ? "locked" : "unlocked");
- } else {
- if (!strcasecmp(argv[1], "lock")) {
- log_fcb_slot1_lock();
- console_printf("slot1 locked\n");
- } else if (!strcasecmp(argv[1], "unlock")) {
- log_fcb_slot1_unlock();
- console_printf("slot1 unlocked\n");
- } else if (!strcasecmp(argv[1], "erase")) {
- rc = flash_area_open(FLASH_AREA_IMAGE_1, &fa);
- if (rc) {
- return -1;
- }
-
- flash_area_erase(fa, 0, fa->fa_size);
-
- console_printf("slot1 erased\n");
- } else {
- return -1;
- }
- }
-
- return 0;
-}
-#endif
#if MYNEWT_VAL(LOG_STORAGE_INFO)
int
diff --git a/sys/log/stub/include/log/log.h b/sys/log/stub/include/log/log.h
index f767894..2b1a17f 100644
--- a/sys/log/stub/include/log/log.h
+++ b/sys/log/stub/include/log/log.h
@@ -132,9 +132,6 @@ log_set_max_entry_len(struct log *log, uint16_t
max_entry_len)
extern const struct log_handler log_console_handler;
extern const struct log_handler log_cbmem_handler;
extern const struct log_handler log_fcb_handler;
-#if MYNEWT_VAL(LOG_FCB_SLOT1)
-extern const struct log_handler log_fcb_slot1_handler;
-#endif
#if MYNEWT_VAL(LOG_CONSOLE)
static inline struct log *
diff --git a/sys/log/stub/include/log/log_fcb_slot1.h
b/sys/log/stub/include/log/log_fcb_slot1.h
deleted file mode 100644
index 7f4cde6..0000000
--- a/sys/log/stub/include/log/log_fcb_slot1.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef __SYS_LOG_FCB_SLOT1_H__
-#define __SYS_LOG_FCB_SLOT1_H__
-
-#include "syscfg/syscfg.h"
-
-#if MYNEWT_VAL(LOG_FCB_SLOT1)
-
-#include "log/log.h"
-struct fcb_log;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct cbmem;
-typedef int (* log_fcb_slot1_reinit_fcb_fn) (struct fcb_log *arg);
-
-struct log_fcb_slot1 {
-};
-
-static inline int
-log_fcb_slot1_init(struct log_fcb_slot1 *s1, struct fcb_log *fcb_arg,
- struct cbmem *cbmem_arg,
- log_fcb_slot1_reinit_fcb_fn fcb_reinit_fn)
-{
- return 0;
-}
-
-static inline void
-log_fcb_slot1_lock(void)
-{
-}
-
-static inline void
-log_fcb_slot1_unlock(void)
-{
-}
-
-static inline bool
-log_fcb_slot1_is_locked(void)
-{
- return false;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif /* __SYS_LOG_FCB_SLOT1_H__ */
diff --git a/sys/log/stub/src/log.c b/sys/log/stub/src/log.c
index 4dc6555..d73f2c1 100644
--- a/sys/log/stub/src/log.c
+++ b/sys/log/stub/src/log.c
@@ -24,6 +24,3 @@ struct log_info g_log_info;
const struct log_handler log_console_handler;
const struct log_handler log_cbmem_handler;
const struct log_handler log_fcb_handler;
-#if MYNEWT_VAL(LOG_FCB_SLOT1)
-const struct log_handler log_fcb_slot1_handler;
-#endif
