Merge branch 'greatscottgadgets:main' into next

Author: gullradriel

firmware/common/fpga_selftest.c

@@ -190,7 +190,7 @@ bool fpga_if_xcvr_selftest(void)
 	max2831_set_frequency(&max283x, 2500000000);
 
 	// Capture 1: 4 Msps, tone at 0.5 MHz, narrowband filter OFF
-	sample_rate_frac_set(4000000 * 2, 1);
+	sample_rate_frac_set(4000000, 1);
 	delay_us_at_mhz(1000, 204);
 	if (rx_samples(num_samples, 2000000) == -1) {
 		timeout = true;
@@ -213,7 +213,7 @@ bool fpga_if_xcvr_selftest(void)
 
 	// Capture 3: 20 Msps, tone at 5 MHz, narrowband filter OFF
 	fpga_set_tx_nco_pstep(&fpga, 255);
-	sample_rate_frac_set(20000000 * 2, 1);
+	sample_rate_frac_set(20000000, 1);
 	narrowband_filter_set(0);
 	delay_us_at_mhz(1000, 204);
 	if (rx_samples(num_samples, 2000000) == -1) {

firmware/common/hackrf_core.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 Great Scott Gadgets <info@greatscottgadgets.com>
+ * Copyright 2012-2026 Great Scott Gadgets <info@greatscottgadgets.com>
  * Copyright 2012 Jared Boone <jared@sharebrained.com>
  * Copyright 2013 Benjamin Vernoux <titanmkd@gmail.com>
  *
@@ -351,40 +351,7 @@ fpga_driver_t fpga = {
 };
 #endif
 
-radio_t radio = {
-	.channel[RADIO_CHANNEL0] =
-		{
-			.id = RADIO_CHANNEL0,
-			.config =
-				{
-					.sample_rate[RADIO_SAMPLE_RATE_CLOCKGEN] =
-						{.hz = 0},
-					.filter[RADIO_FILTER_BASEBAND] = {.hz = 0},
-					.frequency[RADIO_FREQUENCY_RF] =
-						{
-							.hz = 0,
-							.if_hz = 0,
-							.lo_hz = 0,
-							.path = 0,
-						},
-					.gain[RADIO_GAIN_RF_AMP] = {.enable = 0},
-					.gain[RADIO_GAIN_RX_LNA] = {.db = 0},
-					.gain[RADIO_GAIN_RX_VGA] = {.db = 0},
-					.gain[RADIO_GAIN_TX_VGA] = {.db = 0},
-					.antenna[RADIO_ANTENNA_BIAS_TEE] =
-						{.enable = false},
-					.mode = TRANSCEIVER_MODE_OFF,
-					.clock[RADIO_CLOCK_CLKIN] = {.enable = false},
-					.clock[RADIO_CLOCK_CLKOUT] = {.enable = false},
-					.trigger_enable = false,
-#ifdef PRALINE
-					.resampling_n = 0,
-					.shift = FPGA_QUARTER_SHIFT_MODE_NONE,
-#endif
-				},
-			.clock_source = CLOCK_SOURCE_HACKRF,
-		},
-};
+radio_t radio;
 
 rf_path_t rf_path = {
 	.switchctrl = 0,
@@ -486,7 +453,17 @@ bool sample_rate_frac_set(uint32_t rate_num, uint32_t rate_denom)
 	uint32_t a, b, c;
 	uint32_t rem;
 
-	hackrf_ui()->set_sample_rate(rate_num / 2);
+	/* Round to the nearest Hz for display. */
+	uint32_t rate_hz = (rate_num + (rate_denom >> 1)) / rate_denom;
+	hackrf_ui()->set_sample_rate(rate_hz);
+
+	/*
+	 * First double the sample rate so that we can produce a clock at twice
+	 * the intended sample rate. The 2x clock is sometimes used directly,
+	 * and it is divided by two in an output divider to produce the actual
+	 * AFE clock.
+	 */
+	rate_num *= 2;
 
 	/* Find best config */
 	a = (VCO_FREQ * rate_denom) / rate_num;
@@ -999,7 +976,6 @@ clock_source_t activate_best_clock_source(void)
 		&clock_gen,
 		(source == CLOCK_SOURCE_HACKRF) ? PLL_SOURCE_XTAL : PLL_SOURCE_CLKIN);
 	hackrf_ui()->set_clock_source(source);
-	radio.channel[RADIO_CHANNEL0].clock_source = source;
 
 	return source;
 }

firmware/common/mixer.c

@@ -115,36 +115,6 @@ uint64_t mixer_set_frequency(mixer_driver_t* const mixer, uint64_t hz)
 #endif
 }
 
-void mixer_tx(mixer_driver_t* const mixer)
-{
-#if (defined JAWBREAKER || defined HACKRF_ONE || defined PRALINE)
-	rffc5071_tx(mixer);
-#endif
-#ifdef RAD1O
-	(void) mixer;
-#endif
-}
-
-void mixer_rx(mixer_driver_t* const mixer)
-{
-#if (defined JAWBREAKER || defined HACKRF_ONE || defined PRALINE)
-	rffc5071_rx(mixer);
-#endif
-#ifdef RAD1O
-	(void) mixer;
-#endif
-}
-
-void mixer_rxtx(mixer_driver_t* const mixer)
-{
-#if (defined JAWBREAKER || defined HACKRF_ONE || defined PRALINE)
-	rffc5071_rxtx(mixer);
-#endif
-#ifdef RAD1O
-	(void) mixer;
-#endif
-}
-
 void mixer_enable(mixer_driver_t* const mixer)
 {
 #if (defined JAWBREAKER || defined HACKRF_ONE || defined PRALINE)

firmware/common/mixer.h

@@ -40,11 +40,6 @@ extern void mixer_setup(mixer_driver_t* const mixer);
 /* Set frequency (Hz). */
 extern uint64_t mixer_set_frequency(mixer_driver_t* const mixer, uint64_t hz);
 
-/* Set up rx only, tx only, or full duplex. Chip should be disabled
- * before _tx, _rx, or _rxtx are called. */
-extern void mixer_tx(mixer_driver_t* const mixer);
-extern void mixer_rx(mixer_driver_t* const mixer);
-extern void mixer_rxtx(mixer_driver_t* const mixer);
 extern void mixer_enable(mixer_driver_t* const mixer);
 extern void mixer_disable(mixer_driver_t* const mixer);
 extern void mixer_set_gpo(mixer_driver_t* const drv, uint8_t gpo);