CBX support

1 files changed, 27 insertions, 1 deletions

diff --git a/host/lib/usrp/dboard/db_sbx_common.hpp b/host/lib/usrp/dboard/db_sbx_common.hpp
index 501a7f1fc..4f3a2eeaa 100644
--- a/host/lib/usrp/dboard/db_sbx_common.hpp
+++ b/host/lib/usrp/dboard/db_sbx_common.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2011 Ettus Research LLC
+// Copyright 2011-2012 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
@@ -100,6 +100,7 @@ using namespace boost::assign;
  * The SBX dboard constants
  **********************************************************************/
 static const freq_range_t sbx_freq_range(400e6, 4.4e9);
+static const freq_range_t cbx_freq_range(1200e6, 6.0e9);
 
 static const freq_range_t sbx_tx_lo_2dbm = list_of
     (range_t(0.35e9, 0.37e9))
@@ -138,6 +139,7 @@ protected:
     uhd::dict<std::string, double> _tx_gains, _rx_gains;
     double       _rx_lo_freq, _tx_lo_freq;
     std::string  _tx_ant, _rx_ant;
+    bool _rx_lo_lock_cache, _tx_lo_lock_cache;
 
     void set_rx_ant(const std::string &ant);
     void set_tx_ant(const std::string &ant);
@@ -212,6 +214,30 @@ protected:
     };
 
     /*!
+     * CBX daughterboard
+     *
+     * The only driver difference between SBX and CBX is the MAX2870 vs. ADF435x.
+     * There is also no LO filter switching required, but the GPIO is left blank
+     * so we don't worry about it.
+     */
+    class cbx : public sbx_versionx {
+    public:
+        cbx(sbx_xcvr *_self_sbx_xcvr);
+        ~cbx(void);
+
+        double set_lo_freq(dboard_iface::unit_t unit, double target_freq);
+
+        /*! This is the registered instance of the wrapper class, sbx_base. */
+        sbx_xcvr *self_base;
+    };
+
+    /*!
+     * Frequency range of the daughterboard; this is set in the constructor
+     * to correspond either to SBX or CBX.
+     */
+    freq_range_t freq_range;
+
+    /*!
      * Handle to the version-specific implementation of the SBX.
      *
      * Since many of this class's functions are dependent on the version of the