Changeset 9748

Timestamp:

10/08/08 01:05:57

Author:

eb

Message:

work-in-progress re-refactoring usrp_basic. lib/legacy builds. untested.

Files:

• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_base.cc (modified) (3 diffs)
• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_base.h (modified) (2 diffs)
• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc (modified) (3 diffs)
• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_basic.cc (modified) (21 diffs)
• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_basic.h (modified) (17 diffs)
• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.cc (modified) (6 diffs)

gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_base.cc

@@ -43 +43 @@
-  d_usrp = usrp;
-
-  // FIXME: this is a stupid response some the Python examples requiring _which
-  _which = which;
-
-  if(d_tx) {
-    d_slot = d_which * 2;
@@ -300 +297 @@
-}
-
+#if 0   // FIXME tune shouldn't be a method of db_base
-tune_result 
-db_base::tune(int chan, double target_freq)
@@ -372 +370 @@
-  return res;
-}
+#endif
+

gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_base.h

@@ -91 +91 @@
-  virtual void select_rx_antenna(int which_antenna);
-
-
+
+
-
-  int which() { return d_which; }
-
-  int _which;
-
- protected:
@@ -102 +101 @@
-  virtual int _refclk_divisor();
-
-int d_which
-usrp_basic *d_usrp
-int d_refclk_reg
-bool d_tx
-
+usrp_basic   *d_usrp
+int          d_which
+bool         d_tx
+int          d_refclk_reg
+         
-};
-

gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_boards.cc

@@ -59 +59 @@
-    
-  case(USRP_DBID_DBS_RX):
-
+
+
-
-  case(USRP_DBID_TV_RX):
@@ -184 +185 @@
-
-  case(-1):
-(usrp->istx()) 
+ (dynamic_cast<usrp_basic_tx*>(usrp))
-      db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
-    }
@@ -195 +196 @@
-  case(-2):
-  default:
-(usrp->istx()) 
+ (dynamic_cast<usrp_basic_tx*>(usrp))
-      fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM contents as if it were a \"Basic Tx.\"\n");
-      fprintf(stderr, "Warning: This is almost certainly wrong...  Use appropriate burn-*-eeprom utility.\n\n");

gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_basic.cc

@@ -181 +181 @@
-
-bool
-
+_
-{
-  return usrp_write_aux_dac (d_udh, slot, which_dac, value);
@@ -187 +187 @@
-
-bool
-
+_
-{
-  return usrp_read_aux_adc (d_udh, slot, which_adc, value);
@@ -193 +193 @@
-
-int
-
+_
-{
-  int   value;
-
+_
-    return READ_FAILED;
-
@@ -315 +315 @@
-}
-
+bool
+usrp_basic::set_dc_offset_cl_enable(int bits, int mask)
+{
+  return _write_fpga_reg(FR_DC_OFFSET_CL_EN, 
+                         (d_fpga_shadows[FR_DC_OFFSET_CL_EN] & ~mask) | (bits & mask));
+}
+
-// ----------------------------------------------------------------
-
@@ -418 +425 @@
-  return usrp_set_led (d_udh, which_led, on);
-}
+
+/*
+ * ----------------------------------------------------------------
+ * Routines to access and control daughterboard specific i/o
+ * ----------------------------------------------------------------
+ */
+static int
+slot_id_to_oe_reg (int slot_id)
+{
+  static int reg[4]  = { FR_OE_0, FR_OE_1, FR_OE_2, FR_OE_3 };
+  assert (0 <= slot_id && slot_id < 4);
+  return reg[slot_id];
+}
+
+static int
+slot_id_to_io_reg (int slot_id)
+{
+  static int reg[4]  = { FR_IO_0, FR_IO_1, FR_IO_2, FR_IO_3 };
+  assert (0 <= slot_id && slot_id < 4);
+  return reg[slot_id];
+}
+
+static int
+to_slot(txrx_t txrx, int which_side)
+{
+  // TX_A = 0
+  // RX_A = 1
+  // TX_B = 2
+  // RX_B = 3
+  return ((which_side & 0x1) << 1) | ((txrx & 0x1) == C_RX);
+}
+
+bool
+usrp_basic::common_set_pga(txrx_t txrx, int which_amp, double gain)
+{
+  if (which_amp < 0 || which_amp > 3)
+    return false;
+
+  gain = std::min(common_pga_max(txrx),
+                  std::max(common_pga_min(txrx), gain));
+
+  int codec = which_amp >> 1;   
+  int int_gain = (int) rint((gain - common_pga_min(txrx)) / common_pga_db_per_step(txrx));
+
+  if (txrx == C_TX){            // 0 and 1 are same, as are 2 and 3
+    return _write_9862(codec, REG_TX_PGA, int_gain);
+  }
+  else {
+    int reg = (which_amp & 1) == 0 ? REG_RX_A : REG_RX_B;
+
+    // read current value to get input buffer bypass flag.
+    unsigned char cur_rx;
+    if (!_read_9862(codec, reg, &cur_rx))
+      return false;
+
+    cur_rx = (cur_rx & RX_X_BYPASS_INPUT_BUFFER) | (int_gain & 0x7f);
+    return _write_9862(codec, reg, cur_rx);
+  }
+}
+
+double
+usrp_basic::common_pga(txrx_t txrx, int which_amp) const
+{
+  if (which_amp < 0 || which_amp > 3)
+    return READ_FAILED;
+
+  if (txrx == C_TX){
+    int codec = which_amp >> 1;
+    unsigned char v;
+    bool ok = _read_9862 (codec, REG_TX_PGA, &v);
+    if (!ok)
+      return READ_FAILED;
+
+    return (pga_db_per_step() * v) + pga_min();
+  }
+  else {
+    int codec = which_amp >> 1;
+    int reg = (which_amp & 1) == 0 ? REG_RX_A : REG_RX_B;
+    unsigned char v;
+    bool ok = _read_9862 (codec, reg, &v);
+    if (!ok)
+      return READ_FAILED;
+
+    return (pga_db_per_step() * (v & 0x1f)) + pga_min();
+  }
+}
+
+double
+usrp_basic::common_pga_min(txrx_t txrx) const
+{
+  if (txrx == C_TX)
+    return -20.0;
+  else
+    return   0.0;
+}
+
+double
+usrp_basic::common_pga_max(txrx_t txrx) const
+{
+  if (txrx == C_TX)
+    return   0.0;
+  else
+    return  20.0;
+}
+
+double
+usrp_basic::common_pga_db_per_step(txrx_t txrx) const
+{
+  if (txrx == C_TX)
+    return  20.0 / 255;
+  else
+    return  20.0 / 20;
+}
+
+bool
+usrp_basic::_common_write_oe(txrx_t txrx, int which_side, int value, int mask)
+{
+  if (! (0 <= which_side && which_side <= 1))
+    return false;
+
+  return _write_fpga_reg(slot_id_to_oe_reg(to_slot(txrx, which_side)),
+                         (mask << 16) | (value & 0xffff));
+}
+
+bool
+usrp_basic::common_write_io(txrx_t txrx, int which_side, int value, int mask)
+{
+  if (! (0 <= which_side && which_side <= 1))
+    return false;
+
+  return _write_fpga_reg(slot_id_to_io_reg(to_slot(txrx, which_side)),
+                         (mask << 16) | (value & 0xffff));
+}
+
+bool
+usrp_basic::common_read_io(txrx_t txrx, int which_side, int *value)
+{
+  if (! (0 <= which_side && which_side <= 1))
+    return false;
+
+  int t;
+  int reg = which_side + 1;     // FIXME, *very* magic number (fix in serial_io.v)
+  bool ok = _read_fpga_reg(reg, &t);
+  if (!ok)
+    return false;
+
+  if (txrx == C_TX){
+    *value = t & 0xffff;                // FIXME, more magic
+    return true;
+  }
+  else {
+    *value = (t >> 16) & 0xffff;        // FIXME, more magic
+    return true;
+  }
+}
+
+int
+usrp_basic::common_read_io(txrx_t txrx, int which_side)
+{
+  int   value;
+  if (!common_read_io(txrx, which_side, &value))
+    return READ_FAILED;
+  return value;
+}
+
+bool
+usrp_basic::common_write_aux_dac(txrx_t txrx, int which_side, int which_dac, int value)
+{
+  return _write_aux_dac(to_slot(txrx, which_side), which_dac, value);
+}
+
+bool
+usrp_basic::common_read_aux_adc(txrx_t txrx, int which_side, int which_adc, int *value)
+{
+  return _read_aux_adc(to_slot(txrx, which_side), which_adc, value);
+}
+
+int
+usrp_basic::common_read_aux_adc(txrx_t txrx, int which_side, int which_adc)
+{
+  return _read_aux_adc(to_slot(txrx, which_side), which_adc);
+}
+
-
-////////////////////////////////////////////////////////////////
@@ -655 +845 @@
-  if (on != rx_enable ())
-    set_rx_enable (on);
-}
-
-bool
-usrp_basic_rx::set_pga (int which_amp, double gain)
-{
-  if (which_amp < 0 || which_amp > 3)
-    return false;
-
-  gain = std::max (pga_min (), gain);
-  gain = std::min (pga_max (), gain);
-
-  int codec = which_amp >> 1;
-  int reg = (which_amp & 1) == 0 ? REG_RX_A : REG_RX_B;
-
-  // read current value to get input buffer bypass flag.
-  unsigned char cur_rx;
-  if (!_read_9862 (codec, reg, &cur_rx))
-    return false;
-
-  int int_gain = (int) rint ((gain - pga_min ()) / pga_db_per_step());
-
-  cur_rx = (cur_rx & RX_X_BYPASS_INPUT_BUFFER) | (int_gain & 0x7f);
-  return _write_9862 (codec, reg, cur_rx);
-}
-
-double
-usrp_basic_rx::pga (int which_amp) const
-{
-  if (which_amp < 0 || which_amp > 3)
-    return READ_FAILED;
-
-  int codec = which_amp >> 1;
-  int reg = (which_amp & 1) == 0 ? REG_RX_A : REG_RX_B;
-  unsigned char v;
-  bool ok = _read_9862 (codec, reg, &v);
-  if (!ok)
-    return READ_FAILED;
-
-  return (pga_db_per_step() * (v & 0x1f)) + pga_min();
-}
-
-static int
-slot_id_to_oe_reg (int slot_id)
-{
-  static int reg[4]  = { FR_OE_0, FR_OE_1, FR_OE_2, FR_OE_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-slot_id_to_io_reg (int slot_id)
-{
-  static int reg[4]  = { FR_IO_0, FR_IO_1, FR_IO_2, FR_IO_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
@@ -761 +896 @@
-
-bool
+usrp_basic_rx::set_pga (int which_amp, double gain)
+{
+  return common_set_pga(C_RX, which_amp, gain);
+}
+
+double
+usrp_basic_rx::pga (int which_amp) const
+{
+  return common_pga(C_RX, which_amp);
+}
+
+bool
-usrp_basic_rx::_write_oe (int which_side, int value, int mask)
-{
-
-
-
-
-
+
-}
-
@@ -773 +916 @@
-usrp_basic_rx::write_io (int which_side, int value, int mask)
-{
-
-
-
-
-
+
-}
-
@@ -783 +922 @@
-usrp_basic_rx::read_io (int which_side, int *value)
-{
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -799 +928 @@
-usrp_basic_rx::read_io (int which_side)
-{
-
-
-
-
+
-}
-
@@ -808 +934 @@
-usrp_basic_rx::write_aux_dac (int which_side, int which_dac, int value)
-{
-
-
+
-}
-
@@ -815 +940 @@
-usrp_basic_rx::read_aux_adc (int which_side, int which_adc, int *value)
-{
-
-
+
-}
-
@@ -822 +946 @@
-usrp_basic_rx::read_aux_adc (int which_side, int which_adc)
-{
-usrp_basic::read_aux_adc (dboard_to_slot (which_side)
+common_read_aux_adc(C_RX, which_side
-}
-
-int
-usrp_basic_rx::block_size () const { return d_ephandle->block_size(); }
-
-bool
-usrp_basic_rx::set_dc_offset_cl_enable(int bits, int mask)
-{
-  return _write_fpga_reg(FR_DC_OFFSET_CL_EN, 
-                         (d_fpga_shadows[FR_DC_OFFSET_CL_EN] & ~mask) | (bits & mask));
-}
-
-////////////////////////////////////////////////////////////////
@@ -1093 +1210 @@
-  if (on != tx_enable ())
-    set_tx_enable (on);
-}
-
-bool
-usrp_basic_tx::set_pga (int which_amp, double gain)
-{
-  if (which_amp < 0 || which_amp > 3)
-    return false;
-
-  gain = std::max (pga_min (), gain);
-  gain = std::min (pga_max (), gain);
-
-  int codec = which_amp >> 1;   // 0 and 1 are same, as are 2 and 3
-
-  int int_gain = (int) rint ((gain - pga_min ()) / pga_db_per_step());
-
-  return _write_9862 (codec, REG_TX_PGA, int_gain);
-}
-
-double
-usrp_basic_tx::pga (int which_amp) const
-{
-  if (which_amp < 0 || which_amp > 3)
-    return READ_FAILED;
-
-  int codec = which_amp >> 1;
-  unsigned char v;
-  bool ok = _read_9862 (codec, REG_TX_PGA, &v);
-  if (!ok)
-    return READ_FAILED;
-
-  return (pga_db_per_step() * v) + pga_min();
-}
-
@@ -1175 +1261 @@
-
-bool
+usrp_basic_tx::set_pga (int which_amp, double gain)
+{
+  return common_set_pga(C_TX, which_amp, gain);
+}
+
+double
+usrp_basic_tx::pga (int which_amp) const
+{
+  return common_pga(C_TX, which_amp);
+}
+
+bool
-usrp_basic_tx::_write_oe (int which_side, int value, int mask)
-{
-
-
-
-
-
+
-}
-
@@ -1187 +1281 @@
-usrp_basic_tx::write_io (int which_side, int value, int mask)
-{
-
-
-
-
-
+
-}
-
@@ -1197 +1287 @@
-usrp_basic_tx::read_io (int which_side, int *value)
-{
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -1213 +1293 @@
-usrp_basic_tx::read_io (int which_side)
-{
-
-
-
-
+
-}
-
@@ -1222 +1299 @@
-usrp_basic_tx::write_aux_dac (int which_side, int which_dac, int value)
-{
-
-
+
-}
-
@@ -1229 +1305 @@
-usrp_basic_tx::read_aux_adc (int which_side, int which_adc, int *value)
-{
-
-
+
-}
-
@@ -1236 +1311 @@
-usrp_basic_tx::read_aux_adc (int which_side, int which_adc)
-{
-usrp_basic::read_aux_adc (dboard_to_slot (which_side)
+common_read_aux_adc(C_TX, which_side
-}
-

gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_basic.h

@@ -42 +42 @@
-#include <usrp_slots.h>
-#include <string>
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
+
+
+class db_base;
+typedef boost::shared_ptr<db_base> db_base_sptr;
+
-
-struct usb_dev_handle;
@@ -47 +54 @@
-class  fusb_ephandle;
-
+enum txrx_t {
+  C_RX = 0,
+  C_TX = 1
+};
+
+
-/*!
- * \brief base class for usrp operations
- */
-
+ : boost::noncopyable
-{
-private:
-  // NOT IMPLEMENTED
-  usrp_basic (const usrp_basic &rhs);                   // no copy constructor
-  usrp_basic &operator= (const usrp_basic &rhs);        // no assignment operator
-
-  
-protected:
-  struct usb_dev_handle *d_udh;
@@ -93 +100 @@
-   * \returns true iff successful
-   */
-
+_
-
-  /*!
@@ -103 +110 @@
-   * \returns true iff successful
-   */
-
+_
-
-  /*!
@@ -112 +119 @@
-   * \returns value in the range [0,4095] if successful, else READ_FAILED.
-   */
-
+
+
-
-public:
@@ -192 +200 @@
-  bool set_adc_buffer_bypass (int which_adc, bool bypass);
-
+  /*!
+   * \brief Enable/disable automatic DC offset removal control loop in FPGA
+   *
+   * \param bits  which control loops to enable
+   * \param mask  which \p bits to pay attention to
+   *
+   * If the corresponding bit is set, enable the automatic DC
+   * offset correction control loop.
+   *
+   * <pre>
+   * The 4 low bits are significant:
+   *
+   *   ADC0 = (1 << 0)
+   *   ADC1 = (1 << 1)
+   *   ADC2 = (1 << 2)
+   *   ADC3 = (1 << 3)
+   * </pre>
+   *
+   * By default the control loop is enabled on all ADC's.
+   */
+  bool set_dc_offset_cl_enable(int bits, int mask);
-
-  /*!
@@ -199 +228 @@
-   */
-  std::string serial_number();
+
+  /*!
+   * \brief Return daughterboard ID for given side [0,1].
+   *
+   * \param which_side  [0,1] which daughterboard
+   *
+   * \return daughterboard id >= 0 if successful
+   * \return -1 if no daugherboard
+   * \return -2 if invalid EEPROM on daughterboard
+   */
+  virtual int daughterboard_id (int which_side) const = 0;
+
+  // ================================================================
+  // Routines to access and control daughterboard specific i/o
+  //
+  // Those with a common_ prefix access either the Tx or Rx side depending
+  // on the txrx parameter.  Those without the common_ prefix are virtual
+  // and are overriden in usrp_basic_rx and usrp_basic_tx to access the
+  // the Rx or Tx sides automatically.  We provide the common_ versions
+  // for those daughterboards such as the WBX and XCVR2450 that share
+  // h/w resources (such as the LO) between the Tx and Rx sides.
+
+  // ----------------------------------------------------------------
+  // BEGIN common_  daughterboard control functions
+
+  /*!
+   * \brief Set Programmable Gain Amplifier(PGA)
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_amp   which amp [0,3]
+   * \param gain_in_db  gain value(linear in dB)
+   *
+   * gain is rounded to closest setting supported by hardware.
+   *
+   * \returns true iff sucessful.
+   *
+   * \sa pga_min(), pga_max(), pga_db_per_step()
+   */
+  bool common_set_pga(txrx_t txrx, int which_amp, double gain_in_db);
+
+  /*!
+   * \brief Return programmable gain amplifier gain setting in dB.
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_amp   which amp [0,3]
+   */
+  double common_pga(txrx_t txrx, int which_amp) const;
+
+  /*!
+   * \brief Return minimum legal PGA gain in dB.
+   * \param txrx        Tx or Rx?
+   */
+  double common_pga_min(txrx_t txrx) const;
+
+  /*!
+   * \brief Return maximum legal PGA gain in dB.
+   * \param txrx        Tx or Rx?
+   */
+  double common_pga_max(txrx_t txrx) const;
+
+  /*!
+   * \brief Return hardware step size of PGA(linear in dB).
+   * \param txrx        Tx or Rx?
+   */
+  double common_pga_db_per_step(txrx_t txrx) const;
+
+  /*!
+   * \brief Write direction register(output enables) for pins that go to daughterboard.
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which size
+   * \param value       value to write into register
+   * \param mask        which bits of value to write into reg
+   *
+   * Each d'board has 16-bits of general purpose i/o.
+   * Setting the bit makes it an output from the FPGA to the d'board.
+   *
+   * This register is initialized based on a value stored in the
+   * d'board EEPROM.  In general, you shouldn't be using this routine
+   * without a very good reason.  Using this method incorrectly will
+   * kill your USRP motherboard and/or daughterboard.
+   */
+  bool _common_write_oe(txrx_t txrx, int which_side, int value, int mask);
+
+  /*!
+   * \brief Write daughterboard i/o pin value
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which d'board
+   * \param value       value to write into register
+   * \param mask        which bits of value to write into reg
+   */
+  bool common_write_io(txrx_t txrx, int which_side, int value, int mask);
+
+  /*!
+   * \brief Read daughterboard i/o pin value
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which d'board
+   * \param value       output
+   */
+  bool common_read_io(txrx_t txrx, int which_side, int *value);
+
+  /*!
+   * \brief Read daughterboard i/o pin value
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which d'board
+   * \returns register value if successful, else READ_FAILED
+   */
+  int common_read_io(txrx_t txrx, int which_side);
+
+  /*!
+   * \brief Write auxiliary digital to analog converter.
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which d'board
+   *                    N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
+   *                    SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
+   * \param which_dac   [2,3] TX slots must use only 2 and 3.
+   * \param value       [0,4095]
+   * \returns true iff successful
+   */
+  bool common_write_aux_dac(txrx_t txrx, int which_side, int which_dac, int value);
+
+  /*!
+   * \brief Read auxiliary analog to digital converter.
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which d'board
+   * \param which_adc   [0,1]
+   * \param value       return 12-bit value [0,4095]
+   * \returns true iff successful
+   */
+  bool common_read_aux_adc(txrx_t txrx, int which_side, int which_adc, int *value);
+
+  /*!
+   * \brief Read auxiliary analog to digital converter.
+   *
+   * \param txrx        Tx or Rx?
+   * \param which_side  [0,1] which d'board
+   * \param which_adc   [0,1]
+   * \returns value in the range [0,4095] if successful, else READ_FAILED.
+   */
+  int common_read_aux_adc(txrx_t txrx, int which_side, int which_adc);
+
+  // END common_ daughterboard control functions
+  // ----------------------------------------------------------------
+  // BEGIN virtual daughterboard control functions
+
+  /*!
+   * \brief Set Programmable Gain Amplifier (PGA)
+   *
+   * \param which_amp   which amp [0,3]
+   * \param gain_in_db  gain value (linear in dB)
+   *
+   * gain is rounded to closest setting supported by hardware.
+   *
+   * \returns true iff sucessful.
+   *
+   * \sa pga_min(), pga_max(), pga_db_per_step()
+   */
+  virtual bool set_pga (int which_amp, double gain_in_db) = 0;
+
+  /*!
+   * \brief Return programmable gain amplifier gain setting in dB.
+   *
+   * \param which_amp   which amp [0,3]
+   */
+  virtual double pga (int which_amp) const = 0;
+
+  /*!
+   * \brief Return minimum legal PGA gain in dB.
+   */
+  virtual double pga_min () const = 0;
+
+  /*!
+   * \brief Return maximum legal PGA gain in dB.
+   */
+  virtual double pga_max () const = 0;
+
+  /*!
+   * \brief Return hardware step size of PGA (linear in dB).
+   */
+  virtual double pga_db_per_step () const = 0;
+
+  /*!
+   * \brief Write direction register (output enables) for pins that go to daughterboard.
+   *
+   * \param which_side  [0,1] which size
+   * \param value       value to write into register
+   * \param mask        which bits of value to write into reg
+   *
+   * Each d'board has 16-bits of general purpose i/o.
+   * Setting the bit makes it an output from the FPGA to the d'board.
+   *
+   * This register is initialized based on a value stored in the
+   * d'board EEPROM.  In general, you shouldn't be using this routine
+   * without a very good reason.  Using this method incorrectly will
+   * kill your USRP motherboard and/or daughterboard.
+   */
+  virtual bool _write_oe (int which_side, int value, int mask) = 0;
+
+  /*!
+   * \brief Write daughterboard i/o pin value
+   *
+   * \param which_side  [0,1] which d'board
+   * \param value       value to write into register
+   * \param mask        which bits of value to write into reg
+   */
+  virtual bool write_io (int which_side, int value, int mask) = 0;
+
+  /*!
+   * \brief Read daughterboard i/o pin value
+   *
+   * \param which_side  [0,1] which d'board
+   * \param value       output
+   */
+  virtual bool read_io (int which_side, int *value) = 0;
+
+  /*!
+   * \brief Read daughterboard i/o pin value
+   *
+   * \param which_side  [0,1] which d'board
+   * \returns register value if successful, else READ_FAILED
+   */
+  virtual int read_io (int which_side) = 0;
+
+  /*!
+   * \brief Write auxiliary digital to analog converter.
+   *
+   * \param which_side  [0,1] which d'board
+   *                    N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
+   *                    SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
+   * \param which_dac   [2,3] TX slots must use only 2 and 3.
+   * \param value       [0,4095]
+   * \returns true iff successful
+   */
+  virtual bool write_aux_dac (int which_side, int which_dac, int value) = 0;
+
+  /*!
+   * \brief Read auxiliary analog to digital converter.
+   *
+   * \param which_side  [0,1] which d'board
+   * \param which_adc   [0,1]
+   * \param value       return 12-bit value [0,4095]
+   * \returns true iff successful
+   */
+  virtual bool read_aux_adc (int which_side, int which_adc, int *value) = 0;
+
+  /*!
+   * \brief Read auxiliary analog to digital converter.
+   *
+   * \param which_side  [0,1] which d'board
+   * \param which_adc   [0,1]
+   * \returns value in the range [0,4095] if successful, else READ_FAILED.
+   */
+  virtual int read_aux_adc (int which_side, int which_adc) = 0;
+
+  /*!
+   * \brief returns current fusb block size
+   */
+  virtual int block_size() const = 0;
+
+  /*!
+   * \brief returns A/D or D/A converter rate in Hz
+   */
+  virtual long converter_rate() const = 0;
+
+  // END virtual daughterboard control functions
-
-  // ----------------------------------------------------------------
@@ -229 +528 @@
-   */
-  int  _read_fpga_reg (int regno);
-
-
-  /*!
@@ -347 +645 @@
-
-  void probe_rx_slots (bool verbose);
-  int  dboard_to_slot (int dboard) { return (dboard << 1) | 1; }
-
-public:
@@ -359 +656 @@
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default. 
+   * \param fpga_filename    name of file that contains image to load into FPGA
+   * \param firmware_filename   name of file that contains image to load into FX2
-   */
-  static usrp_basic_rx *make (int which_board,
@@ -367 +666 @@
-                              );
-
-  // MANIPULATORS
-
-  /*!
-   * \brief tell the fpga the rate rx samples are coming from the A/D's
@@ -390 +687 @@
-  int read (void *buf, int len, bool *overrun);
-
-  // ACCESSORS
-
-  //! sampling rate of A/D converter
-  virtual long converter_rate() const { return fpga_master_clock_freq(); } // 64M
-  long adc_rate() const { return converter_rate(); }
-  long adc_freq() const { return converter_rate(); }   //!< deprecated method name
-
-  /*!
-   * \brief Return daughterboard ID for given Rx daughterboard slot [0,1].
-   *
-   * \param which_side  [0,1] which Rx daughterboard
-   *
-   * \return daughterboard id >= 0 if successful
-   * \return -1 if no daugherboard
-   * \return -2 if invalid EEPROM on daughterboard
-   */
-  int daughterboard_id (int which_side) const { return d_dbid[which_side & 0x1]; }
-
-  // ----------------------------------------------------------------
-  // routines for controlling the Programmable Gain Amplifier
-  /*!
-   * \brief Set Programmable Gain Amplifier (PGA)
-   *
-   * \param which_amp   which A/D [0,3]
-   * \param gain_in_db  gain value (linear in dB)
-   *
-   * gain is rounded to closest setting supported by hardware.
-   *
-   * \returns true iff sucessful.
-   *
-   * \sa pga_min(), pga_max(), pga_db_per_step()
-   */
-  bool set_pga (int which_amp, double gain_in_db);
-
-  /*!
-   * \brief Return programmable gain amplifier gain setting in dB.
-   *
-   * \param which_amp   which A/D [0,3]
-   */
-  double pga (int which_amp) const;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  bool _write_oe (int which_side, int value, int mask);
-
-  /*!
-   * \brief Write daughterboard i/o pin value
-   *
-   * \param which_side  [0,1] which d'board
-   * \param value       value to write into register
-   * \param mask        which bits of value to write into reg
-   */
-  bool write_io (int which_side, int value, int mask);
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param which_side  [0,1] which d'board
-   * \param value       output
-   */
-  bool read_io (int which_side, int *value);
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param which_side  [0,1] which d'board
-   * \returns register value if successful, else READ_FAILED
-   */
-  int read_io (int which_side);
-
-  /*!
-   * \brief Write auxiliary digital to analog converter.
-   *
-   * \param which_side  [0,1] which d'board
-   *                    N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
-   *                    SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
-   * \param which_dac   [2,3] TX slots must use only 2 and 3.
-   * \param value       [0,4095]
-   * \returns true iff successful
-   */
-  bool write_aux_dac (int which_side, int which_dac, int value);
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param which_side  [0,1] which d'board
-   * \param which_adc   [0,1]
-   * \param value       return 12-bit value [0,4095]
-   * \returns true iff successful
-   */
-  bool read_aux_adc (int which_side, int which_adc, int *value);
-
-
-