Changeset 9756

Timestamp:

10/08/08 17:22:47

Author:

eb

Message:

removed protected d_usrp instance variable

Files:

• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.cc (modified) (7 diffs)
• gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/db_flexrf.h (modified) (4 diffs)

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

@@ -37 +37 @@
-#define CLOCK_OUT (1 << 0)
-
-
-
+bool tx, 
+, tx
-{
-  /*
@@ -55 +55 @@
-  
-  set_auto_tr(false);
-
-  /*
-  std::string title;
-  if(debug_using_gui) {
-    title = "FlexRF Debug Rx";
-    if(d_tx) {
-      title = "FlexRF Debug Tx";
-    }
-    d_gui = flexrf_debug_gui.flexrf_debug_gui(title);
-    d_gui.Show(true);
-  }
-  */
-}
-
@@ -302 +290 @@
-
-flexrf_base_tx::flexrf_base_tx(usrp_basic *usrp, int which, int _power_on)
-
+true, 
-{
-  /*
@@ -309 +297 @@
-  */
-  
-  d_usrp = (usrp_basic_tx*)usrp;
-  d_tx = true;
-
-  if(which == 0) {
-    d_spi_enable = SPI_ENABLE_TX_A;
@@ -408 +393 @@
-
-flexrf_base_rx::flexrf_base_rx(usrp_basic *usrp, int which, int _power_on)
-
+false, 
-{
-  /*
@@ -414 +399 @@
-    @param which: 0 or 1 corresponding to side RX_A or RX_B respectively.
-  */
-
-  d_usrp = (usrp_basic_rx*)usrp;
-  d_tx = false;
-
-  if(which == 0) {
@@ -657 +639 @@
-}
-
-double
-_AD4360_common::freq_min()
-{
-  throw 0;
-}
-
-double
-_AD4360_common::freq_max()
-{
-  throw 0;
-}
-
-//----------------------------------------------------------------------
-

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

@@ -34 +34 @@
-{
-public:
-
+bool tx, 
-  ~flexrf_base();
-
@@ -89 +89 @@
-  bool set_enable(bool on);
-  bool set_gain(float gain);
-
-protected:
-  usrp_basic_tx *d_usrp;
-};
-
@@ -104 +101 @@
-  bool select_rx_antenna(const std::string &which_antenna);
-  bool set_gain(float gain);
-
-protected:
-  usrp_basic_rx *d_usrp;
-};
-
@@ -118 +112 @@
-  virtual ~_AD4360_common();
-
-
-
+ = 0
+ = 0
-
-  bool _compute_regs(double refclk_freq, double freq, int &retR,