samples: radio_test: code cleanups

- cleaned up doxygen comments;
- removed CONFIG_HAS_HW_NRF_RADIO_IEEE802154 and CONFIG_HAS_HW_NRF_RADIO_BLE_CODED
since the radio dts node was removed in ncs-bm.
Both Coded PHY and IEEE802.15.4 are supported by
all of the NCS-BM Bluetooth SoCs so it is safe to remove
corresponding ifdefs completely and always build the code

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

Author: ivaniushkov

samples/peripherals/radio_test/Kconfig

@@ -7,7 +7,7 @@
 mainmenu "Nordic Radio test sample"
 
 config RADIO_TEST_RX_TIMEOUT
-	int "RX packet reception timeout"
+	int "RX packet reception timeout in seconds"
 	default 10
 	help
 	  Specifies the time in seconds that the application waits for the first packet to be

samples/peripherals/radio_test/src/radio_cmd.c

@@ -72,7 +72,6 @@ static struct radio_test_config test_config;
 /* If true, RX sweep, TX sweep or duty cycle test is performed. */
 static bool test_in_progress;
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 static void ieee_channel_check(const struct shell *shell, uint8_t channel)
 {
 	if (config.mode == NRF_RADIO_MODE_IEEE802154_250KBIT) {
@@ -90,7 +89,6 @@ static void ieee_channel_check(const struct shell *shell, uint8_t channel)
 
 	}
 }
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 static int cmd_start_channel_set(const struct shell *shell, size_t argc,
 				 char **argv)
@@ -211,9 +209,7 @@ static int cmd_tx_carrier_start(const struct shell *shell, size_t argc,
 		test_in_progress = false;
 	}
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	ieee_channel_check(shell, config.channel_start);
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	memset(&test_config, 0, sizeof(test_config));
 	test_config.type = UNMODULATED_TX;
@@ -263,9 +259,7 @@ static int cmd_tx_modulated_carrier_start(const struct shell *shell,
 		test_in_progress = false;
 	}
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	ieee_channel_check(shell, config.channel_start);
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	if (argc > 2) {
 		shell_error(shell, "%s: bad parameters count.", argv[0]);
@@ -314,9 +308,7 @@ static int cmd_duty_cycle_set(const struct shell *shell, size_t argc,
 
 	config.duty_cycle = duty_cycle;
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	ieee_channel_check(shell, config.channel_start);
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	memset(&test_config, 0, sizeof(test_config));
 	test_config.type = MODULATED_TX_DUTY_CYCLE;
@@ -488,7 +480,6 @@ static int cmd_print(const struct shell *shell, size_t argc, char **argv)
 			    STRINGIFY(NRF_RADIO_MODE_BLE_2MBIT));
 		break;
 
-#if CONFIG_HAS_HW_NRF_RADIO_BLE_CODED
 	case NRF_RADIO_MODE_BLE_LR125KBIT:
 		shell_print(shell,
 			    "Data rate: %s",
@@ -500,15 +491,12 @@ static int cmd_print(const struct shell *shell, size_t argc, char **argv)
 			    "Data rate: %s",
 			    STRINGIFY(NRF_RADIO_MODE_BLE_LR500KBIT));
 		break;
-#endif /* CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	case NRF_RADIO_MODE_IEEE802154_250KBIT:
 		shell_print(shell,
 			    "Data rate: %s",
 			    STRINGIFY(NRF_RADIO_MODE_IEEE802154_250KBIT));
 		break;
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	default:
 		shell_print(shell,
@@ -607,9 +595,7 @@ static int cmd_rx_start(const struct shell *shell, size_t argc, char **argv)
 		return -EINVAL;
 	}
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	ieee_channel_check(shell, config.channel_start);
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	memset(&test_config, 0, sizeof(test_config));
 	test_config.type = RX;
@@ -980,7 +966,6 @@ static int cmd_ble_2mbit(const struct shell *shell, size_t argc, char **argv)
 	return 0;
 }
 
-#if CONFIG_HAS_HW_NRF_RADIO_BLE_CODED
 static int cmd_ble_lr125kbit(const struct shell *shell, size_t argc,
 			     char **argv)
 {
@@ -1000,9 +985,7 @@ static int cmd_ble_lr500kbit(const struct shell *shell, size_t argc,
 
 	return 0;
 }
-#endif /* CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 static int cmd_ble_ieee(const struct shell *shell, size_t argc, char **argv)
 {
 	config.mode = NRF_RADIO_MODE_IEEE802154_250KBIT;
@@ -1011,7 +994,6 @@ static int cmd_ble_ieee(const struct shell *shell, size_t argc, char **argv)
 
 	return 0;
 }
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 static int cmd_pattern_random(const struct shell *shell, size_t argc,
 			      char **argv)
@@ -1087,20 +1069,16 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_data_rate,
 	SHELL_CMD(ble_2Mbit, NULL, "2 Mbit/s Bluetooth Low Energy",
 		  cmd_ble_2mbit),
 
-#if CONFIG_HAS_HW_NRF_RADIO_BLE_CODED
 	SHELL_CMD(ble_lr125Kbit, NULL,
 		  "Long range 125 kbit/s TX, 125 kbit/s and 500 kbit/s RX",
 		  cmd_ble_lr125kbit),
 
 	SHELL_CMD(ble_lr500Kbit, NULL,
 		  "Long range 500 kbit/s TX, 125 kbit/s and 500 kbit/s RX",
 		  cmd_ble_lr500kbit),
-#endif /* CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	SHELL_CMD(ieee802154_250Kbit, NULL, "IEEE 802.15.4-2006 250 kbit/s",
 		  cmd_ble_ieee),
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	SHELL_SUBCMD_SET_END
 );

samples/peripherals/radio_test/src/radio_test.c

@@ -117,7 +117,6 @@ static void rx_timeout_schedule(int32_t delay_ms)
 
 static uint16_t channel_to_frequency(nrf_radio_mode_t mode, uint8_t channel)
 {
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	if (mode == NRF_RADIO_MODE_IEEE802154_250KBIT) {
 		if ((channel >= IEEE_MIN_CHANNEL) &&
 			(channel <= IEEE_MAX_CHANNEL)) {
@@ -128,9 +127,6 @@ static uint16_t channel_to_frequency(nrf_radio_mode_t mode, uint8_t channel)
 	} else {
 		return CHAN_TO_FREQ(channel);
 	}
-#else
-	return CHAN_TO_FREQ(channel);
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 }
 
 static nrf_radio_txpower_t dbm_to_nrf_radio_txpower(int8_t tx_power)
@@ -441,7 +437,6 @@ static void radio_config(nrf_radio_mode_t mode, enum transmit_pattern pattern)
 	packet_conf.whiteen = true;
 
 	switch (mode) {
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	case NRF_RADIO_MODE_IEEE802154_250KBIT:
 		/* Packet configuration:
 		 * S1 size = 0 bits,
@@ -457,9 +452,7 @@ static void radio_config(nrf_radio_mode_t mode, enum transmit_pattern pattern)
 		/* preamble, address (BALEN + PREFIX), lflen and payload */
 		total_payload_size = 4 + (packet_conf.balen + 1) + 1 + packet_conf.maxlen;
 		break;
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
-#if CONFIG_HAS_HW_NRF_RADIO_BLE_CODED
 	case NRF_RADIO_MODE_BLE_LR500KBIT:
 	case NRF_RADIO_MODE_BLE_LR125KBIT:
 		/* Packet configuration:
@@ -484,8 +477,6 @@ static void radio_config(nrf_radio_mode_t mode, enum transmit_pattern pattern)
 				  packet_conf.termlen + packet_conf.maxlen + RADIO_CRCCNF_LEN_Three;
 		break;
 
-#endif /* CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
-
 	case NRF_RADIO_MODE_BLE_2MBIT:
 		/* Packet configuration:
 		 * S1 size = 0 bits,
@@ -575,15 +566,11 @@ static void generate_modulated_rf_packet(uint8_t mode,
 	radio_config(mode, pattern);
 
 	/* One byte used for size, actual size is SIZE-1 */
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	if (mode == NRF_RADIO_MODE_IEEE802154_250KBIT) {
 		tx_packet[0] = IEEE_MAX_PAYLOAD_LEN - 1;
 	} else {
 		tx_packet[0] = sizeof(tx_packet) - 1;
 	}
-#else
-	tx_packet[0] = sizeof(tx_packet) - 1;
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
 
 	switch (pattern) {
 	case TRANSMIT_PATTERN_RANDOM:
@@ -622,13 +609,9 @@ static void radio_disable(void)
 
 static void mltpan_6(nrf_radio_mode_t mode)
 {
-#if defined(NRF54L_SERIES) && CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	if (mode == NRF_RADIO_MODE_IEEE802154_250KBIT) {
 		*((volatile uint32_t *)0x5008A810) = 2;
 	}
-#else
-	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)
@@ -661,7 +644,6 @@ static void radio_modulated_tx_carrier(uint8_t mode, int8_t txpower, uint8_t cha
 	generate_modulated_rf_packet(mode, pattern);
 
 	switch (mode) {
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154 || CONFIG_HAS_HW_NRF_RADIO_BLE_CODED
 	case NRF_RADIO_MODE_IEEE802154_250KBIT:
 	case NRF_RADIO_MODE_BLE_LR125KBIT:
 	case NRF_RADIO_MODE_BLE_LR500KBIT:
@@ -670,8 +652,6 @@ static void radio_modulated_tx_carrier(uint8_t mode, int8_t txpower, uint8_t cha
 		nrf_radio_int_enable(NRF_RADIO, NRF_RADIO_INT_PHYEND_MASK);
 		break;
 
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 || CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */
-
 	case NRF_RADIO_MODE_BLE_1MBIT:
 	case NRF_RADIO_MODE_BLE_2MBIT:
 	case NRF_RADIO_MODE_NRF_1MBIT:
@@ -886,7 +866,6 @@ void radio_rx_stats_get(struct radio_rx_stats *rx_stats)
 {
 	size_t size;
 
-#if CONFIG_HAS_HW_NRF_RADIO_IEEE802154
 	nrf_radio_mode_t radio_mode;
 
 	radio_mode = nrf_radio_mode_get(NRF_RADIO);
@@ -895,10 +874,6 @@ void radio_rx_stats_get(struct radio_rx_stats *rx_stats)
 	} else {
 		size = sizeof(rx_packet);
 	}
-#else
-	size = sizeof(rx_packet);
-#endif /* CONFIG_HAS_HW_NRF_RADIO_IEEE802154 */
-
 	rx_stats->last_packet.buf = rx_packet;
 	rx_stats->last_packet.len = size;
 	rx_stats->packet_cnt = rx_packet_cnt;

samples/peripherals/radio_test/src/radio_test.h

@@ -19,7 +19,7 @@
 /** IEEE 802.15.4 maximum channel. */
 #define IEEE_MAX_CHANNEL	26
 
-/**@brief Radio transmit and address pattern. */
+/** @brief Radio transmit and address pattern. */
 enum transmit_pattern {
 	/** Random pattern. */
 	TRANSMIT_PATTERN_RANDOM,
@@ -31,7 +31,7 @@ enum transmit_pattern {
 	TRANSMIT_PATTERN_11001100,
 };
 
-/**@brief Radio test mode. */
+/** @brief Radio test mode. */
 enum radio_test_mode {
 	/** TX carrier. */
 	UNMODULATED_TX,
@@ -52,7 +52,7 @@ enum radio_test_mode {
 	MODULATED_TX_DUTY_CYCLE,
 };
 
-/**@brief Radio test configuration. */
+/** @brief Radio test configuration. */
 struct radio_test_config {
 	/** Radio test type. */
 	enum radio_test_mode type;
@@ -61,6 +61,7 @@ struct radio_test_config {
 	nrf_radio_mode_t mode;
 
 	union {
+		/** @brief Configuration for the unmodulated TX mode. */
 		struct {
 			/** Radio output power. */
 			int8_t txpower;
@@ -69,6 +70,7 @@ struct radio_test_config {
 			uint8_t channel;
 		} unmodulated_tx;
 
+		/** @brief Configuration for the modulated TX mode. */
 		struct {
 			/** Radio output power. */
 			int8_t txpower;
@@ -89,6 +91,7 @@ struct radio_test_config {
 			void (*cb)(void);
 		} modulated_tx;
 
+		/** @brief Configuration for the RX mode. */
 		struct {
 			/** Radio transmission pattern. */
 			enum transmit_pattern pattern;
@@ -106,6 +109,7 @@ struct radio_test_config {
 			void (*cb)(void);
 		} rx;
 
+		/** @brief Configuration for the TX sweep mode. */
 		struct {
 			/** Radio output power. */
 			int8_t txpower;
@@ -120,6 +124,7 @@ struct radio_test_config {
 			uint32_t delay_ms;
 		} tx_sweep;
 
+		/** @brief Configuration for the RX sweep mode. */
 		struct {
 			/** Radio start channel (frequency). */
 			uint8_t channel_start;
@@ -131,6 +136,7 @@ struct radio_test_config {
 			uint32_t delay_ms;
 		} rx_sweep;
 
+		/** @brief Configuration for the modulated TX duty cycle mode. */
 		struct {
 			/** Radio output power. */
 			int8_t txpower;
@@ -147,7 +153,7 @@ struct radio_test_config {
 	} params;
 };
 
-/**@brief Radio RX statistics. */
+/** @brief Radio RX statistics. */
 struct radio_rx_stats {
 	/** Content of the last packet. */
 	struct {