uhd: fix USRP b210 master clock overwrite

Author: xavierarteaga

lib/radio/uhd/radio_uhd_device.h

@@ -119,6 +119,10 @@ class radio_uhd_device : public uhd_exception_handler
           }
           break;
         case radio_uhd_device_type::types::B2xx:
+          if (!device_addr.has_key("master_clock_rate")) {
+            automatic_master_clock_rate = true;
+          }
+          break;
         case radio_uhd_device_type::types::UNKNOWN:
         default:
           // No default parameters are required.
@@ -204,6 +208,11 @@ class radio_uhd_device : public uhd_exception_handler
   }
   bool set_automatic_master_clock_rate(double srate_Hz)
   {
+    // Skip automatic master clock rate if it is not available.
+    if (!automatic_master_clock_rate) {
+      return true;
+    }
+
     return safe_execution([this, &srate_Hz]() {
       // Get range of valid master clock rates.
       uhd::meta_range_t range = usrp->get_master_clock_rate_range();
@@ -428,8 +437,9 @@ class radio_uhd_device : public uhd_exception_handler
   }
 
 private:
-  uhd::usrp::multi_usrp::sptr usrp = nullptr;
-  radio_uhd_device_type       type = radio_uhd_device_type::types::UNKNOWN;
+  uhd::usrp::multi_usrp::sptr usrp                        = nullptr;
+  radio_uhd_device_type       type                        = radio_uhd_device_type::types::UNKNOWN;
+  bool                        automatic_master_clock_rate = false;
   srslog::basic_logger&       logger;
 };
 

lib/radio/uhd/radio_uhd_impl.cpp

@@ -251,12 +251,9 @@ radio_session_uhd_impl::radio_session_uhd_impl(const radio_configuration::radio&
     return;
   }
 
-  static const std::set<radio_uhd_device_type::types> automatic_mcr_devices = {radio_uhd_device_type::types::B2xx};
-  if (automatic_mcr_devices.count(device.get_type())) {
-    if (!device.set_automatic_master_clock_rate(radio_config.sampling_rate_hz)) {
-      fmt::print("Error setting master clock rate. {}\n", device.get_error_message());
-      return;
-    }
+  if (!device.set_automatic_master_clock_rate(radio_config.sampling_rate_hz)) {
+    fmt::print("Error setting master clock rate. {}\n", device.get_error_message());
+    return;
   }
 
   // Set sync source.