samples: port radio_test to ncs-bm

changed the implementation of the sample
to the subsystems and modules available in sdk-nrf-bm

Signed-off-by: Ivan Iushkov <ivan.iushkov@nordicsemi.no>

Author: ivaniushkov

samples/peripherals/radio_test/prj.conf

@@ -4,15 +4,26 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_CONSOLE_HANDLER=y
+# Logging
+CONFIG_LOG=y
+CONFIG_LOG_BACKEND_BM_UARTE=y
+
+# Enabling SoftDevice is not strictly needed, though we are building with SoftDevice boards.
+CONFIG_SOFTDEVICE=y
+
+# Shell
 CONFIG_SHELL=y
+CONFIG_SHELL_BACKEND_BM_UARTE=y
 
-CONFIG_DYNAMIC_INTERRUPTS=y
+# Optional shell features
+CONFIG_SHELL_HELP=y
+CONFIG_SHELL_TAB=y
+CONFIG_SHELL_TAB_AUTOCOMPLETION=y
+CONFIG_SHELL_HISTORY=y
 
+# HW used by radio_test
 CONFIG_NRFX_TIMER=y
 CONFIG_NRFX_GPPI=y
 
-CONFIG_ENTROPY_GENERATOR=y
-CONFIG_NRF_SECURITY=y
-
-CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=1024
+# Use fake PRNG to reduce HW dependencies
+CONFIG_TEST_RANDOM_GENERATOR=y

samples/peripherals/radio_test/src/main.c

@@ -7,7 +7,8 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>
-#include <zephyr/pm/device_runtime.h>
+#include <zephyr/shell/shell.h>
+#include <bm/shell/backend_bm_uarte.h>
 #if defined(NRF54L15_XXAA)
 #include <hal/nrf_clock.h>
 #endif /* defined(NRF54L15_XXAA) */
@@ -23,9 +24,9 @@
 #include <hal/nrf_clock.h>
 #endif /* defined(NRF54LM20A_XXAA) */
 
-/* Empty trim value */
-#define TRIM_VALUE_EMPTY 0xFFFFFFFF
+#include "radio_test.h"
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 static void clock_init(void)
 {
 	int err;
@@ -73,12 +74,28 @@ static void clock_init(void)
 
 	printk("Clock has started\n");
 }
+#endif /* defined(CONFIG_CLOCK_CONTROL_NRF) */
 
 int main(void)
 {
+	const struct shell *sh = shell_backend_bm_uarte_get_ptr();
+	const struct shell_backend_config_flags cfg_flags =
+		SHELL_DEFAULT_BACKEND_CONFIG_FLAGS;
+
+	shell_init(sh, NULL, cfg_flags, false, 0);
+	shell_start(sh);
+
 	printk("Starting Radio Test sample\n");
 
+#if defined(CONFIG_CLOCK_CONTROL_NRF)
 	clock_init();
+#endif
+
+	while (true) {
+		shell_process(sh);
+		radio_test_process();
+		k_busy_wait(10000);
+	}
 
 	return 0;
 }

samples/peripherals/radio_test/src/radio_cmd.c

@@ -54,7 +54,6 @@ static struct radio_param_config {
 	 * Set to zero for continuous RX.
 	 */
 	uint32_t rx_packets_num;
-
 } config = {
 	.tx_pattern = TRANSMIT_PATTERN_RANDOM,
 	.mode = NRF_RADIO_MODE_BLE_1MBIT,
@@ -248,7 +247,6 @@ static void rx_end(void)
 		return;
 	}
 
-
 	printk("\n");
 	printk("Received number of packets: %d\n", recv_pkt);
 	printk("Required number of packets: %d\n", req_pkt);
@@ -1122,7 +1120,6 @@ static int cmd_print_payload(const struct shell *shell, size_t argc,
 	return 0;
 }
 
-
 SHELL_STATIC_SUBCMD_SET_CREATE(sub_output_power,
 #if defined(RADIO_TXPOWER_TXPOWER_Pos10dBm)
 	SHELL_CMD(pos10dBm, NULL, "TX power: +10 dBm", cmd_pos10dbm),
@@ -1225,7 +1222,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_transmit_pattern,
 	SHELL_SUBCMD_SET_END
 );
 
-
 SHELL_CMD_REGISTER(start_channel, NULL,
 		   "Start channel for the sweep or the channel for"
 		   " the constant carrier (in MHz as difference from 2400 MHz) <channel>",
@@ -1249,6 +1245,7 @@ SHELL_CMD_REGISTER(output_power,
 		   &sub_output_power,
 		   "Output power set <sub_cmd>",
 		   cmd_output_power_set);
+
 SHELL_CMD_REGISTER(transmit_pattern,
 		   &sub_transmit_pattern,
 		   "Set the transmission pattern",
@@ -1269,8 +1266,6 @@ SHELL_CMD_REGISTER(toggle_dcdc_state, NULL, TOGGLE_DCDC_HELP, cmd_toggle_dc);
 
 static int radio_cmd_init(void)
 {
-
-
 	return radio_test_init(&test_config);
 }
 

samples/peripherals/radio_test/src/radio_test.c

@@ -9,14 +9,17 @@
 #include <string.h>
 #include <inttypes.h>
 
+#if !defined(CONFIG_SOC_SERIES_NRF54L)
 #include <hal/nrf_power.h>
+#endif /* !defined(CONFIG_SOC_SERIES_NRF54L) */
 
 #include <nrfx_timer.h>
 #include <zephyr/kernel.h>
 #include <zephyr/random/random.h>
 
 #include <hal/nrf_egu.h>
 #include <helpers/nrfx_gppi.h>
+#include <bm/bm_irq.h>
 
 /* IEEE 802.15.4 default frequency. */
 #define IEEE_DEFAULT_FREQ         (5)
@@ -81,36 +84,31 @@ static nrfx_gppi_handle_t ppi_radio_start;
 /* PPI endpoint status.*/
 static atomic_t endpoint_state;
 
-/*  Work element used to handle the end of packet reception. */
-static void rx_timeout_work_handler(struct k_work *work);
-K_WORK_DELAYABLE_DEFINE(rx_timeout_work, rx_timeout_work_handler);
+/* RX timeout state for bare-metal polling */
+#define RX_TIMEOUT_INACTIVE 0
+#define RX_TIMEOUT_IMMEDIATE 1
+#define RX_TIMEOUT_DELAYED 2
+static volatile int rx_timeout_state;
+static volatile int64_t rx_timeout_deadline;
 
 /* Pointer to rx timeout callback function. */
 static void (**rx_timeout_cb)(void);
 
 static volatile bool cancel_request;
 static volatile bool test_is_running;
 
+/* Stored config pointer for ISR context access */
+static const struct radio_test_config *radio_test_cfg_ptr;
 
-/**
- * @brief Send errata HMPAN-216 on request signal to SysCtrl
- *
- * Also ensure RADIO is not started within 40 us after the signal is triggered,
- * so execution is blocked until then by a semaphore.
- *
- * @return 0 if successful, otherwise a negative error code
- */
-
-/**
- * @brief Send errata HMPAN-216 off request signal to SysCtrl
- *
- * @return 0 if successful, otherwise a negative error code
- */
-
-/**
- * @brief Return to code execution after the required delay for errata HMPAN-216 has elapsed.
- */
-
+static void rx_timeout_schedule(int32_t delay_ms)
+{
+	if (delay_ms == 0) {
+		rx_timeout_state = RX_TIMEOUT_IMMEDIATE;
+	} else {
+		rx_timeout_deadline = k_uptime_get() + delay_ms;
+		rx_timeout_state = RX_TIMEOUT_DELAYED;
+	}
+}
 
 static uint16_t channel_to_frequency(nrf_radio_mode_t mode, uint8_t channel)
 {
@@ -295,7 +293,8 @@ static void radio_power_set(nrf_radio_mode_t mode, uint8_t channel, int8_t power
 	int8_t output_power = power;
 	int8_t radio_power = power;
 
-
+	ARG_UNUSED(mode);
+	ARG_UNUSED(channel);
 
 	nrf_radio_txpower_set(NRF_RADIO, dbm_to_nrf_radio_txpower(radio_power));
 
@@ -360,7 +359,6 @@ static void radio_ppi_tx_reconfigure(void)
 	nrfx_gppi_conn_enable(ppi_radio_start);
 }
 
-
 static void radio_start(bool rx, bool force_egu)
 {
 	if (force_egu) {
@@ -383,7 +381,12 @@ static void radio_config(nrf_radio_mode_t mode, enum transmit_pattern pattern)
 	nrf_radio_packet_conf_t packet_conf;
 
 	/* Set fast ramp-up time. */
+#if defined(CONFIG_SOC_SERIES_NRF54H) || defined(CONFIG_SOC_SERIES_NRF54L) || \
+	defined(CONFIG_SOC_SERIES_NRF71)
 	nrf_radio_fast_ramp_up_enable_set(NRF_RADIO, true);
+#else
+	nrf_radio_modecnf0_set(NRF_RADIO, true, RADIO_MODECNF0_DTX_Center);
+#endif /* defined(CONFIG_SOC_SERIES_NRF54H) || defined(CONFIG_SOC_SERIES_NRF54L) */
 
 	/* Disable CRC. */
 	nrf_radio_crc_configure(NRF_RADIO, RADIO_CRCCNF_LEN_Disabled,
@@ -622,6 +625,7 @@ static void mltpan_6(nrf_radio_mode_t mode)
 	ARG_UNUSED(mode);
 #endif /* defined(NRF54L_SERIES) && CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 }
+
 static void radio_mode_set(NRF_RADIO_Type *reg, nrf_radio_mode_t mode)
 {
 	nrf_radio_mode_set(reg, mode);
@@ -638,6 +642,9 @@ static void radio_unmodulated_tx_carrier(uint8_t mode, int8_t txpower, uint8_t c
 
 	radio_channel_set(mode, channel);
 
+	if (sweep_processing) {
+		radio_ppi_config(false);
+	}
 
 	radio_start(false, sweep_processing);
 }
@@ -693,8 +700,6 @@ static void radio_modulated_tx_carrier(uint8_t mode, int8_t txpower, uint8_t cha
 
 	tx_packet_cnt = 0;
 
-
-
 	radio_start(false, false);
 }
 
@@ -717,19 +722,21 @@ static void radio_rx(uint8_t mode, uint8_t channel, enum transmit_pattern patter
 
 	nrf_radio_int_enable(NRF_RADIO, NRF_RADIO_INT_CRCOK_MASK);
 
+	if (sweep_processing) {
+		radio_ppi_config(true);
+	}
 
 	radio_start(true, sweep_processing);
 
 	if (rx_packet_num > 0) {
-		k_work_reschedule(&rx_timeout_work, K_SECONDS(CONFIG_RADIO_TEST_RX_TIMEOUT));
+		rx_timeout_schedule(CONFIG_RADIO_TEST_RX_TIMEOUT * 1000);
 	}
 }
 
 static void radio_sweep_start(uint8_t channel, uint32_t delay_ms)
 {
 	current_channel = channel;
 
-
 	nrfx_timer_disable(&timer);
 	nrf_timer_shorts_disable(timer.p_reg, ~0);
 	nrf_timer_int_disable(timer.p_reg, ~0);
@@ -782,6 +789,7 @@ static void radio_modulated_tx_carrier_duty_cycle(uint8_t mode, int8_t txpower,
 	/* We let the TIMER start the radio transmission again. */
 	nrfx_timer_disable(&timer);
 
+	radio_ppi_config(false);
 
 	nrf_timer_shorts_disable(timer.p_reg, ~0);
 	nrf_timer_int_disable(timer.p_reg, ~0);
@@ -854,6 +862,7 @@ static void cancel(void)
 	endpoints_clear();
 	radio_disable();
 
+	rx_timeout_state = RX_TIMEOUT_INACTIVE;
 }
 
 void radio_test_cancel(enum radio_test_mode type)
@@ -913,7 +922,7 @@ void toggle_dcdc_state(uint8_t dcdc_state)
 }
 #endif /* NRF_POWER_HAS_DCDCEN_VDDH || NRF_POWER_HAS_DCDCEN */
 
-static void rx_timeout_work_handler(struct k_work *work)
+static void rx_timeout_handle(void)
 {
 	radio_disable();
 	if (rx_timeout_cb != NULL && *rx_timeout_cb != NULL) {
@@ -985,6 +994,7 @@ void on_radio_end(const struct radio_test_config *config)
 	if (tx_packet_cnt == config->params.modulated_tx.packets_num &&
 	    config->type == MODULATED_TX) {
 		radio_disable();
+
 		config->params.modulated_tx.cb();
 	} else if (cancel_request) {
 		cancel();
@@ -1004,9 +1014,9 @@ void radio_handler(const void *context)
 		rx_packet_cnt++;
 		if (config->params.rx.packets_num) {
 			if (rx_packet_cnt == config->params.rx.packets_num) {
-				k_work_reschedule(&rx_timeout_work, K_NO_WAIT);
+				rx_timeout_schedule(0);
 			} else {
-				k_work_reschedule(&rx_timeout_work, K_MSEC(RX_PACKET_TIMEOUT_MS));
+				rx_timeout_schedule(RX_PACKET_TIMEOUT_MS);
 			}
 		}
 	}
@@ -1026,16 +1036,30 @@ void radio_handler(const void *context)
 	}
 }
 
+ISR_DIRECT_DECLARE(radio_test_timer_isr)
+{
+	nrfx_timer_irq_handler(&timer);
+	return 1;
+}
+
+ISR_DIRECT_DECLARE(radio_test_radio_isr)
+{
+	radio_handler(radio_test_cfg_ptr);
+	return 1;
+}
+
 int radio_test_init(struct radio_test_config *config)
 {
 	int nrfx_err;
 	uint32_t rad_domain = nrfx_gppi_domain_id_get((uint32_t)NRF_RADIO);
 
+	radio_test_cfg_ptr = config;
+
 	timer_init(config);
-	IRQ_CONNECT(RADIO_TEST_TIMER_IRQn, IRQ_PRIO_LOWEST,
-		nrfx_timer_irq_handler, &timer, 0);
+	BM_IRQ_DIRECT_CONNECT(RADIO_TEST_TIMER_IRQn, 7, radio_test_timer_isr, 0);
+	irq_enable(RADIO_TEST_TIMER_IRQn);
 
-	irq_connect_dynamic(RADIO_TEST_RADIO_IRQn, IRQ_PRIO_LOWEST, radio_handler, config, 0);
+	BM_IRQ_DIRECT_CONNECT(RADIO_TEST_RADIO_IRQn, 7, radio_test_radio_isr, 0);
 	irq_enable(RADIO_TEST_RADIO_IRQn);
 
 	nrfx_err = nrfx_gppi_domain_conn_alloc(rad_domain, rad_domain, &ppi_radio_start);
@@ -1046,6 +1070,15 @@ int radio_test_init(struct radio_test_config *config)
 
 	rx_timeout_cb = &config->params.rx.cb;
 
-
 	return 0;
 }
+
+void radio_test_process(void)
+{
+	if (rx_timeout_state == RX_TIMEOUT_IMMEDIATE ||
+	    (rx_timeout_state == RX_TIMEOUT_DELAYED &&
+	     k_uptime_get() >= rx_timeout_deadline)) {
+		rx_timeout_state = RX_TIMEOUT_INACTIVE;
+		rx_timeout_handle();
+	}
+}