Skip to content
Permalink
Browse files

logging: Removing redundant code from UART backend

Refactored UART backend to use standard backend functions

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
  • Loading branch information...
nordic-krch authored and nashif committed Jul 17, 2019
1 parent 65b47f8 commit 20483961a8fbb67f004d9a193398e3771f2f9c1c
Showing with 8 additions and 47 deletions.
  1. +8 −47 subsys/logging/log_backend_uart.c
@@ -8,6 +8,7 @@
#include <logging/log_core.h>
#include <logging/log_msg.h>
#include <logging/log_output.h>
#include "log_backend_std.h"
#include <device.h>
#include <drivers/uart.h>
#include <assert.h>
@@ -30,22 +31,7 @@ LOG_OUTPUT_DEFINE(log_output, char_out, &buf, 1);
static void put(const struct log_backend *const backend,
struct log_msg *msg)
{
log_msg_get(msg);

u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;

if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
flags |= LOG_OUTPUT_FLAG_COLORS;
}

if (IS_ENABLED(CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP)) {
flags |= LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
}

log_output_msg_process(&log_output, msg, flags);

log_msg_put(msg);

log_backend_std_put(&log_output, 0, msg);
}

static void log_backend_uart_init(void)
@@ -60,55 +46,30 @@ static void log_backend_uart_init(void)

static void panic(struct log_backend const *const backend)
{
log_output_flush(&log_output);
log_backend_std_panic(&log_output);
}

static void dropped(const struct log_backend *const backend, u32_t cnt)
{
ARG_UNUSED(backend);

log_output_dropped_process(&log_output, cnt);
log_backend_std_dropped(&log_output, cnt);
}

static void sync_string(const struct log_backend *const backend,
struct log_msg_ids src_level, u32_t timestamp,
const char *fmt, va_list ap)
{
u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
u32_t key;

if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
flags |= LOG_OUTPUT_FLAG_COLORS;
}

if (IS_ENABLED(CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP)) {
flags |= LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
}

key = irq_lock();
log_output_string(&log_output, src_level, timestamp, fmt, ap, flags);
irq_unlock(key);
log_backend_std_sync_string(&log_output, 0, src_level,
timestamp, fmt, ap);
}

static void sync_hexdump(const struct log_backend *const backend,
struct log_msg_ids src_level, u32_t timestamp,
const char *metadata, const u8_t *data, u32_t length)
{
u32_t flags = LOG_OUTPUT_FLAG_LEVEL | LOG_OUTPUT_FLAG_TIMESTAMP;
u32_t key;

if (IS_ENABLED(CONFIG_LOG_BACKEND_SHOW_COLOR)) {
flags |= LOG_OUTPUT_FLAG_COLORS;
}

if (IS_ENABLED(CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP)) {
flags |= LOG_OUTPUT_FLAG_FORMAT_TIMESTAMP;
}

key = irq_lock();
log_output_hexdump(&log_output, src_level, timestamp,
metadata, data, length, flags);
irq_unlock(key);
log_backend_std_sync_hexdump(&log_output, 0, src_level,
timestamp, metadata, data, length);
}

const struct log_backend_api log_backend_uart_api = {

0 comments on commit 2048396

Please sign in to comment.
You can’t perform that action at this time.