logging: log_backend_spinel: Remove LOG1 support (28e9f4a5) · Commits · Wenxi XU / zephyr

subsys/logging/Kconfig.backends

+1 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ endif # LOG_BACKEND_RTT
		config LOG_BACKEND_SPINEL
		bool "OpenThread dedicated Spinel protocol backend"
		depends on !LOG_BACKEND_UART
		depends on !LOG1
		depends on NET_L2_OPENTHREAD
		help
		When enabled, backend will use OpenThread dedicated SPINEL protocol for logging.

subsys/logging/log_backend_spinel.c

+2 −41

Original line number	Diff line number	Diff line
		@@ -29,17 +29,6 @@ static inline bool is_panic_mode(void)
		return panic_mode;
		}

		static void put(const struct log_backend *const backend,
		struct log_msg *msg)
		{
		/* prevent adding CRLF, which may crash spinel decoding */
		uint32_t flag = LOG_OUTPUT_FLAG_CRLF_NONE;

		last_log_level = msg->hdr.ids.level;

		log_backend_std_put(&log_output_spinel, flag, msg);
		}

		static void process(const struct log_backend *const backend,
		union log_msg2_generic *msg)
		{
		@@ -57,29 +46,6 @@ static int format_set(const struct log_backend *const backend, uint32_t log_type
		return 0;
		}

		static void sync_string(const struct log_backend *const backend,
		struct log_msg_ids src_level, uint32_t timestamp,
		const char *fmt, va_list ap)
		{
		/* prevent adding CRLF, which may crash spinel decoding */
		uint32_t flag = LOG_OUTPUT_FLAG_CRLF_NONE;

		log_backend_std_sync_string(&log_output_spinel, flag, src_level,
		timestamp, fmt, ap);
		}

		static void sync_hexdump(const struct log_backend *const backend,
		struct log_msg_ids src_level, uint32_t timestamp,
		const char metadata, const uint8_t data,
		uint32_t length)
		{
		/* prevent adding CRLF, which may crash spinel decoding */
		uint32_t flag = LOG_OUTPUT_FLAG_CRLF_NONE;

		log_backend_std_sync_hexdump(&log_output_spinel, flag, src_level,
		timestamp, metadata, data, length);
		}

		static void log_backend_spinel_init(struct log_backend const *const backend)
		{
		memset(char_buf, '\0', sizeof(char_buf));
		@@ -136,16 +102,11 @@ static int write(uint8_t data, size_t length, void ctx)
		}

		const struct log_backend_api log_backend_spinel_api = {
		.process = IS_ENABLED(CONFIG_LOG2) ? process : NULL,
		.put = IS_ENABLED(CONFIG_LOG1_DEFERRED) ? put : NULL,
		.put_sync_string = IS_ENABLED(CONFIG_LOG1_IMMEDIATE) ?
		sync_string : NULL,
		.put_sync_hexdump = IS_ENABLED(CONFIG_LOG1_IMMEDIATE) ?
		sync_hexdump : NULL,
		.process = process,
		.panic = panic,
		.init = log_backend_spinel_init,
		.dropped = IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ? NULL : dropped,
		.format_set = IS_ENABLED(CONFIG_LOG1) ? NULL : format_set,
		.format_set = format_set,
		};

		LOG_BACKEND_DEFINE(log_backend_spinel, log_backend_spinel_api, true);

Admin message