logging: log_backend_xtensa: Remove LOG1 support (3faee837) · Commits · Wenxi XU / zephyr

subsys/logging/Kconfig.backends

+1 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,7 @@ endif # LOG_BACKEND_NATIVE_POSIX
		config LOG_BACKEND_XTENSA_SIM
		bool "Xtensa simulator backend"
		depends on SOC_XTENSA_SAMPLE_CONTROLLER \|\| SOC_FAMILY_INTEL_ADSP
		depends on !LOG1
		default y if SOC_XTENSA_SAMPLE_CONTROLLER
		help
		Enable backend in xtensa simulator

subsys/logging/log_backend_xtensa_sim.c

+2 −30

Original line number	Diff line number	Diff line
		@@ -38,13 +38,6 @@ static int char_out(uint8_t data, size_t length, void ctx)
		LOG_OUTPUT_DEFINE(log_output_xsim, char_out,
		xtensa_log_buf, sizeof(xtensa_log_buf));

		static void put(const struct log_backend *const backend,
		struct log_msg *msg)
		{
		log_backend_std_put(&log_output_xsim, 0, msg);

		}

		static void process(const struct log_backend *const backend,
		union log_msg2_generic *msg)
		{
		@@ -73,32 +66,11 @@ static void dropped(const struct log_backend *const backend, uint32_t cnt)
		log_backend_std_dropped(&log_output_xsim, cnt);
		}

		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)
		{
		log_backend_std_sync_string(&log_output_xsim, 0, 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)
		{
		log_backend_std_sync_hexdump(&log_output_xsim, 0, src_level,
		timestamp, metadata, data, length);
		}

		const struct log_backend_api log_backend_xtensa_sim_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,
		.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_xtensa_sim, log_backend_xtensa_sim_api, true);

Admin message