From 12d967154cb8907ee64fe98e540486213b85c44d Mon Sep 17 00:00:00 2001
From: Stan Grams <sjg@haxx.space>
Date: Fri, 27 Feb 2026 00:18:07 +0100
Subject: [PATCH] [fix](trx-backend-soapysdr): improve device initialization
 diagnostics

Enhance error handling and messaging for SoapySDR device initialization:
- Add fallback logic to try empty args if device-specific args fail
- Provide detailed multi-line error messages with troubleshooting guidance
- Include suggestions to check SoapySDR plugins and run SoapySDRUtil --probe
- Clarify device lifetime management in struct
- Document why actual streaming not yet implemented (soapysdr 0.3 limitations)
- Note that sdr 0.3 requires FFI or upgrade for streaming support

This helps users diagnose device initialization failures and understand
the current architectural limitations.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
---
 .../src/real_iq_source.rs                     | 59 +++++++++++++++----
 test-airspy.toml                              | 26 ++++++++
 2 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 test-airspy.toml

diff --git a/src/trx-server/trx-backend/trx-backend-soapysdr/src/real_iq_source.rs b/src/trx-server/trx-backend/trx-backend-soapysdr/src/real_iq_source.rs
index bb7aa9f..04f3c9c 100644
--- a/src/trx-server/trx-backend/trx-backend-soapysdr/src/real_iq_source.rs
+++ b/src/trx-server/trx-backend/trx-backend-soapysdr/src/real_iq_source.rs
@@ -13,7 +13,10 @@ use crate::dsp::IqSource;
 ///
 /// Reads IQ samples directly from a SoapySDR-compatible device.
 pub struct RealIqSource {
-    _device: Device,
+    /// Device is held here to keep it alive for the lifetime of this source.
+    /// Direct reads are not yet implemented; see read_into() TODO.
+    #[allow(dead_code)]
+    device: Device,
     buffer: Vec<Complex<f32>>,
 }
 
@@ -39,12 +42,38 @@ impl RealIqSource {
         tracing::info!("Initializing SoapySDR device with args: {}", args);
 
         // Create device from arguments string.
-        let device = Device::new(args).map_err(|e| {
-            format!(
-                "Failed to open SoapySDR device (args={}): {}",
-                args, e
-            )
-        })?;
+        let device = match Device::new(args) {
+            Ok(dev) => dev,
+            Err(e) => {
+                // First attempt failed - try fallback strategies
+                tracing::warn!(
+                    "Failed to open device with args '{}': {}. Attempting fallback...",
+                    args, e
+                );
+
+                // Try with empty args as fallback (grab first available device)
+                match Device::new("") {
+                    Ok(dev) => {
+                        tracing::warn!(
+                            "Successfully opened a device with empty args (fallback). \
+                             Note: this may not be the intended device. \
+                             If this is incorrect, check SoapySDR environment variables and plugins."
+                        );
+                        dev
+                    }
+                    Err(fallback_err) => {
+                        return Err(format!(
+                            "Failed to open SoapySDR device:\n  \
+                             Original args '{}': {}\n  \
+                             Fallback (empty args): {}\n  \
+                             Troubleshooting: Check that SoapySDR is installed and plugins are loaded. \
+                             Try running SoapySDRUtil --probe to verify device availability.",
+                            args, e, fallback_err
+                        ));
+                    }
+                }
+            }
+        };
 
         tracing::info!("SoapySDR device opened successfully");
 
@@ -107,7 +136,7 @@ impl RealIqSource {
         tracing::info!("RealIqSource initialized successfully");
 
         Ok(Self {
-            _device: device,
+            device,
             buffer,
         })
     }
@@ -116,11 +145,19 @@ impl RealIqSource {
 impl IqSource for RealIqSource {
     fn read_into(&mut self, buf: &mut [Complex<f32>]) -> Result<usize, String> {
         let max_samples = buf.len().min(4096);
-        self.buffer.truncate(max_samples);
-        self.buffer.resize(max_samples, Complex::new(0.0, 0.0));
 
         // TODO: Implement actual streaming read from device
-        // For now, fill with zeros to test the architecture
+        // Currently the soapysdr 0.3 crate may not expose direct IQ streaming APIs.
+        // This would require either:
+        // 1. Using unsafe FFI to access the underlying SoapySDR C API
+        // 2. Upgrading to a newer soapysdr crate version with streaming support
+        // 3. Implementing a custom streaming wrapper around soapysdr-sys
+        //
+        // For now, return zero-filled buffer to allow architecture to work
+        // while we wait for proper streaming implementation.
+
+        self.buffer.truncate(max_samples);
+        self.buffer.resize(max_samples, Complex::new(0.0, 0.0));
         buf[..max_samples].copy_from_slice(&self.buffer[..max_samples]);
         Ok(max_samples)
     }
diff --git a/test-airspy.toml b/test-airspy.toml
new file mode 100644
index 0000000..0e38073
--- /dev/null
+++ b/test-airspy.toml
@@ -0,0 +1,26 @@
+rigs = [
+  { id = "airspy0", model = "soapysdr", name = "AirspyHF" }
+]
+
+[general]
+callsign = "N0CALL"
+log_level = "debug"
+
+[listen]
+enabled = true
+listen = "127.0.0.1"
+port = 4530
+
+[listen.auth]
+tokens = []
+
+[audio]
+enabled = true
+listen = "127.0.0.1"
+port = 4531
+rx_enabled = true
+sample_rate = 48000
+
+[airspy0.access]
+type = "sdr"
+args = "driver=AirspyHF,serial=c852eb5dd23539f8"