6 files changed, 28 insertions, 9 deletions
diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp
index 0ae3b0bd8..ecb5a7101 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -30,6 +30,10 @@ using namespace uhd;
 
 static const bool enb_test_clk = false;
 
+usrp2_clock_ctrl::~usrp2_clock_ctrl(void){
+    /* NOP */
+}
+
 /*!
  * A usrp2 clock control specific to the ad9510 ic.
  */
diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp
index 067e1e35d..80dcd0a2d 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@ class usrp2_clock_ctrl : boost::noncopyable{
 public:
     typedef boost::shared_ptr<usrp2_clock_ctrl> sptr;
 
+    virtual ~usrp2_clock_ctrl(void) = 0;
+
     /*!
      * Make a clock config for the ad9510 ic.
      * \param iface a pointer to the usrp2 interface object
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index b53c4d9df..a565078cf 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,6 +27,10 @@
 
 using namespace uhd;
 
+usrp2_codec_ctrl::~usrp2_codec_ctrl(void){
+    /* NOP */
+}
+
 /*!
  * A usrp2 codec control specific to the ad9777 ic.
  */
diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp
index b0d815be2..ddecc6026 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.hpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@ class usrp2_codec_ctrl : boost::noncopyable{
 public:
     typedef boost::shared_ptr<usrp2_codec_ctrl> sptr;
 
+    virtual ~usrp2_codec_ctrl(void) = 0;
+
     /*!
      * Make a codec control for the DAC and ADC.
      * \param iface a pointer to the usrp2 interface object
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 3414b7009..217c1d434 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -200,7 +200,7 @@ static device::sptr usrp2_make(const device_addr_t &device_addr){
 }
 
 UHD_STATIC_BLOCK(register_usrp2_device){
-    device::register_device(&usrp2_find, &usrp2_make);
+    device::register_device(&usrp2_find, &usrp2_make, device::USRP);
 }
 
 /***********************************************************************
@@ -368,6 +368,8 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr){
     // create controller objects and initialize the properties tree
     ////////////////////////////////////////////////////////////////////
     _tree = property_tree::make();
+    _type = device::USRP;
+    _ignore_cal_file = device_addr.has_key("ignore-cal-file");
     _tree->create<std::string>("/name").set("USRP2 / N-Series Device");
 
     for (size_t mbi = 0; mbi < device_args.size(); mbi++){
@@ -793,11 +795,15 @@ sensor_value_t usrp2_impl::get_ref_locked(const std::string &mb){
 }
 
 void usrp2_impl::set_rx_fe_corrections(const std::string &mb, const double lo_freq){
-    apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/" + mb), "A", lo_freq);
+    if(not _ignore_cal_file){
+        apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/" + mb), "A", lo_freq);
+    }
 }
 
 void usrp2_impl::set_tx_fe_corrections(const std::string &mb, const double lo_freq){
-    apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/" + mb), "A", lo_freq);
+    if(not _ignore_cal_file){
+        apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/" + mb), "A", lo_freq);
+    }
 }
 
 #include <boost/math/special_functions/round.hpp>
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index d7b53e56b..edbb7888b 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2012 Ettus Research LLC
+// Copyright 2010-2012,2014 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -113,6 +113,7 @@ private:
 
     void set_rx_fe_corrections(const std::string &mb, const double);
     void set_tx_fe_corrections(const std::string &mb, const double);
+    bool _ignore_cal_file;
 
     //io impl methods and members
     UHD_PIMPL_DECL(io_impl) _io_impl;