Skip to content

Commit 1026356

Browse files
Damian-Nordicpull[bot]
authored andcommitted
[nrfconnect] Adapt Pigweed Logger to newer Zephyr versions (#19713)
Initialization of the Pigwed HDLC-based Zephyr logging backend would fail due to usage of deprecated backend API. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
1 parent 1340589 commit 1026356

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

examples/platform/nrfconnect/util/PigweedLogger.cpp

+8-18
Original file line numberDiff line numberDiff line change
@@ -98,25 +98,17 @@ void init(const log_backend *)
9898
pw_sys_io_Init();
9999
}
100100

101-
void putMessageSync(const log_backend *, log_msg_ids srcLevel, uint32_t timestamp, const char * fmt, va_list args)
101+
void processMessage(const struct log_backend * const backend, union log_msg2_generic * msg)
102102
{
103103
int ret = k_sem_take(&sLoggerLock, K_FOREVER);
104104
assert(ret == 0);
105105

106106
if (!sIsPanicMode)
107-
log_backend_std_sync_string(&pigweedLogOutput, 0, srcLevel, timestamp, fmt, args);
108-
109-
k_sem_give(&sLoggerLock);
110-
}
111-
112-
void putHexdumpSync(const log_backend *, log_msg_ids srcLevel, uint32_t timestamp, const char * metadata, const uint8_t * data,
113-
uint32_t length)
114-
{
115-
int ret = k_sem_take(&sLoggerLock, K_FOREVER);
116-
assert(ret == 0);
107+
{
108+
log_format_func_t outputFunc = log_format_func_t_get(LOG_OUTPUT_TEXT);
117109

118-
if (!sIsPanicMode)
119-
log_backend_std_sync_hexdump(&pigweedLogOutput, 0, srcLevel, timestamp, metadata, data, length);
110+
outputFunc(&pigweedLogOutput, &msg->log, log_backend_std_get_flags());
111+
}
120112

121113
k_sem_give(&sLoggerLock);
122114
}
@@ -134,11 +126,9 @@ void panic(const log_backend *)
134126
}
135127

136128
const log_backend_api pigweedLogApi = {
137-
.put = nullptr,
138-
.put_sync_string = putMessageSync,
139-
.put_sync_hexdump = putHexdumpSync,
140-
.panic = panic,
141-
.init = init,
129+
.process = processMessage,
130+
.panic = panic,
131+
.init = init,
142132
};
143133

144134
LOG_BACKEND_DEFINE(pigweedLogBackend, pigweedLogApi, /* autostart */ true);

0 commit comments

Comments
 (0)