[Commit-gnuradio] r8315 - usrp2/trunk/firmware/lib

[eb]

Author: eb
Date: 2008-05-07 15:59:09 -0600 (Wed, 07 May 2008)
New Revision: 8315

Modified:
   usrp2/trunk/firmware/lib/db_base.h
   usrp2/trunk/firmware/lib/db_rfx.c
Log:
work-in-progress on u2 d'board code

Modified: usrp2/trunk/firmware/lib/db_base.h
===================================================================
--- usrp2/trunk/firmware/lib/db_base.h  2008-05-07 21:38:01 UTC (rev 8314)
+++ usrp2/trunk/firmware/lib/db_base.h  2008-05-07 21:59:09 UTC (rev 8315)
@@ -26,21 +26,34 @@
  * \brief "base class" for firmware version of daughterboard code
  */
 struct db_base {
-  uint16_t             dbid;           // daughterboard ID
+  uint16_t             dbid;           //< daughterboard ID
 
-  u2_fxpt_freq_t       freq_min;       // min freq that can be set (Hz)
-  u2_fxpt_freq_t       freq_max;       // max freq that can be set (Hz)
-  u2_fxpt_freq_t       freq_step_size; // (Hz)
+  u2_fxpt_freq_t       freq_min;       //< min freq that can be set (Hz)
+  u2_fxpt_freq_t       freq_max;       //< max freq that can be set (Hz)
+  u2_fxpt_freq_t       freq_step_size; //< (Hz)
 
-  u2_fxpt_gain_t       gain_min;       // min gain that can be set (dB)
-  u2_fxpt_gain_t       gain_max;       // max gain that can be set (dB)
-  u2_fxpt_gain_t       gain_step_size; // (dB)
+  u2_fxpt_gain_t       gain_min;       //< min gain that can be set (dB)
+  u2_fxpt_gain_t       gain_max;       //< max gain that can be set (dB)
+  u2_fxpt_gain_t       gain_step_size; //< (dB)
 
   bool                 is_quadrature;
   bool                 i_and_q_swapped;
   bool                 spectrum_inverted;
   u2_fxpt_freq_t       lo_offset;
 
+  /*
+   * Auto T/R control values
+   */
+  uint32_t             atr_mask;       //< which bits to control
+  uint32_t             atr_txval;      //< value to use when transmitting
+  uint32_t             atr_rxval;      //< value to use when receiving
+
+  //! delay in clk ticks from when Tx fifo gets data to when T/R switches
+  uint32_t             atr_tx_delay;
+
+  //! delay in clk ticks from when Tx fifo goes empty to when T/R switches
+  uint32_t             atr_rx_delay;
+
   bool (*set_freq)(struct db_base *, u2_fxpt_freq_t freq);
   bool (*set_gain)(struct db_base *, u2_fxpt_gain_t gain);
   bool (*set_tx_enable)(struct db_base *, bool on);

Modified: usrp2/trunk/firmware/lib/db_rfx.c
===================================================================
--- usrp2/trunk/firmware/lib/db_rfx.c   2008-05-07 21:38:01 UTC (rev 8314)
+++ usrp2/trunk/firmware/lib/db_rfx.c   2008-05-07 21:59:09 UTC (rev 8315)
@@ -70,6 +70,11 @@
   .base.set_freq = rfx_set_freq,
   .base.set_gain = rfx_set_gain,
   .base.set_tx_enable = 0,
+  // .base.atr_mask = 
+  // .base.atr_txval = 
+  // .base.atr_rxval =
+  // .base.atr_tx_delay =
+  // .base.atr_rx_delay =
 };
 
 
@@ -88,6 +93,11 @@
   .base.set_freq = rfx_set_freq,
   .base.set_gain = rfx_set_gain,
   .base.set_tx_enable = rfx_set_tx_enable,
+  // .base.atr_mask = 
+  // .base.atr_txval = 
+  // .base.atr_rxval =
+  // .base.atr_tx_delay =
+  // .base.atr_rx_delay =
 };