samples: logging: syst: Remove support for logging v1 (85f20274) · Commits · Wenxi XU / zephyr

samples/subsys/logging/syst/sample.yaml

+8 −70

Original line number	Diff line number	Diff line
		@@ -6,35 +6,7 @@ common:
		- mipi-sys-t
		arch_exclude: mips nios2 posix sparc
		tests:
		sample.logger.syst.v1.deferred:
		extra_args: OVERLAY_CONFIG=overlay_deferred.conf
		integration_platforms:
		- mps2_an385
		- qemu_x86
		- sam_e70_xplained
		- qemu_cortex_a53
		harness: console
		harness_config:
		type: one_line
		regex:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_LOG1=y
		sample.logger.syst.v1.immediate:
		extra_args: OVERLAY_CONFIG=overlay_immediate.conf
		integration_platforms:
		- mps2_an385
		- qemu_x86
		- sam_e70_xplained
		- qemu_cortex_a53
		harness: console
		harness_config:
		type: one_line
		regex:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_LOG1=y
		sample.logger.syst.v2.deferred:
		sample.logger.syst.deferred:
		toolchain_exclude: xcc
		integration_platforms:
		- mps2_an385
		@@ -48,7 +20,7 @@ tests:
		regex:
		- "SYS-T RAW DATA: "
		- "SYST Sample Execution Completed"
		sample.logger.syst.v2.immediate:
		sample.logger.syst.immediate:
		toolchain_exclude: xcc
		extra_args: OVERLAY_CONFIG=overlay_immediate.conf
		integration_platforms:
		@@ -62,7 +34,7 @@ tests:
		regex:
		- "SYS-T RAW DATA: "
		- "SYST Sample Execution Completed"
		sample.logger.syst.catalog.v2.deferred:
		sample.logger.syst.catalog.deferred:
		toolchain_exclude: xcc
		extra_args: OVERLAY_CONFIG=overlay_deferred.conf
		integration_platforms:
		@@ -77,7 +49,7 @@ tests:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_LOG_MIPI_SYST_USE_CATALOG=y
		sample.logger.syst.catalog.v2.immediate:
		sample.logger.syst.catalog.immediate:
		toolchain_exclude: xcc
		integration_platforms:
		- mps2_an385
		@@ -91,41 +63,7 @@ tests:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_LOG_MIPI_SYST_USE_CATALOG=y

		sample.logger.syst.v1.deferred_cpp:
		toolchain_exclude: xcc
		extra_args: OVERLAY_CONFIG=overlay_deferred.conf
		integration_platforms:
		- mps2_an385
		- qemu_x86
		- qemu_x86_64
		- sam_e70_xplained
		- qemu_cortex_a53
		harness: console
		harness_config:
		type: one_line
		regex:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_LOG1=y
		- CONFIG_CPLUSPLUS=y
		sample.logger.syst.v1.immediate_cpp:
		toolchain_exclude: xcc
		integration_platforms:
		- mps2_an385
		- qemu_x86
		- qemu_x86_64
		- sam_e70_xplained
		- qemu_cortex_a53
		harness: console
		harness_config:
		type: one_line
		regex:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_LOG1=y
		- CONFIG_CPLUSPLUS=y
		sample.logger.syst.v2.deferred_cpp:
		sample.logger.syst.deferred_cpp:
		toolchain_exclude: xcc
		extra_args: OVERLAY_CONFIG=overlay_deferred.conf
		integration_platforms:
		@@ -141,7 +79,7 @@ tests:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_CPLUSPLUS=y
		sample.logger.syst.v2.immediate_cpp:
		sample.logger.syst.immediate_cpp:
		toolchain_exclude: xcc
		integration_platforms:
		- mps2_an385
		@@ -156,7 +94,7 @@ tests:
		- "SYS-T RAW DATA: "
		extra_configs:
		- CONFIG_CPLUSPLUS=y
		sample.logger.syst.catalog.v2.deferred_cpp:
		sample.logger.syst.catalog.deferred_cpp:
		toolchain_exclude: xcc
		extra_args: OVERLAY_CONFIG=overlay_deferred.conf
		integration_platforms:
		@@ -172,7 +110,7 @@ tests:
		extra_configs:
		- CONFIG_LOG_MIPI_SYST_USE_CATALOG=y
		- CONFIG_CPLUSPLUS=y
		sample.logger.syst.catalog.v2.immediate_cpp:
		sample.logger.syst.catalog.immediate_cpp:
		toolchain_exclude: xcc
		integration_platforms:
		- mps2_an385

samples/subsys/logging/syst/src/main.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -36,13 +36,6 @@ void log_msgs(void)
		struct test_frame frame = { 0 };
		const uint8_t data[DATA_MAX_DLEN] = { 0x01, 0x02, 0x03, 0x04,
		0x05, 0x06, 0x07, 0x08 };
		#ifndef CONFIG_LOG2
		struct log_msg_ids src_level = {
		.level = LOG_LEVEL_INTERNAL_RAW_STRING,
		.domain_id = 0, /* not used as level indicates raw string. */
		.source_id = 0, /* not used as level indicates raw string. */
		};
		#endif

		char c = '!';
		const char *s = "static str";
		@@ -70,21 +63,11 @@ void log_msgs(void)
		LOG_DBG("char %c", c);
		LOG_DBG("s str %s %s", s, s1);

		#ifdef CONFIG_LOG1
		LOG_DBG("d str %s", log_strdup(vs0));
		LOG_DBG("mixed str %s %s %s %s %s %s %s",
		log_strdup(vs0), "---", log_strdup(vs0), "---",
		log_strdup(vs1), "---", log_strdup(vs1));
		LOG_DBG("mixed c/s %c %s %s %s %c", c, s, log_strdup(vs0), s, c);
		#else
		LOG_DBG("d str %s", vs0);
		LOG_DBG("mixed str %s %s %s %s %s %s %s", vs0, "---", vs0, "---", vs1, "---", vs1);
		LOG_DBG("mixed c/s %c %s %s %s %c", c, s, vs0, s, c);
		#endif

		#ifdef CONFIG_LOG2
		LOG_DBG("Debug message example, %f", 3.14159265359);
		#endif

		/* hexdump */
		frame.rtr = 1U;
		@@ -101,11 +84,6 @@ void log_msgs(void)
		/* raw string */
		printk("hello sys-t on board %s\n", CONFIG_BOARD);

		#ifndef CONFIG_LOG2
		/* log output string */
		log_string_sync(src_level, "%s", "log string sync");
		#endif

		#if CONFIG_LOG_MODE_DEFERRED
		/*
		* When deferred logging is enabled, the work is being performed by
		@@ -121,8 +99,6 @@ int main(void)
		{
		log_msgs();

		#ifndef CONFIG_LOG1

		uint32_t log_type = LOG_OUTPUT_TEXT;

		log_format_set_all_active_backends(log_type);
		@@ -139,6 +115,5 @@ int main(void)

		/* raw string */
		printk("SYST Sample Execution Completed\n");
		#endif
		return 0;
		}

Admin message